diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:30:18 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:30:18 -0600 |
commit | f3372e7bea9bbc288e039d85d660450220a637d8 (patch) | |
tree | a67f22c6994e07957a7d7053caa39c3808128f07 /src/diff.h | |
parent | b6e4d65c272eed16b317a7f8fed20d05b7bd8236 (diff) | |
download | kdiff3-f3372e7bea9bbc288e039d85d660450220a637d8.tar.gz kdiff3-f3372e7bea9bbc288e039d85d660450220a637d8.zip |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'src/diff.h')
-rw-r--r-- | src/diff.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -22,7 +22,7 @@ #include <tqpixmap.h> #include <tqtimer.h> #include <tqframe.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqpainter.h> #include <list> #include <vector> @@ -169,10 +169,10 @@ public: typedef std::vector<Diff3WrapLine> Diff3WrapLineVector; -class TotalDifftqStatus +class TotalDiffStatus { public: - TotalDifftqStatus(){ reset(); } + TotalDiffStatus(){ 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_tqunicodeBuf; + TQString m_unicodeBuf; std::vector<LineData> m_v; bool m_bIsText; bool readFile( const TQString& filename ); |