diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
tree | 30834aa632d442019e14f88685001d94657d060b /kdecore/netwm.cpp | |
parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/netwm.cpp')
-rw-r--r-- | kdecore/netwm.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kdecore/netwm.cpp b/kdecore/netwm.cpp index 9c8bd1283..64c6aab2b 100644 --- a/kdecore/netwm.cpp +++ b/kdecore/netwm.cpp @@ -4626,18 +4626,18 @@ Time NET::timestampDiff( Time time1, Time time2 ) // returns time2 - time1 #else int NET::timestampCompare( unsigned long time1_, unsigned long time2_ ) // like strcmp() { - Q_UINT32 time1 = time1_; - Q_UINT32 time2 = time2_; + TQ_UINT32 time1 = time1_; + TQ_UINT32 time2 = time2_; if( time1 == time2 ) return 0; - return Q_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping + return TQ_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping } int NET::timestampDiff( unsigned long time1_, unsigned long time2_ ) // returns time2 - time1 { // no need to handle wrapping? - Q_UINT32 time1 = time1_; - Q_UINT32 time2 = time2_; - return Q_UINT32( time2 - time1 ); + TQ_UINT32 time1 = time1_; + TQ_UINT32 time2 = time2_; + return TQ_UINT32( time2 - time1 ); } #endif |