diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
| commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
| tree | b910be3588cb706defc00c31aefa850bb2312784 /src/tools/ntqdatastream.h | |
| parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt-d1096751ddb25cdef23919c17389fc268c31edaf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/tools/ntqdatastream.h')
| -rw-r--r-- | src/tools/ntqdatastream.h | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/src/tools/ntqdatastream.h b/src/tools/ntqdatastream.h index 1031f3bf5..3c2df1474 100644 --- a/src/tools/ntqdatastream.h +++ b/src/tools/ntqdatastream.h @@ -72,34 +72,34 @@ public: int version() const; void setVersion( int ); - TQDataStream &operator>>( Q_INT8 &i ); - TQDataStream &operator>>( Q_UINT8 &i ); - TQDataStream &operator>>( Q_INT16 &i ); - TQDataStream &operator>>( Q_UINT16 &i ); - TQDataStream &operator>>( Q_INT32 &i ); - TQDataStream &operator>>( Q_UINT32 &i ); - TQDataStream &operator>>( Q_INT64 &i ); - TQDataStream &operator>>( Q_UINT64 &i ); + TQDataStream &operator>>( TQ_INT8 &i ); + TQDataStream &operator>>( TQ_UINT8 &i ); + TQDataStream &operator>>( TQ_INT16 &i ); + TQDataStream &operator>>( TQ_UINT16 &i ); + TQDataStream &operator>>( TQ_INT32 &i ); + TQDataStream &operator>>( TQ_UINT32 &i ); + TQDataStream &operator>>( TQ_INT64 &i ); + TQDataStream &operator>>( TQ_UINT64 &i ); #if !defined(Q_OS_WIN64) - TQDataStream &operator>>( Q_LONG &i ); - TQDataStream &operator>>( Q_ULONG &i ); + TQDataStream &operator>>( TQ_LONG &i ); + TQDataStream &operator>>( TQ_ULONG &i ); #endif TQDataStream &operator>>( float &f ); TQDataStream &operator>>( double &f ); TQDataStream &operator>>( char *&str ); - TQDataStream &operator<<( Q_INT8 i ); - TQDataStream &operator<<( Q_UINT8 i ); - TQDataStream &operator<<( Q_INT16 i ); - TQDataStream &operator<<( Q_UINT16 i ); - TQDataStream &operator<<( Q_INT32 i ); - TQDataStream &operator<<( Q_UINT32 i ); - TQDataStream &operator<<( Q_INT64 i ); - TQDataStream &operator<<( Q_UINT64 i ); + TQDataStream &operator<<( TQ_INT8 i ); + TQDataStream &operator<<( TQ_UINT8 i ); + TQDataStream &operator<<( TQ_INT16 i ); + TQDataStream &operator<<( TQ_UINT16 i ); + TQDataStream &operator<<( TQ_INT32 i ); + TQDataStream &operator<<( TQ_UINT32 i ); + TQDataStream &operator<<( TQ_INT64 i ); + TQDataStream &operator<<( TQ_UINT64 i ); #if !defined(Q_OS_WIN64) - TQDataStream &operator<<( Q_LONG i ); - TQDataStream &operator<<( Q_ULONG i ); + TQDataStream &operator<<( TQ_LONG i ); + TQDataStream &operator<<( TQ_ULONG i ); #endif TQDataStream &operator<<( float f ); TQDataStream &operator<<( double f ); @@ -155,38 +155,38 @@ inline int TQDataStream::version() const inline void TQDataStream::setVersion( int v ) { ver = v; } -inline TQDataStream &TQDataStream::operator>>( Q_UINT8 &i ) -{ return *this >> (Q_INT8&)i; } +inline TQDataStream &TQDataStream::operator>>( TQ_UINT8 &i ) +{ return *this >> (TQ_INT8&)i; } -inline TQDataStream &TQDataStream::operator>>( Q_UINT16 &i ) -{ return *this >> (Q_INT16&)i; } +inline TQDataStream &TQDataStream::operator>>( TQ_UINT16 &i ) +{ return *this >> (TQ_INT16&)i; } -inline TQDataStream &TQDataStream::operator>>( Q_UINT32 &i ) -{ return *this >> (Q_INT32&)i; } +inline TQDataStream &TQDataStream::operator>>( TQ_UINT32 &i ) +{ return *this >> (TQ_INT32&)i; } -inline TQDataStream &TQDataStream::operator>>( Q_UINT64 &i ) -{ return *this >> (Q_INT64&)i; } +inline TQDataStream &TQDataStream::operator>>( TQ_UINT64 &i ) +{ return *this >> (TQ_INT64&)i; } #if !defined(Q_OS_WIN64) -inline TQDataStream &TQDataStream::operator>>( Q_ULONG &i ) -{ return *this >> (Q_LONG&)i; } +inline TQDataStream &TQDataStream::operator>>( TQ_ULONG &i ) +{ return *this >> (TQ_LONG&)i; } #endif -inline TQDataStream &TQDataStream::operator<<( Q_UINT8 i ) -{ return *this << (Q_INT8)i; } +inline TQDataStream &TQDataStream::operator<<( TQ_UINT8 i ) +{ return *this << (TQ_INT8)i; } -inline TQDataStream &TQDataStream::operator<<( Q_UINT16 i ) -{ return *this << (Q_INT16)i; } +inline TQDataStream &TQDataStream::operator<<( TQ_UINT16 i ) +{ return *this << (TQ_INT16)i; } -inline TQDataStream &TQDataStream::operator<<( Q_UINT32 i ) -{ return *this << (Q_INT32)i; } +inline TQDataStream &TQDataStream::operator<<( TQ_UINT32 i ) +{ return *this << (TQ_INT32)i; } -inline TQDataStream &TQDataStream::operator<<( Q_UINT64 i ) -{ return *this << (Q_INT64)i; } +inline TQDataStream &TQDataStream::operator<<( TQ_UINT64 i ) +{ return *this << (TQ_INT64)i; } #if !defined(Q_OS_WIN64) -inline TQDataStream &TQDataStream::operator<<( Q_ULONG i ) -{ return *this << (Q_LONG)i; } +inline TQDataStream &TQDataStream::operator<<( TQ_ULONG i ) +{ return *this << (TQ_LONG)i; } #endif #endif // QT_NO_DATASTREAM |