Automated update from Qt3

1 files changed, 21 insertions, 21 deletions

diff --git a/src/tools/ntqvaluevector.h b/src/tools/ntqvaluevector.h
index bef40f54b..02a151110 100644
--- a/src/tools/ntqvaluevector.h
+++ b/src/tools/ntqvaluevector.h
@@ -130,9 +130,9 @@ Q_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQValueV
 	finish = start + i;
 	end = start + i;
 #if defined(__xlC__) && __xlC__ < 0x400 // xlC 3.6 confused by const
-	qCopy( (pointer)x.start, (pointer)x.finish, start );
+	tqCopy( (pointer)x.start, (pointer)x.finish, start );
 #else
-	qCopy( x.start, x.finish, start );
+	tqCopy( x.start, x.finish, start );
 #endif
     } else {
 	start = 0;
@@ -163,9 +163,9 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, const T& x
     const size_t offset = pos - start;
     pointer newStart = new T[n];
     pointer newFinish = newStart + offset;
-    qCopy( start, pos, newStart );
+    tqCopy( start, pos, newStart );
     *newFinish = x;
-    qCopy( pos, finish, ++newFinish );
+    tqCopy( pos, finish, ++newFinish );
     delete[] start;
     start = newStart;
     finish = newStart + lastSize + 1;
@@ -180,31 +180,31 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, size_t n,
 	const size_t elems_after = finish - pos;
 	pointer old_finish = finish;
 	if ( elems_after > n ) {
-	    qCopy( finish - n, finish, finish );
+	    tqCopy( finish - n, finish, finish );
 	    finish += n;
-	    qCopyBackward( pos, old_finish - n, old_finish );
-	    qFill( pos, pos + n, x );
+	    tqCopyBackward( pos, old_finish - n, old_finish );
+	    tqFill( pos, pos + n, x );
 	} else {
 	    pointer filler = finish;
 	    size_t i = n - elems_after;
 	    for ( ; i > 0; --i, ++filler )
 		*filler = x;
 	    finish += n - elems_after;
-	    qCopy( pos, old_finish, finish );
+	    tqCopy( pos, old_finish, finish );
 	    finish += elems_after;
-	    qFill( pos, old_finish, x );
+	    tqFill( pos, old_finish, x );
 	}
     } else {
 	// not enough room
 	const size_t lastSize = size();
 	const size_t len = lastSize + TQMAX( lastSize, n );
 	pointer newStart = new T[len];
-	pointer newFinish = qCopy( start, pos, newStart );
+	pointer newFinish = tqCopy( start, pos, newStart );
 	// fill up inserted space
 	size_t i = n;
 	for ( ; i > 0; --i, ++newFinish )
 	    *newFinish = x;
-	newFinish = qCopy( pos, finish, newFinish );
+	newFinish = tqCopy( pos, finish, newFinish );
 	delete[] start;
 	start = newStart;
 	finish = newFinish;
@@ -226,7 +226,7 @@ template <class T>
 Q_INLINE_TEMPLATES Q_TYPENAME TQValueVectorPrivate<T>::pointer TQValueVectorPrivate<T>::growAndCopy( size_t n, pointer s, pointer f )
 {
     pointer newStart = new T[n];
-    qCopy( s, f, newStart );
+    tqCopy( s, f, newStart );
     delete[] start;
     return newStart;
 }
@@ -268,13 +268,13 @@ public:
     TQValueVector( std::vector<T>& v ) // ### remove in 4.0
     {
 	sh = new TQValueVectorPrivate<T>( v.size() );
-	qCopy( v.begin(), v.end(), begin() );
+	tqCopy( v.begin(), v.end(), begin() );
     }
 
     TQValueVector( const std::vector<T>& v )
     {
 	sh = new TQValueVectorPrivate<T>( v.size() );
-	qCopy( v.begin(), v.end(), begin() );
+	tqCopy( v.begin(), v.end(), begin() );
     }
 #endif
 
@@ -296,7 +296,7 @@ public:
     {
 	clear();
 	resize( v.size() );
-	qCopy( v.begin(), v.end(), begin() );
+	tqCopy( v.begin(), v.end(), begin() );
 	return *this;
     }
 #endif
@@ -441,7 +441,7 @@ public:
     {
 	detach();
 	if ( pos + 1 != end() )
-	    qCopy( pos + 1, sh->finish, pos );
+	    tqCopy( pos + 1, sh->finish, pos );
 	--sh->finish;
 	return pos;
     }
@@ -449,7 +449,7 @@ public:
     iterator erase( iterator first, iterator last )
     {
 	detach();
-	qCopy( last, sh->finish, first );
+	tqCopy( last, sh->finish, first );
 	sh->finish = sh->finish - ( last - first );
 	return first;
     }
@@ -457,12 +457,12 @@ public:
     // ### remove in TQt 4.0
     bool operator==( const TQValueVector<T>& x )
     {
-	return size()==x.size() ? qEqual( constBegin(), constEnd(), x.begin()) : FALSE;
+	return size()==x.size() ? tqEqual( constBegin(), constEnd(), x.begin()) : FALSE;
     }
 
     bool operator==( const TQValueVector<T>& x ) const
     {
-	return size()==x.size() ? qEqual( begin(), end(), x.begin() ) : FALSE;
+	return size()==x.size() ? tqEqual( begin(), end(), x.begin() ) : FALSE;
     }
 
     typedef T ValueType;
@@ -494,7 +494,7 @@ template <class T>
 Q_INLINE_TEMPLATES TQValueVector<T>::TQValueVector( size_type n, const T& val )
 {
     sh = new TQValueVectorPrivate<T>( n );
-    qFill( begin(), end(), val );
+    tqFill( begin(), end(), val );
 }
 
 template <class T>
@@ -522,7 +522,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::inser
 	} else {
 	    *sh->finish = *(sh->finish - 1);
 	    ++sh->finish;
-	    qCopyBackward( pos, sh->finish - 2, sh->finish - 1 );
+	    tqCopyBackward( pos, sh->finish - 2, sh->finish - 1 );
 	    *pos = x;
 	}
     }