From f3372e7bea9bbc288e039d85d660450220a637d8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:30:18 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 src/directorymergewindow.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/directorymergewindow.h')

diff --git a/src/directorymergewindow.h b/src/directorymergewindow.h
index 25a66f7..99c0405 100644
--- a/src/directorymergewindow.h
+++ b/src/directorymergewindow.h
@@ -26,7 +26,7 @@
 #include <map>
 #include "common.h"
 #include "fileaccess.h"
-#include "diff.h" //TotalDifftqStatus
+#include "diff.h" //TotalDiffStatus
 
 class OptionDialog;
 class KIconLoader;
@@ -37,7 +37,7 @@ class TQLabel;
 class KAction;
 class KToggleAction;
 class KActionCollection;
-class TotalDifftqStatus;
+class TotalDiffStatus;
 
 enum e_MergeOperation
 {
@@ -99,7 +99,7 @@ public:
    FileAccess m_fileInfoB;
    FileAccess m_fileInfoC;
 
-   TotalDifftqStatus m_totalDifftqStatus;   
+   TotalDiffStatus m_totalDiffStatus;   
 };
 
 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,TotalDifftqStatus*);
+   void startDiffMerge(TQString fn1,TQString fn2, TQString fn3, TQString ofn, TQString,TQString,TQString,TotalDiffStatus*);
    void checkIfCanContinue( bool* pbContinue );
    void updateAvailabilities();
    void statusBarMessage( const TQString& msg );
-- 
cgit v1.2.3