Remove TQ_INLINE_TEMPLATES define.remove/tq-inline-template-define

inline' is redundant in function template definitions, except for specific template specialization

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

13 files changed, 123 insertions, 147 deletions

diff --git a/doc/html/tqglobal-h.html b/doc/html/tqglobal-h.html
index 0cbc709a7..deaeab9ca 100644
--- a/doc/html/tqglobal-h.html
+++ b/doc/html/tqglobal-h.html
@@ -253,7 +253,6 @@ body { background: #ffffff; color: black; }
 #  define Q_CC_MSVC
 /* proper support of bool for _MSC_VER >= 1100 */
 #  define Q_CANNOT_DELETE_CONSTANT
-#  define TQ_INLINE_TEMPLATES inline
 /* Visual C++.Net issues for _MSC_VER >= 1300 */
 #  if _MSC_VER >= 1300
 #    define Q_CC_MSVC_NET
@@ -347,7 +346,6 @@ body { background: #ffffff; color: black; }
 #  if __xlC__ < 0x400
 #    define Q_NO_USING_KEYWORD
 #    define TQ_TYPENAME
-#    define TQ_INLINE_TEMPLATES inline
 #    define Q_CANNOT_DELETE_CONSTANT
 #  endif
 
@@ -394,10 +392,6 @@ body { background: #ffffff; color: black; }
 /* The UnixWare 7 UDK compiler is based on EDG and does define __EDG__ */
 #  elif defined(__USLC__) && defined(__SCO_VERSION__)
 #    define Q_CC_USLC
-/* The latest UDK 7.1.1b does not need this, but previous versions do */
-#    if !defined(__SCO_VERSION__) || (__SCO_VERSION__ < 302200010)
-#      define TQ_INLINE_TEMPLATES inline
-#    endif
 #    define Q_NO_USING_KEYWORD /* ### check "using" status */
 
 /* Never tested! */
@@ -411,7 +405,6 @@ body { background: #ffffff; color: black; }
 #    define Q_CC_MIPS
 #    if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32) /* o32 ABI */
 #      define TQ_TYPENAME
-#      define TQ_INLINE_TEMPLATES inline
 #    elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */
 #      define TQ_TYPENAME
 #    endif
@@ -426,7 +419,6 @@ body { background: #ffffff; color: black; }
 #  define Q_CC_USLC
 #  define TQ_TYPENAME
 #  define Q_NO_USING_KEYWORD
-#  define TQ_INLINE_TEMPLATES inline
 
 /* Never tested! */
 #elif defined(__HIGHC__)
@@ -757,10 +749,6 @@ TQ_EXPORT int qWinVersion();
 #define QT_WA_INLINE( uni, ansi ) ( uni )
 #endif
 
-#ifndef TQ_INLINE_TEMPLATES
-#  define TQ_INLINE_TEMPLATES
-#endif
-
 #ifndef TQ_TYPENAME
 #  define TQ_TYPENAME typename
 #endif
diff --git a/doc/html/tqmap-h.html b/doc/html/tqmap-h.html
index 161cfe82c..21405dfa0 100644
--- a/doc/html/tqmap-h.html
+++ b/doc/html/tqmap-h.html
@@ -201,7 +201,7 @@ public:
 };
 
 template <class K, class T>
-TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::inc()
+int TQMapIterator<K,T>::inc()
 {
     TQMapNodeBase* tmp = node;
     if ( tmp->right ) {
@@ -222,7 +222,7 @@ TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::inc()
 }
 
 template <class K, class T>
-TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::dec()
+int TQMapIterator<K,T>::dec()
 {
     TQMapNodeBase* tmp = node;
     if (tmp->color == TQMapNodeBase::Red &&
@@ -317,7 +317,7 @@ public:
 };
 
 template <class K, class T>
-TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc()
+int TQMapConstIterator<K,T>::inc()
 {
     TQMapNodeBase* tmp = node;
     if ( tmp->right ) {
@@ -338,7 +338,7 @@ TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc()
 }
 
 template <class K, class T>
-TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec()
+int TQMapConstIterator<K,T>::dec()
 {
     TQMapNodeBase* tmp = node;
     if (tmp->color == TQMapNodeBase::Red &&
@@ -466,14 +466,14 @@ protected:
 
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate() {
+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>
-TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate< Key, T >* _map ) : TQMapPrivateBase( _map ) {
+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 ) {
@@ -488,7 +488,7 @@ TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate&
 }
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T>::copy( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p )
+TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T>::copy( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p )
 {
     if ( !p )
 	return 0;
@@ -510,7 +510,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate&
 }
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear()
+void TQMapPrivate<Key,T>::clear()
 {
     clear( (NodePtr)(header->parent) );
     header->color = TQMapNodeBase::Red;
@@ -520,7 +520,7 @@ TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear()
 }
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p )
+void TQMapPrivate<Key,T>::clear( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p )
 {
     while ( p != 0 ) {
 	clear( (NodePtr)p->right );
@@ -531,7 +531,7 @@ TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( TQ_TYPENAME TQMapPriv
 }
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<Key,T>::find(const Key& k) const
+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.
@@ -554,7 +554,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPr
 }
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insertSingle( const Key& k )
+TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insertSingle( const Key& k )
 {
     // Search correct position in the tree
     TQMapNodeBase* y = header;
@@ -585,7 +585,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate
 
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insert( TQMapNodeBase* x, TQMapNodeBase* y, const Key& k )
+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) ) {
@@ -784,7 +784,7 @@ private:
 };
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( const TQMap<Key,T>& m )
+TQMap<Key,T>& TQMap<Key,T>::operator= ( const TQMap<Key,T>& m )
 {
     m.sh->ref();
     if ( sh->deref() )
@@ -794,7 +794,7 @@ TQ_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( cons
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T>::insert( const TQ_TYPENAME TQMap<Key,T>::value_type& x )
+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();
@@ -808,7 +808,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T&g
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k )
+void TQMap<Key,T>::erase( const Key& k )
 {
     detach();
     iterator it( sh->find( k ).node );
@@ -817,7 +817,7 @@ TQ_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k )
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>::count( const Key& k ) const
+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() ) {
@@ -832,7 +832,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k )
+T& TQMap<Key,T>::operator[] ( const Key& k )
 {
     detach();
     TQMapNode<Key,T>* p = sh->find( k ).node;
@@ -842,7 +842,7 @@ TQ_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k )
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES void TQMap<Key,T>::clear()
+void TQMap<Key,T>::clear()
 {
     if ( sh->count == 1 )
 	sh->clear();
@@ -853,7 +853,7 @@ TQ_INLINE_TEMPLATES void TQMap<Key,T>::clear()
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::insert( const Key& key, const T& value, bool overwrite )
+TQ_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::insert( const Key& key, const T& value, bool overwrite )
 {
     detach();
     size_type n = size();
@@ -864,7 +864,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>:
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k )
+void TQMap<Key,T>::remove( const Key& k )
 {
     detach();
     iterator it( sh->find( k ).node );
@@ -873,7 +873,7 @@ TQ_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k )
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal()
+void TQMap<Key,T>::detachInternal()
 {
     sh->deref(); sh = new TQMapPrivate<Key,T>( sh );
 }
@@ -881,7 +881,7 @@ TQ_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal()
 
 #ifndef TQT_NO_DATASTREAM
 template<class Key, class T>
-TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) {
+TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) {
     m.clear();
     TQ_UINT32 c;
     s >> c;
@@ -897,7 +897,7 @@ TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQM
 
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQMap<Key,T>& m ) {
+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 )
diff --git a/doc/html/tqpair-h.html b/doc/html/tqpair-h.html
index 6df787924..454bce351 100644
--- a/doc/html/tqpair-h.html
+++ b/doc/html/tqpair-h.html
@@ -106,20 +106,20 @@ struct TQPair
 };
 
 template <class T1, class T2>
-TQ_INLINE_TEMPLATES bool operator==( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
+bool operator==( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
 {
     return x.first == y.first && x.second == y.second;
 }
 
 template <class T1, class T2>
-TQ_INLINE_TEMPLATES bool operator<( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
+bool operator<( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
 {
     return x.first < y.first ||
 	   ( !( y.first < x.first ) && x.second < y.second );
 }
 
 template <class T1, class T2>
-TQ_INLINE_TEMPLATES TQPair<T1, T2> qMakePair( const T1& x, const T2& y )
+TQPair<T1, T2> qMakePair( const T1& x, const T2& y )
 {
     return TQPair<T1, T2>( x, y );
 }
diff --git a/doc/html/tqvaluelist-h.html b/doc/html/tqvaluelist-h.html
index e2bf06f13..ffe7bcd25 100644
--- a/doc/html/tqvaluelist-h.html
+++ b/doc/html/tqvaluelist-h.html
@@ -293,13 +293,13 @@ public:
 };
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate()
+TQValueListPrivate<T>::TQValueListPrivate()
 {
     node = new Node; node->next = node->prev = node; nodes = 0;
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate( const TQValueListPrivate<T>& _p )
+TQValueListPrivate<T>::TQValueListPrivate( const TQValueListPrivate<T>& _p )
     : TQShared()
 {
     node = new Node; node->next = node->prev = node; nodes = 0;
@@ -311,7 +311,7 @@ TQ_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate( const TQVal
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueListPrivate<T>::~TQValueListPrivate() {
+TQValueListPrivate<T>::~TQValueListPrivate() {
     NodePtr p = node->next;
     while( p != node ) {
 	NodePtr x = p->next;
@@ -322,7 +322,7 @@ TQ_INLINE_TEMPLATES TQValueListPrivate<T>::~TQValueListPrivate() {
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::insert( TQ_TYPENAME TQValueListPrivate<T>::Iterator it, const T& x )
+TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::insert( TQ_TYPENAME TQValueListPrivate<T>::Iterator it, const T& x )
 {
     NodePtr p = new Node( x );
     p->next = it.node;
@@ -334,7 +334,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueLis
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::remove( TQ_TYPENAME TQValueListPrivate<T>::Iterator it )
+TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::remove( TQ_TYPENAME TQValueListPrivate<T>::Iterator it )
 {
     Q_ASSERT ( it.node != node );
     NodePtr next = it.node->next;
@@ -347,7 +347,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueLis
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::find( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const
+TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::find( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const
 {
     ConstIterator first( start );
     ConstIterator last( node );
@@ -360,7 +360,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueList
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES int TQValueListPrivate<T>::findIndex( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const
+int TQValueListPrivate<T>::findIndex( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const
 {
     ConstIterator first( start );
     ConstIterator last( node );
@@ -375,7 +375,7 @@ TQ_INLINE_TEMPLATES int TQValueListPrivate<T>::findIndex( TQ_TYPENAME TQVa
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::contains( const T& x ) const
+uint TQValueListPrivate<T>::contains( const T& x ) const
 {
     uint result = 0;
     Iterator first = Iterator( node->next );
@@ -389,7 +389,7 @@ TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::contains( const T& x )
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::remove( const T& _x )
+uint TQValueListPrivate<T>::remove( const T& _x )
 {
     const T x = _x;
     uint result = 0;
@@ -406,7 +406,7 @@ TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::remove( const T& _x )
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::at( size_type i ) const
+TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::at( size_type i ) const
 {
     Q_ASSERT( i <= nodes );
     NodePtr p = node->next;
@@ -416,7 +416,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueList
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueListPrivate<T>::clear()
+void TQValueListPrivate<T>::clear()
 {
     nodes = 0;
     NodePtr p = node->next;
@@ -611,7 +611,7 @@ private:
 };
 
 template <class T>
-TQ_INLINE_TEMPLATES bool TQValueList<T>::operator== ( const TQValueList<T>& l ) const
+bool TQValueList<T>::operator== ( const TQValueList<T>& l ) const
 {
     if ( size() != l.size() )
 	return false;
@@ -624,13 +624,13 @@ TQ_INLINE_TEMPLATES bool TQValueList<T>::operator== ( const TQValueList&lt
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueList<T>::clear()
+void TQValueList<T>::clear()
 {
     if ( sh->count == 1 ) sh->clear(); else { sh->deref(); sh = new TQValueListPrivate<T>; }
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueList<T>::iterator TQValueList<T>::erase( TQ_TYPENAME TQValueList<T>::iterator first, TQ_TYPENAME TQValueList<T>::iterator last )
+TQ_TYPENAME TQValueList<T>::iterator TQValueList<T>::erase( TQ_TYPENAME TQValueList<T>::iterator first, TQ_TYPENAME TQValueList<T>::iterator last )
 {
     while ( first != last )
 	erase( first++ );
@@ -639,14 +639,14 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueList<T>::iterator TQValueList<T&
 
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueList<T>::insert( TQ_TYPENAME TQValueList<T>::iterator pos, size_type n, const T& x )
+void TQValueList<T>::insert( TQ_TYPENAME TQValueList<T>::iterator pos, size_type n, const T& x )
 {
     for ( ; n > 0; --n )
 	insert( pos, x );
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueList<T> TQValueList<T>::operator+ ( const TQValueList<T>& l ) const
+TQValueList<T> TQValueList<T>::operator+ ( const TQValueList<T>& l ) const
 {
     TQValueList<T> l2( *this );
     for( const_iterator it = l.begin(); it != l.end(); ++it )
@@ -655,7 +655,7 @@ TQ_INLINE_TEMPLATES TQValueList<T> TQValueList<T>::operator+ ( const
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueList<T>& TQValueList<T>::operator+= ( const TQValueList<T>& l )
+TQValueList<T>& TQValueList<T>::operator+= ( const TQValueList<T>& l )
 {
     TQValueList<T> copy = l;
     for( const_iterator it = copy.begin(); it != copy.end(); ++it )
@@ -664,14 +664,14 @@ TQ_INLINE_TEMPLATES TQValueList<T>& TQValueList<T>::operator+= (
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueList<T>::detachInternal()
+void TQValueList<T>::detachInternal()
 {
     sh->deref(); sh = new TQValueListPrivate<T>( *sh );
 }
 
 #ifndef TQT_NO_DATASTREAM
 template <class T>
-TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l )
+TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l )
 {
     l.clear();
     TQ_UINT32 c;
@@ -688,7 +688,7 @@ TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQV
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueList<T>& l )
+TQDataStream& operator<<( TQDataStream& s, const TQValueList<T>& l )
 {
     s << (TQ_UINT32)l.size();
     TQValueListConstIterator<T> it = l.begin();
diff --git a/doc/html/tqvaluevector-h.html b/doc/html/tqvaluevector-h.html
index 35df2d6fc..b89cdbb48 100644
--- a/doc/html/tqvaluevector-h.html
+++ b/doc/html/tqvaluevector-h.html
@@ -154,7 +154,7 @@ private:
 };
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQValueVectorPrivate<T>& x )
+TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQValueVectorPrivate<T>& x )
     : TQShared()
 {
     size_t i = x.size();
@@ -175,7 +175,7 @@ TQ_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( const T
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( size_t size )
+TQValueVectorPrivate<T>::TQValueVectorPrivate( size_t size )
 {
     if ( size > 0 ) {
 	start = new T[size];
@@ -189,7 +189,7 @@ TQ_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( size_t
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, const T& x )
+void TQValueVectorPrivate<T>::insert( pointer pos, const T& x )
 {
     const size_t lastSize = size();
     const size_t n = lastSize !=0 ? 2*lastSize : 1;
@@ -206,7 +206,7 @@ TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, con
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, size_t n, const T& x )
+void TQValueVectorPrivate<T>::insert( pointer pos, size_t n, const T& x )
 {
     if ( size_t( end - finish ) >= n ) {
 	// enough room
@@ -246,7 +246,7 @@ TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, siz
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::reserve( size_t n )
+void TQValueVectorPrivate<T>::reserve( size_t n )
 {
     const size_t lastSize = size();
     pointer tmp = growAndCopy( n, start, finish );
@@ -256,7 +256,7 @@ TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::reserve( size_t n )
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVectorPrivate<T>::pointer TQValueVectorPrivate<T>::growAndCopy( size_t n, pointer s, pointer f )
+TQ_TYPENAME TQValueVectorPrivate<T>::pointer TQValueVectorPrivate<T>::growAndCopy( size_t n, pointer s, pointer f )
 {
     pointer newStart = new T[n];
     tqCopy( s, f, newStart );
@@ -524,21 +524,21 @@ private:
 };
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueVector<T>::TQValueVector( size_type n, const T& val )
+TQValueVector<T>::TQValueVector( size_type n, const T& val )
 {
     sh = new TQValueVectorPrivate<T>( n );
     tqFill( begin(), end(), val );
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueVector<T>::detachInternal()
+void TQValueVector<T>::detachInternal()
 {
     sh->deref();
     sh = new TQValueVectorPrivate<T>( *sh );
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, const T& x )
+TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, const T& x )
 {
     size_type offset = pos - sh->start;
     detach();
@@ -563,7 +563,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector<T>::iterator TQValueVector&l
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, size_type n, const T& x )
+TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, size_type n, const T& x )
 {
     if ( n != 0 ) {
 	size_type offset = pos - sh->start;
@@ -577,7 +577,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector<T>::iterator TQValueVector&l
 
 #ifndef TQT_NO_DATASTREAM
 template<class T>
-TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& v )
+TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& v )
 {
     v.clear();
     TQ_UINT32 c;
@@ -593,7 +593,7 @@ TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQV
 }
 
 template<class T>
-TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVector<T>& v )
+TQDataStream& operator<<( TQDataStream& s, const TQValueVector<T>& v )
 {
     s << (TQ_UINT32)v.size();
     // ### use typename TQValueVector<T>::const_iterator once all supported
diff --git a/src/kernel/tqobjectdefs.h b/src/kernel/tqobjectdefs.h
index 69d44d6bc..871ba47a3 100644
--- a/src/kernel/tqobjectdefs.h
+++ b/src/kernel/tqobjectdefs.h
@@ -169,6 +169,6 @@ TQ_EXPORT void *tqt_find_obj_child( TQObject *, const char *, const char * );
 TQ_EXPORT void *tqt_inheritedBy( TQMetaObject *super, const TQObject *cls );
 
 template <typename T>
-TQ_INLINE_TEMPLATES T tqt_cast(const TQObject *object)
+T tqt_cast(const TQObject *object)
 { return (T)tqt_inheritedBy( ((T)0)->staticMetaObject(), object ); }
 #endif // TQOBJECTDEFS_H
diff --git a/src/kernel/tqscriptengine.cpp b/src/kernel/tqscriptengine.cpp
index 963d2bb3b..e9431463c 100644
--- a/src/kernel/tqscriptengine.cpp
+++ b/src/kernel/tqscriptengine.cpp
@@ -98,7 +98,7 @@ private:
 };
 
 template <class T>
-TQ_INLINE_TEMPLATES TQVarLengthArray<T>::TQVarLengthArray(int asize)
+TQVarLengthArray<T>::TQVarLengthArray(int asize)
     : s(asize) {
     if (s > Prealloc) {
         ptr = reinterpret_cast<T *>(malloc(s * sizeof(T)));
diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h
index 15c700058..6120dbf45 100644
--- a/src/tools/tqglobal.h
+++ b/src/tools/tqglobal.h
@@ -220,7 +220,6 @@
 #  define Q_CC_MSVC
 /* proper support of bool for _MSC_VER >= 1100 */
 #  define Q_CANNOT_DELETE_CONSTANT
-#  define TQ_INLINE_TEMPLATES inline
 /* Visual C++.Net issues for _MSC_VER >= 1300 */
 #  if _MSC_VER >= 1300
 #    define Q_CC_MSVC_NET
@@ -314,7 +313,6 @@
 #  if __xlC__ < 0x400
 #    define Q_NO_USING_KEYWORD
 #    define TQ_TYPENAME
-#    define TQ_INLINE_TEMPLATES inline
 #    define Q_CANNOT_DELETE_CONSTANT
 #  endif
 
@@ -361,10 +359,6 @@
 /* The UnixWare 7 UDK compiler is based on EDG and does define __EDG__ */
 #  elif defined(__USLC__) && defined(__SCO_VERSION__)
 #    define Q_CC_USLC
-/* The latest UDK 7.1.1b does not need this, but previous versions do */
-#    if !defined(__SCO_VERSION__) || (__SCO_VERSION__ < 302200010)
-#      define TQ_INLINE_TEMPLATES inline
-#    endif
 #    define Q_NO_USING_KEYWORD /* ### check "using" status */
 
 /* Never tested! */
@@ -378,7 +372,6 @@
 #    define Q_CC_MIPS
 #    if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32) /* o32 ABI */
 #      define TQ_TYPENAME
-#      define TQ_INLINE_TEMPLATES inline
 #    elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */
 #      define TQ_TYPENAME
 #    endif
@@ -393,7 +386,6 @@
 #  define Q_CC_USLC
 #  define TQ_TYPENAME
 #  define Q_NO_USING_KEYWORD
-#  define TQ_INLINE_TEMPLATES inline
 
 /* Never tested! */
 #elif defined(__HIGHC__)
@@ -732,10 +724,6 @@ TQ_EXPORT int qWinVersion();
 #define QT_WA_INLINE( uni, ansi ) ( uni )
 #endif
 
-#ifndef TQ_INLINE_TEMPLATES
-#  define TQ_INLINE_TEMPLATES
-#endif
-
 #ifndef TQ_TYPENAME
 #  define TQ_TYPENAME typename
 #endif
diff --git a/src/tools/tqmap.h b/src/tools/tqmap.h
index 8689e17ee..5f594c068 100644
--- a/src/tools/tqmap.h
+++ b/src/tools/tqmap.h
@@ -167,7 +167,7 @@ public:
 };
 
 template <class K, class T>
-TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::inc()
+int TQMapIterator<K,T>::inc()
 {
     TQMapNodeBase* tmp = node;
     if ( tmp->right ) {
@@ -188,7 +188,7 @@ TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::inc()
 }
 
 template <class K, class T>
-TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::dec()
+int TQMapIterator<K,T>::dec()
 {
     TQMapNodeBase* tmp = node;
     if (tmp->color == TQMapNodeBase::Red &&
@@ -283,7 +283,7 @@ public:
 };
 
 template <class K, class T>
-TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc()
+int TQMapConstIterator<K,T>::inc()
 {
     TQMapNodeBase* tmp = node;
     if ( tmp->right ) {
@@ -304,7 +304,7 @@ TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc()
 }
 
 template <class K, class T>
-TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec()
+int TQMapConstIterator<K,T>::dec()
 {
     TQMapNodeBase* tmp = node;
     if (tmp->color == TQMapNodeBase::Red &&
@@ -432,14 +432,14 @@ protected:
 
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate() {
+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>
-TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate< Key, T >* _map ) : TQMapPrivateBase( _map ) {
+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 @@ TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate< Key,
 }
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T>::copy( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p )
+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 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T>
 }
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear()
+void TQMapPrivate<Key,T>::clear()
 {
     clear( (NodePtr)(header->parent) );
     header->color = TQMapNodeBase::Red;
@@ -486,7 +486,7 @@ TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear()
 }
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p )
+void TQMapPrivate<Key,T>::clear( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p )
 {
     while ( p != 0 ) {
 	clear( (NodePtr)p->right );
@@ -497,7 +497,7 @@ TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( TQ_TYPENAME TQMapPrivate<Ke
 }
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<Key,T>::find(const Key& k) const
+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 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<
 }
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insertSingle( const Key& k )
+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 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T
 
 
 template <class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insert( TQMapNodeBase* x, TQMapNodeBase* y, const Key& k )
+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) ) {
@@ -754,7 +754,7 @@ private:
 };
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( const TQMap<Key,T>& m )
+TQMap<Key,T>& TQMap<Key,T>::operator= ( const TQMap<Key,T>& m )
 {
     m.sh->ref();
     if ( sh->deref() )
@@ -764,7 +764,7 @@ TQ_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( const TQMap<Key,T>&
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T>::insert( const TQ_TYPENAME TQMap<Key,T>::value_type& x )
+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 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T>::insert(
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k )
+void TQMap<Key,T>::erase( const Key& k )
 {
     detach();
     iterator it( sh->find( k ).node );
@@ -787,7 +787,7 @@ TQ_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k )
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>::count( const Key& k ) const
+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 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>::count( con
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k )
+T& TQMap<Key,T>::operator[] ( const Key& k )
 {
     detach();
     TQMapNode<Key,T>* p = sh->find( k ).node;
@@ -812,7 +812,7 @@ TQ_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k )
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES void TQMap<Key,T>::clear()
+void TQMap<Key,T>::clear()
 {
     if ( sh->count == 1 )
 	sh->clear();
@@ -823,7 +823,7 @@ TQ_INLINE_TEMPLATES void TQMap<Key,T>::clear()
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::insert( const Key& key, const T& value, bool overwrite )
+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 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::insert( con
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k )
+void TQMap<Key,T>::remove( const Key& k )
 {
     detach();
     iterator it( sh->find( k ).node );
@@ -843,7 +843,7 @@ TQ_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k )
 }
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal()
+void TQMap<Key,T>::detachInternal()
 {
     sh->deref(); sh = new TQMapPrivate<Key,T>( sh );
 }
@@ -851,7 +851,7 @@ TQ_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal()
 
 #ifndef TQT_NO_DATASTREAM
 template<class Key, class T>
-TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) {
+TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) {
     m.clear();
     TQ_UINT32 c;
     s >> c;
@@ -867,7 +867,7 @@ TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m )
 
 
 template<class Key, class T>
-TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQMap<Key,T>& m ) {
+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 )
diff --git a/src/tools/tqpair.h b/src/tools/tqpair.h
index 8d487e38b..588c809c2 100644
--- a/src/tools/tqpair.h
+++ b/src/tools/tqpair.h
@@ -72,20 +72,20 @@ struct TQPair
 };
 
 template <class T1, class T2>
-TQ_INLINE_TEMPLATES bool operator==( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
+bool operator==( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
 {
     return x.first == y.first && x.second == y.second;
 }
 
 template <class T1, class T2>
-TQ_INLINE_TEMPLATES bool operator<( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
+bool operator<( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
 {
     return x.first < y.first ||
 	   ( !( y.first < x.first ) && x.second < y.second );
 }
 
 template <class T1, class T2>
-TQ_INLINE_TEMPLATES TQPair<T1, T2> qMakePair( const T1& x, const T2& y )
+TQPair<T1, T2> qMakePair( const T1& x, const T2& y )
 {
     return TQPair<T1, T2>( x, y );
 }
diff --git a/src/tools/tqtl.h b/src/tools/tqtl.h
index 63da09080..858a48ce0 100644
--- a/src/tools/tqtl.h
+++ b/src/tools/tqtl.h
@@ -149,7 +149,7 @@ inline void tqSwap( T& _value1, T& _value2 )
 
 
 template <class InputIterator>
-TQ_INLINE_TEMPLATES void qBubbleSort( InputIterator b, InputIterator e )
+void qBubbleSort( InputIterator b, InputIterator e )
 {
     // Goto last element;
     InputIterator last = e;
@@ -190,7 +190,7 @@ inline void qBubbleSort( Container &c )
 
 
 template <class Value>
-TQ_INLINE_TEMPLATES void qHeapSortPushDown( Value* heap, int first, int last )
+void qHeapSortPushDown( Value* heap, int first, int last )
 {
     int r = first;
     while ( r <= last / 2 ) {
@@ -219,7 +219,7 @@ TQ_INLINE_TEMPLATES void qHeapSortPushDown( Value* heap, int first, int last )
 
 
 template <class InputIterator, class Value>
-TQ_INLINE_TEMPLATES void qHeapSortHelper( InputIterator b, InputIterator e, Value, uint n )
+void qHeapSortHelper( InputIterator b, InputIterator e, Value, uint n )
 {
     // Create the heap
     InputIterator insert = b;
@@ -250,7 +250,7 @@ TQ_INLINE_TEMPLATES void qHeapSortHelper( InputIterator b, InputIterator e, Valu
 
 
 template <class InputIterator>
-TQ_INLINE_TEMPLATES void qHeapSort( InputIterator b, InputIterator e )
+void qHeapSort( InputIterator b, InputIterator e )
 {
     // Empty ?
     if ( b == e )
@@ -271,7 +271,7 @@ TQ_INLINE_TEMPLATES void qHeapSort( InputIterator b, InputIterator e )
 
 
 template <class Container>
-TQ_INLINE_TEMPLATES void qHeapSort( Container &c )
+void qHeapSort( Container &c )
 {
     if ( c.begin() == c.end() )
 	return;
diff --git a/src/tools/tqvaluelist.h b/src/tools/tqvaluelist.h
index d0beab5ed..f770214b7 100644
--- a/src/tools/tqvaluelist.h
+++ b/src/tools/tqvaluelist.h
@@ -250,13 +250,13 @@ public:
 };
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate()
+TQValueListPrivate<T>::TQValueListPrivate()
 {
     node = new Node(); node->next = node->prev = node; nodes = 0;
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate( const TQValueListPrivate<T>& _p )
+TQValueListPrivate<T>::TQValueListPrivate( const TQValueListPrivate<T>& _p )
     : TQShared()
 {
     node = new Node(); node->next = node->prev = node; nodes = 0;
@@ -268,7 +268,7 @@ TQ_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate( const TQValueList
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueListPrivate<T>::~TQValueListPrivate() {
+TQValueListPrivate<T>::~TQValueListPrivate() {
     NodePtr p = node->next;
     while( p != node ) {
 	NodePtr x = p->next;
@@ -279,7 +279,7 @@ TQ_INLINE_TEMPLATES TQValueListPrivate<T>::~TQValueListPrivate() {
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::insert( TQ_TYPENAME TQValueListPrivate<T>::Iterator it, const T& x )
+TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::insert( TQ_TYPENAME TQValueListPrivate<T>::Iterator it, const T& x )
 {
     NodePtr p = new Node( x );
     p->next = it.node;
@@ -291,7 +291,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPriva
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::remove( TQ_TYPENAME TQValueListPrivate<T>::Iterator it )
+TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::remove( TQ_TYPENAME TQValueListPrivate<T>::Iterator it )
 {
     Q_ASSERT ( it.node != node );
     NodePtr next = it.node->next;
@@ -304,7 +304,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPriva
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::find( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const
+TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::find( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const
 {
     ConstIterator first( start );
     ConstIterator last( node );
@@ -317,7 +317,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivat
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES int TQValueListPrivate<T>::findIndex( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const
+int TQValueListPrivate<T>::findIndex( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const
 {
     ConstIterator first( start );
     ConstIterator last( node );
@@ -332,7 +332,7 @@ TQ_INLINE_TEMPLATES int TQValueListPrivate<T>::findIndex( TQ_TYPENAME TQValueLis
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::contains( const T& x ) const
+uint TQValueListPrivate<T>::contains( const T& x ) const
 {
     uint result = 0;
     Iterator first = Iterator( node->next );
@@ -346,7 +346,7 @@ TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::contains( const T& x ) const
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES bool TQValueListPrivate<T>::containsYesNo( const T& x ) const
+bool TQValueListPrivate<T>::containsYesNo( const T& x ) const
 {
     Iterator first = Iterator( node->next );
     Iterator last = Iterator( node );
@@ -359,7 +359,7 @@ TQ_INLINE_TEMPLATES bool TQValueListPrivate<T>::containsYesNo( const T& x ) cons
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::remove( const T& _x )
+uint TQValueListPrivate<T>::remove( const T& _x )
 {
     const T x = _x;
     uint result = 0;
@@ -376,7 +376,7 @@ TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::remove( const T& _x )
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::at( size_type i ) const
+TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::at( size_type i ) const
 {
     Q_ASSERT( i <= nodes );
     NodePtr p = node->next;
@@ -386,7 +386,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivat
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueListPrivate<T>::clear()
+void TQValueListPrivate<T>::clear()
 {
     nodes = 0;
     NodePtr p = node->next;
@@ -596,7 +596,7 @@ private:
 };
 
 template <class T>
-TQ_INLINE_TEMPLATES bool TQValueList<T>::operator== ( const TQValueList<T>& l ) const
+bool TQValueList<T>::operator== ( const TQValueList<T>& l ) const
 {
     if ( size() != l.size() )
 	return false;
@@ -609,13 +609,13 @@ TQ_INLINE_TEMPLATES bool TQValueList<T>::operator== ( const TQValueList<T>& l )
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueList<T>::clear()
+void TQValueList<T>::clear()
 {
     if ( sh->count == 1 ) sh->clear(); else { sh->deref(); sh = new TQValueListPrivate<T>(); }
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueList<T>::iterator TQValueList<T>::erase( TQ_TYPENAME TQValueList<T>::iterator first, TQ_TYPENAME TQValueList<T>::iterator last )
+TQ_TYPENAME TQValueList<T>::iterator TQValueList<T>::erase( TQ_TYPENAME TQValueList<T>::iterator first, TQ_TYPENAME TQValueList<T>::iterator last )
 {
     while ( first != last )
 	erase( first++ );
@@ -624,14 +624,14 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueList<T>::iterator TQValueList<T>::erase(
 
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueList<T>::insert( TQ_TYPENAME TQValueList<T>::iterator pos, size_type n, const T& x )
+void TQValueList<T>::insert( TQ_TYPENAME TQValueList<T>::iterator pos, size_type n, const T& x )
 {
     for ( ; n > 0; --n )
 	insert( pos, x );
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueList<T> TQValueList<T>::operator+ ( const TQValueList<T>& l ) const
+TQValueList<T> TQValueList<T>::operator+ ( const TQValueList<T>& l ) const
 {
     TQValueList<T> l2( *this );
     for( const_iterator it = l.begin(); it != l.end(); ++it )
@@ -640,7 +640,7 @@ TQ_INLINE_TEMPLATES TQValueList<T> TQValueList<T>::operator+ ( const TQValueList
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueList<T>& TQValueList<T>::operator+= ( const TQValueList<T>& l )
+TQValueList<T>& TQValueList<T>::operator+= ( const TQValueList<T>& l )
 {
     TQValueList<T> copy = l;
     for( const_iterator it = copy.begin(); it != copy.end(); ++it )
@@ -650,7 +650,7 @@ TQ_INLINE_TEMPLATES TQValueList<T>& TQValueList<T>::operator+= ( const TQValueLi
 
 #ifndef TQT_NO_DATASTREAM
 template <class T>
-TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l )
+TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l )
 {
     l.clear();
     TQ_UINT32 c;
@@ -665,7 +665,7 @@ TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueList<T>& l )
+TQDataStream& operator<<( TQDataStream& s, const TQValueList<T>& l )
 {
     s << (TQ_UINT32)l.size();
     TQValueListConstIterator<T> it = l.begin();
diff --git a/src/tools/tqvaluevector.h b/src/tools/tqvaluevector.h
index 3cae4b71d..791095b93 100644
--- a/src/tools/tqvaluevector.h
+++ b/src/tools/tqvaluevector.h
@@ -121,7 +121,7 @@ private:
 };
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQValueVectorPrivate<T>& x )
+TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQValueVectorPrivate<T>& x )
     : TQShared()
 {
     size_t i = x.size();
@@ -142,7 +142,7 @@ TQ_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQValue
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( size_t size )
+TQValueVectorPrivate<T>::TQValueVectorPrivate( size_t size )
 {
     if ( size > 0 ) {
 	start = new T[size];
@@ -156,7 +156,7 @@ TQ_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( size_t size )
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, const T& x )
+void TQValueVectorPrivate<T>::insert( pointer pos, const T& x )
 {
     const size_t lastSize = size();
     const size_t n = lastSize !=0 ? 2*lastSize : 1;
@@ -173,7 +173,7 @@ TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, const T&
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, size_t n, const T& x )
+void TQValueVectorPrivate<T>::insert( pointer pos, size_t n, const T& x )
 {
     if ( size_t( end - finish ) >= n ) {
 	// enough room
@@ -213,7 +213,7 @@ TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, size_t n,
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::reserve( size_t n )
+void TQValueVectorPrivate<T>::reserve( size_t n )
 {
     const size_t lastSize = size();
     pointer tmp = growAndCopy( n, start, finish );
@@ -223,7 +223,7 @@ TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::reserve( size_t n )
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVectorPrivate<T>::pointer TQValueVectorPrivate<T>::growAndCopy( size_t n, pointer s, pointer f )
+TQ_TYPENAME TQValueVectorPrivate<T>::pointer TQValueVectorPrivate<T>::growAndCopy( size_t n, pointer s, pointer f )
 {
     pointer newStart = new T[n];
     tqCopy( s, f, newStart );
@@ -491,21 +491,21 @@ private:
 };
 
 template <class T>
-TQ_INLINE_TEMPLATES TQValueVector<T>::TQValueVector( size_type n, const T& val )
+TQValueVector<T>::TQValueVector( size_type n, const T& val )
 {
     sh = new TQValueVectorPrivate<T>( n );
     tqFill( begin(), end(), val );
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES void TQValueVector<T>::detachInternal()
+void TQValueVector<T>::detachInternal()
 {
     sh->deref();
     sh = new TQValueVectorPrivate<T>( *sh );
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, const T& x )
+TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, const T& x )
 {
     size_type offset = pos - sh->start;
     detach();
@@ -530,7 +530,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::ins
 }
 
 template <class T>
-TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, size_type n, const T& x )
+TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, size_type n, const T& x )
 {
     if ( n != 0 ) {
 	size_type offset = pos - sh->start;
@@ -544,7 +544,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::ins
 
 #ifndef TQT_NO_DATASTREAM
 template<class T>
-TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& v )
+TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& v )
 {
     v.clear();
     TQ_UINT32 c;
@@ -560,7 +560,7 @@ TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>&
 }
 
 template<class T>
-TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVector<T>& v )
+TQDataStream& operator<<( TQDataStream& s, const TQValueVector<T>& v )
 {
     s << (TQ_UINT32)v.size();
     // ### use typename TQValueVector<T>::const_iterator once all supported