Rename a number of classes to enhance compatibility with KDE4

1 files changed, 49 insertions, 49 deletions

diff --git a/src/directorymergewindow.h b/src/directorymergewindow.h
index 855811a..88ee923 100644
--- a/src/directorymergewindow.h
+++ b/src/directorymergewindow.h
@@ -34,9 +34,9 @@ class StatusInfo;
 class DirectoryMergeInfo;
 class OneDirectoryInfo;
 class TQLabel;
-class KAction;
-class KToggleAction;
-class KActionCollection;
+class TDEAction;
+class TDEToggleAction;
+class TDEActionCollection;
 class TotalDiffStatus;
 
 enum e_MergeOperation
@@ -136,9 +136,9 @@ public:
    int totalColumnWidth();
    bool isSyncMode() { return m_bSyncMode; }
    bool isScanning() { return m_bScanning; }
-   void initDirectoryMergeActions( TQObject* pKDiff3App, KActionCollection* ac );
+   void initDirectoryMergeActions( TQObject* pKDiff3App, TDEActionCollection* ac );
    void updateAvailabilities( bool bDirCompare, bool bDiffWindowVisible,
-      KToggleAction* chooseA, KToggleAction* chooseB, KToggleAction* chooseC );
+      TDEToggleAction* chooseA, TDEToggleAction* chooseB, TDEToggleAction* chooseC );
    void updateFileVisibilities();
 
    virtual void keyPressEvent( TQKeyEvent* e );
@@ -274,50 +274,50 @@ protected:
    void selectItemAndColumn(DirMergeItem* pDMI, int c, bool bContextMenu);
    friend class DirMergeItem;
 
-   KAction* m_pDirStartOperation;
-   KAction* m_pDirRunOperationForCurrentItem;
-   KAction* m_pDirCompareCurrent;
-   KAction* m_pDirMergeCurrent;
-   KAction* m_pDirRescan;
-   KAction* m_pDirChooseAEverywhere;
-   KAction* m_pDirChooseBEverywhere;
-   KAction* m_pDirChooseCEverywhere;
-   KAction* m_pDirAutoChoiceEverywhere;
-   KAction* m_pDirDoNothingEverywhere;
-   KAction* m_pDirFoldAll;
-   KAction* m_pDirUnfoldAll;
-
-   KToggleAction* m_pDirShowIdenticalFiles;
-   KToggleAction* m_pDirShowDifferentFiles;
-   KToggleAction* m_pDirShowFilesOnlyInA;
-   KToggleAction* m_pDirShowFilesOnlyInB;
-   KToggleAction* m_pDirShowFilesOnlyInC;
-
-   KToggleAction* m_pDirSynchronizeDirectories;
-   KToggleAction* m_pDirChooseNewerFiles;
-
-   KAction* m_pDirCompareExplicit;
-   KAction* m_pDirMergeExplicit;
-
-   KAction* m_pDirCurrentDoNothing;
-   KAction* m_pDirCurrentChooseA;
-   KAction* m_pDirCurrentChooseB;
-   KAction* m_pDirCurrentChooseC;
-   KAction* m_pDirCurrentMerge;
-   KAction* m_pDirCurrentDelete;
-
-   KAction* m_pDirCurrentSyncDoNothing;
-   KAction* m_pDirCurrentSyncCopyAToB;
-   KAction* m_pDirCurrentSyncCopyBToA;
-   KAction* m_pDirCurrentSyncDeleteA;
-   KAction* m_pDirCurrentSyncDeleteB;
-   KAction* m_pDirCurrentSyncDeleteAAndB;
-   KAction* m_pDirCurrentSyncMergeToA;
-   KAction* m_pDirCurrentSyncMergeToB;
-   KAction* m_pDirCurrentSyncMergeToAAndB;
-
-   KAction* m_pDirSaveMergeState;
-   KAction* m_pDirLoadMergeState;
+   TDEAction* m_pDirStartOperation;
+   TDEAction* m_pDirRunOperationForCurrentItem;
+   TDEAction* m_pDirCompareCurrent;
+   TDEAction* m_pDirMergeCurrent;
+   TDEAction* m_pDirRescan;
+   TDEAction* m_pDirChooseAEverywhere;
+   TDEAction* m_pDirChooseBEverywhere;
+   TDEAction* m_pDirChooseCEverywhere;
+   TDEAction* m_pDirAutoChoiceEverywhere;
+   TDEAction* m_pDirDoNothingEverywhere;
+   TDEAction* m_pDirFoldAll;
+   TDEAction* m_pDirUnfoldAll;
+
+   TDEToggleAction* m_pDirShowIdenticalFiles;
+   TDEToggleAction* m_pDirShowDifferentFiles;
+   TDEToggleAction* m_pDirShowFilesOnlyInA;
+   TDEToggleAction* m_pDirShowFilesOnlyInB;
+   TDEToggleAction* m_pDirShowFilesOnlyInC;
+
+   TDEToggleAction* m_pDirSynchronizeDirectories;
+   TDEToggleAction* m_pDirChooseNewerFiles;
+
+   TDEAction* m_pDirCompareExplicit;
+   TDEAction* m_pDirMergeExplicit;
+
+   TDEAction* m_pDirCurrentDoNothing;
+   TDEAction* m_pDirCurrentChooseA;
+   TDEAction* m_pDirCurrentChooseB;
+   TDEAction* m_pDirCurrentChooseC;
+   TDEAction* m_pDirCurrentMerge;
+   TDEAction* m_pDirCurrentDelete;
+
+   TDEAction* m_pDirCurrentSyncDoNothing;
+   TDEAction* m_pDirCurrentSyncCopyAToB;
+   TDEAction* m_pDirCurrentSyncCopyBToA;
+   TDEAction* m_pDirCurrentSyncDeleteA;
+   TDEAction* m_pDirCurrentSyncDeleteB;
+   TDEAction* m_pDirCurrentSyncDeleteAAndB;
+   TDEAction* m_pDirCurrentSyncMergeToA;
+   TDEAction* m_pDirCurrentSyncMergeToB;
+   TDEAction* m_pDirCurrentSyncMergeToAAndB;
+
+   TDEAction* m_pDirSaveMergeState;
+   TDEAction* m_pDirLoadMergeState;
 signals:
    void startDiffMerge(TQString fn1,TQString fn2, TQString fn3, TQString ofn, TQString,TQString,TQString,TotalDiffStatus*);
    void checkIfCanContinue( bool* pbContinue );