diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /dcop/kdatastream.h | |
parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'dcop/kdatastream.h')
-rw-r--r-- | dcop/kdatastream.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dcop/kdatastream.h b/dcop/kdatastream.h index 6551295f6..de85ebb47 100644 --- a/dcop/kdatastream.h +++ b/dcop/kdatastream.h @@ -6,13 +6,13 @@ #ifdef USE_QT3 inline TQDataStream & operator << (TQDataStream & str, bool b) { - str << TQ_INT8(b); + str << Q_INT8(b); return str; } inline TQDataStream & operator >> (TQDataStream & str, bool & b) { - TQ_INT8 l; + Q_INT8 l; str >> l; b = bool(l); return str; @@ -22,7 +22,7 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b) #if QT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) inline TQDataStream & operator << (TQDataStream & str, long long int ll) { - TQ_UINT32 l1,l2; + Q_UINT32 l1,l2; l1 = ll & 0xffffffffLL; l2 = ll >> 32; str << l1 << l2; @@ -31,7 +31,7 @@ inline TQDataStream & operator << (TQDataStream & str, long long int ll) inline TQDataStream & operator >> (TQDataStream & str, long long int&ll) { - TQ_UINT32 l1,l2; + Q_UINT32 l1,l2; str >> l1 >> l2; ll = ((unsigned long long int)(l2) << 32) + (long long int) l1; return str; @@ -39,7 +39,7 @@ inline TQDataStream & operator >> (TQDataStream & str, long long int&ll) inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll) { - TQ_UINT32 l1,l2; + Q_UINT32 l1,l2; l1 = ll & 0xffffffffLL; l2 = ll >> 32; str << l1 << l2; @@ -48,7 +48,7 @@ inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll inline TQDataStream & operator >> (TQDataStream & str, unsigned long long int &ll) { - TQ_UINT32 l1,l2; + Q_UINT32 l1,l2; str >> l1 >> l2; ll = ((unsigned long long int)(l2) << 32) + (unsigned long long int) l1; return str; |