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/ntqvaluevector.h | |
| 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/ntqvaluevector.h')
| -rw-r--r-- | src/tools/ntqvaluevector.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/ntqvaluevector.h b/src/tools/ntqvaluevector.h index 02a151110..6a50230e9 100644 --- a/src/tools/ntqvaluevector.h +++ b/src/tools/ntqvaluevector.h @@ -547,10 +547,10 @@ template<class T> Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& v ) { v.clear(); - Q_UINT32 c; + TQ_UINT32 c; s >> c; v.resize( c ); - for( Q_UINT32 i = 0; i < c; ++i ) + for( TQ_UINT32 i = 0; i < c; ++i ) { T t; s >> t; @@ -562,7 +562,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& template<class T> Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVector<T>& v ) { - s << (Q_UINT32)v.size(); + s << (TQ_UINT32)v.size(); // ### use typename TQValueVector<T>::const_iterator once all supported // ### compilers know about the 'typename' keyword. const T* it = v.begin(); |