Undo prior accidental commit

39 files changed, 394 insertions, 394 deletions

diff --git a/src/tools/qbitarray.cpp b/src/tools/qbitarray.cpp
index 111583c..bdbeaa2 100644
--- a/src/tools/qbitarray.cpp
+++ b/src/tools/qbitarray.cpp
@@ -296,7 +296,7 @@ bool QBitArray::testBit( uint index ) const
 {
 #if defined(QT_CHECK_RANGE)
     if ( index >= size() ) {
-	tqWarning( "QBitArray::testBit: Index %d out of range", index );
+	qWarning( "QBitArray::testBit: Index %d out of range", index );
 	return FALSE;
     }
 #endif
@@ -315,7 +315,7 @@ void QBitArray::setBit( uint index )
 {
 #if defined(QT_CHECK_RANGE)
     if ( index >= size() ) {
-	tqWarning( "QBitArray::setBit: Index %d out of range", index );
+	qWarning( "QBitArray::setBit: Index %d out of range", index );
 	return;
     }
 #endif
@@ -348,7 +348,7 @@ void QBitArray::clearBit( uint index )
 {
 #if defined(QT_CHECK_RANGE)
     if ( index >= size() ) {
-	tqWarning( "QBitArray::clearBit: Index %d out of range", index );
+	qWarning( "QBitArray::clearBit: Index %d out of range", index );
 	return;
     }
 #endif
@@ -368,7 +368,7 @@ bool QBitArray::toggleBit( uint index )
 {
 #if defined(QT_CHECK_RANGE)
     if ( index >= size() ) {
-	tqWarning( "QBitArray::toggleBit: Index %d out of range", index );
+	qWarning( "QBitArray::toggleBit: Index %d out of range", index );
 	return FALSE;
     }
 #endif
@@ -653,7 +653,7 @@ QDataStream &operator>>( QDataStream &s, QBitArray &a )
     s >> len;					// read size of array
     if ( !a.resize( (uint)len ) ) {		// resize array
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QDataStream: Not enough memory to read QBitArray" );
+	qWarning( "QDataStream: Not enough memory to read QBitArray" );
 #endif
 	len = 0;
     }
diff --git a/src/tools/qbuffer.cpp b/src/tools/qbuffer.cpp
index ab2cdac..35509b7 100644
--- a/src/tools/qbuffer.cpp
+++ b/src/tools/qbuffer.cpp
@@ -150,7 +150,7 @@ bool QBuffer::setBuffer( QByteArray buf )
 {
     if ( isOpen() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QBuffer::setBuffer: Buffer is open" );
+        qWarning( "QBuffer::setBuffer: Buffer is open" );
 #endif
         return FALSE;
     }
@@ -193,7 +193,7 @@ bool QBuffer::open( int m  )
 {
     if ( isOpen() ) {                           // buffer already open
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QBuffer::open: Buffer already open" );
+        qWarning( "QBuffer::open: Buffer already open" );
 #endif
         return FALSE;
     }
@@ -262,16 +262,16 @@ bool QBuffer::at( Offset pos )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {
-        tqWarning( "QBuffer::at: Buffer is not open" );
+        qWarning( "QBuffer::at: Buffer is not open" );
         return FALSE;
     }
 #endif
     if ( pos > a_len ) {
 #if defined(QT_CHECK_RANGE)
 #if defined(QT_ABI_QT4)
-        tqWarning( "QBuffer::at: Index %lld out of range", pos );
+        qWarning( "QBuffer::at: Index %lld out of range", pos );
 #else
-        tqWarning( "QBuffer::at: Index %lu out of range", pos );
+        qWarning( "QBuffer::at: Index %lu out of range", pos );
 #endif
 #endif
         return FALSE;
@@ -289,15 +289,15 @@ Q_LONG QBuffer::readBlock( char *p, Q_ULONG len )
 {
 #if defined(QT_CHECK_STATE)
     if ( !p ) {
-	tqWarning( "QBuffer::readBlock: Null pointer error" );
+	qWarning( "QBuffer::readBlock: Null pointer error" );
 	return -1;
     }
     if ( !isOpen() ) {                          // buffer not open
-        tqWarning( "QBuffer::readBlock: Buffer not open" );
+        qWarning( "QBuffer::readBlock: Buffer not open" );
         return -1;
     }
     if ( !isReadable() ) {                      // reading not permitted
-        tqWarning( "QBuffer::readBlock: Read operation not permitted" );
+        qWarning( "QBuffer::readBlock: Read operation not permitted" );
         return -1;
     }
 #endif
@@ -337,17 +337,17 @@ Q_LONG QBuffer::writeBlock( const char *p, Q_ULONG len )
 
 #if defined(QT_CHECK_NULL)
     if ( p == 0 ) {
-        tqWarning( "QBuffer::writeBlock: Null pointer error" );
+        qWarning( "QBuffer::writeBlock: Null pointer error" );
         return -1;
     }
 #endif
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {                          // buffer not open
-        tqWarning( "QBuffer::writeBlock: Buffer not open" );
+        qWarning( "QBuffer::writeBlock: Buffer not open" );
         return -1;
     }
     if ( !isWritable() ) {                      // writing not permitted
-        tqWarning( "QBuffer::writeBlock: Write operation not permitted" );
+        qWarning( "QBuffer::writeBlock: Write operation not permitted" );
         return -1;
     }
 #endif
@@ -355,7 +355,7 @@ Q_LONG QBuffer::writeBlock( const char *p, Q_ULONG len )
         Q_ULONG new_len = a_len + a_inc*((ioIndex+len-a_len)/a_inc+1);
         if ( !a.resize( new_len ) ) {           // could not resize
 #if defined(QT_CHECK_NULL)
-            tqWarning( "QBuffer::writeBlock: Memory allocation error" );
+            qWarning( "QBuffer::writeBlock: Memory allocation error" );
 #endif
             setStatus( IO_ResourceError );
             return -1;
@@ -380,17 +380,17 @@ Q_LONG QBuffer::readLine( char *p, Q_ULONG maxlen )
 {
 #if defined(QT_CHECK_NULL)
     if ( p == 0 ) {
-        tqWarning( "QBuffer::readLine: Null pointer error" );
+        qWarning( "QBuffer::readLine: Null pointer error" );
         return -1;
     }
 #endif
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {                          // buffer not open
-        tqWarning( "QBuffer::readLine: Buffer not open" );
+        qWarning( "QBuffer::readLine: Buffer not open" );
         return -1;
     }
     if ( !isReadable() ) {                      // reading not permitted
-        tqWarning( "QBuffer::readLine: Read operation not permitted" );
+        qWarning( "QBuffer::readLine: Read operation not permitted" );
         return -1;
     }
 #endif
@@ -419,11 +419,11 @@ int QBuffer::getch()
 {
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {                          // buffer not open
-        tqWarning( "QBuffer::getch: Buffer not open" );
+        qWarning( "QBuffer::getch: Buffer not open" );
         return -1;
     }
     if ( !isReadable() ) {                      // reading not permitted
-        tqWarning( "QBuffer::getch: Read operation not permitted" );
+        qWarning( "QBuffer::getch: Read operation not permitted" );
         return -1;
     }
 #endif
@@ -450,11 +450,11 @@ int QBuffer::putch( int ch )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {                          // buffer not open
-        tqWarning( "QBuffer::putch: Buffer not open" );
+        qWarning( "QBuffer::putch: Buffer not open" );
         return -1;
     }
     if ( !isWritable() ) {                      // writing not permitted
-        tqWarning( "QBuffer::putch: Write operation not permitted" );
+        qWarning( "QBuffer::putch: Write operation not permitted" );
         return -1;
     }
 #endif
@@ -479,11 +479,11 @@ int QBuffer::ungetch( int ch )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {                          // buffer not open
-        tqWarning( "QBuffer::ungetch: Buffer not open" );
+        qWarning( "QBuffer::ungetch: Buffer not open" );
         return -1;
     }
     if ( !isReadable() ) {                      // reading not permitted
-        tqWarning( "QBuffer::ungetch: Read operation not permitted" );
+        qWarning( "QBuffer::ungetch: Read operation not permitted" );
         return -1;
     }
 #endif
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index bae4e7d..8d13549 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -100,25 +100,25 @@ static bool qt_verify( const QString& library, uint version, uint flags,
 
     if ( (flags & 1) == 0 ) {
 	if ( warn )
-	    tqWarning( "Conflict in %s:\n"
+	    qWarning( "Conflict in %s:\n"
 		      "  Plugin cannot be queried successfully!",
 		      (const char*) QFile::encodeName(library) );
     } else if ( ( version > QT_VERSION ) ||
 		( ( QT_VERSION & 0xff0000 ) > ( version & 0xff0000 ) ) ) {
 	if ( warn )
-	    tqWarning( "Conflict in %s:\n"
+	    qWarning( "Conflict in %s:\n"
 		      "  Plugin uses incompatible Qt library (%d.%d.%d)!",
 		      (const char*) QFile::encodeName(library),
 		      (version&0xff0000) >> 16, (version&0xff00) >> 8, version&0xff );
     } else if ( (flags & 2) != (our_flags & 2) ) {
 	if ( warn )
-	    tqWarning( "Conflict in %s:\n"
+	    qWarning( "Conflict in %s:\n"
 		      "  Plugin uses %s Qt library!",
 		      (const char*) QFile::encodeName(library),
 		      (flags & 2) ? "multi threaded" : "single threaded" );
     } else if ( key != QT_BUILD_KEY ) {
 	if ( warn )
-	    tqWarning( "Conflict in %s:\n"
+	    qWarning( "Conflict in %s:\n"
 		      "  Plugin uses incompatible Qt library!\n"
 		      "  expected build key \"%s\", got \"%s\".",
 		      (const char*) QFile::encodeName(library),
@@ -326,7 +326,7 @@ static bool qt_unix_query( const QString &library, uint *version, uint *flags,
 {
     QFile file( library );
     if (! file.open( IO_ReadOnly ) ) {
-	tqWarning( "%s: %s", (const char*) QFile::encodeName(library),
+	qWarning( "%s: %s", (const char*) QFile::encodeName(library),
 	    strerror( errno ) );
 	return FALSE;
     }
@@ -345,7 +345,7 @@ static bool qt_unix_query( const QString &library, uint *version, uint *flags,
 	fdlen = maplen;
     } else {
 	// mmap failed
-	tqWarning( "mmap: %s", strerror( errno ) );
+	qWarning( "mmap: %s", strerror( errno ) );
 #endif // USE_MMAP
 	// try reading the data into memory instead
 	data = file.readAll();
@@ -367,7 +367,7 @@ static bool qt_unix_query( const QString &library, uint *version, uint *flags,
 
 #ifdef USE_MMAP
     if ( mapaddr != MAP_FAILED && munmap(mapaddr, maplen) != 0 ) {
-	tqWarning( "munmap: %s", strerror( errno ) );
+	qWarning( "munmap: %s", strerror( errno ) );
     }
 #endif // USE_MMAP
 
@@ -474,7 +474,7 @@ void QComLibrary::createInstanceInternal()
 
     if ( ! query_done ) {
 	if ( warn_mismatch ) {
-	    tqWarning( "Conflict in %s:\n Plugin cannot be queried successfully!",
+	    qWarning( "Conflict in %s:\n Plugin cannot be queried successfully!",
 		      (const char*) QFile::encodeName( library() ) );
 	}
 	unload();
@@ -499,7 +499,7 @@ void QComLibrary::createInstanceInternal()
     ucmInstanceProc = (UCMInstanceProc) resolve( "ucm_instantiate" );
 #if defined(QT_DEBUG_COMPONENT)
     if ( !ucmInstanceProc )
-	tqWarning( "%s: Not a UCOM library.", (const char*) QFile::encodeName(library()) );
+	qWarning( "%s: Not a UCOM library.", (const char*) QFile::encodeName(library()) );
 #endif
     entry = ucmInstanceProc ? ucmInstanceProc() : 0;
 
@@ -514,7 +514,7 @@ void QComLibrary::createInstanceInternal()
 	}
     } else {
 #if defined(QT_DEBUG_COMPONENT)
-	tqWarning( "%s: No exported component provided.", (const char*) QFile::encodeName(library()) );
+	qWarning( "%s: No exported component provided.", (const char*) QFile::encodeName(library()) );
 #endif
 	unload();
     }
diff --git a/src/tools/qcomponentfactory.cpp b/src/tools/qcomponentfactory.cpp
index 79ef562..d47c174 100644
--- a/src/tools/qcomponentfactory.cpp
+++ b/src/tools/qcomponentfactory.cpp
@@ -116,7 +116,7 @@ static QPtrList<QComLibrary> *liblist()
     if ( !libraries ) {
 	libraries = new QPtrList<QComLibrary>();
 	libraries->setAutoDelete( TRUE );
-	tqAddPostRoutine( cleanup );
+	qAddPostRoutine( cleanup );
     }
     return libraries;
 }
diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp
index 6dc45c0..9abf9e7 100644
--- a/src/tools/qcstring.cpp
+++ b/src/tools/qcstring.cpp
@@ -70,7 +70,7 @@
     is copied correctly even if \a src and \a dst overlap.
 */
 
-void *tqmemmove( void *dst, const void *src, uint len )
+void *qmemmove( void *dst, const void *src, uint len )
 {
     register char *d;
     register char *s;
@@ -100,7 +100,7 @@ void *tqmemmove( void *dst, const void *src, uint len )
     The returned string must be deleted using \c delete[].
 */
 
-char *tqstrdup( const char *src )
+char *qstrdup( const char *src )
 {
     if ( !src )
 	return 0;
@@ -133,7 +133,7 @@ char *tqstrdup( const char *src )
     \sa qstrcpy()
 */
 
-char *tqstrncpy( char *dst, const char *src, uint len )
+char *qstrncpy( char *dst, const char *src, uint len )
 {
     if ( !src || !dst )
 	return 0;
@@ -170,7 +170,7 @@ char *tqstrncpy( char *dst, const char *src, uint len )
     Special case II: Returns a random nonzero value if \a str1 is 0
     or \a str2 is 0 (but not both).
 
-    \sa qstrncmp() tqstricmp() tqstrnicmp()
+    \sa qstrncmp() qstricmp() qstrnicmp()
 	\link #asciinotion Note on character comparisons \endlink
 */
 
@@ -192,7 +192,7 @@ char *tqstrncpy( char *dst, const char *src, uint len )
     Special case II: Returns a random nonzero value if \a str1 is 0
     or \a str2 is 0 (but not both).
 
-    \sa qstrcmp(), tqstricmp(), tqstrnicmp()
+    \sa qstrcmp(), qstricmp(), qstrnicmp()
 	\link #asciinotion Note on character comparisons \endlink
 */
 
@@ -212,11 +212,11 @@ char *tqstrncpy( char *dst, const char *src, uint len )
     Special case II: Returns a random nonzero value if \a str1 is 0
     or \a str2 is 0 (but not both).
 
-    \sa qstrcmp(), qstrncmp(), tqstrnicmp()
+    \sa qstrcmp(), qstrncmp(), qstrnicmp()
 	\link #asciinotion Note on character comparisons \endlink
 */
 
-int tqstricmp( const char *str1, const char *str2 )
+int qstricmp( const char *str1, const char *str2 )
 {
     register const uchar *s1 = (const uchar *)str1;
     register const uchar *s2 = (const uchar *)str2;
@@ -246,11 +246,11 @@ int tqstricmp( const char *str1, const char *str2 )
     Special case II: Returns a random nonzero value if \a str1 is 0
     or \a str2 is 0 (but not both).
 
-    \sa qstrcmp(), qstrncmp() tqstricmp()
+    \sa qstrcmp(), qstrncmp() qstricmp()
 	\link #asciinotion Note on character comparisons \endlink
 */
 
-int tqstrnicmp( const char *str1, const char *str2, uint len )
+int qstrnicmp( const char *str1, const char *str2, uint len )
 {
     register const uchar *s1 = (const uchar *)str1;
     register const uchar *s2 = (const uchar *)str2;
@@ -308,7 +308,7 @@ static void createCRC16Table()			// build CRC16 lookup table
     The checksum is independent of the byte order (endianness).
 */
 
-Q_UINT16 tqChecksum( const char *data, uint len )
+Q_UINT16 qChecksum( const char *data, uint len )
 {
     if ( !crc_tbl_init ) {			// create lookup table
 
@@ -335,7 +335,7 @@ Q_UINT16 tqChecksum( const char *data, uint len )
 }
 
 /*!
-    \fn QByteArray tqCompress( const QByteArray& data )
+    \fn QByteArray qCompress( const QByteArray& data )
 
     \relates QByteArray
 
@@ -355,7 +355,7 @@ Q_UINT16 tqChecksum( const char *data, uint len )
 */
 
 #ifndef QT_NO_COMPRESS
-QByteArray tqCompress( const uchar* data, int nbytes )
+QByteArray qCompress( const uchar* data, int nbytes )
 {
     if ( nbytes == 0 ) {
 	QByteArray tmp( 4 );
@@ -364,7 +364,7 @@ QByteArray tqCompress( const uchar* data, int nbytes )
     }
     if ( !data ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "qCompress: data is NULL." );
+	qWarning( "qCompress: data is NULL." );
 #endif
 	return QByteArray();
     }
@@ -386,7 +386,7 @@ QByteArray tqCompress( const uchar* data, int nbytes )
 	    break;
 	case Z_MEM_ERROR:
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "qCompress: Z_MEM_ERROR: Not enough memory." );
+	    qWarning( "qCompress: Z_MEM_ERROR: Not enough memory." );
 #endif
 	    bazip.resize( 0 );
 	    break;
@@ -411,12 +411,12 @@ QByteArray tqCompress( const uchar* data, int nbytes )
     Returns an empty QByteArray if the input data was corrupt.
     \omit
     ADD THE FOLLOWING FOR Qt 4.0
-    This function will uncompress data compressed with tqCompress()
+    This function will uncompress data compressed with qCompress()
     from this and any earlier Qt version, back to Qt 3.1 when this
     feature was added.
     \endomit
 
-    \sa tqCompress()
+    \sa qCompress()
 */
 
 /*!
@@ -433,14 +433,14 @@ QByteArray qUncompress( const uchar* data, int nbytes )
 {
     if ( !data ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "qUncompress: data is NULL." );
+	qWarning( "qUncompress: data is NULL." );
 #endif
 	return QByteArray();
     }
     if ( nbytes <= 4 ) {
 #if defined(QT_CHECK_RANGE)
 	if ( nbytes < 4 || ( data[0]!=0 || data[1]!=0 || data[2]!=0 || data[3]!=0 ) )
-	    tqWarning( "qUncompress: Input data is corrupted." );
+	    qWarning( "qUncompress: Input data is corrupted." );
 #endif
 	return QByteArray();
     }
@@ -463,7 +463,7 @@ QByteArray qUncompress( const uchar* data, int nbytes )
 	    break;
 	case Z_MEM_ERROR:
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "qUncompress: Z_MEM_ERROR: Not enough memory." );
+	    qWarning( "qUncompress: Z_MEM_ERROR: Not enough memory." );
 #endif
 	    break;
 	case Z_BUF_ERROR:
@@ -471,7 +471,7 @@ QByteArray qUncompress( const uchar* data, int nbytes )
 	    break;
 	case Z_DATA_ERROR:
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "qUncompress: Z_DATA_ERROR: Input data is corrupted." );
+	    qWarning( "qUncompress: Z_DATA_ERROR: Input data is corrupted." );
 #endif
 	    break;
 	}
@@ -552,7 +552,7 @@ QDataStream &operator>>( QDataStream &s, QByteArray &a )
     }
     if ( !a.resize( (uint)len ) ) {		// resize array
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QDataStream: Not enough memory to read QByteArray" );
+	qWarning( "QDataStream: Not enough memory to read QByteArray" );
 #endif
 	len = 0;
     }
@@ -1031,7 +1031,7 @@ int QCString::find( const char *str, int index, bool cs, uint l ) const
 	while ( haystack <= end ) {
 	    hashHaystack += tolower(*(haystack+sl_minus_1));
 	    if ( hashHaystack == hashNeedle
-		 && tqstrnicmp( needle, haystack, sl ) == 0 )
+		 && qstrnicmp( needle, haystack, sl ) == 0 )
 		return haystack - data();
 
 	    REHASH( tolower(*haystack) );
@@ -1136,7 +1136,7 @@ int QCString::findRev( const char *str, int index, bool cs ) const
 	hashHaystack -= tolower(*haystack);
 	while ( haystack >= end ) {
 	    hashHaystack += tolower(*haystack);
-	    if ( hashHaystack == hashNeedle && tqstrnicmp( needle, haystack, sl ) == 0 )
+	    if ( hashHaystack == hashNeedle && qstrnicmp( needle, haystack, sl ) == 0 )
 		return haystack-data();
 	    --haystack;
 	    REHASH( tolower(*(haystack+sl)) );
@@ -2192,7 +2192,7 @@ QCString &QCString::setNum( double n, char f, int prec )
 {
 #if defined(QT_CHECK_RANGE)
     if ( !(f=='f' || f=='F' || f=='e' || f=='E' || f=='g' || f=='G') )
-	tqWarning( "QCString::setNum: Invalid format char '%c'", f );
+	qWarning( "QCString::setNum: Invalid format char '%c'", f );
 #endif
     char format[20];
     register char *fs = format;			// generate format string
@@ -2323,7 +2323,7 @@ QDataStream &operator>>( QDataStream &s, QCString &str )
     }
     if ( !str.QByteArray::resize( (uint)len )) {// resize string
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QDataStream: Not enough memory to read QCString" );
+	qWarning( "QDataStream: Not enough memory to read QCString" );
 #endif
 	len = 0;
     }
diff --git a/src/tools/qcstring.h b/src/tools/qcstring.h
index 2c602e7..372ae80 100644
--- a/src/tools/qcstring.h
+++ b/src/tools/qcstring.h
@@ -53,9 +53,9 @@
   Safe and portable C string functions; extensions to standard string.h
  *****************************************************************************/
 
-Q_EXPORT void *tqmemmove( void *dst, const void *src, uint len );
+Q_EXPORT void *qmemmove( void *dst, const void *src, uint len );
 
-Q_EXPORT char *tqstrdup( const char * );
+Q_EXPORT char *qstrdup( const char * );
 
 Q_EXPORT inline uint qstrlen( const char *str )
 { return str ? (uint)strlen(str) : 0u; }
@@ -63,7 +63,7 @@ Q_EXPORT inline uint qstrlen( const char *str )
 Q_EXPORT inline char *qstrcpy( char *dst, const char *src )
 { return src ? strcpy(dst, src) : 0; }
 
-Q_EXPORT char *tqstrncpy( char *dst, const char *src, uint len );
+Q_EXPORT char *qstrncpy( char *dst, const char *src, uint len );
 
 Q_EXPORT inline int qstrcmp( const char *str1, const char *str2 )
 {
@@ -77,9 +77,9 @@ Q_EXPORT inline int qstrncmp( const char *str1, const char *str2, uint len )
 			    : ( str1 ? 1 : ( str2 ? -1 : 0 ) );
 }
 
-Q_EXPORT int tqstricmp( const char *, const char * );
+Q_EXPORT int qstricmp( const char *, const char * );
 
-Q_EXPORT int tqstrnicmp( const char *, const char *, uint len );
+Q_EXPORT int qstrnicmp( const char *, const char *, uint len );
 
 #ifndef QT_CLEAN_NAMESPACE
 Q_EXPORT inline uint cstrlen( const char *str )
@@ -96,9 +96,9 @@ Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len )
 #endif
 
 
-// tqChecksum: Internet checksum
+// qChecksum: Internet checksum
 
-Q_EXPORT Q_UINT16 tqChecksum( const char *s, uint len );
+Q_EXPORT Q_UINT16 qChecksum( const char *s, uint len );
 
 /*****************************************************************************
   QByteArray class
@@ -120,10 +120,10 @@ typedef QMemArray<char> QByteArray;
 #endif
 
 #ifndef QT_NO_COMPRESS
-Q_EXPORT QByteArray tqCompress( const uchar* data, int nbytes );
+Q_EXPORT QByteArray qCompress( const uchar* data, int nbytes );
 Q_EXPORT QByteArray qUncompress( const uchar* data, int nbytes );
-Q_EXPORT inline QByteArray tqCompress( const QByteArray& data)
-{ return tqCompress( (const uchar*)data.data(), data.size() ); }
+Q_EXPORT inline QByteArray qCompress( const QByteArray& data)
+{ return qCompress( (const uchar*)data.data(), data.size() ); }
 Q_EXPORT inline QByteArray qUncompress( const QByteArray& data )
 { return qUncompress( (const uchar*)data.data(), data.size() ); }
 #endif
diff --git a/src/tools/qdatastream.cpp b/src/tools/qdatastream.cpp
index d0cd70a..dfdc20e 100644
--- a/src/tools/qdatastream.cpp
+++ b/src/tools/qdatastream.cpp
@@ -219,7 +219,7 @@
 #if defined(QT_CHECK_STATE)
 #undef  CHECK_STREAM_PRECOND
 #define CHECK_STREAM_PRECOND  if ( !dev ) {				\
-				tqWarning( "QDataStream: No device" );	\
+				qWarning( "QDataStream: No device" );	\
 				return *this; }
 #else
 #define CHECK_STREAM_PRECOND
@@ -248,7 +248,7 @@ static const int DefaultStreamVersion = 6;
 QDataStream::QDataStream()
 {
     if ( systemWordSize == 0 )			// get system features
-	tqSysInfo( &systemWordSize, &systemBigEndian );
+	qSysInfo( &systemWordSize, &systemBigEndian );
     dev	      = 0;				// no device set
     owndev    = FALSE;
     byteorder = BigEndian;			// default byte order
@@ -272,7 +272,7 @@ QDataStream::QDataStream()
 QDataStream::QDataStream( QIODevice *d )
 {
     if ( systemWordSize == 0 )			// get system features
-	tqSysInfo( &systemWordSize, &systemBigEndian );
+	qSysInfo( &systemWordSize, &systemBigEndian );
     dev	      = d;				// set device
     owndev    = FALSE;
     byteorder = BigEndian;			// default byte order
@@ -303,7 +303,7 @@ QDataStream::QDataStream( QIODevice *d )
 QDataStream::QDataStream( QByteArray a, int mode )
 {
     if ( systemWordSize == 0 )			// get system features
-	tqSysInfo( &systemWordSize, &systemBigEndian );
+	qSysInfo( &systemWordSize, &systemBigEndian );
     dev	      = new QBuffer( a );		// create device
     ((QBuffer *)dev)->open( mode );		// open device
     owndev    = TRUE;
diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp
index ea8950a..d0c21dc 100644
--- a/src/tools/qdatetime.cpp
+++ b/src/tools/qdatetime.cpp
@@ -513,7 +513,7 @@ QString QDate::shortMonthName( int month )
 {
 #if defined(QT_CHECK_RANGE)
     if ( month < 1 || month > 12 ) {
-	tqWarning( "QDate::shortMonthName: Parameter out ouf range" );
+	qWarning( "QDate::shortMonthName: Parameter out ouf range" );
 	month = 1;
     }
 #endif
@@ -559,7 +559,7 @@ QString QDate::longMonthName( int month )
 {
 #if defined(QT_CHECK_RANGE)
     if ( month < 1 || month > 12 ) {
-	tqWarning( "QDate::longMonthName: Parameter out ouf range" );
+	qWarning( "QDate::longMonthName: Parameter out ouf range" );
 	month = 1;
     }
 #endif
@@ -613,7 +613,7 @@ QString QDate::shortDayName( int weekday )
 {
 #if defined(QT_CHECK_RANGE)
     if ( weekday < 1 || weekday > 7 ) {
-	tqWarning( "QDate::shortDayName: Parameter out of range" );
+	qWarning( "QDate::shortDayName: Parameter out of range" );
 	weekday = 1;
     }
 #endif
@@ -661,7 +661,7 @@ QString QDate::longDayName( int weekday )
 {
 #if defined(QT_CHECK_RANGE)
     if ( weekday < 1 || weekday > 7 ) {
-	tqWarning( "QDate::longDayName: Parameter out of range" );
+	qWarning( "QDate::longDayName: Parameter out of range" );
 	weekday = 1;
     }
 #endif
@@ -850,7 +850,7 @@ bool QDate::setYMD( int y, int m, int d )
 	return isValid();
     if ( !isValid(y,m,d) ) {
 #if defined(QT_CHECK_RANGE)
-	 tqWarning( "QDate::setYMD: Invalid date %04d-%02d-%02d", y, m, d );
+	 qWarning( "QDate::setYMD: Invalid date %04d-%02d-%02d", y, m, d );
 #endif
 	 return FALSE;
     }
@@ -1073,7 +1073,7 @@ QDate QDate::fromString( const QString& s, Qt::DateFormat f )
 {
     if ( ( s.isEmpty() ) || ( f == Qt::LocalDate ) ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QDate::fromString: Parameter out of range" );
+	qWarning( "QDate::fromString: Parameter out of range" );
 #endif
 	QDate d;
 	d.jd = 0;
@@ -1122,7 +1122,7 @@ QDate QDate::fromString( const QString& s, Qt::DateFormat f )
 	    }
 #if defined(QT_CHECK_RANGE)
 	    if ( month < 1 || month > 12 ) {
-		tqWarning( "QDate::fromString: Parameter out of range" );
+		qWarning( "QDate::fromString: Parameter out of range" );
 		QDate d;
 		d.jd = 0;
 		return d;
@@ -1493,7 +1493,7 @@ bool QTime::setHMS( int h, int m, int s, int ms )
 {
     if ( !isValid(h,m,s,ms) ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QTime::setHMS Invalid time %02d:%02d:%02d.%03d", h, m, s,
+	qWarning( "QTime::setHMS Invalid time %02d:%02d:%02d.%03d", h, m, s,
 		 ms );
 #endif
 	ds = MSECS_PER_DAY;		// make this invalid
@@ -1664,7 +1664,7 @@ QTime QTime::fromString( const QString& s, Qt::DateFormat f )
 {
     if ( ( s.isEmpty() ) || ( f == Qt::LocalDate ) ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QTime::fromString: Parameter out of range" );
+	qWarning( "QTime::fromString: Parameter out of range" );
 #endif
 	QTime t;
 	t.ds = MSECS_PER_DAY;
@@ -1708,7 +1708,7 @@ bool QTime::currentTime( QTime *ct, Qt::TimeSpec ts )
 {
     if ( !ct ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QTime::currentTime(QTime *): Null pointer not allowed" );
+	qWarning( "QTime::currentTime(QTime *): Null pointer not allowed" );
 #endif
 	return FALSE;
     }
@@ -1789,7 +1789,7 @@ bool QTime::isValid( int h, int m, int s, int ms )
     QTime t;
     t.start();
     some_lengthy_task();
-    tqDebug( "Time elapsed: %d ms", t.elapsed() );
+    qDebug( "Time elapsed: %d ms", t.elapsed() );
     \endcode
 
     \sa restart(), elapsed(), currentTime()
@@ -2320,7 +2320,7 @@ int QDateTime::daysTo( const QDateTime &dt ) const
     \code
     QDateTime dt = QDateTime::currentDateTime();
     QDateTime xmas( QDate(dt.date().year(),12,24), QTime(17,00) );
-    tqDebug( "There are %d seconds to Christmas", dt.secsTo(xmas) );
+    qDebug( "There are %d seconds to Christmas", dt.secsTo(xmas) );
     \endcode
 
     \sa addSecs(), daysTo(), QTime::secsTo()
@@ -2449,7 +2449,7 @@ QDateTime QDateTime::fromString( const QString& s, Qt::DateFormat f )
 {
     if ( ( s.isEmpty() ) || ( f == Qt::LocalDate ) ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QDateTime::fromString: Parameter out of range" );
+	qWarning( "QDateTime::fromString: Parameter out of range" );
 #endif
 	QDateTime dt;
 	dt.d.jd = 0;
@@ -2482,7 +2482,7 @@ QDateTime QDateTime::fromString( const QString& s, Qt::DateFormat f )
 	}
 #if defined(QT_CHECK_RANGE)
 	if ( month < 1 || month > 12 ) {
-	    tqWarning( "QDateTime::fromString: Parameter out of range" );
+	    qWarning( "QDateTime::fromString: Parameter out of range" );
 	    QDateTime dt;
 	    dt.d.jd = 0;
 	    return dt;
diff --git a/src/tools/qdir.cpp b/src/tools/qdir.cpp
index 03796cb..b3164d4 100644
--- a/src/tools/qdir.cpp
+++ b/src/tools/qdir.cpp
@@ -132,18 +132,18 @@ const bool CaseSensitiveFS = TRUE;
     \code
     QDir d( "example" );			// "./example"
     if ( !d.exists() )
-	tqWarning( "Cannot find the example directory" );
+	qWarning( "Cannot find the example directory" );
     \endcode
 
     Traversing directories and reading a file.
     \code
     QDir d = QDir::root();			// "/"
     if ( !d.cd("tmp") ) {			// "/tmp"
-	tqWarning( "Cannot find the \"/tmp\" directory" );
+	qWarning( "Cannot find the \"/tmp\" directory" );
     } else {
 	QFile f( d.filePath("ex1.txt") );	// "/tmp/ex1.txt"
 	if ( !f.open(IO_ReadWrite) )
-	    tqWarning( "Cannot create the file %s", f.name() );
+	    qWarning( "Cannot create the file %s", f.name() );
     }
     \endcode
 
@@ -1005,7 +1005,7 @@ QDir &QDir::operator=( const QString &path )
     QDir d1( "/usr/local/bin" );
     QDir d2( "bin" );
     if ( d1 != d2 )
-	tqDebug( "They differ" );
+	qDebug( "They differ" );
     \endcode
 */
 
@@ -1021,7 +1021,7 @@ QDir &QDir::operator=( const QString &path )
     QDir d2( "bin" );
     d2.convertToAbs();
     if ( d1 == d2 )
-	tqDebug( "They're the same" );
+	qDebug( "They're the same" );
     \endcode
 */
 
@@ -1051,7 +1051,7 @@ bool QDir::remove( const QString &fileName, bool acceptAbsPath )
 {
     if ( fileName.isEmpty() ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QDir::remove: Empty or null file name" );
+	qWarning( "QDir::remove: Empty or null file name" );
 #endif
 	return FALSE;
     }
@@ -1076,7 +1076,7 @@ bool QDir::exists( const QString &name, bool acceptAbsPath ) //### const in 4.0
 {
     if ( name.isEmpty() ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QDir::exists: Empty or null file name" );
+	qWarning( "QDir::exists: Empty or null file name" );
 #endif
 	return FALSE;
     }
diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp
index 65a745c..5c0c393 100644
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/qdir_unix.cpp
@@ -142,7 +142,7 @@ bool QDir::rename( const QString &name, const QString &newName,
 {
     if ( name.isEmpty() || newName.isEmpty() ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QDir::rename: Empty or null file name(s)" );
+	qWarning( "QDir::rename: Empty or null file name(s)" );
 #endif
 	return FALSE;
     }
@@ -178,11 +178,11 @@ QString QDir::currentDirPath()
 #endif /* __GLIBC__ && !PATH_MAX */
 #if defined(QT_DEBUG)
 	if ( result.isNull() )
-	    tqWarning( "QDir::currentDirPath: getcwd() failed" );
+	    qWarning( "QDir::currentDirPath: getcwd() failed" );
 #endif
     } else {
 #if defined(QT_DEBUG)
-	tqWarning( "QDir::currentDirPath: stat(\".\") failed" );
+	qWarning( "QDir::currentDirPath: stat(\".\") failed" );
 #endif
     }
     slashify( result );
@@ -269,7 +269,7 @@ bool QDir::readDirEntries( const QString &nameFilter,
     }
     if ( closedir(dir) != 0 ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QDir::readDirEntries: Cannot close the directory: %s",
+	qWarning( "QDir::readDirEntries: Cannot close the directory: %s",
 		  dPath.local8Bit().data() );
 #endif
     }
diff --git a/src/tools/qfile.cpp b/src/tools/qfile.cpp
index bf11cab..11e21d1 100644
--- a/src/tools/qfile.cpp
+++ b/src/tools/qfile.cpp
@@ -247,7 +247,7 @@ void QFile::setName( const QString &name )
 {
     if ( isOpen() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QFile::setName: File is open" );
+	qWarning( "QFile::setName: File is open" );
 #endif
 	close();
     }
@@ -336,7 +336,7 @@ bool QFile::atEnd() const
 {
     if ( !isOpen() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QFile::atEnd: File is not open" );
+	qWarning( "QFile::atEnd: File is not open" );
 #endif
 	return FALSE;
     }
@@ -373,11 +373,11 @@ Q_LONG QFile::readLine( char *p, Q_ULONG maxlen )
 #if defined(QT_CHECK_STATE)
     Q_CHECK_PTR( p );
     if ( !isOpen() ) {				// file not open
-	tqWarning( "QFile::readLine: File not open" );
+	qWarning( "QFile::readLine: File not open" );
 	return -1;
     }
     if ( !isReadable() ) {			// reading not permitted
-	tqWarning( "QFile::readLine: Read operation not permitted" );
+	qWarning( "QFile::readLine: Read operation not permitted" );
 	return -1;
     }
 #endif
@@ -444,11 +444,11 @@ int QFile::getch()
 {
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {				// file not open
-	tqWarning( "QFile::getch: File not open" );
+	qWarning( "QFile::getch: File not open" );
 	return EOF;
     }
     if ( !isReadable() ) {			// reading not permitted
-	tqWarning( "QFile::getch: Read operation not permitted" );
+	qWarning( "QFile::getch: Read operation not permitted" );
 	return EOF;
     }
 #endif
@@ -489,11 +489,11 @@ int QFile::putch( int ch )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {				// file not open
-	tqWarning( "QFile::putch: File not open" );
+	qWarning( "QFile::putch: File not open" );
 	return EOF;
     }
     if ( !isWritable() ) {			// writing not permitted
-	tqWarning( "QFile::putch: Write operation not permitted" );
+	qWarning( "QFile::putch: Write operation not permitted" );
 	return EOF;
     }
 #endif
@@ -530,11 +530,11 @@ int QFile::ungetch( int ch )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {				// file not open
-	tqWarning( "QFile::ungetch: File not open" );
+	qWarning( "QFile::ungetch: File not open" );
 	return EOF;
     }
     if ( !isReadable() ) {			// reading not permitted
-	tqWarning( "QFile::ungetch: Read operation not permitted" );
+	qWarning( "QFile::ungetch: Read operation not permitted" );
 	return EOF;
     }
 #endif
diff --git a/src/tools/qfile_unix.cpp b/src/tools/qfile_unix.cpp
index 30e7a43..b6da559 100644
--- a/src/tools/qfile_unix.cpp
+++ b/src/tools/qfile_unix.cpp
@@ -75,7 +75,7 @@ bool QFile::remove( const QString &fileName )
 {
     if ( fileName.isEmpty() ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QFile::remove: Empty or null file name" );
+	qWarning( "QFile::remove: Empty or null file name" );
 #endif
 	return FALSE;
     }
@@ -168,13 +168,13 @@ bool QFile::open( int m )
 {
     if ( isOpen() ) {				// file already open
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QFile::open: File already open" );
+	qWarning( "QFile::open: File already open" );
 #endif
 	return FALSE;
     }
     if ( fn.isEmpty() ) {			// no file name defined
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QFile::open: No file name specified" );
+	qWarning( "QFile::open: No file name specified" );
 #endif
 	return FALSE;
     }
@@ -182,7 +182,7 @@ bool QFile::open( int m )
     setMode( m );
     if ( !(isReadable() || isWritable()) ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QFile::open: File access not specified" );
+	qWarning( "QFile::open: File access not specified" );
 #endif
 	return FALSE;
     }
@@ -340,7 +340,7 @@ bool QFile::open( int m, FILE *f )
 {
     if ( isOpen() ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QFile::open: File already open" );
+	qWarning( "QFile::open: File already open" );
 #endif
 	return FALSE;
     }
@@ -412,7 +412,7 @@ bool QFile::open( int m, int f )
 {
     if ( isOpen() ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QFile::open: File already open" );
+	qWarning( "QFile::open: File already open" );
 #endif
 	return FALSE;
     }
@@ -508,7 +508,7 @@ bool QFile::at( Offset pos )
 {
     if ( !isOpen() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QFile::at: File is not open" );
+	qWarning( "QFile::at: File is not open" );
 #endif
 	return FALSE;
     }
@@ -535,9 +535,9 @@ bool QFile::at( Offset pos )
 #if defined(QT_CHECK_RANGE)
     else
 #if defined(QT_ABI_QT4)
-	tqWarning( "QFile::at: Cannot set file position %lld", pos );
+	qWarning( "QFile::at: Cannot set file position %lld", pos );
 #else
-	tqWarning( "QFile::at: Cannot set file position %lu", pos );
+	qWarning( "QFile::at: Cannot set file position %lu", pos );
 #endif
 #endif
     return ok;
@@ -560,15 +560,15 @@ Q_LONG QFile::readBlock( char *p, Q_ULONG len )
 
 #if defined(QT_CHECK_NULL)
     if ( !p )
-	tqWarning( "QFile::readBlock: Null pointer error" );
+	qWarning( "QFile::readBlock: Null pointer error" );
 #endif
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {
-	tqWarning( "QFile::readBlock: File not open" );
+	qWarning( "QFile::readBlock: File not open" );
 	return -1;
     }
     if ( !isReadable() ) {
-	tqWarning( "QFile::readBlock: Read operation not permitted" );
+	qWarning( "QFile::readBlock: Read operation not permitted" );
 	return -1;
     }
 #endif
@@ -629,15 +629,15 @@ Q_LONG QFile::writeBlock( const char *p, Q_ULONG len )
 
 #if defined(QT_CHECK_NULL)
     if ( p == 0 && len != 0 )
-	tqWarning( "QFile::writeBlock: Null pointer error" );
+	qWarning( "QFile::writeBlock: Null pointer error" );
 #endif
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {				// file not open
-	tqWarning( "QFile::writeBlock: File not open" );
+	qWarning( "QFile::writeBlock: File not open" );
 	return -1;
     }
     if ( !isWritable() ) {			// writing not permitted
-	tqWarning( "QFile::writeBlock: Write operation not permitted" );
+	qWarning( "QFile::writeBlock: Write operation not permitted" );
 	return -1;
     }
 #endif
diff --git a/src/tools/qfileinfo_unix.cpp b/src/tools/qfileinfo_unix.cpp
index 342303d..cddb8f9 100644
--- a/src/tools/qfileinfo_unix.cpp
+++ b/src/tools/qfileinfo_unix.cpp
@@ -277,9 +277,9 @@ uint QFileInfo::groupId() const
     \code
 	QFileInfo fi( "/tmp/archive.tar.gz" );
 	if ( fi.permission( QFileInfo::WriteUser | QFileInfo::ReadGroup ) )
-	    tqWarning( "I can change the file; my group can read the file" );
+	    qWarning( "I can change the file; my group can read the file" );
 	if ( fi.permission( QFileInfo::WriteGroup | QFileInfo::WriteOther ) )
-	    tqWarning( "The group or others can change the file" );
+	    qWarning( "The group or others can change the file" );
     \endcode
 
     \sa isReadable(), isWritable(), isExecutable()
@@ -319,7 +319,7 @@ bool QFileInfo::permission( int permissionSpec ) const
 	   return (fic->st.st_mode & mask) == mask;
 	} else {
 #if defined(QT_CHECK_NULL)
-	   tqWarning( "QFileInfo::permission: permissionSpec is 0" );
+	   qWarning( "QFileInfo::permission: permissionSpec is 0" );
 #endif
 	   return TRUE;
 	}
diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp
index c110462..8a27510 100644
--- a/src/tools/qgarray.cpp
+++ b/src/tools/qgarray.cpp
@@ -138,7 +138,7 @@ QGArray::QGArray( int size )
 {
     if ( size < 0 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QGArray: Cannot allocate array with negative length" );
+	qWarning( "QGArray: Cannot allocate array with negative length" );
 #endif
 	size = 0;
     }
@@ -578,7 +578,7 @@ void QGArray::resetRawData( const char *d, uint len )
 {
     if ( d != shd->data || len != shd->len ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QGArray::resetRawData: Inconsistent arguments" );
+	qWarning( "QGArray::resetRawData: Inconsistent arguments" );
 #endif
 	return;
     }
@@ -601,7 +601,7 @@ int QGArray::find( const char *d, uint index, uint sz ) const
     index *= sz;
     if ( index >= shd->len ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QGArray::find: Index %d out of range", index/sz );
+	qWarning( "QGArray::find: Index %d out of range", index/sz );
 #endif
 	return -1;
     }
@@ -803,7 +803,7 @@ bool QGArray::setExpand( uint index, const char *d, uint sz )
 void QGArray::msg_index( uint index )
 {
 #if defined(QT_CHECK_RANGE)
-    tqWarning( "QGArray::at: Absolute index %d out of range", index );
+    qWarning( "QGArray::at: Absolute index %d out of range", index );
 #else
     Q_UNUSED( index )
 #endif
diff --git a/src/tools/qgcache.cpp b/src/tools/qgcache.cpp
index 2e6294b..3c70d9f 100644
--- a/src/tools/qgcache.cpp
+++ b/src/tools/qgcache.cpp
@@ -283,7 +283,7 @@ QGCache::QGCache( const QGCache & )
     : QPtrCollection()
 {
 #if defined(QT_CHECK_NULL)
-    tqFatal( "QGCache::QGCache(QGCache &): Cannot copy a cache" );
+    qFatal( "QGCache::QGCache(QGCache &): Cannot copy a cache" );
 #endif
 }
 
@@ -305,7 +305,7 @@ QGCache::~QGCache()
 QGCache &QGCache::operator=( const QGCache & )
 {
 #if defined(QT_CHECK_NULL)
-    tqFatal( "QGCache::operator=: Cannot copy a cache" );
+    qFatal( "QGCache::operator=: Cannot copy a cache" );
 #endif
     return *this;
 }
@@ -413,7 +413,7 @@ bool QGCache::insert_other( const char *key, QPtrCollection::Item data,
     lruList->insertCosts += cost;
 #endif
     if ( keytype == AsciiKey && copyk )
-	key = tqstrdup( key );
+	key = qstrdup( key );
     if ( priority < -32768 )
 	priority = -32768;
     else if ( priority > 32767 )
@@ -641,28 +641,28 @@ void QGCache::statistics() const
 #if defined(QT_DEBUG)
     QString line;
     line.fill( '*', 80 );
-    tqDebug( "%s", line.ascii() );
-    tqDebug( "CACHE STATISTICS:" );
-    tqDebug( "cache contains %d item%s, with a total cost of %d",
+    qDebug( "%s", line.ascii() );
+    qDebug( "CACHE STATISTICS:" );
+    qDebug( "cache contains %d item%s, with a total cost of %d",
 	   count(), count() != 1 ? "s" : "", tCost );
-    tqDebug( "maximum cost is %d, cache is %d%% full.",
+    qDebug( "maximum cost is %d, cache is %d%% full.",
 	   mCost, (200*tCost + mCost) / (mCost*2) );
-    tqDebug( "find() has been called %d time%s",
+    qDebug( "find() has been called %d time%s",
 	   lruList->finds, lruList->finds != 1 ? "s" : "" );
-    tqDebug( "%d of these were hits, items found had a total cost of %d.",
+    qDebug( "%d of these were hits, items found had a total cost of %d.",
 	   lruList->hits,lruList->hitCosts );
-    tqDebug( "%d item%s %s been inserted with a total cost of %d.",
+    qDebug( "%d item%s %s been inserted with a total cost of %d.",
 	   lruList->inserts,lruList->inserts != 1 ? "s" : "",
 	   lruList->inserts != 1 ? "have" : "has", lruList->insertCosts );
-    tqDebug( "%d item%s %s too large or had too low priority to be inserted.",
+    qDebug( "%d item%s %s too large or had too low priority to be inserted.",
 	   lruList->insertMisses, lruList->insertMisses != 1 ? "s" : "",
 	   lruList->insertMisses != 1 ? "were" : "was" );
-    tqDebug( "%d item%s %s been thrown away with a total cost of %d.",
+    qDebug( "%d item%s %s been thrown away with a total cost of %d.",
 	   lruList->dumps, lruList->dumps != 1 ? "s" : "",
 	   lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts );
-    tqDebug( "Statistics from internal dictionary class:" );
+    qDebug( "Statistics from internal dictionary class:" );
     dict->statistics();
-    tqDebug( "%s", line.ascii() );
+    qDebug( "%s", line.ascii() );
 #endif
 }
 
diff --git a/src/tools/qgdict.cpp b/src/tools/qgdict.cpp
index 0e86c20..b9c1810 100644
--- a/src/tools/qgdict.cpp
+++ b/src/tools/qgdict.cpp
@@ -92,7 +92,7 @@ int QGDict::hashKeyString( const QString &key )
 {
 #if defined(QT_CHECK_NULL)
     if ( key.isNull() )
-	tqWarning( "QGDict::hashKeyString: Invalid null key" );
+	qWarning( "QGDict::hashKeyString: Invalid null key" );
 #endif
     int i;
     register uint h=0;
@@ -127,7 +127,7 @@ int QGDict::hashKeyAscii( const char *key )
 {
 #if defined(QT_CHECK_NULL)
     if ( key == 0 )
-	tqWarning( "QGDict::hashAsciiKey: Invalid null key" );
+	qWarning( "QGDict::hashAsciiKey: Invalid null key" );
 #endif
     register const char *k = key;
     register uint h=0;
@@ -361,7 +361,7 @@ QPtrCollection::Item QGDict::look_string( const QString &key, QPtrCollection::It
     Q_CHECK_PTR( n );
 #if defined(QT_CHECK_NULL)
     if ( n->getData() == 0 )
-	tqWarning( "QDict: Cannot insert null item" );
+	qWarning( "QDict: Cannot insert null item" );
 #endif
     vec[index] = n;
     numItems++;
@@ -382,7 +382,7 @@ QPtrCollection::Item QGDict::look_ascii( const char *key, QPtrCollection::Item d
 	} else {
 	    for ( n=(QAsciiBucket*)vec[index]; n;
 		  n=(QAsciiBucket*)n->getNext() ) {
-		if ( tqstricmp(n->getKey(),key) == 0 )
+		if ( qstricmp(n->getKey(),key) == 0 )
 		    return n->getData();	// item found
 	    }
 	}
@@ -393,11 +393,11 @@ QPtrCollection::Item QGDict::look_ascii( const char *key, QPtrCollection::Item d
 	    remove_ascii( key );
     }
     // op_insert or op_replace
-    n = new QAsciiBucket(copyk ? tqstrdup(key) : key,newItem(d),vec[index]);
+    n = new QAsciiBucket(copyk ? qstrdup(key) : key,newItem(d),vec[index]);
     Q_CHECK_PTR( n );
 #if defined(QT_CHECK_NULL)
     if ( n->getData() == 0 )
-	tqWarning( "QAsciiDict: Cannot insert null item" );
+	qWarning( "QAsciiDict: Cannot insert null item" );
 #endif
     vec[index] = n;
     numItems++;
@@ -425,7 +425,7 @@ QPtrCollection::Item QGDict::look_int( long key, QPtrCollection::Item d, int op
     Q_CHECK_PTR( n );
 #if defined(QT_CHECK_NULL)
     if ( n->getData() == 0 )
-	tqWarning( "QIntDict: Cannot insert null item" );
+	qWarning( "QIntDict: Cannot insert null item" );
 #endif
     vec[index] = n;
     numItems++;
@@ -453,7 +453,7 @@ QPtrCollection::Item QGDict::look_ptr( void *key, QPtrCollection::Item d, int op
     Q_CHECK_PTR( n );
 #if defined(QT_CHECK_NULL)
     if ( n->getData() == 0 )
-	tqWarning( "QPtrDict: Cannot insert null item" );
+	qWarning( "QPtrDict: Cannot insert null item" );
 #endif
     vec[index] = n;
     numItems++;
@@ -610,7 +610,7 @@ QAsciiBucket *QGDict::unlink_ascii( const char *key, QPtrCollection::Item d )
     int index = hashKeyAscii(key) % vlen;
     for ( n=(QAsciiBucket *)vec[index]; n; n=(QAsciiBucket *)n->getNext() ) {
 	bool found = (cases ? qstrcmp(n->getKey(),key)
-		       : tqstricmp(n->getKey(),key)) == 0;
+		       : qstricmp(n->getKey(),key)) == 0;
 	if ( found && d )
 	    found = (n->getData() == d);
 	if ( found ) {
@@ -846,11 +846,11 @@ void QGDict::statistics() const
     QString line;
     line.fill( '-', 60 );
     double real, ideal;
-    tqDebug( "%s", line.ascii() );
-    tqDebug( "DICTIONARY STATISTICS:" );
+    qDebug( "%s", line.ascii() );
+    qDebug( "DICTIONARY STATISTICS:" );
     if ( count() == 0 ) {
-	tqDebug( "Empty!" );
-	tqDebug( "%s", line.ascii() );
+	qDebug( "Empty!" );
+	qDebug( "%s", line.ascii() );
 	return;
     }
     real = 0.0;
@@ -871,15 +871,15 @@ void QGDict::statistics() const
 	while ( b-- )
 	    *pbuf++ = '*';
 	*pbuf = '\0';
-	tqDebug( "%s", buf );
+	qDebug( "%s", buf );
 	i++;
     }
-    tqDebug( "Array size = %d", size() );
-    tqDebug( "# items    = %d", count() );
-    tqDebug( "Real dist  = %g", real );
-    tqDebug( "Rand dist  = %g", ideal );
-    tqDebug( "Real/Rand  = %g", real/ideal );
-    tqDebug( "%s", line.ascii() );
+    qDebug( "Array size = %d", size() );
+    qDebug( "# items    = %d", count() );
+    qDebug( "Real dist  = %g", real );
+    qDebug( "Rand dist  = %g", ideal );
+    qDebug( "Real/Rand  = %g", real/ideal );
+    qDebug( "%s", line.ascii() );
 #endif // QT_DEBUG
 }
 
@@ -1072,7 +1072,7 @@ QPtrCollection::Item QGDictIterator::toFirst()
 {
     if ( !dict ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QGDictIterator::toFirst: Dictionary has been deleted" );
+	qWarning( "QGDictIterator::toFirst: Dictionary has been deleted" );
 #endif
 	return 0;
     }
@@ -1098,7 +1098,7 @@ QPtrCollection::Item QGDictIterator::operator()()
 {
     if ( !dict ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QGDictIterator::operator(): Dictionary has been deleted" );
+	qWarning( "QGDictIterator::operator(): Dictionary has been deleted" );
 #endif
 	return 0;
     }
@@ -1117,7 +1117,7 @@ QPtrCollection::Item QGDictIterator::operator++()
 {
     if ( !dict ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QGDictIterator::operator++: Dictionary has been deleted" );
+	qWarning( "QGDictIterator::operator++: Dictionary has been deleted" );
 #endif
 	return 0;
     }
diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp
index f3909f4..b04ac75 100644
--- a/src/tools/qglist.cpp
+++ b/src/tools/qglist.cpp
@@ -516,7 +516,7 @@ bool QGList::removeNode( QLNode *n )
 #if defined(QT_CHECK_NULL)
     if ( n == 0 || (n->prev && n->prev->next != n) ||
 	 (n->next && n->next->prev != n) ) {
-	tqWarning( "QGList::removeNode: Corrupted node" );
+	qWarning( "QGList::removeNode: Corrupted node" );
 	return FALSE;
     }
 #endif
@@ -618,7 +618,7 @@ QPtrCollection::Item QGList::takeNode( QLNode *n )
 #if defined(QT_CHECK_NULL)
     if ( n == 0 || (n->prev && n->prev->next != n) ||
 	 (n->next && n->next->prev != n) ) {
-	tqWarning( "QGList::takeNode: Corrupted node" );
+	qWarning( "QGList::takeNode: Corrupted node" );
 	return 0;
     }
 #endif
@@ -1171,7 +1171,7 @@ QPtrCollection::Item QGListIterator::toFirst()
 {
     if ( !list ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QGListIterator::toFirst: List has been deleted" );
+	qWarning( "QGListIterator::toFirst: List has been deleted" );
 #endif
 	return 0;
     }
@@ -1187,7 +1187,7 @@ QPtrCollection::Item QGListIterator::toLast()
 {
     if ( !list ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QGListIterator::toLast: List has been deleted" );
+	qWarning( "QGListIterator::toLast: List has been deleted" );
 #endif
 	return 0;
     }
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp
index e7183a4..47986e1 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/qglobal.cpp
@@ -63,12 +63,12 @@
     3.0.5's \c QT_VERSION is 0x030005.
 */
 
-const char *tqVersion()
+const char *qVersion()
 {
     return QT_VERSION_STR;
 }
 
-bool tqSharedBuild()
+bool qSharedBuild()
 {
 #ifdef QT_SHARED
     return TRUE;
@@ -94,12 +94,12 @@ static bool si_bigEndian;
     *wordSize. The \a *bigEndian is set to TRUE if this is a big-endian
     machine, or to FALSE if this is a little-endian machine.
 
-    In debug mode, this function calls tqFatal() with a message if the
+    In debug mode, this function calls qFatal() with a message if the
     computer is truly weird (i.e. different endianness for 16 bit and
     32 bit integers); in release mode it returns FALSE.
 */
 
-bool tqSysInfo( int *wordSize, bool *bigEndian )
+bool qSysInfo( int *wordSize, bool *bigEndian )
 {
 #if defined(QT_CHECK_NULL)
     Q_ASSERT( wordSize != 0 );
@@ -124,14 +124,14 @@ bool tqSysInfo( int *wordSize, bool *bigEndian )
 	 *wordSize != 32 &&
 	 *wordSize != 16 ) {			// word size: 16, 32 or 64
 #if defined(QT_CHECK_RANGE)
-	tqFatal( "qSysInfo: Unsupported system word size %d", *wordSize );
+	qFatal( "qSysInfo: Unsupported system word size %d", *wordSize );
 #endif
 	return FALSE;
     }
     if ( sizeof(Q_INT8) != 1 || sizeof(Q_INT16) != 2 || sizeof(Q_INT32) != 4 ||
 	 sizeof(Q_ULONG)*8 != si_wordSize || sizeof(float) != 4 || sizeof(double) != 8 ) {
 #if defined(QT_CHECK_RANGE)
-	tqFatal( "qSysInfo: Unsupported system data type size" );
+	qFatal( "qSysInfo: Unsupported system data type size" );
 #endif
 	return FALSE;
     }
@@ -154,7 +154,7 @@ bool tqSysInfo( int *wordSize, bool *bigEndian )
 
     if ( be16 != be32 ) {			// strange machine!
 #if defined(QT_CHECK_RANGE)
-	tqFatal( "qSysInfo: Inconsistent system byte order" );
+	qFatal( "qSysInfo: Inconsistent system byte order" );
 #endif
 	return FALSE;
     }
@@ -321,7 +321,7 @@ int qWinVersion()
 	    } else if ( osver.dwMinorVersion == 2 ) {
 		winver = Qt::WV_2003;
 	    } else {
-		tqWarning("Untested Windows version detected!");
+		qWarning("Untested Windows version detected!");
 		winver = Qt::WV_NT_based;
 	    }
 	}
@@ -346,7 +346,7 @@ Qt::WindowsVersion qt_winver = (Qt::WindowsVersion)qWinVersion();
  *****************************************************************************/
 
 /*!
-    \fn void tqDebug( const char *msg, ... )
+    \fn void qDebug( const char *msg, ... )
 
     \relates QApplication
 
@@ -358,7 +358,7 @@ Qt::WindowsVersion qt_winver = (Qt::WindowsVersion)qWinVersion();
 
     Example:
     \code
-	tqDebug( "my window handle = %x", myWidget->id() );
+	qDebug( "my window handle = %x", myWidget->id() );
     \endcode
 
     Under X11, the text is printed to stderr. Under Windows, the text
@@ -367,15 +367,15 @@ Qt::WindowsVersion qt_winver = (Qt::WindowsVersion)qWinVersion();
     \warning The internal buffer is limited to 8196 bytes (including
     the '\0'-terminator).
 
-    \warning Passing (const char *)0 as argument to tqDebug might lead
+    \warning Passing (const char *)0 as argument to qDebug might lead
     to crashes on certain platforms due to the platforms printf implementation.
 
-    \sa tqWarning(), tqFatal(), qInstallMsgHandler(),
+    \sa qWarning(), qFatal(), qInstallMsgHandler(),
 	\link debug.html Debugging\endlink
 */
 
 /*!
-    \fn void tqWarning( const char *msg, ... )
+    \fn void qWarning( const char *msg, ... )
 
     \relates QApplication
 
@@ -390,7 +390,7 @@ Qt::WindowsVersion qt_winver = (Qt::WindowsVersion)qWinVersion();
 	void f( int c )
 	{
 	    if ( c > 200 )
-		tqWarning( "f: bad argument, c == %d", c );
+		qWarning( "f: bad argument, c == %d", c );
 	}
     \endcode
 
@@ -400,15 +400,15 @@ Qt::WindowsVersion qt_winver = (Qt::WindowsVersion)qWinVersion();
     \warning The internal buffer is limited to 8196 bytes (including
     the '\0'-terminator).
 
-    \warning Passing (const char *)0 as argument to tqWarning might lead
+    \warning Passing (const char *)0 as argument to qWarning might lead
     to crashes on certain platforms due to the platforms printf implementation.
 
-    \sa tqDebug(), tqFatal(), qInstallMsgHandler(),
+    \sa qDebug(), qFatal(), qInstallMsgHandler(),
     \link debug.html Debugging\endlink
 */
 
 /*!
-    \fn void tqFatal( const char *msg, ... )
+    \fn void qFatal( const char *msg, ... )
 
     \relates QApplication
 
@@ -423,7 +423,7 @@ Qt::WindowsVersion qt_winver = (Qt::WindowsVersion)qWinVersion();
 	int divide( int a, int b )
 	{
 	    if ( b == 0 )				// program error
-		tqFatal( "divide: cannot divide by zero" );
+		qFatal( "divide: cannot divide by zero" );
 	    return a/b;
 	}
     \endcode
@@ -434,10 +434,10 @@ Qt::WindowsVersion qt_winver = (Qt::WindowsVersion)qWinVersion();
     \warning The internal buffer is limited to 8196 bytes (including
     the '\0'-terminator).
 
-    \warning Passing (const char *)0 as argument to tqFatal might lead
+    \warning Passing (const char *)0 as argument to qFatal might lead
     to crashes on certain platforms due to the platforms printf implementation.
 
-    \sa tqDebug(), tqWarning(), qInstallMsgHandler(),
+    \sa qDebug(), qWarning(), qInstallMsgHandler(),
     \link debug.html Debugging\endlink
 */
 
@@ -465,7 +465,7 @@ static void mac_default_handler( const char *msg )
 #endif
 
 
-void tqDebug( const char *msg, ... )
+void qDebug( const char *msg, ... )
 {
     char buf[QT_BUFFER_LENGTH];
     va_list ap;
@@ -516,7 +516,7 @@ void debug( const char *msg, ... )
     }
 }
 
-void tqWarning( const char *msg, ... )
+void qWarning( const char *msg, ... )
 {
     char buf[QT_BUFFER_LENGTH];
     va_list ap;
@@ -568,7 +568,7 @@ void warning( const char *msg, ... )
     }
 }
 
-void tqFatal( const char *msg, ... )
+void qFatal( const char *msg, ... )
 {
     char buf[QT_BUFFER_LENGTH];
     va_list ap;
@@ -646,7 +646,7 @@ void fatal( const char *msg, ... )
   This function does nothing when Qt is built with \c QT_NO_DEBUG
   defined.
 */
-void tqSystemWarning( const char* msg, int code )
+void qSystemWarning( const char* msg, int code )
 {
 #ifndef QT_NO_DEBUG
 #if defined(Q_OS_WIN32)
@@ -666,7 +666,7 @@ void tqSystemWarning( const char* msg, int code )
 		       0,
 		       NULL );
 
-	tqWarning( "%s\n\tError code %d - %s", msg, code, QString::fromUcs2(string).latin1() );
+	qWarning( "%s\n\tError code %d - %s", msg, code, QString::fromUcs2(string).latin1() );
     }, {
 	FormatMessageA( FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
 			NULL,
@@ -676,14 +676,14 @@ void tqSystemWarning( const char* msg, int code )
 			0,
 			NULL );
 
-	tqWarning( "%s\n\tError code %d - %s", msg, code, (const char*)string );
+	qWarning( "%s\n\tError code %d - %s", msg, code, (const char*)string );
     } );
     LocalFree( (HLOCAL)string );
 #else
     if ( code != -1 )
-	tqWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
+	qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
     else
-	tqWarning( "%s", msg );
+	qWarning( "%s", msg );
 #endif
 #else
     Q_UNUSED( msg );
@@ -719,12 +719,12 @@ void tqSystemWarning( const char* msg, int code )
     \endcode
 
     If \c b is zero, the Q_ASSERT statement will output the following
-    message using the tqWarning() function:
+    message using the qWarning() function:
     \code
 	ASSERT: "b != 0" in div.cpp (9)
     \endcode
 
-    \sa tqWarning(), \link debug.html Debugging\endlink
+    \sa qWarning(), \link debug.html Debugging\endlink
 */
 
 
@@ -748,7 +748,7 @@ void tqSystemWarning( const char* msg, int code )
 	Q_CHECK_PTR( a );
     \endcode
 
-    \sa tqWarning(), \link debug.html Debugging\endlink
+    \sa qWarning(), \link debug.html Debugging\endlink
 */
 
 
@@ -764,7 +764,7 @@ void tqSystemWarning( const char* msg, int code )
 bool qt_check_pointer( bool c, const char *n, int l )
 {
     if ( c )
-	tqWarning( "In file %s, line %d: Out of memory", n, l );
+	qWarning( "In file %s, line %d: Out of memory", n, l );
     return TRUE;
 }
 
@@ -775,7 +775,7 @@ static bool firstObsoleteWarning(const char *obj, const char *oldfunc )
     if ( !obsoleteDict ) {			// first time func is called
 	obsoleteDict = new QAsciiDict<int>;
 #if defined(QT_DEBUG)
-	tqDebug(
+	qDebug(
       "You are using obsolete functions in the Qt library. Call the function\n"
       "qSuppressObsoleteWarnings() to suppress obsolete warnings.\n"
 	     );
@@ -793,44 +793,44 @@ static bool firstObsoleteWarning(const char *obj, const char *oldfunc )
 
 static bool suppressObsolete = FALSE;
 
-void tqSuppressObsoleteWarnings( bool suppress )
+void qSuppressObsoleteWarnings( bool suppress )
 {
     suppressObsolete = suppress;
 }
 
-void tqObsolete(	 const char *obj, const char *oldfunc, const char *newfunc )
+void qObsolete(	 const char *obj, const char *oldfunc, const char *newfunc )
 {
     if ( suppressObsolete )
 	return;
     if ( !firstObsoleteWarning(obj, oldfunc) )
 	return;
     if ( obj )
-	tqDebug( "%s::%s: This function is obsolete, use %s instead.",
+	qDebug( "%s::%s: This function is obsolete, use %s instead.",
 	       obj, oldfunc, newfunc );
     else
-	tqDebug( "%s: This function is obsolete, use %s instead.",
+	qDebug( "%s: This function is obsolete, use %s instead.",
 	       oldfunc, newfunc );
 }
 
-void tqObsolete(	 const char *obj, const char *oldfunc )
+void qObsolete(	 const char *obj, const char *oldfunc )
 {
     if ( suppressObsolete )
 	return;
     if ( !firstObsoleteWarning(obj, oldfunc) )
 	return;
     if ( obj )
-	tqDebug( "%s::%s: This function is obsolete.", obj, oldfunc );
+	qDebug( "%s::%s: This function is obsolete.", obj, oldfunc );
     else
-	tqDebug( "%s: This function is obsolete.", oldfunc );
+	qDebug( "%s: This function is obsolete.", oldfunc );
 }
 
-void tqObsolete(	 const char *message )
+void qObsolete(	 const char *message )
 {
     if ( suppressObsolete )
 	return;
     if ( !firstObsoleteWarning( "Qt", message) )
 	return;
-    tqDebug( "%s", message );
+    qDebug( "%s", message );
 }
 
 
@@ -886,7 +886,7 @@ void tqObsolete(	 const char *message )
 	}
     \endcode
 
-    \sa tqDebug(), tqWarning(), tqFatal(), \link debug.html Debugging\endlink
+    \sa qDebug(), qWarning(), qFatal(), \link debug.html Debugging\endlink
 */
 
 QtMsgHandler qInstallMsgHandler( QtMsgHandler h )
diff --git a/src/tools/qglobal.h b/src/tools/qglobal.h
index a0ef13c..44e6bbf 100644
--- a/src/tools/qglobal.h
+++ b/src/tools/qglobal.h
@@ -912,9 +912,9 @@ extern Q_EXPORT bool qt_winunicode;
 // System information
 //
 
-Q_EXPORT const char *tqVersion();
-Q_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian );
-Q_EXPORT bool tqSharedBuild();
+Q_EXPORT const char *qVersion();
+Q_EXPORT bool qSysInfo( int *wordSize, bool *bigEndian );
+Q_EXPORT bool qSharedBuild();
 #if defined(Q_OS_MAC)
 int qMacVersion();
 #elif defined(Q_WS_WIN)
@@ -973,25 +973,25 @@ Q_EXPORT int qWinVersion();
 #endif
 
 
-Q_EXPORT void tqDebug( const char *, ... )	// print debug message
+Q_EXPORT void qDebug( const char *, ... )	// print debug message
 #if defined(Q_CC_GNU) && !defined(__INSURE__)
     __attribute__ ((format (printf, 1, 2)))
 #endif
 ;
 
-Q_EXPORT void tqWarning( const char *, ... )	// print warning message
+Q_EXPORT void qWarning( const char *, ... )	// print warning message
 #if defined(Q_CC_GNU) && !defined(__INSURE__)
     __attribute__ ((format (printf, 1, 2)))
 #endif
 ;
 
-Q_EXPORT void tqFatal( const char *, ... )	// print fatal message and exit
+Q_EXPORT void qFatal( const char *, ... )	// print fatal message and exit
 #if defined(Q_CC_GNU)
     __attribute__ ((format (printf, 1, 2)))
 #endif
 ;
 
-Q_EXPORT void tqSystemWarning( const char *, int code = -1 );
+Q_EXPORT void qSystemWarning( const char *, int code = -1 );
 
 #if !defined(QT_CLEAN_NAMESPACE) 		// compatibility with Qt 1
 
@@ -1019,9 +1019,9 @@ Q_EXPORT void fatal( const char *, ... )	// print fatal message and exit
 #if !defined(Q_ASSERT)
 #  if defined(QT_CHECK_STATE)
 #    if defined(QT_FATAL_ASSERT)
-#      define Q_ASSERT(x)  ((x) ? (void)0 : tqFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__))
+#      define Q_ASSERT(x)  ((x) ? (void)0 : qFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__))
 #    else
-#      define Q_ASSERT(x)  ((x) ? (void)0 : tqWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__))
+#      define Q_ASSERT(x)  ((x) ? (void)0 : qWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__))
 #    endif
 #  else
 #    define Q_ASSERT(x)
@@ -1060,27 +1060,27 @@ Q_EXPORT QtMsgHandler qInstallMsgHandler( QtMsgHandler );
 typedef QtMsgHandler msg_handler;
 #endif // QT_NO_COMPAT
 
-Q_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE );
+Q_EXPORT void qSuppressObsoleteWarnings( bool = TRUE );
 
-Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc,
+Q_EXPORT void qObsolete( const char *obj, const char *oldfunc,
 		   const char *newfunc );
-Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc );
-Q_EXPORT void tqObsolete( const char *message );
+Q_EXPORT void qObsolete( const char *obj, const char *oldfunc );
+Q_EXPORT void qObsolete( const char *message );
 
 
 //
 // Install paths from configure
 //
 
-Q_EXPORT const char *tqInstallPath();
-Q_EXPORT const char *tqInstallPathDocs();
-Q_EXPORT const char *tqInstallPathHeaders();
-Q_EXPORT const char *tqInstallPathLibs();
-Q_EXPORT const char *tqInstallPathBins();
-Q_EXPORT const char *tqInstallPathPlugins();
-Q_EXPORT const char *tqInstallPathData();
-Q_EXPORT const char *tqInstallPathTranslations();
-Q_EXPORT const char *tqInstallPathSysconf();
+Q_EXPORT const char *qInstallPath();
+Q_EXPORT const char *qInstallPathDocs();
+Q_EXPORT const char *qInstallPathHeaders();
+Q_EXPORT const char *qInstallPathLibs();
+Q_EXPORT const char *qInstallPathBins();
+Q_EXPORT const char *qInstallPathPlugins();
+Q_EXPORT const char *qInstallPathData();
+Q_EXPORT const char *qInstallPathTranslations();
+Q_EXPORT const char *qInstallPathSysconf();
 
 #endif /* __cplusplus */
 
@@ -1095,7 +1095,7 @@ Q_EXPORT const char *tqInstallPathSysconf();
 #ifdef Q_FULL_TEMPLATE_INSTANTIATION
 #  define Q_DUMMY_COMPARISON_OPERATOR(C) \
     bool operator==( const C& ) const { \
-        tqWarning( #C"::operator==( const "#C"& ) got called." ); \
+        qWarning( #C"::operator==( const "#C"& ) got called." ); \
         return FALSE; \
     }
 #else
diff --git a/src/tools/qgpluginmanager.cpp b/src/tools/qgpluginmanager.cpp
index 21391d7..56b12cd 100644
--- a/src/tools/qgpluginmanager.cpp
+++ b/src/tools/qgpluginmanager.cpp
@@ -501,12 +501,12 @@ bool QGPluginManager::addLibrary( QLibrary* lib )
 		if ( !takeFirst ) {
 		    useful = TRUE;
 		    plugDict.replace( *f, plugin );
-		    tqWarning("%s: Discarding feature %s in %s!",
+		    qWarning("%s: Discarding feature %s in %s!",
 			     (const char*) QFile::encodeName( plugin->library()),
 			     (*f).latin1(),
 			     (const char*) QFile::encodeName( old->library() ) );
 		} else {
-		    tqWarning("%s: Feature %s already defined in %s!",
+		    qWarning("%s: Feature %s already defined in %s!",
 			     (const char*) QFile::encodeName( old->library() ),
 			     (*f).latin1(),
 			     (const char*) QFile::encodeName( plugin->library() ) );
diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp
index 74d7435..154d07d 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/qgvector.cpp
@@ -236,7 +236,7 @@ bool QGVector::insert( uint index, Item d )	// insert item at index
 {
 #if defined(QT_CHECK_RANGE)
     if ( index >= len ) {			// range error
-	tqWarning( "QGVector::insert: Index %d out of range", index );
+	qWarning( "QGVector::insert: Index %d out of range", index );
 	return FALSE;
     }
 #endif
@@ -259,7 +259,7 @@ bool QGVector::remove( uint index )		// remove item at index
 {
 #if defined(QT_CHECK_RANGE)
     if ( index >= len ) {			// range error
-	tqWarning( "QGVector::remove: Index %d out of range", index );
+	qWarning( "QGVector::remove: Index %d out of range", index );
 	return FALSE;
     }
 #endif
@@ -275,7 +275,7 @@ QPtrCollection::Item QGVector::take( uint index )		// take out item
 {
 #if defined(QT_CHECK_RANGE)
     if ( index >= len ) {			// range error
-	tqWarning( "QGVector::take: Index %d out of range", index );
+	qWarning( "QGVector::take: Index %d out of range", index );
 	return 0;
     }
 #endif
@@ -421,7 +421,7 @@ int QGVector::bsearch( Item d ) const		// binary search; when sorted
 	return -1;
     if ( !d ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QGVector::bsearch: Cannot search for null object" );
+	qWarning( "QGVector::bsearch: Cannot search for null object" );
 #endif
 	return -1;
     }
@@ -457,7 +457,7 @@ int QGVector::findRef( Item d, uint index) const // find exact item in vector
 {
 #if defined(QT_CHECK_RANGE)
     if ( index > len ) {			// range error
-	tqWarning( "QGVector::findRef: Index %d out of range", index );
+	qWarning( "QGVector::findRef: Index %d out of range", index );
 	return -1;
     }
 #endif
@@ -472,7 +472,7 @@ int QGVector::find( Item d, uint index ) const	// find equal item in vector
 {
 #if defined(QT_CHECK_RANGE)
     if ( index >= len ) {			// range error
-	tqWarning( "QGVector::find: Index %d out of range", index );
+	qWarning( "QGVector::find: Index %d out of range", index );
 	return -1;
     }
 #endif
@@ -530,7 +530,7 @@ void QGVector::toList( QGList *list ) const	// store items in list
 void QGVector::warningIndexRange( uint i )
 {
 #if defined(QT_CHECK_RANGE)
-    tqWarning( "QGVector::operator[]: Index %d out of range", i );
+    qWarning( "QGVector::operator[]: Index %d out of range", i );
 #else
     Q_UNUSED( i )
 #endif
diff --git a/src/tools/qiodevice.cpp b/src/tools/qiodevice.cpp
index cc17c5c..236a02f 100644
--- a/src/tools/qiodevice.cpp
+++ b/src/tools/qiodevice.cpp
@@ -431,7 +431,7 @@ void QIODevice::setType( int t )
 {
 #if defined(QT_CHECK_RANGE)
     if ( (t & IO_TypeMask) != t )
-	tqWarning( "QIODevice::setType: Specified type out of range" );
+	qWarning( "QIODevice::setType: Specified type out of range" );
 #endif
     ioMode &= ~IO_TypeMask;			// reset type bits
     ioMode |= t;
@@ -447,7 +447,7 @@ void QIODevice::setMode( int m )
 {
 #if defined(QT_CHECK_RANGE)
     if ( (m & IO_ModeMask) != m )
-	tqWarning( "QIODevice::setMode: Specified mode out of range" );
+	qWarning( "QIODevice::setMode: Specified mode out of range" );
 #endif
     ioMode &= ~IO_ModeMask;			// reset mode bits
     ioMode |= m;
@@ -463,7 +463,7 @@ void QIODevice::setState( int s )
 {
 #if defined(QT_CHECK_RANGE)
     if ( ((uint)s & IO_StateMask) != (uint)s )
-	tqWarning( "QIODevice::setState: Specified state out of range" );
+	qWarning( "QIODevice::setState: Specified state out of range" );
 #endif
     ioMode &= ~IO_StateMask;			// reset state bits
     ioMode |= (uint)s;
@@ -569,9 +569,9 @@ bool QIODevice::at( Offset pos )
 #if defined(QT_CHECK_RANGE)
     if ( pos > size() ) {
 #if defined(QT_ABI_QT4)
-	tqWarning( "QIODevice::at: Index %lld out of range", pos );
+	qWarning( "QIODevice::at: Index %lld out of range", pos );
 #else
-	tqWarning( "QIODevice::at: Index %lu out of range", pos );
+	qWarning( "QIODevice::at: Index %lu out of range", pos );
 #endif
 	return FALSE;
     }
diff --git a/src/tools/qlibrary.cpp b/src/tools/qlibrary.cpp
index 2f5b13c..9f18b9c 100644
--- a/src/tools/qlibrary.cpp
+++ b/src/tools/qlibrary.cpp
@@ -342,13 +342,13 @@ bool QLibrary::unload()
 #if !defined(QT_NO_LIBRARY_UNLOAD)
     if ( !d->freeLibrary() ) {
 # if defined(QT_DEBUG_COMPONENT)
-	tqWarning( "%s could not be unloaded", (const char*) QFile::encodeName(library()) );
+	qWarning( "%s could not be unloaded", (const char*) QFile::encodeName(library()) );
 # endif
 	return FALSE;
     }
 
 # if defined(QT_DEBUG_COMPONENT) && QT_DEBUG_COMPONENT == 2
-    tqWarning( "%s has been unloaded", (const char*) QFile::encodeName(library()) );
+    qWarning( "%s has been unloaded", (const char*) QFile::encodeName(library()) );
 # endif
     d->pHnd = 0;
 #endif
diff --git a/src/tools/qlibrary_unix.cpp b/src/tools/qlibrary_unix.cpp
index 0c67ca1..d75ae0d 100644
--- a/src/tools/qlibrary_unix.cpp
+++ b/src/tools/qlibrary_unix.cpp
@@ -68,7 +68,7 @@ bool QLibraryPrivate::loadLibrary()
     pHnd = (void*)shl_load( filename.latin1(), BIND_DEFERRED | BIND_NONFATAL | DYNAMIC_PATH, 0 );
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     if ( !pHnd )
-	tqWarning( "%s: failed to load library!", filename.latin1() );
+	qWarning( "%s: failed to load library!", filename.latin1() );
 #endif
     return pHnd != 0;
 }
@@ -81,7 +81,7 @@ bool QLibraryPrivate::freeLibrary()
     if ( shl_unload( (shl_t)pHnd ) ) {
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
 	QString filename = library->library();
-	tqWarning( "%s: Failed to unload library!", filename.latin1() );
+	qWarning( "%s: Failed to unload library!", filename.latin1() );
 #endif
 	return FALSE;
     }
@@ -98,7 +98,7 @@ void* QLibraryPrivate::resolveSymbol( const char* symbol )
     if ( shl_findsym( (shl_t*)&pHnd, symbol, TYPE_UNDEFINED, &address ) < 0 ) {
 #if defined(QT_DEBUG_COMPONENT)
 	QString filename = library->library();
-	tqWarning( "%s: couldn't resolve symbol \"%s\"", filename.latin1(), symbol );
+	qWarning( "%s: couldn't resolve symbol \"%s\"", filename.latin1(), symbol );
 #endif
     }
     return address;
@@ -120,7 +120,7 @@ bool QLibraryPrivate::loadLibrary()
     pHnd = DL_PREFIX(dlopen)( filename.latin1(), RTLD_LAZY );
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     if ( !pHnd )
-	tqWarning( "%s", DL_PREFIX(dlerror)() );
+	qWarning( "%s", DL_PREFIX(dlerror)() );
 #endif
     return pHnd != 0;
 }
@@ -132,7 +132,7 @@ bool QLibraryPrivate::freeLibrary()
 
     if ( DL_PREFIX(dlclose)( pHnd ) ) {
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
-	tqWarning( "%s", DL_PREFIX(dlerror)() );
+	qWarning( "%s", DL_PREFIX(dlerror)() );
 #endif
 	return FALSE;
     }
@@ -159,7 +159,7 @@ void* QLibraryPrivate::resolveSymbol( const char* symbol )
 #if defined(QT_DEBUG_COMPONENT)
     const char* error = DL_PREFIX(dlerror)();
     if ( error )
-	tqWarning( "%s", error );
+	qWarning( "%s", error );
 #endif
     return address;
 }
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index 0c7753b..a20ea83 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -3071,7 +3071,7 @@ static char digitToCLocale(QChar zero, QChar d)
             && zero.unicode() + 10 > d.unicode())
         return '0' + d.unicode() - zero.unicode();
 
-    tqWarning("QLocalePrivate::digitToCLocale(): bad digit: row=%d, cell=%d", d.row(), d.cell());
+    qWarning("QLocalePrivate::digitToCLocale(): bad digit: row=%d, cell=%d", d.row(), d.cell());
     return QChar(0);
 }
 
diff --git a/src/tools/qmap.h b/src/tools/qmap.h
index 7a1fb70..4f9772f 100644
--- a/src/tools/qmap.h
+++ b/src/tools/qmap.h
@@ -577,7 +577,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME QMapPrivate<Key,T>::Iterator QMapPrivate<Key,T>::i
 
 #ifdef QT_CHECK_RANGE
 # if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE )
-#  define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "QMap: Warning invalid element" )
+#  define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) qWarning( "QMap: Warning invalid element" )
 #  define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() );
 # else
 #  define QT_CHECK_INVALID_MAP_ELEMENT
diff --git a/src/tools/qmutex_unix.cpp b/src/tools/qmutex_unix.cpp
index 74cf502..7f14e6a 100644
--- a/src/tools/qmutex_unix.cpp
+++ b/src/tools/qmutex_unix.cpp
@@ -119,7 +119,7 @@ QMutexPrivate::~QMutexPrivate()
 
 #ifdef QT_CHECK_RANGE
     if ( ret )
-	tqWarning( "Mutex destroy failure: %s", strerror( ret ) );
+	qWarning( "Mutex destroy failure: %s", strerror( ret ) );
 #endif
 }
 
@@ -136,7 +136,7 @@ QRealMutexPrivate::QRealMutexPrivate(bool recurs)
 
 #ifdef QT_CHECK_RANGE
     if( ret )
-	tqWarning( "Mutex init failure: %s", strerror( ret ) );
+	qWarning( "Mutex init failure: %s", strerror( ret ) );
 #endif // QT_CHECK_RANGE
 }
 
@@ -146,7 +146,7 @@ void QRealMutexPrivate::lock()
 
 #ifdef QT_CHECK_RANGE
     if (ret)
-	tqWarning("Mutex lock failure: %s", strerror(ret));
+	qWarning("Mutex lock failure: %s", strerror(ret));
 #endif
 }
 
@@ -156,7 +156,7 @@ void QRealMutexPrivate::unlock()
 
 #ifdef QT_CHECK_RANGE
     if (ret)
-	tqWarning("Mutex unlock failure: %s", strerror(ret));
+	qWarning("Mutex unlock failure: %s", strerror(ret));
 #endif
 }
 
@@ -168,7 +168,7 @@ bool QRealMutexPrivate::locked()
 	return TRUE;
     } else if (ret) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("Mutex locktest failure: %s", strerror(ret));
+	qWarning("Mutex locktest failure: %s", strerror(ret));
 #endif
     } else
 	pthread_mutex_unlock(&handle);
@@ -184,7 +184,7 @@ bool QRealMutexPrivate::trylock()
 	return FALSE;
     } else if (ret) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("Mutex trylock failure: %s", strerror(ret));
+	qWarning("Mutex trylock failure: %s", strerror(ret));
 #endif
 	return FALSE;
     }
@@ -210,7 +210,7 @@ QRecursiveMutexPrivate::QRecursiveMutexPrivate()
 
 #  ifdef QT_CHECK_RANGE
     if (ret)
-	tqWarning( "Mutex init failure: %s", strerror(ret) );
+	qWarning( "Mutex init failure: %s", strerror(ret) );
 #  endif
 
     pthread_mutexattr_init(&attr);
@@ -219,7 +219,7 @@ QRecursiveMutexPrivate::QRecursiveMutexPrivate()
 
 #  ifdef QT_CHECK_RANGE
     if (ret)
-	tqWarning( "Mutex init failure: %s", strerror(ret) );
+	qWarning( "Mutex init failure: %s", strerror(ret) );
 #  endif
 }
 
@@ -229,7 +229,7 @@ QRecursiveMutexPrivate::~QRecursiveMutexPrivate()
 
 #  ifdef QT_CHECK_RANGE
     if (ret)
-	tqWarning( "Mutex destroy failure: %s", strerror(ret) );
+	qWarning( "Mutex destroy failure: %s", strerror(ret) );
 #  endif
 }
 
@@ -263,8 +263,8 @@ void QRecursiveMutexPrivate::unlock()
 	}
     } else {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QMutex::unlock: unlock from different thread than locker");
-	tqWarning("                was locked by %d, unlock attempt from %d",
+	qWarning("QMutex::unlock: unlock from different thread than locker");
+	qWarning("                was locked by %d, unlock attempt from %d",
 		 (int)owner, (int)pthread_self());
 #endif
     }
@@ -284,7 +284,7 @@ bool QRecursiveMutexPrivate::locked()
     } else {
 #ifdef QT_CHECK_RANGE
 	if (code)
-	    tqWarning("Mutex trylock failure: %s", strerror(code));
+	    qWarning("Mutex trylock failure: %s", strerror(code));
 #endif
 
 	pthread_mutex_unlock(&handle);
@@ -311,7 +311,7 @@ bool QRecursiveMutexPrivate::trylock()
 	    ret = FALSE;
 	} else if (code) {
 #ifdef QT_CHECK_RANGE
-	    tqWarning("Mutex trylock failure: %s", strerror(code));
+	    qWarning("Mutex trylock failure: %s", strerror(code));
 #endif
 	    ret = FALSE;
 	} else {
diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp
index 7d4946d..5b990f8 100644
--- a/src/tools/qregexp.cpp
+++ b/src/tools/qregexp.cpp
@@ -1516,49 +1516,49 @@ void QRegExpEngine::heuristicallyChooseHeuristic()
 void QRegExpEngine::dump() const
 {
     int i, j;
-    tqDebug( "Case %ssensitive engine", cs ? "" : "in" );
-    tqDebug( "  States" );
+    qDebug( "Case %ssensitive engine", cs ? "" : "in" );
+    qDebug( "  States" );
     for ( i = 0; i < ns; i++ ) {
-	tqDebug( "  %d%s", i,
+	qDebug( "  %d%s", i,
 		i == InitialState ? " (initial)" :
 		i == FinalState ? " (final)" : "" );
 #ifndef QT_NO_REGEXP_CAPTURE
-	tqDebug( "    in atom %d", s[i]->atom );
+	qDebug( "    in atom %d", s[i]->atom );
 #endif
 	int m = s[i]->match;
 	if ( (m & CharClassBit) != 0 ) {
-	    tqDebug( "    match character class %d", m ^ CharClassBit );
+	    qDebug( "    match character class %d", m ^ CharClassBit );
 #ifndef QT_NO_REGEXP_CCLASS
 	    cl[m ^ CharClassBit]->dump();
 #else
-	    tqDebug( "    negative character class" );
+	    qDebug( "    negative character class" );
 #endif
 	} else if ( (m & BackRefBit) != 0 ) {
-	    tqDebug( "    match back-reference %d", m ^ BackRefBit );
+	    qDebug( "    match back-reference %d", m ^ BackRefBit );
 	} else if ( m >= 0x20 && m <= 0x7e ) {
-	    tqDebug( "    match 0x%.4x (%c)", m, m );
+	    qDebug( "    match 0x%.4x (%c)", m, m );
 	} else {
-	    tqDebug( "    match 0x%.4x", m );
+	    qDebug( "    match 0x%.4x", m );
 	}
 	for ( j = 0; j < (int) s[i]->outs.size(); j++ ) {
 	    int next = s[i]->outs[j];
-	    tqDebug( "    -> %d", next );
+	    qDebug( "    -> %d", next );
 	    if ( s[i]->reenter != 0 && s[i]->reenter->contains(next) )
-		tqDebug( "       [reenter %d]", (*s[i]->reenter)[next] );
+		qDebug( "       [reenter %d]", (*s[i]->reenter)[next] );
 	    if ( s[i]->anchors != 0 && at(*s[i]->anchors, next) != 0 )
-		tqDebug( "       [anchors 0x%.8x]", (*s[i]->anchors)[next] );
+		qDebug( "       [anchors 0x%.8x]", (*s[i]->anchors)[next] );
 	}
     }
 #ifndef QT_NO_REGEXP_CAPTURE
     if ( nf > 0 ) {
-	tqDebug( "  Atom    Parent  Capture" );
+	qDebug( "  Atom    Parent  Capture" );
 	for ( i = 0; i < nf; i++ )
-	    tqDebug( "  %6d  %6d  %6d", i, f[i].parent, f[i].capture );
+	    qDebug( "  %6d  %6d  %6d", i, f[i].parent, f[i].capture );
     }
 #endif
 #ifndef QT_NO_REGEXP_ANCHOR_ALT
     for ( i = 0; i < (int) aa.size(); i++ )
-	tqDebug( "  Anchor alternation 0x%.8x: 0x%.8x 0x%.9x", i, aa[i].a,
+	qDebug( "  Anchor alternation 0x%.8x: 0x%.8x 0x%.9x", i, aa[i].a,
 		aa[i].b );
 #endif
 }
@@ -2290,13 +2290,13 @@ bool QRegExpEngine::CharClass::in( QChar ch ) const
 void QRegExpEngine::CharClass::dump() const
 {
     int i;
-    tqDebug( "    %stive character class", n ? "nega" : "posi" );
+    qDebug( "    %stive character class", n ? "nega" : "posi" );
 #ifndef QT_NO_REGEXP_CCLASS
     if ( c != 0 )
-	tqDebug( "      categories 0x%.8x", c );
+	qDebug( "      categories 0x%.8x", c );
 #endif
     for ( i = 0; i < (int) r.size(); i++ )
-	tqDebug( "      0x%.4x through 0x%.4x", r[i].from, r[i].to );
+	qDebug( "      0x%.4x through 0x%.4x", r[i].from, r[i].to );
 }
 #endif
 #endif
@@ -2559,22 +2559,22 @@ void QRegExpEngine::Box::setupHeuristics()
 void QRegExpEngine::Box::dump() const
 {
     int i;
-    tqDebug( "Box of at least %d character%s", minl, minl == 1 ? "" : "s" );
-    tqDebug( "  Left states:" );
+    qDebug( "Box of at least %d character%s", minl, minl == 1 ? "" : "s" );
+    qDebug( "  Left states:" );
     for ( i = 0; i < (int) ls.size(); i++ ) {
 	if ( at(lanchors, ls[i]) == 0 )
-	    tqDebug( "    %d", ls[i] );
+	    qDebug( "    %d", ls[i] );
 	else
-	    tqDebug( "    %d [anchors 0x%.8x]", ls[i], lanchors[ls[i]] );
+	    qDebug( "    %d [anchors 0x%.8x]", ls[i], lanchors[ls[i]] );
     }
-    tqDebug( "  Right states:" );
+    qDebug( "  Right states:" );
     for ( i = 0; i < (int) rs.size(); i++ ) {
 	if ( at(ranchors, rs[i]) == 0 )
-	    tqDebug( "    %d", rs[i] );
+	    qDebug( "    %d", rs[i] );
 	else
-	    tqDebug( "    %d [anchors 0x%.8x]", rs[i], ranchors[rs[i]] );
+	    qDebug( "    %d [anchors 0x%.8x]", rs[i], ranchors[rs[i]] );
     }
-    tqDebug( "  Skip anchors: 0x%.8x", skipanchors );
+    qDebug( "  Skip anchors: 0x%.8x", skipanchors );
 }
 #endif
 
diff --git a/src/tools/qsemaphore.cpp b/src/tools/qsemaphore.cpp
index 3ca62fa..43ea17e 100644
--- a/src/tools/qsemaphore.cpp
+++ b/src/tools/qsemaphore.cpp
@@ -178,7 +178,7 @@ int QSemaphore::operator+=(int n)
 
     if ( n < 0 || n > d->max ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QSemaphore::operator+=: paramter %d out of range", n );
+	qWarning( "QSemaphore::operator+=: paramter %d out of range", n );
 #endif // QT_CHECK_RANGE
 	n = n < 0 ? 0 : d->max;
     }
@@ -201,7 +201,7 @@ int QSemaphore::operator-=(int n)
 
     if ( n < 0 || n > d->value ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QSemaphore::operator-=: paramter %d out of range", n );
+	qWarning( "QSemaphore::operator-=: paramter %d out of range", n );
 #endif // QT_CHECK_RANGE
 	n = n < 0 ? 0 : d->value;
     }
diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp
index 23fd307..006deb7 100644
--- a/src/tools/qsettings.cpp
+++ b/src/tools/qsettings.cpp
@@ -345,7 +345,7 @@ void QSettingsHeading::read(const QString &filename)
     QFile file(filename);
     if (! file.open(IO_ReadOnly)) {
 #if defined(QT_CHECK_STATE)
-	tqWarning("QSettings: failed to open file '%s'", filename.latin1());
+	qWarning("QSettings: failed to open file '%s'", filename.latin1());
 #endif
 	return;
     }
@@ -391,7 +391,7 @@ void QSettingsHeading::parseLine(QTextStream &stream)
     } else {
 	if (git == end()) {
 #if defined(QT_CHECK_STATE)
-	    tqWarning("QSettings: line '%s' out of group", line.latin1());
+	    qWarning("QSettings: line '%s' out of group", line.latin1());
 #endif
 	    return;
 	}
@@ -399,7 +399,7 @@ void QSettingsHeading::parseLine(QTextStream &stream)
 	int i = line.find('=');
        	if (i == -1) {
 #if defined(QT_CHECK_STATE)
-	    tqWarning("QSettings: malformed line '%s' in group '%s'",
+	    qWarning("QSettings: malformed line '%s' in group '%s'",
 		     line.latin1(), git.key().latin1());
 #endif
 	    return;
@@ -430,7 +430,7 @@ void QSettingsHeading::parseLine(QTextStream &stream)
 		    // still escaped at EOL - manually escaped "newline"
 		    if (stream.atEnd()) {
 #if defined(QT_CHECK_STATE)
-			tqWarning("QSettings: reached end of file, expected continued line");
+			qWarning("QSettings: reached end of file, expected continued line");
 #endif
 			break;
 		    }
@@ -503,13 +503,13 @@ QSettingsPrivate::QSettingsPrivate( QSettings::Format format )
     } );
 #endif // Q_OS_TEMP
 #else
-    defPath = tqInstallPathSysconf();
+    defPath = qInstallPathSysconf();
 #endif
     QDir dir(appSettings);
     if (! dir.exists()) {
 	if (! dir.mkdir(dir.path()))
 #if defined(QT_CHECK_STATE)
-	    tqWarning("QSettings: error creating %s", dir.path().latin1());
+	    qWarning("QSettings: error creating %s", dir.path().latin1());
 #else
 	    ;
 #endif
@@ -804,7 +804,7 @@ void QSettings::insertSearchPath( System s, const QString &path)
 
     if ( !qt_verify_key( path ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::insertSearchPath: Invalid key: '%s'", path.isNull() ? "(null)" : path.latin1() );
+	qWarning( "QSettings::insertSearchPath: Invalid key: '%s'", path.isNull() ? "(null)" : path.latin1() );
 #endif
 	return;
     }
@@ -844,7 +844,7 @@ void QSettings::removeSearchPath( System s, const QString &path)
 {
     if ( !qt_verify_key( path ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::insertSearchPath: Invalid key: '%s'", path.isNull() ? "(null)" : path.latin1() );
+	qWarning( "QSettings::insertSearchPath: Invalid key: '%s'", path.isNull() ? "(null)" : path.latin1() );
 #endif
 	return;
     }
@@ -985,7 +985,7 @@ bool QSettings::sync()
 	if ( filename.isEmpty() ) {
 
 #ifdef QT_CHECK_STATE
-	    tqWarning("QSettings::sync: filename is null/empty");
+	    qWarning("QSettings::sync: filename is null/empty");
 #endif // QT_CHECK_STATE
 
 	    success = FALSE;
@@ -1000,7 +1000,7 @@ bool QSettings::sync()
 	if (! file.open(IO_WriteOnly)) {
 
 #ifdef QT_CHECK_STATE
-	    tqWarning("QSettings::sync: failed to open '%s' for writing",
+	    qWarning("QSettings::sync: failed to open '%s' for writing",
 		     file.name().latin1());
 #endif // QT_CHECK_STATE
 
@@ -1041,7 +1041,7 @@ bool QSettings::sync()
 	if (file.status() != IO_Ok) {
 
 #ifdef QT_CHECK_STATE
-	    tqWarning("QSettings::sync: error at end of write");
+	    qWarning("QSettings::sync: error at end of write");
 #endif // QT_CHECK_STATE
 
 	    success = FALSE;
@@ -1055,7 +1055,7 @@ bool QSettings::sync()
 		 !dir.rename( file.name(), filename, TRUE ) ) {
 
 #ifdef QT_CHECK_STATE
-		tqWarning( "QSettings::sync: error writing file '%s'",
+		qWarning( "QSettings::sync: error writing file '%s'",
 			  QFile::encodeName( filename ).data() );
 #endif // QT_CHECK_STATE
 
@@ -1096,7 +1096,7 @@ bool QSettings::readBoolEntry(const QString &key, bool def, bool *ok )
     QString grp_key( groupKey( group(), key ) );
     if ( !qt_verify_key( grp_key ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::readBoolEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
+	qWarning( "QSettings::readBoolEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
 #endif
     	if ( ok )
 	    *ok = FALSE;
@@ -1121,7 +1121,7 @@ bool QSettings::readBoolEntry(const QString &key, bool def, bool *ok )
 	return FALSE;
 
     if (! value.isEmpty())
-	tqWarning("QSettings::readBoolEntry: '%s' is not 'true' or 'false'",
+	qWarning("QSettings::readBoolEntry: '%s' is not 'true' or 'false'",
 		 value.latin1());
     if ( ok )
 	*ok = FALSE;
@@ -1148,7 +1148,7 @@ double QSettings::readDoubleEntry(const QString &key, double def, bool *ok )
     QString grp_key( groupKey( group(), key ) );
     if ( !qt_verify_key( grp_key ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::readDoubleEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
+	qWarning( "QSettings::readDoubleEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
 #endif
     	if ( ok )
 	    *ok = FALSE;
@@ -1167,7 +1167,7 @@ double QSettings::readDoubleEntry(const QString &key, double def, bool *ok )
     if ( conv_ok )
 	return retval;
     if ( ! value.isEmpty() )
-	tqWarning( "QSettings::readDoubleEntry: '%s' is not a number",
+	qWarning( "QSettings::readDoubleEntry: '%s' is not a number",
 		  value.latin1() );
     if ( ok )
 	*ok = FALSE;
@@ -1194,7 +1194,7 @@ int QSettings::readNumEntry(const QString &key, int def, bool *ok )
     QString grp_key( groupKey( group(), key ) );
     if ( !qt_verify_key( grp_key ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::readNumEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
+	qWarning( "QSettings::readNumEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
 #endif
 	if ( ok )
 	    *ok = FALSE;
@@ -1212,7 +1212,7 @@ int QSettings::readNumEntry(const QString &key, int def, bool *ok )
     if ( conv_ok )
 	return retval;
     if ( ! value.isEmpty() )
-	tqWarning( "QSettings::readNumEntry: '%s' is not a number",
+	qWarning( "QSettings::readNumEntry: '%s' is not a number",
 		  value.latin1() );
     if ( ok )
 	*ok = FALSE;
@@ -1239,7 +1239,7 @@ QString QSettings::readEntry(const QString &key, const QString &def, bool *ok )
     QString grp_key( groupKey( group(), key ) );
     if ( !qt_verify_key( grp_key ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::readEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
+	qWarning( "QSettings::readEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
 #endif
 	if ( ok )
 	    *ok = FALSE;
@@ -1263,7 +1263,7 @@ QString QSettings::readEntry(const QString &key, const QString &def, bool *ok )
 
 	if (list.count() < 2) {
 #ifdef QT_CHECK_STATE
-	    tqWarning("QSettings::readEntry: invalid key '%s'", grp_key.latin1());
+	    qWarning("QSettings::readEntry: invalid key '%s'", grp_key.latin1());
 #endif // QT_CHECK_STATE
 	    if ( ok )
 		*ok = FALSE;
@@ -1321,7 +1321,7 @@ bool QSettings::writeEntry(const QString &key, bool value)
     QString grp_key( groupKey( group(), key ) );
     if ( !qt_verify_key( grp_key ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
+	qWarning( "QSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
 #endif
 	return FALSE;
     }
@@ -1352,7 +1352,7 @@ bool QSettings::writeEntry(const QString &key, double value)
     QString grp_key( groupKey( group(), key ) );
     if ( !qt_verify_key( grp_key ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
+	qWarning( "QSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
 #endif
 	return FALSE;
     }
@@ -1382,7 +1382,7 @@ bool QSettings::writeEntry(const QString &key, int value)
     QString grp_key( groupKey( group(), key ) );
     if ( !qt_verify_key( grp_key ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
+	qWarning( "QSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
 #endif
 	return FALSE;
     }
@@ -1435,7 +1435,7 @@ bool QSettings::writeEntry(const QString &key, const QString &value)
     QString grp_key( groupKey( group(), key ) );
     if ( !qt_verify_key( grp_key ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
+	qWarning( "QSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
 #endif
 	return FALSE;
     }
@@ -1454,7 +1454,7 @@ bool QSettings::writeEntry(const QString &key, const QString &value)
 
 	if (list.count() < 2) {
 #ifdef QT_CHECK_STATE
-	    tqWarning("QSettings::writeEntry: invalid key '%s'", grp_key.latin1());
+	    qWarning("QSettings::writeEntry: invalid key '%s'", grp_key.latin1());
 #endif // QT_CHECK_STATE
 
 	    return FALSE;
@@ -1498,7 +1498,7 @@ bool QSettings::removeEntry(const QString &key)
     QString grp_key( groupKey( group(), key ) );
     if ( !qt_verify_key( grp_key ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::removeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
+	qWarning( "QSettings::removeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
 #endif
 	return FALSE;
     }
@@ -1515,7 +1515,7 @@ bool QSettings::removeEntry(const QString &key)
 
 	if (list.count() < 2) {
 #ifdef QT_CHECK_STATE
-	    tqWarning("QSettings::removeEntry: invalid key '%s'", grp_key.latin1());
+	    qWarning("QSettings::removeEntry: invalid key '%s'", grp_key.latin1());
 #endif // QT_CHECK_STATE
 
 	    return FALSE;
@@ -1578,7 +1578,7 @@ QStringList QSettings::entryList(const QString &key) const
     QString grp_key( groupKey( group(), key ) );
     if ( !qt_verify_key( grp_key ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::entryList: Invalid key: %s", grp_key.isNull() ? "(null)" : grp_key.latin1() );
+	qWarning( "QSettings::entryList: Invalid key: %s", grp_key.isNull() ? "(null)" : grp_key.latin1() );
 #endif
 	return QStringList();
     }
@@ -1595,7 +1595,7 @@ QStringList QSettings::entryList(const QString &key) const
 
 	if (list.count() < 1) {
 #ifdef QT_CHECK_STATE
-	    tqWarning("QSettings::listEntries: invalid key '%s'", grp_key.latin1());
+	    qWarning("QSettings::listEntries: invalid key '%s'", grp_key.latin1());
 #endif // QT_CHECK_STATE
 
 	    return QStringList();
@@ -1686,7 +1686,7 @@ QStringList QSettings::subkeyList(const QString &key) const
     QString grp_key( groupKey( group(), key ) );
     if ( !qt_verify_key( grp_key ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::subkeyList: Invalid key: %s", grp_key.isNull() ? "(null)" : grp_key.latin1() );
+	qWarning( "QSettings::subkeyList: Invalid key: %s", grp_key.isNull() ? "(null)" : grp_key.latin1() );
 #endif
 	return QStringList();
     }
@@ -1704,7 +1704,7 @@ QStringList QSettings::subkeyList(const QString &key) const
 
 	if (list.count() < 1) {
 #ifdef QT_CHECK_STATE
-	    tqWarning("QSettings::subkeyList: invalid key '%s'", grp_key.latin1());
+	    qWarning("QSettings::subkeyList: invalid key '%s'", grp_key.latin1());
 #endif // QT_CHECK_STATE
 
 	    return QStringList();
@@ -1781,7 +1781,7 @@ QDateTime QSettings::lastModificationTime( const QString &key )
     QString grp_key( groupKey( group(), key ) );
     if ( !qt_verify_key( grp_key ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSettings::lastModificationTime: Invalid key '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
+	qWarning( "QSettings::lastModificationTime: Invalid key '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() );
 #endif
 	return QDateTime();
     }
@@ -1797,7 +1797,7 @@ QDateTime QSettings::lastModificationTime( const QString &key )
 
 	if (list.count() < 2) {
 #ifdef QT_CHECK_STATE
-	    tqWarning("QSettings::lastModificationTime: Invalid key '%s'", grp_key.latin1());
+	    qWarning("QSettings::lastModificationTime: Invalid key '%s'", grp_key.latin1());
 #endif // QT_CHECK_STATE
 
 	    return QDateTime();
@@ -2030,7 +2030,7 @@ void QSettings::setPath( const QString &domain, const QString &product, Scope sc
     if (scope == User)
 	actualSearchPath = QDir::homeDirPath() + "/.";
     else
-	actualSearchPath = QString(tqInstallPathSysconf()) + "/";
+	actualSearchPath = QString(qInstallPathSysconf()) + "/";
     actualSearchPath += domain.mid( 0, lastDot ) + "/" + product;
     insertSearchPath( Unix, actualSearchPath );
 #endif
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index c8795de..24b8164 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -1986,7 +1986,7 @@ static QString replaceArgEscapes(const QString &s, const ArgEscapeData &d, int f
     differ between languages.
 
     If there is no place marker (\c %1, \c %2, etc.), a warning
-    message (tqWarning()) is output and the result is undefined.
+    message (qWarning()) is output and the result is undefined.
 
     \warning If any placeholder occurs more than once, the result is undefined.
 
@@ -1996,7 +1996,7 @@ QString QString::arg( const QString& a, int fieldWidth ) const
     ArgEscapeData d = findArgEscapes(*this);
 
     if (d.occurrences == 0) {
-        tqWarning( "QString::arg(): Argument missing: %s, %s", latin1(),
+        qWarning( "QString::arg(): Argument missing: %s, %s", latin1(),
                   a.latin1() );
         return *this;
     }
@@ -2103,7 +2103,7 @@ QString QString::arg( Q_LLONG a, int fieldWidth, int base ) const
     ArgEscapeData d = findArgEscapes(*this);
 
     if (d.occurrences == 0) {
-        tqWarning( "QString::arg(): Argument missing: %s, %lld", latin1(),
+        qWarning( "QString::arg(): Argument missing: %s, %lld", latin1(),
                   a );
         return *this;
     }
@@ -2133,7 +2133,7 @@ QString QString::arg( Q_ULLONG a, int fieldWidth, int base ) const
     ArgEscapeData d = findArgEscapes(*this);
 
     if (d.occurrences == 0) {
-        tqWarning( "QString::arg(): Argument missing: %s, %llu", latin1(),
+        qWarning( "QString::arg(): Argument missing: %s, %llu", latin1(),
                   a );
         return *this;
     }
@@ -2249,7 +2249,7 @@ QString QString::arg( double a, int fieldWidth, char fmt, int prec ) const
     ArgEscapeData d = findArgEscapes(*this);
 
     if (d.occurrences == 0) {
-        tqWarning( "QString::arg(): Argument missing: %s, %g", latin1(),
+        qWarning( "QString::arg(): Argument missing: %s, %g", latin1(),
                   a );
         return *this;
     }
@@ -2281,7 +2281,7 @@ QString QString::arg( double a, int fieldWidth, char fmt, int prec ) const
 		break;
 	    default:
 #if defined(QT_CHECK_RANGE)
-		tqWarning( "QString::setNum: Invalid format char '%c'", fmt );
+		qWarning( "QString::setNum: Invalid format char '%c'", fmt );
 #endif
 		break;
 	}
@@ -2329,7 +2329,7 @@ QString QString::multiArg( int numArgs, const QString& a1, const QString& a2,
 	} while ( lastDigit < 10 && digitUsed[lastDigit] == 0 );
 
 	if ( lastDigit == 10 ) {
-	    tqWarning( "QString::arg(): Argument missing: %s, %s",
+	    qWarning( "QString::arg(): Argument missing: %s, %s",
 		      latin1(), args[i]->latin1() );
 	    numArgs = i;
 	    lastDigit = 9;
@@ -4735,7 +4735,7 @@ Q_LLONG QString::toLongLong( bool *ok, int base ) const
 {
 #if defined(QT_CHECK_RANGE)
     if ( base != 0 && (base < 2 || base > 36) ) {
-	tqWarning( "QString::toLongLong: Invalid base (%d)", base );
+	qWarning( "QString::toLongLong: Invalid base (%d)", base );
 	base = 10;
     }
 #endif
@@ -4825,7 +4825,7 @@ Q_ULLONG QString::toULongLong( bool *ok, int base ) const
 {
 #if defined(QT_CHECK_RANGE)
     if ( base != 0 && (base < 2 || base > 36) ) {
-	tqWarning( "QString::toULongLong: Invalid base %d", base );
+	qWarning( "QString::toULongLong: Invalid base %d", base );
 	base = 10;
     }
 #endif
@@ -5153,7 +5153,7 @@ QString &QString::setNum( Q_LLONG n, int base )
 {
 #if defined(QT_CHECK_RANGE)
     if ( base < 2 || base > 36 ) {
-	tqWarning( "QString::setNum: Invalid base %d", base );
+	qWarning( "QString::setNum: Invalid base %d", base );
 	base = 10;
     }
 #endif
@@ -5175,7 +5175,7 @@ QString &QString::setNum( Q_ULLONG n, int base )
 {
 #if defined(QT_CHECK_RANGE)
     if ( base < 2 || base > 36 ) {
-	tqWarning( "QString::setNum: Invalid base %d", base );
+	qWarning( "QString::setNum: Invalid base %d", base );
 	base = 10;
     }
 #endif
@@ -5282,7 +5282,7 @@ QString &QString::setNum( double n, char f, int prec )
 	    break;
 	default:
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QString::setNum: Invalid format char '%c'", f );
+	    qWarning( "QString::setNum: Invalid format char '%c'", f );
 #endif
 	    break;
     }
@@ -7128,7 +7128,7 @@ QCString qt_winQString2MB( const QString& s, int uclen )
 	} else {
 #ifndef QT_NO_DEBUG
 	    // Fail.
-	    tqWarning("WideCharToMultiByte cannot convert multibyte text (error %d): %s (UTF8)",
+	    qWarning("WideCharToMultiByte cannot convert multibyte text (error %d): %s (UTF8)",
 		r, s.utf8().data());
 #endif
 	    break;
@@ -7154,7 +7154,7 @@ QString qt_winMB2QString( const char* mb, int mblen )
 	int r = GetLastError();
 	if ( r == ERROR_INSUFFICIENT_BUFFER ) {
 	    if ( wc != wc_auto ) {
-		tqWarning("Size changed in MultiByteToWideChar");
+		qWarning("Size changed in MultiByteToWideChar");
 		break;
 	    } else {
 		wclen = MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED,
@@ -7164,7 +7164,7 @@ QString qt_winMB2QString( const char* mb, int mblen )
 	    }
 	} else {
 	    // Fail.
-	    tqWarning("MultiByteToWideChar cannot convert multibyte text");
+	    qWarning("MultiByteToWideChar cannot convert multibyte text");
 	    break;
 	}
     }
diff --git a/src/tools/qstring.h b/src/tools/qstring.h
index a9e89a4..587d0f2 100644
--- a/src/tools/qstring.h
+++ b/src/tools/qstring.h
@@ -225,7 +225,7 @@ public:
     static bool networkOrdered() {
 	int wordSize;
 	bool bigEndian = FALSE;
-	tqSysInfo( &wordSize, &bigEndian );
+	qSysInfo( &wordSize, &bigEndian );
 	return bigEndian;
     }
 
diff --git a/src/tools/qstrlist.h b/src/tools/qstrlist.h
index 131c191..baeb090 100644
--- a/src/tools/qstrlist.h
+++ b/src/tools/qstrlist.h
@@ -64,7 +64,7 @@ public:
     QStrList& operator=( const QStrList & );
 
 private:
-    QPtrCollection::Item newItem( QPtrCollection::Item d ) { return dc ? tqstrdup( (const char*)d ) : d; }
+    QPtrCollection::Item newItem( QPtrCollection::Item d ) { return dc ? qstrdup( (const char*)d ) : d; }
     void deleteItem( QPtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; }
     int compareItems( QPtrCollection::Item s1, QPtrCollection::Item s2 ) { return qstrcmp((const char*)s1,
 							 (const char*)s2); }
@@ -85,7 +85,7 @@ public:
     ~QStrIList()			{ clear(); }
 private:
     int	  compareItems( QPtrCollection::Item s1, QPtrCollection::Item s2 )
-				{ return tqstricmp((const char*)s1,
+				{ return qstricmp((const char*)s1,
 						    (const char*)s2); }
 };
 
diff --git a/src/tools/qstrvec.h b/src/tools/qstrvec.h
index d3c580f..360d4c7 100644
--- a/src/tools/qstrvec.h
+++ b/src/tools/qstrvec.h
@@ -54,7 +54,7 @@ public:
     QStrVec( uint size, bool deepc = TRUE ) : QPtrVector<char>(size) {dc=deepc;}
    ~QStrVec()  { clear(); }
 private:
-    Item	 newItem( Item d )	{ return dc ? tqstrdup( (const char*)d ) : d; }
+    Item	 newItem( Item d )	{ return dc ? qstrdup( (const char*)d ) : d; }
     void deleteItem( Item d )	{ if ( dc ) delete[] (char*)d; }
     int	 compareItems( Item s1, Item s2 )
 				{ return qstrcmp((const char*)s1,
@@ -77,7 +77,7 @@ public:
    ~QStrIVec() { clear(); }
 private:
     int	 compareItems( Item s1, Item s2 )
-				{ return tqstricmp((const char*)s1,
+				{ return qstricmp((const char*)s1,
 						 (const char*)s2); }
 };
 
diff --git a/src/tools/qtextstream.cpp b/src/tools/qtextstream.cpp
index 28ddbd1..63f9625 100644
--- a/src/tools/qtextstream.cpp
+++ b/src/tools/qtextstream.cpp
@@ -185,7 +185,7 @@
 #if defined(QT_CHECK_STATE)
 #undef  CHECK_STREAM_PRECOND
 #define CHECK_STREAM_PRECOND  if ( !dev ) {				\
-				tqWarning( "QTextStream: No device" );	\
+				qWarning( "QTextStream: No device" );	\
 				return *this; }
 #else
 #define CHECK_STREAM_PRECOND
@@ -327,13 +327,13 @@ bool QStringBuffer::open( int m )
 {
     if ( !s ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QStringBuffer::open: No string" );
+	qWarning( "QStringBuffer::open: No string" );
 #endif
 	return FALSE;
     }
     if ( isOpen() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QStringBuffer::open: Buffer already open" );
+	qWarning( "QStringBuffer::open: Buffer already open" );
 #endif
 	return FALSE;
     }
@@ -377,16 +377,16 @@ bool QStringBuffer::at( Offset pos )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {
-	tqWarning( "QStringBuffer::at: Buffer is not open" );
+	qWarning( "QStringBuffer::at: Buffer is not open" );
 	return FALSE;
     }
 #endif
     if ( pos >= s->length()*2 ) {
 #if defined(QT_CHECK_RANGE)
 #if defined(QT_ABI_QT4)
-	tqWarning( "QStringBuffer::at: Index %lld out of range", pos );
+	qWarning( "QStringBuffer::at: Index %lld out of range", pos );
 #else
-	tqWarning( "QStringBuffer::at: Index %lu out of range", pos );
+	qWarning( "QStringBuffer::at: Index %lu out of range", pos );
 #endif
 #endif
 	return FALSE;
@@ -401,11 +401,11 @@ Q_LONG QStringBuffer::readBlock( char *p, Q_ULONG len )
 #if defined(QT_CHECK_STATE)
     Q_CHECK_PTR( p );
     if ( !isOpen() ) {
-	tqWarning( "QStringBuffer::readBlock: Buffer not open" );
+	qWarning( "QStringBuffer::readBlock: Buffer not open" );
 	return -1;
     }
     if ( !isReadable() ) {
-	tqWarning( "QStringBuffer::readBlock: Read operation not permitted" );
+	qWarning( "QStringBuffer::readBlock: Read operation not permitted" );
 	return -1;
     }
 #endif
@@ -427,23 +427,23 @@ Q_LONG QStringBuffer::writeBlock( const char *p, Q_ULONG len )
 {
 #if defined(QT_CHECK_NULL)
     if ( p == 0 && len != 0 )
-	tqWarning( "QStringBuffer::writeBlock: Null pointer error" );
+	qWarning( "QStringBuffer::writeBlock: Null pointer error" );
 #endif
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {
-	tqWarning( "QStringBuffer::writeBlock: Buffer not open" );
+	qWarning( "QStringBuffer::writeBlock: Buffer not open" );
 	return -1;
     }
     if ( !isWritable() ) {
-	tqWarning( "QStringBuffer::writeBlock: Write operation not permitted" );
+	qWarning( "QStringBuffer::writeBlock: Write operation not permitted" );
 	return -1;
     }
     if ( ioIndex&1 ) {
-	tqWarning( "QStringBuffer::writeBlock: non-even index - non Unicode" );
+	qWarning( "QStringBuffer::writeBlock: non-even index - non Unicode" );
 	return -1;
     }
     if ( len&1 ) {
-	tqWarning( "QStringBuffer::writeBlock: non-even length - non Unicode" );
+	qWarning( "QStringBuffer::writeBlock: non-even length - non Unicode" );
 	return -1;
     }
 #endif
@@ -456,11 +456,11 @@ int QStringBuffer::getch()
 {
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {
-	tqWarning( "QStringBuffer::getch: Buffer not open" );
+	qWarning( "QStringBuffer::getch: Buffer not open" );
 	return -1;
     }
     if ( !isReadable() ) {
-	tqWarning( "QStringBuffer::getch: Read operation not permitted" );
+	qWarning( "QStringBuffer::getch: Read operation not permitted" );
 	return -1;
     }
 #endif
@@ -484,11 +484,11 @@ int QStringBuffer::ungetch( int ch )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {
-	tqWarning( "QStringBuffer::ungetch: Buffer not open" );
+	qWarning( "QStringBuffer::ungetch: Buffer not open" );
 	return -1;
     }
     if ( !isReadable() ) {
-	tqWarning( "QStringBuffer::ungetch: Read operation not permitted" );
+	qWarning( "QStringBuffer::ungetch: Read operation not permitted" );
 	return -1;
     }
 #endif
@@ -1702,7 +1702,7 @@ QString QTextStream::readLine()
 {
 #if defined(QT_CHECK_STATE)
     if ( !dev ) {
-	tqWarning( "QTextStream::readLine: No device" );
+	qWarning( "QTextStream::readLine: No device" );
 	return QString::null;
     }
 #endif
@@ -1785,7 +1785,7 @@ QString QTextStream::read()
 {
 #if defined(QT_CHECK_STATE)
     if ( !dev ) {
-	tqWarning( "QTextStream::read: No device" );
+	qWarning( "QTextStream::read: No device" );
 	return QString::null;
     }
 #endif
diff --git a/src/tools/qthreadstorage_unix.cpp b/src/tools/qthreadstorage_unix.cpp
index 63dbb7a..248a0ad 100644
--- a/src/tools/qthreadstorage_unix.cpp
+++ b/src/tools/qthreadstorage_unix.cpp
@@ -80,7 +80,7 @@ QThreadStorageData::QThreadStorageData( void (*func)( void * ) )
     thread_storage_usage[id].func = func;
 
 #ifdef QTHREADSTORAGE_DEBUG
-    tqDebug( "QThreadStorageData: allocated id %d", id );
+    qDebug( "QThreadStorageData: allocated id %d", id );
 #endif // QTHREADSTORAGE_DEBUG
 
     pthread_mutex_unlock( &thread_storage_mutex );
@@ -93,7 +93,7 @@ QThreadStorageData::~QThreadStorageData()
     thread_storage_usage[id].func = 0;
 
 #ifdef QTHREADSTORAGE_DEBUG
-    tqDebug( "QThreadStorageData: released id %d", id );
+    qDebug( "QThreadStorageData: released id %d", id );
 #endif // QTHREADSTORAGE_DEBUG
 
     pthread_mutex_unlock( &thread_storage_mutex );
@@ -103,7 +103,7 @@ void **QThreadStorageData::get() const
 {
     QThreadInstance *d = QThreadInstance::current();
     if (!d) {
-        tqWarning("QThreadStorage can only be used with threads started with QThread");
+        qWarning("QThreadStorage can only be used with threads started with QThread");
         return 0;
     }
     QMutexLocker locker( d->mutex() );
@@ -114,13 +114,13 @@ void **QThreadStorageData::set( void *p )
 {
     QThreadInstance *d = QThreadInstance::current();
     if (!d) {
-        tqWarning("QThreadStorage can only be used with threads started with QThread");
+        qWarning("QThreadStorage can only be used with threads started with QThread");
         return 0;
     }
     QMutexLocker locker( d->mutex() );
     if ( !d->thread_storage ) {
 #ifdef QTHREADSTORAGE_DEBUG
-	tqDebug( "QThreadStorageData: allocating storage for thread %lx",
+	qDebug( "QThreadStorageData: allocating storage for thread %lx",
 		(unsigned long) pthread_self() );
 #endif // QTHREADSTORAGE_DEBUG
 
@@ -142,7 +142,7 @@ void QThreadStorageData::finish( void **thread_storage )
     if ( ! thread_storage ) return; // nothing to do
 
 #ifdef QTHREADSTORAGE_DEBUG
-    tqDebug( "QThreadStorageData: destroying storage for thread %lx",
+    qDebug( "QThreadStorageData: destroying storage for thread %lx",
 	    (unsigned long) pthread_self() );
 #endif // QTHREADSTORAGE_DEBUG
 
@@ -150,7 +150,7 @@ void QThreadStorageData::finish( void **thread_storage )
 	if ( ! thread_storage[i] ) continue;
 	if ( ! thread_storage_usage[i].used ) {
 #ifdef QT_CHECK_STATE
-	    tqWarning( "QThreadStorage: thread %lx exited after QThreadStorage destroyed",
+	    qWarning( "QThreadStorage: thread %lx exited after QThreadStorage destroyed",
 		      (unsigned long) pthread_self() );
 #endif // QT_CHECK_STATE
 	    continue;
diff --git a/src/tools/qucom.cpp b/src/tools/qucom.cpp
index 9357024..f210318 100644
--- a/src/tools/qucom.cpp
+++ b/src/tools/qucom.cpp
@@ -514,7 +514,7 @@ bool QUType_QString::convertTo( QUObject *o, QUType *t )
 {
     QString *str = (QString *)o->payload.ptr;
     if ( isEqual( t, &static_QUType_charstar ) ) {
-	o->payload.charstar.ptr = tqstrdup( str->local8Bit().data() );
+	o->payload.charstar.ptr = qstrdup( str->local8Bit().data() );
 	o->payload.charstar.owner = TRUE;
 	o->type = &static_QUType_charstar;
     } else if ( isEqual( t,  &static_QUType_int ) ) {
diff --git a/src/tools/qvaluelist.h b/src/tools/qvaluelist.h
index c031a45..95dc7ff 100644
--- a/src/tools/qvaluelist.h
+++ b/src/tools/qvaluelist.h
@@ -396,7 +396,7 @@ Q_INLINE_TEMPLATES void QValueListPrivate<T>::clear()
 
 #ifdef QT_CHECK_RANGE
 # if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE )
-#  define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) tqWarning( "QValueList: Warning invalid element" )
+#  define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) qWarning( "QValueList: Warning invalid element" )
 #  define QT_CHECK_INVALID_LIST_ELEMENT_FATAL Q_ASSERT( !empty() );
 # else
 #  define QT_CHECK_INVALID_LIST_ELEMENT
diff --git a/src/tools/qwaitcondition_unix.cpp b/src/tools/qwaitcondition_unix.cpp
index 58c8106..5c3c23c 100644
--- a/src/tools/qwaitcondition_unix.cpp
+++ b/src/tools/qwaitcondition_unix.cpp
@@ -153,7 +153,7 @@ QWaitCondition::QWaitCondition()
 
 #ifdef QT_CHECK_RANGE
     if (ret)
-	tqWarning( "Wait condition init failure: %s", strerror( ret ) );
+	qWarning( "Wait condition init failure: %s", strerror( ret ) );
 #endif
 }
 
@@ -167,7 +167,7 @@ QWaitCondition::~QWaitCondition()
 
     if (ret) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "Wait condition destroy failure: %s", strerror( ret ) );
+	qWarning( "Wait condition destroy failure: %s", strerror( ret ) );
 #endif
 
 	// seems we have threads waiting on us, lets wake them up
@@ -190,7 +190,7 @@ void QWaitCondition::wakeOne()
 
 #ifdef QT_CHECK_RANGE
     if (ret)
-	tqWarning("Wait condition wakeOne failure: %s", strerror(ret));
+	qWarning("Wait condition wakeOne failure: %s", strerror(ret));
 #endif
 }
 
@@ -207,7 +207,7 @@ void QWaitCondition::wakeAll()
 
 #ifdef QT_CHECK_RANGE
     if (ret)
-	tqWarning("Wait condition wakeAll failure: %s", strerror(ret));
+	qWarning("Wait condition wakeAll failure: %s", strerror(ret));
 #endif
 }
 
@@ -246,7 +246,7 @@ bool QWaitCondition::wait(unsigned long time)
 
 #ifdef QT_CHECK_RANGE
     if (ret && ret != ETIMEDOUT)
-	tqWarning("Wait condition wait failure: %s",strerror(ret));
+	qWarning("Wait condition wait failure: %s",strerror(ret));
 #endif
 
     pthread_mutex_unlock( &mutex );
@@ -285,7 +285,7 @@ bool QWaitCondition::wait(QMutex *mutex, unsigned long time)
 
     if (mutex->d->type() == Q_MUTEX_RECURSIVE) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("Wait condition warning: using recursive mutexes with\n"
+	qWarning("Wait condition warning: using recursive mutexes with\n"
 		 "                        wait conditions is undefined!");
 #endif
 	return FALSE;
@@ -307,7 +307,7 @@ bool QWaitCondition::wait(QMutex *mutex, unsigned long time)
 
 #ifdef QT_CHECK_RANGE
     if (ret && ret != ETIMEDOUT)
-	tqWarning("Wait condition wait failure: %s",strerror(ret));
+	qWarning("Wait condition wait failure: %s",strerror(ret));
 #endif
 
     return (ret == 0);