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/qcstring.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/qcstring.cpp')
| -rw-r--r-- | src/tools/qcstring.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp index f6f4f1ff8..a3bea8ff4 100644 --- a/src/tools/qcstring.cpp +++ b/src/tools/qcstring.cpp @@ -268,7 +268,7 @@ int tqstrnicmp( const char *str1, const char *str2, uint len ) } -static Q_UINT16 crc_tbl[16]; +static TQ_UINT16 crc_tbl[16]; static bool crc_tbl_init = FALSE; static void createCRC16Table() // build CRC16 lookup table @@ -308,7 +308,7 @@ static void createCRC16Table() // build CRC16 lookup table The checksum is independent of the byte order (endianness). */ -Q_UINT16 tqChecksum( const char *data, uint len ) +TQ_UINT16 tqChecksum( const char *data, uint len ) { if ( !crc_tbl_init ) { // create lookup table @@ -322,7 +322,7 @@ Q_UINT16 tqChecksum( const char *data, uint len ) crc_tbl_init = TRUE; } } - register Q_UINT16 crc = 0xffff; + register TQ_UINT16 crc = 0xffff; uchar c; uchar *p = (uchar *)data; while ( len-- ) { @@ -544,7 +544,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQByteArray &a ) TQDataStream &operator>>( TQDataStream &s, TQByteArray &a ) { - Q_UINT32 len; + TQ_UINT32 len; s >> len; // read size of array if ( len == 0 || s.eof() ) { // end of file reached a.resize( 0 ); @@ -2315,7 +2315,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQCString &str ) TQDataStream &operator>>( TQDataStream &s, TQCString &str ) { str.detach(); - Q_UINT32 len; + TQ_UINT32 len; s >> len; // read size of string if ( len == 0 || s.eof() ) { // end of file reached str.resize( 0 ); |