diff options
| author | Darrell Anderson <[email protected]> | 2012-06-18 00:09:52 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-06-18 00:09:52 -0500 |
| commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
| tree | b910be3588cb706defc00c31aefa850bb2312784 /src/tools/quuid.cpp | |
| parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/tools/quuid.cpp')
| -rw-r--r-- | src/tools/quuid.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/quuid.cpp b/src/tools/quuid.cpp index 64ec7a3bd..36472176a 100644 --- a/src/tools/quuid.cpp +++ b/src/tools/quuid.cpp @@ -209,11 +209,11 @@ TQString TQUuid::toString() const */ TQDataStream &operator<<( TQDataStream &s, const TQUuid &id ) { - s << (Q_UINT32)id.data1; - s << (Q_UINT16)id.data2; - s << (Q_UINT16)id.data3; + s << (TQ_UINT32)id.data1; + s << (TQ_UINT16)id.data2; + s << (TQ_UINT16)id.data3; for (int i = 0; i < 8; i++ ) - s << (Q_UINT8)id.data4[i]; + s << (TQ_UINT8)id.data4[i]; return s; } @@ -223,9 +223,9 @@ TQDataStream &operator<<( TQDataStream &s, const TQUuid &id ) */ TQDataStream &operator>>( TQDataStream &s, TQUuid &id ) { - Q_UINT32 u32; - Q_UINT16 u16; - Q_UINT8 u8; + TQ_UINT32 u32; + TQ_UINT16 u16; + TQ_UINT8 u8; s >> u32; id.data1 = u32; s >> u16; |