summaryrefslogtreecommitdiffstats
path: root/src/directorymergewindow.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/directorymergewindow.h')
-rw-r--r--src/directorymergewindow.h8
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 );