Mercurial > hg > easyhg-kdiff3

comparison kdiff3/src/kdiff3.h @ 58:8af4bb9d9a5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Version 0.9.83
author joachim99
date Sun, 07 Mar 2004 09:59:09 +0000
parents 32d5cbf9db71
children efe33e938730
comparison
equal deleted inserted replaced
57:023fbd76c1e3 58:8af4bb9d9a5a
1 /*************************************************************************** 1 /***************************************************************************
2 kdiff3.h - description 2 kdiff3.h - description
3 ------------------- 3 -------------------
4 begin : Don Jul 11 12:31:29 CEST 2002 4 begin : Don Jul 11 12:31:29 CEST 2002
5 copyright : (C) 2002 by Joachim Eibl 5 copyright : (C) 2002-2004 by Joachim Eibl
6 email : joachim.eibl@gmx.de 6 email : joachim.eibl@gmx.de
7 ***************************************************************************/ 7 ***************************************************************************/
8 8
9 /*************************************************************************** 9 /***************************************************************************
10 * * 10 * *
218 218
219 SourceData m_sd1; 219 SourceData m_sd1;
220 SourceData m_sd2; 220 SourceData m_sd2;
221 SourceData m_sd3; 221 SourceData m_sd3;
222 222
223 SourceData m_sdlm1; // SourceData for Line Matching only.
224 SourceData m_sdlm2;
225 SourceData m_sdlm3;
226
227 QString m_outputFilename; 223 QString m_outputFilename;
228 bool m_bDefaultFilename; 224 bool m_bDefaultFilename;
229 225
230 DiffList m_diffList12; 226 DiffList m_diffList12;
231 DiffList m_diffList23; 227 DiffList m_diffList23;
248 virtual bool eventFilter( QObject* o, QEvent* e ); 244 virtual bool eventFilter( QObject* o, QEvent* e );
249 virtual void resizeEvent(QResizeEvent*); 245 virtual void resizeEvent(QResizeEvent*);
250 246
251 bool improveFilenames(); 247 bool improveFilenames();
252 248
253 bool runDiff( LineData* p1, int size1, LineData* p2, int size2, DiffList& diffList ); 249 bool runDiff( const LineData* p1, int size1, const LineData* p2, int size2, DiffList& diffList );
254 bool canContinue(); 250 bool canContinue();
255 251
256 void choose(int choice); 252 void choose(int choice);
257 253
258 KActionCollection* actionCollection(); 254 KActionCollection* actionCollection();
338 QComboBox* m_lineC; 334 QComboBox* m_lineC;
339 QComboBox* m_lineOut; 335 QComboBox* m_lineOut;
340 336
341 QCheckBox* m_pMerge; 337 QCheckBox* m_pMerge;
342 virtual void accept(); 338 virtual void accept();
339 virtual bool eventFilter(QObject* o, QEvent* e);
343 private: 340 private:
344 OptionDialog* m_pOptions; 341 OptionDialog* m_pOptions;
345 void selectURL( QComboBox* pLine, bool bDir, int i, bool bSave ); 342 void selectURL( QComboBox* pLine, bool bDir, int i, bool bSave );
343 bool m_bInputFileNameChanged;
346 private slots: 344 private slots:
347 void selectFileA(); 345 void selectFileA();
348 void selectFileB(); 346 void selectFileB();
349 void selectFileC(); 347 void selectFileC();
350 void selectDirA(); 348 void selectDirA();
351 void selectDirB(); 349 void selectDirB();
352 void selectDirC(); 350 void selectDirC();
353 void selectOutputName(); 351 void selectOutputName();
354 void selectOutputDir(); 352 void selectOutputDir();
355 void internalSlot(int); 353 void internalSlot(int);
354 void inputFilenameChanged();
356 signals: 355 signals:
357 void internalSignal(bool); 356 void internalSignal(bool);
358 }; 357 };
359 358
360 class FindDialog : public QDialog 359 class FindDialog : public QDialog