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/ntqmap.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/ntqmap.h')
| -rw-r--r-- | src/tools/ntqmap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/ntqmap.h b/src/tools/ntqmap.h index 02dd289ca..c8d97fd59 100644 --- a/src/tools/ntqmap.h +++ b/src/tools/ntqmap.h @@ -849,9 +849,9 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal() template<class Key, class T> Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) { m.clear(); - Q_UINT32 c; + TQ_UINT32 c; s >> c; - for( Q_UINT32 i = 0; i < c; ++i ) { + for( TQ_UINT32 i = 0; i < c; ++i ) { Key k; T t; s >> k >> t; m.insert( k, t ); @@ -864,7 +864,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) template<class Key, class T> Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQMap<Key,T>& m ) { - s << (Q_UINT32)m.size(); + s << (TQ_UINT32)m.size(); TQMapConstIterator<Key,T> it = m.begin(); for( ; it != m.end(); ++it ) s << it.key() << it.data(); |