diff options
Diffstat (limited to 'src/kdiff3.h')
| -rw-r--r-- | src/kdiff3.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kdiff3.h b/src/kdiff3.h index 46c0d3c..f5e240f 100644 --- a/src/kdiff3.h +++ b/src/kdiff3.h @@ -110,7 +110,7 @@ class KDiff3App : public TQSplitter /** initializes the KActions of the application */ void initActions( KActionCollection* ); - /** save general Options like all bar positions and status as well as the geometry + /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration file */ void saveOptions( KConfig* ); @@ -144,7 +144,7 @@ class KDiff3App : public TQSplitter /** open a file and load it into the document*/ void slotFileOpen(); void slotFileOpen2( TQString fn1, TQString fn2, TQString fn3, TQString ofn, - TQString an1, TQString an2, TQString an3, TotalDiffStatus* pTotalDiffStatus ); + TQString an1, TQString an2, TQString an3, TotalDifftqStatus* pTotalDifftqStatus ); void slotFileNameChanged(const TQString& fileName, int winIdx); @@ -281,7 +281,7 @@ class KDiff3App : public TQSplitter TQWidget* m_pCornerWidget; - TotalDiffStatus m_totalDiffStatus; + TotalDifftqStatus m_totalDifftqStatus; SourceData m_sd1; SourceData m_sd2; @@ -310,7 +310,7 @@ class KDiff3App : public TQSplitter OptionDialog* m_pOptionDialog; FindDialog* m_pFindDialog; - void init( bool bAuto=false, TotalDiffStatus* pTotalDiffStatus=0, bool bLoadFiles=true ); + void init( bool bAuto=false, TotalDifftqStatus* pTotalDifftqStatus=0, bool bLoadFiles=true ); virtual bool eventFilter( TQObject* o, TQEvent* e ); virtual void resizeEvent(TQResizeEvent*); |