diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
commit | 99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch) | |
tree | eff34cf0762227f6baf2a93e8fef48d4bed2651c /kompare/libdiff2/kompare.h | |
parent | 1c104292188541106338d4940b0f04beeb4301a0 (diff) | |
download | tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.tar.gz tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.zip |
TQt4 convert kdesdk
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kompare/libdiff2/kompare.h')
-rw-r--r-- | kompare/libdiff2/kompare.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kompare/libdiff2/kompare.h b/kompare/libdiff2/kompare.h index 8f6b7fe5..1c21db07 100644 --- a/kompare/libdiff2/kompare.h +++ b/kompare/libdiff2/kompare.h @@ -63,7 +63,7 @@ namespace Kompare UnknownDiffMode // Use to initialize the Info struct }; - enum Status { + enum tqStatus { RunningDiff, Parsing, FinishedParsing, @@ -135,7 +135,7 @@ public: relative += "../"; } - relative += TQString( to ).replace( 0, root.path(1).length(), "" ); + relative += TQString( to ).tqreplace( 0, root.path(1).length(), "" ); return relative; } |