joachim99@8
|
1 /***************************************************************************
|
joachim99@8
|
2 diff.h - description
|
joachim99@8
|
3 -------------------
|
joachim99@8
|
4 begin : Mon Mar 18 2002
|
joachim99@58
|
5 copyright : (C) 2002-2004 by Joachim Eibl
|
joachim99@69
|
6 email : joachim.eibl at gmx.de
|
joachim99@8
|
7 ***************************************************************************/
|
joachim99@8
|
8
|
joachim99@8
|
9 /***************************************************************************
|
joachim99@8
|
10 * *
|
joachim99@8
|
11 * This program is free software; you can redistribute it and/or modify *
|
joachim99@8
|
12 * it under the terms of the GNU General Public License as published by *
|
joachim99@8
|
13 * the Free Software Foundation; either version 2 of the License, or *
|
joachim99@8
|
14 * (at your option) any later version. *
|
joachim99@8
|
15 * *
|
joachim99@8
|
16 ***************************************************************************/
|
joachim99@8
|
17
|
joachim99@8
|
18 #ifndef DIFF_H
|
joachim99@8
|
19 #define DIFF_H
|
joachim99@8
|
20
|
joachim99@75
|
21 #include <QPainter>
|
joachim99@8
|
22 #include <list>
|
joachim99@8
|
23 #include <vector>
|
joachim99@8
|
24 #include <assert.h>
|
joachim99@8
|
25 #include "common.h"
|
joachim99@8
|
26 #include "fileaccess.h"
|
joachim99@8
|
27
|
joachim99@75
|
28 class OptionDialog;
|
joachim99@8
|
29
|
joachim99@8
|
30 // Each range with matching elements is followed by a range with differences on either side.
|
joachim99@8
|
31 // Then again range of matching elements should follow.
|
joachim99@8
|
32 struct Diff
|
joachim99@8
|
33 {
|
joachim99@8
|
34 int nofEquals;
|
joachim99@8
|
35
|
joachim99@8
|
36 int diff1;
|
joachim99@8
|
37 int diff2;
|
joachim99@8
|
38
|
joachim99@8
|
39 Diff(int eq, int d1, int d2){nofEquals=eq; diff1=d1; diff2=d2; }
|
joachim99@8
|
40 };
|
joachim99@8
|
41
|
joachim99@8
|
42 typedef std::list<Diff> DiffList;
|
joachim99@8
|
43
|
joachim99@69
|
44 struct LineData
|
joachim99@69
|
45 {
|
joachim99@69
|
46 const QChar* pLine;
|
joachim99@69
|
47 const QChar* pFirstNonWhiteChar;
|
joachim99@69
|
48 int size;
|
joachim99@69
|
49
|
joachim99@69
|
50 LineData(){ pLine=0; pFirstNonWhiteChar=0; size=0; /*occurances=0;*/ bContainsPureComment=false; }
|
joachim99@69
|
51 int width(int tabSize) const; // Calcs width considering tabs.
|
joachim99@69
|
52 //int occurances;
|
joachim99@69
|
53 bool whiteLine() const { return pFirstNonWhiteChar-pLine == size; }
|
joachim99@69
|
54 bool bContainsPureComment;
|
joachim99@69
|
55 };
|
joachim99@69
|
56
|
joachim99@69
|
57 class Diff3LineList;
|
joachim99@69
|
58 class Diff3LineVector;
|
joachim99@69
|
59
|
joachim99@69
|
60 struct DiffBufferInfo
|
joachim99@69
|
61 {
|
joachim99@69
|
62 const LineData* m_pLineDataA;
|
joachim99@69
|
63 const LineData* m_pLineDataB;
|
joachim99@69
|
64 const LineData* m_pLineDataC;
|
joachim99@69
|
65 int m_sizeA;
|
joachim99@69
|
66 int m_sizeB;
|
joachim99@69
|
67 int m_sizeC;
|
joachim99@69
|
68 const Diff3LineList* m_pDiff3LineList;
|
joachim99@69
|
69 const Diff3LineVector* m_pDiff3LineVector;
|
joachim99@69
|
70 void init( Diff3LineList* d3ll, const Diff3LineVector* d3lv,
|
joachim99@69
|
71 const LineData* pldA, int sizeA, const LineData* pldB, int sizeB, const LineData* pldC, int sizeC );
|
joachim99@69
|
72 };
|
joachim99@69
|
73
|
joachim99@8
|
74 struct Diff3Line
|
joachim99@8
|
75 {
|
joachim99@8
|
76 int lineA;
|
joachim99@8
|
77 int lineB;
|
joachim99@8
|
78 int lineC;
|
joachim99@8
|
79
|
joachim99@69
|
80 bool bAEqC : 1; // These are true if equal or only white-space changes exist.
|
joachim99@69
|
81 bool bBEqC : 1;
|
joachim99@69
|
82 bool bAEqB : 1;
|
joachim99@8
|
83
|
joachim99@69
|
84 bool bWhiteLineA : 1;
|
joachim99@69
|
85 bool bWhiteLineB : 1;
|
joachim99@69
|
86 bool bWhiteLineC : 1;
|
joachim99@69
|
87
|
joachim99@69
|
88 DiffList* pFineAB; // These are 0 only if completely equal or if either source doesn't exist.
|
joachim99@8
|
89 DiffList* pFineBC;
|
joachim99@8
|
90 DiffList* pFineCA;
|
joachim99@8
|
91
|
joachim99@66
|
92 int linesNeededForDisplay; // Due to wordwrap
|
joachim99@66
|
93 int sumLinesNeededForDisplay; // For fast conversion to m_diff3WrapLineVector
|
joachim99@69
|
94
|
joachim99@69
|
95 DiffBufferInfo* m_pDiffBufferInfo; // For convenience
|
joachim99@69
|
96
|
joachim99@8
|
97 Diff3Line()
|
joachim99@8
|
98 {
|
joachim99@8
|
99 lineA=-1; lineB=-1; lineC=-1;
|
joachim99@8
|
100 bAEqC=false; bAEqB=false; bBEqC=false;
|
joachim99@8
|
101 pFineAB=0; pFineBC=0; pFineCA=0;
|
joachim99@66
|
102 linesNeededForDisplay=1;
|
joachim99@69
|
103 sumLinesNeededForDisplay=0;
|
joachim99@69
|
104 bWhiteLineA=false; bWhiteLineB=false; bWhiteLineC=false;
|
joachim99@69
|
105 m_pDiffBufferInfo=0;
|
joachim99@8
|
106 }
|
joachim99@8
|
107
|
joachim99@8
|
108 ~Diff3Line()
|
joachim99@8
|
109 {
|
joachim99@8
|
110 if (pFineAB!=0) delete pFineAB;
|
joachim99@8
|
111 if (pFineBC!=0) delete pFineBC;
|
joachim99@8
|
112 if (pFineCA!=0) delete pFineCA;
|
joachim99@8
|
113 pFineAB=0; pFineBC=0; pFineCA=0;
|
joachim99@8
|
114 }
|
joachim99@8
|
115
|
joachim99@8
|
116 bool operator==( const Diff3Line& d3l )
|
joachim99@8
|
117 {
|
joachim99@8
|
118 return lineA == d3l.lineA && lineB == d3l.lineB && lineC == d3l.lineC
|
joachim99@8
|
119 && bAEqB == d3l.bAEqB && bAEqC == d3l.bAEqC && bBEqC == d3l.bBEqC;
|
joachim99@8
|
120 }
|
joachim99@69
|
121
|
joachim99@69
|
122 const LineData* getLineData( int src ) const
|
joachim99@69
|
123 {
|
joachim99@69
|
124 assert( m_pDiffBufferInfo!=0 );
|
joachim99@69
|
125 if ( src == 1 && lineA >= 0 ) return &m_pDiffBufferInfo->m_pLineDataA[lineA];
|
joachim99@69
|
126 if ( src == 2 && lineB >= 0 ) return &m_pDiffBufferInfo->m_pLineDataB[lineB];
|
joachim99@69
|
127 if ( src == 3 && lineC >= 0 ) return &m_pDiffBufferInfo->m_pLineDataC[lineC];
|
joachim99@69
|
128 return 0;
|
joachim99@69
|
129 }
|
joachim99@69
|
130 QString getString( int src ) const
|
joachim99@69
|
131 {
|
joachim99@69
|
132 const LineData* pld = getLineData(src);
|
joachim99@69
|
133 if ( pld )
|
joachim99@69
|
134 return QString( pld->pLine, pld->size);
|
joachim99@69
|
135 else
|
joachim99@69
|
136 return QString();
|
joachim99@69
|
137 }
|
joachim99@69
|
138 int getLineInFile( int src ) const
|
joachim99@69
|
139 {
|
joachim99@69
|
140 if ( src == 1 ) return lineA;
|
joachim99@69
|
141 if ( src == 2 ) return lineB;
|
joachim99@69
|
142 if ( src == 3 ) return lineC;
|
joachim99@69
|
143 return -1;
|
joachim99@69
|
144 }
|
joachim99@8
|
145 };
|
joachim99@8
|
146
|
joachim99@66
|
147
|
joachim99@69
|
148 class Diff3LineList : public std::list<Diff3Line>
|
joachim99@69
|
149 {
|
joachim99@69
|
150 };
|
joachim99@69
|
151 class Diff3LineVector : public std::vector<Diff3Line*>
|
joachim99@69
|
152 {
|
joachim99@69
|
153 };
|
joachim99@66
|
154
|
joachim99@66
|
155 class Diff3WrapLine
|
joachim99@66
|
156 {
|
joachim99@66
|
157 public:
|
joachim99@66
|
158 Diff3Line* pD3L;
|
joachim99@66
|
159 int diff3LineIndex;
|
joachim99@66
|
160 int wrapLineOffset;
|
joachim99@69
|
161 int wrapLineLength;
|
joachim99@66
|
162 };
|
joachim99@66
|
163
|
joachim99@66
|
164 typedef std::vector<Diff3WrapLine> Diff3WrapLineVector;
|
joachim99@66
|
165
|
joachim99@8
|
166
|
joachim99@8
|
167 class TotalDiffStatus
|
joachim99@8
|
168 {
|
joachim99@8
|
169 public:
|
joachim99@66
|
170 TotalDiffStatus(){ reset(); }
|
joachim99@8
|
171 void reset() {bBinaryAEqC=false; bBinaryBEqC=false; bBinaryAEqB=false;
|
joachim99@66
|
172 bTextAEqC=false; bTextBEqC=false; bTextAEqB=false;
|
joachim99@66
|
173 nofUnsolvedConflicts=0; nofSolvedConflicts=0;
|
joachim99@69
|
174 nofWhitespaceConflicts=0;
|
joachim99@66
|
175 }
|
joachim99@8
|
176 bool bBinaryAEqC;
|
joachim99@8
|
177 bool bBinaryBEqC;
|
joachim99@8
|
178 bool bBinaryAEqB;
|
joachim99@8
|
179
|
joachim99@8
|
180 bool bTextAEqC;
|
joachim99@8
|
181 bool bTextBEqC;
|
joachim99@8
|
182 bool bTextAEqB;
|
joachim99@69
|
183
|
joachim99@66
|
184 int nofUnsolvedConflicts;
|
joachim99@66
|
185 int nofSolvedConflicts;
|
joachim99@66
|
186 int nofWhitespaceConflicts;
|
joachim99@8
|
187 };
|
joachim99@8
|
188
|
joachim99@69
|
189 // Three corresponding ranges. (Minimum size of a valid range is one line.)
|
joachim99@69
|
190 class ManualDiffHelpEntry
|
joachim99@69
|
191 {
|
joachim99@69
|
192 public:
|
joachim99@69
|
193 ManualDiffHelpEntry() { lineA1=-1; lineA2=-1;
|
joachim99@69
|
194 lineB1=-1; lineB2=-1;
|
joachim99@69
|
195 lineC1=-1; lineC2=-1; }
|
joachim99@69
|
196 int lineA1;
|
joachim99@69
|
197 int lineA2;
|
joachim99@69
|
198 int lineB1;
|
joachim99@69
|
199 int lineB2;
|
joachim99@69
|
200 int lineC1;
|
joachim99@69
|
201 int lineC2;
|
joachim99@69
|
202 int& firstLine( int winIdx )
|
joachim99@69
|
203 {
|
joachim99@69
|
204 return winIdx==1 ? lineA1 : (winIdx==2 ? lineB1 : lineC1 );
|
joachim99@69
|
205 }
|
joachim99@69
|
206 int& lastLine( int winIdx )
|
joachim99@69
|
207 {
|
joachim99@69
|
208 return winIdx==1 ? lineA2 : (winIdx==2 ? lineB2 : lineC2 );
|
joachim99@69
|
209 }
|
joachim99@69
|
210 bool isLineInRange( int line, int winIdx )
|
joachim99@69
|
211 {
|
joachim99@69
|
212 return line>=0 && line>=firstLine(winIdx) && line<=lastLine(winIdx);
|
joachim99@69
|
213 }
|
joachim99@69
|
214 bool operator==(const ManualDiffHelpEntry& r) const
|
joachim99@69
|
215 {
|
joachim99@69
|
216 return lineA1 == r.lineA1 && lineB1 == r.lineB1 && lineC1 == r.lineC1 &&
|
joachim99@69
|
217 lineA2 == r.lineA2 && lineB2 == r.lineB2 && lineC2 == r.lineC2;
|
joachim99@69
|
218 }
|
joachim99@69
|
219 };
|
joachim99@69
|
220
|
joachim99@69
|
221 // A list of corresponding ranges
|
joachim99@69
|
222 typedef std::list<ManualDiffHelpEntry> ManualDiffHelpList;
|
joachim99@69
|
223
|
joachim99@51
|
224 void calcDiff3LineListUsingAB(
|
joachim99@8
|
225 const DiffList* pDiffListAB,
|
joachim99@8
|
226 Diff3LineList& d3ll
|
joachim99@8
|
227 );
|
joachim99@8
|
228
|
joachim99@8
|
229 void calcDiff3LineListUsingAC(
|
joachim99@8
|
230 const DiffList* pDiffListBC,
|
joachim99@8
|
231 Diff3LineList& d3ll
|
joachim99@8
|
232 );
|
joachim99@8
|
233
|
joachim99@68
|
234 void calcDiff3LineListUsingBC(
|
joachim99@8
|
235 const DiffList* pDiffListBC,
|
joachim99@8
|
236 Diff3LineList& d3ll
|
joachim99@8
|
237 );
|
joachim99@8
|
238
|
joachim99@69
|
239 void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManualDiffHelpList );
|
joachim99@8
|
240
|
joachim99@8
|
241 class SourceData
|
joachim99@8
|
242 {
|
joachim99@8
|
243 public:
|
joachim99@58
|
244 SourceData();
|
joachim99@58
|
245 ~SourceData();
|
joachim99@68
|
246
|
joachim99@58
|
247 void setOptionDialog( OptionDialog* pOptionDialog );
|
joachim99@68
|
248
|
joachim99@58
|
249 int getSizeLines() const;
|
joachim99@58
|
250 int getSizeBytes() const;
|
joachim99@58
|
251 const char* getBuf() const;
|
joachim99@58
|
252 const LineData* getLineDataForDisplay() const;
|
joachim99@58
|
253 const LineData* getLineDataForDiff() const;
|
joachim99@58
|
254
|
joachim99@8
|
255 void setFilename(const QString& filename);
|
joachim99@8
|
256 void setFileAccess( const FileAccess& fa );
|
joachim99@75
|
257 //FileAccess& getFileAccess();
|
joachim99@8
|
258 QString getFilename();
|
joachim99@8
|
259 void setAliasName(const QString& a);
|
joachim99@8
|
260 QString getAliasName();
|
joachim99@58
|
261 bool isEmpty(); // File was set
|
joachim99@58
|
262 bool hasData(); // Data was readable
|
joachim99@58
|
263 bool isText(); // is it pure text (vs. binary data)
|
joachim99@58
|
264 bool isFromBuffer(); // was it set via setData() (vs. setFileAccess() or setFilename())
|
joachim99@58
|
265 void setData( const QString& data );
|
joachim99@66
|
266 bool isValid(); // Either no file is specified or reading was successful
|
joachim99@68
|
267
|
joachim99@75
|
268 void readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetectUnicode );
|
joachim99@58
|
269 bool saveNormalDataAs( const QString& fileName );
|
joachim99@68
|
270
|
joachim99@58
|
271 bool isBinaryEqualWith( const SourceData& other ) const;
|
joachim99@68
|
272
|
joachim99@58
|
273 void reset();
|
joachim99@58
|
274
|
joachim99@75
|
275 QTextCodec* getEncoding() const { return m_pEncoding; }
|
joachim99@75
|
276
|
joachim99@68
|
277 private:
|
joachim99@75
|
278 QTextCodec* detectEncoding( const QString& fileName, QTextCodec* pFallbackCodec );
|
joachim99@8
|
279 QString m_aliasName;
|
joachim99@8
|
280 FileAccess m_fileAccess;
|
joachim99@58
|
281 OptionDialog* m_pOptionDialog;
|
joachim99@58
|
282 QString m_tempInputFileName;
|
joachim99@58
|
283
|
joachim99@58
|
284 struct FileData
|
joachim99@68
|
285 {
|
joachim99@69
|
286 FileData(){ m_pBuf=0; m_size=0; m_vSize=0; m_bIsText=false; }
|
joachim99@58
|
287 ~FileData(){ reset(); }
|
joachim99@58
|
288 const char* m_pBuf;
|
joachim99@58
|
289 int m_size;
|
joachim99@58
|
290 int m_vSize; // Nr of lines in m_pBuf1 and size of m_v1, m_dv12 and m_dv13
|
joachim99@68
|
291 QString m_unicodeBuf;
|
joachim99@58
|
292 std::vector<LineData> m_v;
|
joachim99@58
|
293 bool m_bIsText;
|
joachim99@58
|
294 bool readFile( const QString& filename );
|
joachim99@58
|
295 bool writeFile( const QString& filename );
|
joachim99@68
|
296 void preprocess(bool bPreserveCR, QTextCodec* pEncoding );
|
joachim99@58
|
297 void reset();
|
joachim99@58
|
298 void removeComments();
|
joachim99@58
|
299 void copyBufFrom( const FileData& src );
|
joachim99@58
|
300 };
|
joachim99@58
|
301 FileData m_normalData;
|
joachim99@68
|
302 FileData m_lmppData;
|
joachim99@68
|
303 QTextCodec* m_pEncoding;
|
joachim99@8
|
304 };
|
joachim99@8
|
305
|
joachim99@69
|
306 void calcDiff3LineListTrim( Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC, ManualDiffHelpList* pManualDiffHelpList );
|
joachim99@58
|
307 void calcWhiteDiff3Lines( Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC );
|
joachim99@8
|
308
|
joachim99@66
|
309 void calcDiff3LineVector( Diff3LineList& d3ll, Diff3LineVector& d3lv );
|
joachim99@8
|
310
|
joachim99@8
|
311 void debugLineCheck( Diff3LineList& d3ll, int size, int idx );
|
joachim99@8
|
312
|
joachim99@8
|
313 class QStatusBar;
|
joachim99@8
|
314
|
joachim99@8
|
315
|
joachim99@8
|
316 class Selection
|
joachim99@8
|
317 {
|
joachim99@8
|
318 public:
|
joachim99@8
|
319 Selection(){ reset(); oldLastLine=-1; lastLine=-1; oldFirstLine=-1; }
|
joachim99@8
|
320 int firstLine;
|
joachim99@8
|
321 int firstPos;
|
joachim99@8
|
322 int lastLine;
|
joachim99@8
|
323 int lastPos;
|
joachim99@8
|
324 int oldLastLine;
|
joachim99@8
|
325 int oldFirstLine;
|
joachim99@8
|
326 bool bSelectionContainsData;
|
joachim99@8
|
327 bool isEmpty() { return firstLine==-1 || (firstLine==lastLine && firstPos==lastPos) || bSelectionContainsData==false;}
|
joachim99@8
|
328 void reset(){
|
joachim99@8
|
329 oldFirstLine=firstLine;
|
joachim99@8
|
330 oldLastLine =lastLine;
|
joachim99@8
|
331 firstLine=-1;
|
joachim99@69
|
332 lastLine=-1;
|
joachim99@8
|
333 bSelectionContainsData = false;
|
joachim99@8
|
334 }
|
joachim99@8
|
335 void start( int l, int p ) { firstLine = l; firstPos = p; }
|
joachim99@8
|
336 void end( int l, int p ) {
|
joachim99@8
|
337 if ( oldLastLine == -1 )
|
joachim99@8
|
338 oldLastLine = lastLine;
|
joachim99@8
|
339 lastLine = l;
|
joachim99@8
|
340 lastPos = p;
|
joachim99@8
|
341 }
|
joachim99@8
|
342 bool within( int l, int p );
|
joachim99@8
|
343
|
joachim99@8
|
344 bool lineWithin( int l );
|
joachim99@8
|
345 int firstPosInLine(int l);
|
joachim99@8
|
346 int lastPosInLine(int l);
|
joachim99@69
|
347 int beginLine(){
|
joachim99@69
|
348 if (firstLine<0 && lastLine<0) return -1;
|
joachim99@69
|
349 return max2(0,min2(firstLine,lastLine));
|
joachim99@69
|
350 }
|
joachim99@69
|
351 int endLine(){
|
joachim99@69
|
352 if (firstLine<0 && lastLine<0) return -1;
|
joachim99@69
|
353 return max2(firstLine,lastLine);
|
joachim99@69
|
354 }
|
joachim99@8
|
355 int beginPos() { return firstLine==lastLine ? min2(firstPos,lastPos) :
|
joachim99@69
|
356 firstLine<lastLine ? (firstLine<0?0:firstPos) : (lastLine<0?0:lastPos); }
|
joachim99@8
|
357 int endPos() { return firstLine==lastLine ? max2(firstPos,lastPos) :
|
joachim99@8
|
358 firstLine<lastLine ? lastPos : firstPos; }
|
joachim99@8
|
359 };
|
joachim99@8
|
360
|
joachim99@8
|
361 class OptionDialog;
|
joachim99@8
|
362
|
joachim99@68
|
363
|
joachim99@68
|
364 // Helper class that swaps left and right for some commands.
|
joachim99@68
|
365 class MyPainter : public QPainter
|
joachim99@68
|
366 {
|
joachim99@68
|
367 int m_factor;
|
joachim99@68
|
368 int m_xOffset;
|
joachim99@68
|
369 int m_fontWidth;
|
joachim99@68
|
370 public:
|
joachim99@70
|
371 MyPainter(QPaintDevice* pd, bool bRTL, int width, int fontWidth)
|
joachim99@69
|
372 : QPainter(pd)
|
joachim99@68
|
373 {
|
joachim99@68
|
374 if (bRTL)
|
joachim99@68
|
375 {
|
joachim99@68
|
376 m_fontWidth = fontWidth;
|
joachim99@68
|
377 m_factor = -1;
|
joachim99@68
|
378 m_xOffset = width-1;
|
joachim99@68
|
379 }
|
joachim99@68
|
380 else
|
joachim99@68
|
381 {
|
joachim99@68
|
382 m_fontWidth = 0;
|
joachim99@68
|
383 m_factor = 1;
|
joachim99@68
|
384 m_xOffset = 0;
|
joachim99@68
|
385 }
|
joachim99@68
|
386 }
|
joachim99@68
|
387
|
joachim99@68
|
388 void fillRect( int x, int y, int w, int h, const QBrush& b )
|
joachim99@68
|
389 {
|
joachim99@69
|
390 if (m_factor==1)
|
joachim99@69
|
391 QPainter::fillRect( m_xOffset + x , y, w, h, b );
|
joachim99@69
|
392 else
|
joachim99@69
|
393 QPainter::fillRect( m_xOffset - x - w, y, w, h, b );
|
joachim99@68
|
394 }
|
joachim99@68
|
395
|
joachim99@68
|
396 void drawText( int x, int y, const QString& s, bool bAdapt=false )
|
joachim99@68
|
397 {
|
joachim99@70
|
398 Qt::LayoutDirection ld = (m_factor==1 || bAdapt == false) ? Qt::LeftToRight : Qt::RightToLeft;
|
joachim99@70
|
399 QPainter::setLayoutDirection( ld );
|
joachim99@75
|
400 QPainter::drawText( m_xOffset-m_fontWidth*s.length() + m_factor*x, y, s );
|
joachim99@68
|
401 }
|
joachim99@68
|
402
|
joachim99@68
|
403 void drawLine( int x1, int y1, int x2, int y2 )
|
joachim99@68
|
404 {
|
joachim99@68
|
405 QPainter::drawLine( m_xOffset + m_factor*x1, y1, m_xOffset + m_factor*x2, y2 );
|
joachim99@68
|
406 }
|
joachim99@68
|
407 };
|
joachim99@51
|
408
|
joachim99@8
|
409 void fineDiff(
|
joachim99@8
|
410 Diff3LineList& diff3LineList,
|
joachim99@8
|
411 int selector,
|
joachim99@58
|
412 const LineData* v1,
|
joachim99@58
|
413 const LineData* v2,
|
joachim99@8
|
414 bool& bTextsTotalEqual
|
joachim99@8
|
415 );
|
joachim99@8
|
416
|
joachim99@8
|
417
|
joachim99@8
|
418 bool equal( const LineData& l1, const LineData& l2, bool bStrict );
|
joachim99@8
|
419
|
joachim99@8
|
420
|
joachim99@8
|
421
|
joachim99@8
|
422
|
joachim99@68
|
423 inline bool isWhite( QChar c )
|
joachim99@8
|
424 {
|
joachim99@8
|
425 return c==' ' || c=='\t' || c=='\r';
|
joachim99@8
|
426 }
|
joachim99@8
|
427
|
joachim99@8
|
428 /** Returns the number of equivalent spaces at position outPos.
|
joachim99@8
|
429 */
|
joachim99@8
|
430 inline int tabber( int outPos, int tabSize )
|
joachim99@8
|
431 {
|
joachim99@8
|
432 return tabSize - ( outPos % tabSize );
|
joachim99@8
|
433 }
|
joachim99@8
|
434
|
joachim99@8
|
435 /** Returns a line number where the linerange [line, line+nofLines] can
|
joachim99@8
|
436 be displayed best. If it fits into the currently visible range then
|
joachim99@8
|
437 the returned value is the current firstLine.
|
joachim99@8
|
438 */
|
joachim99@8
|
439 int getBestFirstLine( int line, int nofLines, int firstLine, int visibleLines );
|
joachim99@8
|
440
|
joachim99@8
|
441 extern bool g_bIgnoreWhiteSpace;
|
joachim99@8
|
442 extern bool g_bIgnoreTrivialMatches;
|
joachim99@8
|
443 extern int g_bAutoSolve;
|
joachim99@8
|
444
|
joachim99@8
|
445 // Cursor conversions that consider g_tabSize.
|
joachim99@69
|
446 int convertToPosInText( const QString& s, int posOnScreen, int tabSize );
|
joachim99@69
|
447 int convertToPosOnScreen( const QString& s, int posInText, int tabSize );
|
joachim99@69
|
448
|
joachim99@69
|
449 enum e_CoordType { eFileCoords, eD3LLineCoords, eWrapCoords };
|
joachim99@69
|
450
|
joachim99@69
|
451 void calcTokenPos( const QString&, int posOnScreen, int& pos1, int& pos2, int tabSize );
|
joachim99@69
|
452
|
joachim99@69
|
453 QString calcHistorySortKey( const QString& keyOrder, QRegExp& matchedRegExpr, const QStringList& parenthesesGroupList );
|
joachim99@69
|
454 bool findParenthesesGroups( const QString& s, QStringList& sl );
|
joachim99@8
|
455 #endif
|
joachim99@8
|
456
|