diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:04 -0600 |
| commit | 303e108109ce526c414e8770119134dcc2f2d7bd (patch) | |
| tree | 16e7fdb1b604f30ac7b9cb7bbaeae90c34f438a6 /src/directorymergewindow.h | |
| parent | f3372e7bea9bbc288e039d85d660450220a637d8 (diff) | |
| download | kdiff3-303e108109ce526c414e8770119134dcc2f2d7bd.tar.gz kdiff3-303e108109ce526c414e8770119134dcc2f2d7bd.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit f3372e7bea9bbc288e039d85d660450220a637d8.
Diffstat (limited to 'src/directorymergewindow.h')
| -rw-r--r-- | src/directorymergewindow.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/directorymergewindow.h b/src/directorymergewindow.h index 99c0405..25a66f7 100644 --- a/src/directorymergewindow.h +++ b/src/directorymergewindow.h @@ -26,7 +26,7 @@ #include <map> #include "common.h" #include "fileaccess.h" -#include "diff.h" //TotalDiffStatus +#include "diff.h" //TotalDifftqStatus class OptionDialog; class KIconLoader; @@ -37,7 +37,7 @@ class TQLabel; class KAction; class KToggleAction; class KActionCollection; -class TotalDiffStatus; +class TotalDifftqStatus; enum e_MergeOperation { @@ -99,7 +99,7 @@ public: FileAccess m_fileInfoB; FileAccess m_fileInfoC; - TotalDiffStatus m_totalDiffStatus; + TotalDifftqStatus m_totalDifftqStatus; }; class DirMergeItem : public TQListViewItem @@ -319,7 +319,7 @@ protected: KAction* m_pDirSaveMergeState; KAction* m_pDirLoadMergeState; signals: - void startDiffMerge(TQString fn1,TQString fn2, TQString fn3, TQString ofn, TQString,TQString,TQString,TotalDiffStatus*); + void startDiffMerge(TQString fn1,TQString fn2, TQString fn3, TQString ofn, TQString,TQString,TQString,TotalDifftqStatus*); void checkIfCanContinue( bool* pbContinue ); void updateAvailabilities(); void statusBarMessage( const TQString& msg ); |