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/qbitarray.cpp | |
| 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/qbitarray.cpp')
| -rw-r--r-- | src/tools/qbitarray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qbitarray.cpp b/src/tools/qbitarray.cpp index 49074ad93..ec8503276 100644 --- a/src/tools/qbitarray.cpp +++ b/src/tools/qbitarray.cpp @@ -632,7 +632,7 @@ TQBitArray operator^( const TQBitArray &a1, const TQBitArray &a2 ) #ifndef QT_NO_DATASTREAM TQDataStream &operator<<( TQDataStream &s, const TQBitArray &a ) { - Q_UINT32 len = a.size(); + TQ_UINT32 len = a.size(); s << len; // write size of array if ( len > 0 ) // write data s.writeRawBytes( a.data(), a.TQByteArray::size() ); @@ -649,7 +649,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQBitArray &a ) TQDataStream &operator>>( TQDataStream &s, TQBitArray &a ) { - Q_UINT32 len; + TQ_UINT32 len; s >> len; // read size of array if ( !a.resize( (uint)len ) ) { // resize array #if defined(QT_CHECK_NULL) |