1 files changed, 4 insertions, 4 deletions
diff --git a/src/diff.h b/src/diff.h
index 2866f5f..ee3076e 100644
--- a/src/diff.h
+++ b/src/diff.h
@@ -22,7 +22,7 @@
 #include <tqpixmap.h>
 #include <tqtimer.h>
 #include <tqframe.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqpainter.h>
 #include <list>
 #include <vector>
@@ -169,10 +169,10 @@ public:
 typedef std::vector<Diff3WrapLine> Diff3WrapLineVector;
 
 
-class TotalDiffStatus
+class TotalDifftqStatus
 {
 public:
-   TotalDiffStatus(){ reset(); }
+   TotalDifftqStatus(){ reset(); }
    void reset() {bBinaryAEqC=false; bBinaryBEqC=false; bBinaryAEqB=false;
                  bTextAEqC=false;   bTextBEqC=false;   bTextAEqB=false;
                  nofUnsolvedConflicts=0; nofSolvedConflicts=0;
@@ -293,7 +293,7 @@ private:
       const char* m_pBuf;
       int m_size;
       int m_vSize; // Nr of lines in m_pBuf1 and size of m_v1, m_dv12 and m_dv13
-      TQString m_unicodeBuf;
+      TQString m_tqunicodeBuf;
       std::vector<LineData> m_v;
       bool m_bIsText;
       bool readFile( const TQString& filename );