diff options
Diffstat (limited to 'src/tools/ntqmap.h')
-rw-r--r-- | src/tools/ntqmap.h | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/tools/ntqmap.h b/src/tools/ntqmap.h index de51a95f4..f34f665cc 100644 --- a/src/tools/ntqmap.h +++ b/src/tools/ntqmap.h @@ -167,7 +167,7 @@ public: }; template <class K, class T> -Q_INLINE_TEMPLATES int TQMapIterator<K,T>::inc() +TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::inc() { TQMapNodeBase* tmp = node; if ( tmp->right ) { @@ -188,7 +188,7 @@ Q_INLINE_TEMPLATES int TQMapIterator<K,T>::inc() } template <class K, class T> -Q_INLINE_TEMPLATES int TQMapIterator<K,T>::dec() +TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::dec() { TQMapNodeBase* tmp = node; if (tmp->color == TQMapNodeBase::Red && @@ -283,7 +283,7 @@ public: }; template <class K, class T> -Q_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc() +TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc() { TQMapNodeBase* tmp = node; if ( tmp->right ) { @@ -304,7 +304,7 @@ Q_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc() } template <class K, class T> -Q_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec() +TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec() { TQMapNodeBase* tmp = node; if (tmp->color == TQMapNodeBase::Red && @@ -432,14 +432,14 @@ protected: template <class Key, class T> -Q_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate() { +TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate() { header = new Node; header->color = TQMapNodeBase::Red; // Mark the header header->parent = 0; header->left = header->right = header; } template <class Key, class T> -Q_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate< Key, T >* _map ) : TQMapPrivateBase( _map ) { +TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate< Key, T >* _map ) : TQMapPrivateBase( _map ) { header = new Node; header->color = TQMapNodeBase::Red; // Mark the header if ( _map->header->parent == 0 ) { @@ -454,7 +454,7 @@ Q_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate< Key, T } template <class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T>::copy( Q_TYPENAME TQMapPrivate<Key,T>::NodePtr p ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T>::copy( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p ) { if ( !p ) return 0; @@ -476,7 +476,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T>:: } template <class Key, class T> -Q_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear() +TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear() { clear( (NodePtr)(header->parent) ); header->color = TQMapNodeBase::Red; @@ -486,7 +486,7 @@ Q_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear() } template <class Key, class T> -Q_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( Q_TYPENAME TQMapPrivate<Key,T>::NodePtr p ) +TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p ) { while ( p != 0 ) { clear( (NodePtr)p->right ); @@ -497,7 +497,7 @@ Q_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( Q_TYPENAME TQMapPrivate<Key, } template <class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<Key,T>::find(const Key& k) const +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<Key,T>::find(const Key& k) const { TQMapNodeBase* y = header; // Last node TQMapNodeBase* x = header->parent; // Root node. @@ -520,7 +520,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<Ke } template <class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insertSingle( const Key& k ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insertSingle( const Key& k ) { // Search correct position in the tree TQMapNodeBase* y = header; @@ -551,7 +551,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>: template <class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insert( TQMapNodeBase* x, TQMapNodeBase* y, const Key& k ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insert( TQMapNodeBase* x, TQMapNodeBase* y, const Key& k ) { NodePtr z = new Node( k ); if (y == header || x != 0 || k < key(y) ) { @@ -577,15 +577,15 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>: #ifdef QT_CHECK_RANGE # if !defined( TQT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE ) -# define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "TQMap: Warning invalid element" ) -# define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() ); +# define TQT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "TQMap: Warning invalid element" ) +# define TQT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() ); # else -# define QT_CHECK_INVALID_MAP_ELEMENT -# define QT_CHECK_INVALID_MAP_ELEMENT_FATAL +# define TQT_CHECK_INVALID_MAP_ELEMENT +# define TQT_CHECK_INVALID_MAP_ELEMENT_FATAL # endif #else -# define QT_CHECK_INVALID_MAP_ELEMENT -# define QT_CHECK_INVALID_MAP_ELEMENT_FATAL +# define TQT_CHECK_INVALID_MAP_ELEMENT +# define TQT_CHECK_INVALID_MAP_ELEMENT_FATAL #endif template <class T> class TQDeepCopy; @@ -635,7 +635,7 @@ public: TQMap( const std::map<Key,T>& m ) { sh = new TQMapPrivate<Key,T>; - Q_TYPENAME std::map<Key,T>::const_iterator it = m.begin(); + TQ_TYPENAME std::map<Key,T>::const_iterator it = m.begin(); for ( ; it != m.end(); ++it ) { value_type p( (*it).first, (*it).second ); insert( p ); @@ -656,7 +656,7 @@ public: TQMap<Key,T>& operator= ( const std::map<Key,T>& m ) { clear(); - Q_TYPENAME std::map<Key,T>::const_iterator it = m.begin(); + TQ_TYPENAME std::map<Key,T>::const_iterator it = m.begin(); for ( ; it != m.end(); ++it ) { value_type p( (*it).first, (*it).second ); insert( p ); @@ -706,7 +706,7 @@ public: const_iterator find ( const Key& k ) const { return sh->find( k ); } const T& operator[] ( const Key& k ) const - { QT_CHECK_INVALID_MAP_ELEMENT; return sh->find( k ).data(); } + { TQT_CHECK_INVALID_MAP_ELEMENT; return sh->find( k ).data(); } bool contains ( const Key& k ) const { return find( k ) != end(); } //{ return sh->find( k ) != ((const Priv*)sh)->end(); } @@ -754,7 +754,7 @@ private: }; template<class Key, class T> -Q_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( const TQMap<Key,T>& m ) +TQ_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( const TQMap<Key,T>& m ) { m.sh->ref(); if ( sh->deref() ) @@ -764,7 +764,7 @@ Q_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( const TQMap<Key,T>& m } template<class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T>::insert( const Q_TYPENAME TQMap<Key,T>::value_type& x ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T>::insert( const TQ_TYPENAME TQMap<Key,T>::value_type& x ) { detach(); size_type n = size(); @@ -778,7 +778,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T>::insert( co } template<class Key, class T> -Q_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k ) +TQ_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k ) { detach(); iterator it( sh->find( k ).node ); @@ -787,7 +787,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k ) } template<class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>::count( const Key& k ) const +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>::count( const Key& k ) const { const_iterator it( sh->find( k ).node ); if ( it != end() ) { @@ -802,7 +802,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>::count( const } template<class Key, class T> -Q_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k ) +TQ_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k ) { detach(); TQMapNode<Key,T>* p = sh->find( k ).node; @@ -812,7 +812,7 @@ Q_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k ) } template<class Key, class T> -Q_INLINE_TEMPLATES void TQMap<Key,T>::clear() +TQ_INLINE_TEMPLATES void TQMap<Key,T>::clear() { if ( sh->count == 1 ) sh->clear(); @@ -823,7 +823,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::clear() } template<class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::insert( const Key& key, const T& value, bool overwrite ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::insert( const Key& key, const T& value, bool overwrite ) { detach(); size_type n = size(); @@ -834,7 +834,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::insert( const } template<class Key, class T> -Q_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k ) +TQ_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k ) { detach(); iterator it( sh->find( k ).node ); @@ -843,7 +843,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k ) } template<class Key, class T> -Q_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal() +TQ_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal() { sh->deref(); sh = new TQMapPrivate<Key,T>( sh ); } @@ -851,7 +851,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal() #ifndef TQT_NO_DATASTREAM template<class Key, class T> -Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) { +TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) { m.clear(); TQ_UINT32 c; s >> c; @@ -867,7 +867,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 ) { +TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQMap<Key,T>& m ) { s << (TQ_UINT32)m.size(); TQMapConstIterator<Key,T> it = m.begin(); for( ; it != m.end(); ++it ) |