Undo prior accidental commit

362 files changed, 2305 insertions, 2305 deletions

diff --git a/configure b/configure
index 5c09536..2dc3f31 100755
--- a/configure
+++ b/configure
@@ -1093,15 +1093,15 @@ static const char QT_INSTALL_TRANSLATIONS[267] = "qt_trnpath=$QT_INSTALL_TRANSLA
 static const char QT_INSTALL_SYSCONF     [267] = "qt_cnfpath=$QT_INSTALL_SYSCONF";
 
 /* strlen( "qt_xxxpath=" ) == 11 */
-const char *tqInstallPath()             { return QT_INSTALL_PREFIX       + 11; }
-const char *tqInstallPathDocs()         { return QT_INSTALL_DOCS         + 11; }
-const char *tqInstallPathHeaders()      { return QT_INSTALL_HEADERS      + 11; }
-const char *tqInstallPathLibs()         { return QT_INSTALL_LIBS         + 11; }
-const char *tqInstallPathBins()         { return QT_INSTALL_BINS         + 11; }
-const char *tqInstallPathPlugins()      { return QT_INSTALL_PLUGINS      + 11; }
-const char *tqInstallPathData()         { return QT_INSTALL_DATA         + 11; }
-const char *tqInstallPathTranslations() { return QT_INSTALL_TRANSLATIONS + 11; }
-const char *tqInstallPathSysconf()      { return QT_INSTALL_SYSCONF      + 11; }
+const char *qInstallPath()             { return QT_INSTALL_PREFIX       + 11; }
+const char *qInstallPathDocs()         { return QT_INSTALL_DOCS         + 11; }
+const char *qInstallPathHeaders()      { return QT_INSTALL_HEADERS      + 11; }
+const char *qInstallPathLibs()         { return QT_INSTALL_LIBS         + 11; }
+const char *qInstallPathBins()         { return QT_INSTALL_BINS         + 11; }
+const char *qInstallPathPlugins()      { return QT_INSTALL_PLUGINS      + 11; }
+const char *qInstallPathData()         { return QT_INSTALL_DATA         + 11; }
+const char *qInstallPathTranslations() { return QT_INSTALL_TRANSLATIONS + 11; }
+const char *qInstallPathSysconf()      { return QT_INSTALL_SYSCONF      + 11; }
 EOF
 
 # avoid unecessary rebuilds by copying only if qconfig.cpp has changed
diff --git a/doc/debug.doc b/doc/debug.doc
index 945f019..d8779b9 100644
--- a/doc/debug.doc
+++ b/doc/debug.doc
@@ -72,10 +72,10 @@ that can help with debugging.
 Qt includes three global functions for writing out warning and debug
 text.
 \list
-\i \link ::tqDebug() tqDebug()\endlink for writing debug output for testing etc.
-\i \link ::tqWarning() tqWarning()\endlink for writing warning output when program
+\i \link ::qDebug() qDebug()\endlink for writing debug output for testing etc.
+\i \link ::qWarning() qWarning()\endlink for writing warning output when program
 errors occur.
-\i \link ::tqFatal() tqFatal()\endlink for writing fatal error messages
+\i \link ::qFatal() qFatal()\endlink for writing fatal error messages
 and exiting.
 \endlist
 
@@ -166,12 +166,12 @@ Example:
   {
   #if defined(QT_CHECK_NULL)
       if ( p == 0 )
-	  tqWarning( "f: Null pointer not allowed" );
+	  qWarning( "f: Null pointer not allowed" );
   #endif
 
   #if defined(QT_CHECK_RANGE)
       if ( i < 0 )
-	  tqWarning( "f: The index cannot be negative" );
+	  qWarning( "f: The index cannot be negative" );
   #endif
   }
 \endcode
diff --git a/doc/html/canvas-example.html b/doc/html/canvas-example.html
index 0bdd142..b4b9a43 100644
--- a/doc/html/canvas-example.html
+++ b/doc/html/canvas-example.html
@@ -867,7 +867,7 @@ void <a name="f653"></a>Main::addMesh()
 #ifndef QT_NO_PROGRESSDIALOG
     progress.<a href="qprogressdialog.html#setProgress">setProgress</a>( rows );
 #endif
-    // tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() );
+    // qDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() );
 }
 
 void <a name="f654"></a>Main::addRectangle()
diff --git a/doc/html/designer-manual-8.html b/doc/html/designer-manual-8.html
index 8e455f7..353f092 100644
--- a/doc/html/designer-manual-8.html
+++ b/doc/html/designer-manual-8.html
@@ -77,7 +77,7 @@ bool createConnections()
     // create the default database connection
     QSqlDatabase *defaultDB = QSqlDatabase::addDatabase( "QPSQL7" );
     if ( ! defaultDB ) {
-        tqWarning( "Failed to connect to driver" );
+        qWarning( "Failed to connect to driver" );
         return FALSE;
     }
     defaultDB-&gt;setDatabaseName( "book" );
@@ -85,9 +85,9 @@ bool createConnections()
     defaultDB-&gt;setPassword( "bookpw" );
     defaultDB-&gt;setHostName( "bookhost" );
     if ( ! defaultDB-&gt;open() ) {
-        tqWarning( "Failed to open books database: " +
+        qWarning( "Failed to open books database: " +
                   defaultDB-&gt;lastError().driverText() );
-        tqWarning( defaultDB-&gt;lastError().databaseText() );
+        qWarning( defaultDB-&gt;lastError().databaseText() );
         return FALSE;
     }
 
diff --git a/doc/html/functions.html b/doc/html/functions.html
index cd31f2f..a780320 100644
--- a/doc/html/functions.html
+++ b/doc/html/functions.html
@@ -2077,7 +2077,7 @@ packImage:
  <a href="qftp.html#put">QFtp</a> <a href="qurloperator.html#put">QUrlOperator</a><li>putPoints:
  <a href="qpointarray.html#putPoints">QPointArray</a><li>putch:
  <a href="qfile.html#putch">QFile</a> <a href="qiodevice.html#putch">QIODevice</a> <a href="qsocket.html#putch">QSocket</a><li><a name="q"></a>
-tqAddPostRoutine:
+qAddPostRoutine:
  <a href="qapplication.html#qAddPostRoutine">QApplication</a><li>qAlpha:
  <a href="qcolor.html#qAlpha">QColor</a><li>qBlue:
  <a href="qcolor.html#qBlue">QColor</a><li>qChecksum:
diff --git a/doc/html/porting.html b/doc/html/porting.html
index 7308d7d..5d9d3c7 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -390,8 +390,8 @@ new code.
 <li> <tt>#define strcpy qstrcpy</tt>
 <li> <tt>#define strcmp qstrcmp</tt>
 <li> <tt>#define strncmp qstrncmp</tt>
-<li> <tt>#define stricmp tqstricmp</tt>
-<li> <tt>#define strnicmp tqstrnicmp</tt>
+<li> <tt>#define stricmp qstricmp</tt>
+<li> <tt>#define strnicmp qstrnicmp</tt>
 </ul>
 <p> See the changes-3.0.0 document for an explanation of why this had to be done.
 You might have been relying on the non-portable and unpredictable behavior
diff --git a/doc/html/qapplication.html b/doc/html/qapplication.html
index 461406a..411f37e 100644
--- a/doc/html/qapplication.html
+++ b/doc/html/qapplication.html
@@ -1900,7 +1900,7 @@ similar to the C printf() function.
 is sent to the debugger.
 <p> <b>Warning:</b> The internal buffer is limited to 8196 bytes (including
 the '&#92;0'-terminator).
-<p> <b>Warning:</b> Passing (const char *)0 as argument to tqDebug might lead
+<p> <b>Warning:</b> Passing (const char *)0 as argument to qDebug might lead
 to crashes on certain platforms due to the platforms printf implementation.
 <p> <p>See also <a href="#qWarning">qWarning</a>(), <a href="#qFatal">qFatal</a>(), <a href="#qInstallMsgHandler">qInstallMsgHandler</a>(), and <a href="debug.html">Debugging</a>.
 
@@ -1926,7 +1926,7 @@ similar to the C printf() function.
 is sent to the debugger.
 <p> <b>Warning:</b> The internal buffer is limited to 8196 bytes (including
 the '&#92;0'-terminator).
-<p> <b>Warning:</b> Passing (const char *)0 as argument to tqFatal might lead
+<p> <b>Warning:</b> Passing (const char *)0 as argument to qFatal might lead
 to crashes on certain platforms due to the platforms printf implementation.
 <p> <p>See also <a href="#qDebug">qDebug</a>(), <a href="#qWarning">qWarning</a>(), <a href="#qInstallMsgHandler">qInstallMsgHandler</a>(), and <a href="debug.html">Debugging</a>.
 
@@ -2029,7 +2029,7 @@ similar to the C printf() function.
 is sent to the debugger.
 <p> <b>Warning:</b> The internal buffer is limited to 8196 bytes (including
 the '&#92;0'-terminator).
-<p> <b>Warning:</b> Passing (const char *)0 as argument to tqWarning might lead
+<p> <b>Warning:</b> Passing (const char *)0 as argument to qWarning might lead
 to crashes on certain platforms due to the platforms printf implementation.
 <p> <p>See also <a href="#qDebug">qDebug</a>(), <a href="#qFatal">qFatal</a>(), <a href="#qInstallMsgHandler">qInstallMsgHandler</a>(), and <a href="debug.html">Debugging</a>.
 
diff --git a/doc/html/qcstring-h.html b/doc/html/qcstring-h.html
index 79668de..5219aa9 100644
--- a/doc/html/qcstring-h.html
+++ b/doc/html/qcstring-h.html
@@ -89,9 +89,9 @@ body { background: #ffffff; color: black; }
   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; }
@@ -99,7 +99,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 )
 {
@@ -113,9 +113,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 )
@@ -132,9 +132,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
@@ -156,10 +156,10 @@ typedef QMemArray&lt;char&gt; 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&amp; data)
-{ return tqCompress( (const uchar*)data.data(), data.size() ); }
+Q_EXPORT inline QByteArray qCompress( const QByteArray&amp; data)
+{ return qCompress( (const uchar*)data.data(), data.size() ); }
 Q_EXPORT inline QByteArray qUncompress( const QByteArray&amp; data )
 { return qUncompress( (const uchar*)data.data(), data.size() ); }
 #endif
diff --git a/doc/html/qgl-h.html b/doc/html/qgl-h.html
index 5e32cba..ade7003 100644
--- a/doc/html/qgl-h.html
+++ b/doc/html/qgl-h.html
@@ -92,7 +92,7 @@ body { background: #ffffff; color: black; }
 #define QGL_VERSION	450
 #define QGL_VERSION_STR	"4.5"
 QM_EXPORT_OPENGL inline const char *qGLVersion() {
-    tqObsolete( 0, "qGLVersion", "qVersion" );
+    qObsolete( 0, "qGLVersion", "qVersion" );
     return QGL_VERSION_STR;
 }
 #endif
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index 681e47a..5aefb57 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -942,9 +942,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)
@@ -1003,25 +1003,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) &amp;&amp; !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) &amp;&amp; !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
 
@@ -1049,9 +1049,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)
@@ -1090,27 +1090,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 */
 
@@ -1125,7 +1125,7 @@ Q_EXPORT const char *tqInstallPathSysconf();
 #ifdef Q_FULL_TEMPLATE_INSTANTIATION
 #  define Q_DUMMY_COMPARISON_OPERATOR(C) \
     bool operator==( const C&amp; ) const { \
-        tqWarning( #C"::operator==( const "#C"&amp; ) got called." ); \
+        qWarning( #C"::operator==( const "#C"&amp; ) got called." ); \
         return FALSE; \
     }
 #else
diff --git a/doc/html/qmake-manual-4.html b/doc/html/qmake-manual-4.html
index 1036729..1577835 100644
--- a/doc/html/qmake-manual-4.html
+++ b/doc/html/qmake-manual-4.html
@@ -135,7 +135,7 @@ body { background: #ffffff; color: black; }
 </pre>
 <p>Use <em>qmake</em> as before to generate a makefile. If you rename <em>main.cpp</em> temporarily, you will see the message and <em>qmake</em> will stop processing.</p>
 <h3><a name="6"></a>Checking for more than one condition</h3>
-<p>Suppose you use Windows and you want to be able to see the tqDebug() statements when you run your application on the command line. Unless you build your application with the console setting, you won't see the output. We can easily put <em>console</em> on the CONFIG line so that on Windows the makefile will have this setting. But let's say that we only want to add the CONFIG line if we are running on Windows <em>and</em> when <em>debug</em> is already on the CONFIG line. This requires using two nested scopes; just create one scope, then create the other inside that one. Put the settings to be processed inside the last scope, like this:</p>
+<p>Suppose you use Windows and you want to be able to see the qDebug() statements when you run your application on the command line. Unless you build your application with the console setting, you won't see the output. We can easily put <em>console</em> on the CONFIG line so that on Windows the makefile will have this setting. But let's say that we only want to add the CONFIG line if we are running on Windows <em>and</em> when <em>debug</em> is already on the CONFIG line. This requires using two nested scopes; just create one scope, then create the other inside that one. Put the settings to be processed inside the last scope, like this:</p>
 <pre>
     win32 {
         debug {
diff --git a/doc/html/qmap-h.html b/doc/html/qmap-h.html
index d0da1c2..5538adf 100644
--- a/doc/html/qmap-h.html
+++ b/doc/html/qmap-h.html
@@ -612,7 +612,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME QMapPrivate&lt;Key,T&gt;::Iterator QMapPrivate&lt;
 
 #ifdef QT_CHECK_RANGE
 # if !defined( QT_NO_DEBUG ) &amp;&amp; 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/doc/html/qmessagebox-h.html b/doc/html/qmessagebox-h.html
index 54f6c99..dba27ca 100644
--- a/doc/html/qmessagebox-h.html
+++ b/doc/html/qmessagebox-h.html
@@ -245,13 +245,13 @@ private:	// Disabled copy constructor and operator=
 *   }
 */
 #define QT_REQUIRE_VERSION( argc, argv, str ) { QString s=QString::fromLatin1(str);\
-QString sq=QString::fromLatin1(tqVersion()); if ( (sq.section('.',0,0).toInt()&lt;&lt;16)+\
+QString sq=QString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()&lt;&lt;16)+\
 (sq.section('.',1,1).toInt()&lt;&lt;8)+sq.section('.',2,2).toInt()&lt;(s.section('.',0,0).toInt()&lt;&lt;16)+\
 (s.section('.',1,1).toInt()&lt;&lt;8)+s.section('.',2,2).toInt() ){if ( !qApp){ int c=0; new \
 QApplication(argc,argv);} QString s = QApplication::tr("Executable '%1' requires Qt "\
  "%2, found Qt %3.").arg(QString::fromLatin1(qAppName())).arg(QString::fromLatin1(\
-str)).arg(QString::fromLatin1(tqVersion()) ); QMessageBox::critical( 0, QApplication::tr(\
-"Incompatible Qt Library Error" ), s, QMessageBox::Abort,0 ); tqFatal(s.ascii()); }}
+str)).arg(QString::fromLatin1(qVersion()) ); QMessageBox::critical( 0, QApplication::tr(\
+"Incompatible Qt Library Error" ), s, QMessageBox::Abort,0 ); qFatal(s.ascii()); }}
 
 
 #endif // QT_NO_MESSAGEBOX
diff --git a/doc/html/qstring-h.html b/doc/html/qstring-h.html
index 9c96e91..db9e396 100644
--- a/doc/html/qstring-h.html
+++ b/doc/html/qstring-h.html
@@ -261,7 +261,7 @@ public:
     static bool networkOrdered() {
 	int wordSize;
 	bool bigEndian = FALSE;
-	tqSysInfo( &amp;wordSize, &amp;bigEndian );
+	qSysInfo( &amp;wordSize, &amp;bigEndian );
 	return bigEndian;
     }
 
diff --git a/doc/html/qstrlist-h.html b/doc/html/qstrlist-h.html
index e5136ac..b190bf7 100644
--- a/doc/html/qstrlist-h.html
+++ b/doc/html/qstrlist-h.html
@@ -100,7 +100,7 @@ public:
     QStrList&amp; operator=( const QStrList &amp; );
 
 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); }
@@ -121,7 +121,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/doc/html/qvaluelist-h.html b/doc/html/qvaluelist-h.html
index 6203589..7fc21a8 100644
--- a/doc/html/qvaluelist-h.html
+++ b/doc/html/qvaluelist-h.html
@@ -431,7 +431,7 @@ Q_INLINE_TEMPLATES void QValueListPrivate&lt;T&gt;::clear()
 
 #ifdef QT_CHECK_RANGE
 # if !defined( QT_NO_DEBUG ) &amp;&amp; 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/doc/html/qwindowdefs-h.html b/doc/html/qwindowdefs-h.html
index 535df08..8a837c8 100644
--- a/doc/html/qwindowdefs-h.html
+++ b/doc/html/qwindowdefs-h.html
@@ -221,8 +221,8 @@ Q_EXPORT const char *qAppName();		// get application name
 // Misc functions
 
 typedef void (*QtCleanUpFunction)();
-Q_EXPORT void tqAddPostRoutine( QtCleanUpFunction );
-Q_EXPORT void tqRemovePostRoutine( QtCleanUpFunction );
+Q_EXPORT void qAddPostRoutine( QtCleanUpFunction );
+Q_EXPORT void qRemovePostRoutine( QtCleanUpFunction );
 
 #if !defined(QT_CLEAN_NAMESPACE)
 // source compatibility with Qt 2.x
diff --git a/doc/html/tutorial1-08.html b/doc/html/tutorial1-08.html
index c1e144d..beb1f66 100644
--- a/doc/html/tutorial1-08.html
+++ b/doc/html/tutorial1-08.html
@@ -78,7 +78,7 @@ limit the possible range of <tt>minVal</tt> and <tt>maxVal</tt> to 0..99 to avoi
 overflow of the QLCDNumber. (We could have allowed values down to -9
 but chose not to.)  If the arguments are illegal, we use Qt's
 <a href="qapplication.html#qWarning">qWarning</a>() function to issue a warning to the user and return
-immediately. tqWarning() is a printf-like function that by default
+immediately. qWarning() is a printf-like function that by default
 sends its output to <tt>stderr</tt>. If you want, you can install your own handler
 function using <a href="qapplication.html#qInstallMsgHandler">::qInstallMsgHandler</a>().
 <p> <h3> <a href="t8-cannon-h.html">t8/cannon.h</a>
diff --git a/doc/i18n.doc b/doc/i18n.doc
index e13dd49..02bb195 100644
--- a/doc/i18n.doc
+++ b/doc/i18n.doc
@@ -297,8 +297,8 @@ example:
     QString s1 = "%1 of %2 files copied. Copying: %3";
     QString s2 = "Kopierer nu %3. Av totalt %2 filer er %1 kopiert.";
 
-    tqDebug( s1.arg(5).arg(10).arg("somefile.txt").ascii() );
-    tqDebug( s2.arg(5).arg(10).arg("somefile.txt").ascii() );
+    qDebug( s1.arg(5).arg(10).arg("somefile.txt").ascii() );
+    qDebug( s2.arg(5).arg(10).arg("somefile.txt").ascii() );
 \endcode
 
 produces the correct output in English and Norwegian:
diff --git a/doc/mac.doc b/doc/mac.doc
index ab0edbc..8f44919 100644
--- a/doc/mac.doc
+++ b/doc/mac.doc
@@ -177,7 +177,7 @@ do this:
                                                kCFURLPOSIXPathStyle);
         const char *pathPtr = CFStringGetCStringPtr(macPath, 
                                                CFStringGetSystemEncoding());
-        tqDebug("Path = %s", pathPtr);
+        qDebug("Path = %s", pathPtr);
         CFRelease(pluginRef);
         CFRelease(macPath);
 \endcode
diff --git a/doc/man/man3/qapplication.3qt b/doc/man/man3/qapplication.3qt
index 45aeaba..0be4627 100644
--- a/doc/man/man3/qapplication.3qt
+++ b/doc/man/man3/qapplication.3qt
@@ -1696,7 +1696,7 @@ Example:
 .br
 .fi
 .PP
-If \fCb\fR is zero, the Q_ASSERT statement will output the following message using the tqWarning() function:
+If \fCb\fR is zero, the Q_ASSERT statement will output the following message using the qWarning() function:
 .PP
 .nf
 .br
@@ -1704,7 +1704,7 @@ If \fCb\fR is zero, the Q_ASSERT statement will output the following message usi
 .br
 .fi
 .PP
-See also tqWarning() and Debugging.
+See also qWarning() and Debugging.
 .SH "void Q_CHECK_PTR ( void * p )"
 If \fIp\fR is 0, prints a warning message containing the source code file name and line number, saying that the program ran out of memory.
 .PP
@@ -1726,8 +1726,8 @@ Example:
 .br
 .fi
 .PP
-See also tqWarning() and Debugging.
-.SH "void tqAddPostRoutine ( QtCleanUpFunction p )"
+See also qWarning() and Debugging.
+.SH "void qAddPostRoutine ( QtCleanUpFunction p )"
 Adds a global routine that will be called from the QApplication destructor. This function is normally used to add cleanup routines for program-wide functionality.
 .PP
 The function given by \fIp\fR should take no arguments and return nothing, like this:
@@ -1754,13 +1754,13 @@ The function given by \fIp\fR should take no arguments and return nothing, like
 .br
         global_ptr = new int[100];      // allocate data
 .br
-        tqAddPostRoutine( cleanup_ptr ); // delete later
+        qAddPostRoutine( cleanup_ptr ); // delete later
 .br
     }
 .br
 .fi
 .PP
-Note that for an application- or module-wide cleanup, tqAddPostRoutine() is often not suitable. People have a tendency to make such modules dynamically loaded, and then unload those modules long before the QApplication destructor is called, for example.
+Note that for an application- or module-wide cleanup, qAddPostRoutine() is often not suitable. People have a tendency to make such modules dynamically loaded, and then unload those modules long before the QApplication destructor is called, for example.
 .PP
 For modules and libraries, using a reference-counted initialization manager or Qt' parent-child delete mechanism may be better. Here is an example of a private class which uses the parent-child mechanism to call a cleanup function at the right time:
 .PP
@@ -1803,7 +1803,7 @@ For modules and libraries, using a reference-counted initialization manager or Q
 .fi
 .PP
 By selecting the right parent widget/object, this can often be made to clean up the module's data at the exact right moment.
-.SH "void tqDebug ( const char * msg, ... )"
+.SH "void qDebug ( const char * msg, ... )"
 Prints a debug message \fImsg\fR, or calls the message handler (if it has been installed).
 .PP
 This function takes a format string and a list of arguments, similar to the C printf() function.
@@ -1812,7 +1812,7 @@ Example:
 .PP
 .nf
 .br
-        tqDebug( "my window handle = %x", myWidget->id() );
+        qDebug( "my window handle = %x", myWidget->id() );
 .br
 .fi
 .PP
@@ -1820,10 +1820,10 @@ Under X11, the text is printed to stderr. Under Windows, the text is sent to the
 .PP
 \fBWarning:\fR The internal buffer is limited to 8196 bytes (including the '&#92;0'-terminator).
 .PP
-\fBWarning:\fR Passing (const char *)0 as argument to tqDebug might lead to crashes on certain platforms due to the platforms printf implementation.
+\fBWarning:\fR Passing (const char *)0 as argument to qDebug might lead to crashes on certain platforms due to the platforms printf implementation.
 .PP
-See also tqWarning(), tqFatal(), qInstallMsgHandler(), and Debugging.
-.SH "void tqFatal ( const char * msg, ... )"
+See also qWarning(), qFatal(), qInstallMsgHandler(), and Debugging.
+.SH "void qFatal ( const char * msg, ... )"
 Prints a fatal error message \fImsg\fR and exits, or calls the message handler (if it has been installed).
 .PP
 This function takes a format string and a list of arguments, similar to the C printf() function.
@@ -1838,7 +1838,7 @@ Example:
 .br
             if ( b == 0 )                               // program error
 .br
-                tqFatal( "divide: cannot divide by zero" );
+                qFatal( "divide: cannot divide by zero" );
 .br
             return a/b;
 .br
@@ -1850,9 +1850,9 @@ Under X11, the text is printed to stderr. Under Windows, the text is sent to the
 .PP
 \fBWarning:\fR The internal buffer is limited to 8196 bytes (including the '&#92;0'-terminator).
 .PP
-\fBWarning:\fR Passing (const char *)0 as argument to tqFatal might lead to crashes on certain platforms due to the platforms printf implementation.
+\fBWarning:\fR Passing (const char *)0 as argument to qFatal might lead to crashes on certain platforms due to the platforms printf implementation.
 .PP
-See also tqDebug(), tqWarning(), qInstallMsgHandler(), and Debugging.
+See also qDebug(), qWarning(), qInstallMsgHandler(), and Debugging.
 .SH "QtMsgHandler qInstallMsgHandler ( QtMsgHandler h )"
 Installs a Qt message handler \fIh\fR. Returns a pointer to the message handler previously defined.
 .PP
@@ -1920,22 +1920,22 @@ Example:
 .br
 .fi
 .PP
-See also tqDebug(), tqWarning(), tqFatal(), and Debugging.
-.SH "bool tqSysInfo ( int * wordSize, bool * bigEndian )"
+See also qDebug(), qWarning(), qFatal(), and Debugging.
+.SH "bool qSysInfo ( int * wordSize, bool * bigEndian )"
 Obtains information about the system.
 .PP
 The system's word size in bits (typically 32) is returned in \fI*wordSize\fR. The \fI*bigEndian\fR is set to TRUE if this is a big-endian machine, or to FALSE if this is a little-endian machine.
 .PP
-In debug mode, this function calls tqFatal() 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.
-.SH "void tqSystemWarning ( const char * msg, int code )"
+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.
+.SH "void qSystemWarning ( const char * msg, int code )"
 Prints the message \fImsg\fR and uses \fIcode\fR to get a system specific error message. When \fIcode\fR is -1 (the default), the system's last error code will be used if possible. Use this method to handle failures in platform specific API calls.
 .PP
 This function does nothing when Qt is built with \fCQT_NO_DEBUG\fR defined.
-.SH "const char * tqVersion ()"
+.SH "const char * qVersion ()"
 Returns the Qt version number as a string, for example, "2.3.0" or" 3.0.5".
 .PP
 The \fCQT_VERSION\fR define has the numeric value in the form: 0xmmiibb (m = major, i = minor, b = bugfix). For example, Qt 3.0.5's \fCQT_VERSION\fR is 0x030005.
-.SH "void tqWarning ( const char * msg, ... )"
+.SH "void qWarning ( const char * msg, ... )"
 Prints a warning message \fImsg\fR, or calls the message handler (if it has been installed).
 .PP
 This function takes a format string and a list of arguments, similar to the C printf() function.
@@ -1950,7 +1950,7 @@ Example:
 .br
             if ( c > 200 )
 .br
-                tqWarning( "f: bad argument, c == %d", c );
+                qWarning( "f: bad argument, c == %d", c );
 .br
         }
 .br
@@ -1960,9 +1960,9 @@ Under X11, the text is printed to stderr. Under Windows, the text is sent to the
 .PP
 \fBWarning:\fR The internal buffer is limited to 8196 bytes (including the '&#92;0'-terminator).
 .PP
-\fBWarning:\fR Passing (const char *)0 as argument to tqWarning might lead to crashes on certain platforms due to the platforms printf implementation.
+\fBWarning:\fR Passing (const char *)0 as argument to qWarning might lead to crashes on certain platforms due to the platforms printf implementation.
 .PP
-See also tqDebug(), tqFatal(), qInstallMsgHandler(), and Debugging.
+See also qDebug(), qFatal(), qInstallMsgHandler(), and Debugging.
 
 .SH "SEE ALSO"
 .BR http://doc.trolltech.com/qapplication.html
diff --git a/doc/man/man3/qasciicache.3qt b/doc/man/man3/qasciicache.3qt
index 1b0ab51..489b650 100644
--- a/doc/man/man3/qasciicache.3qt
+++ b/doc/man/man3/qasciicache.3qt
@@ -151,7 +151,7 @@ See also maxCost() and totalCost().
 .SH "uint QAsciiCache::size () const"
 Returns the size of the hash array used to implement the cache. This should be a bit bigger than count() is likely to be.
 .SH "void QAsciiCache::statistics () const"
-A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using tqDebug(). This function does nothing in the release library.
+A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using qDebug(). This function does nothing in the release library.
 .SH "type * QAsciiCache::take ( const char * k )"
 Takes the item associated with \fIk\fR out of the cache without deleting it and returns a pointer to the item taken out, or 0 if the key does not exist in the cache.
 .PP
diff --git a/doc/man/man3/qasciidict.3qt b/doc/man/man3/qasciidict.3qt
index 2d3d0c9..4f64e64 100644
--- a/doc/man/man3/qasciidict.3qt
+++ b/doc/man/man3/qasciidict.3qt
@@ -275,7 +275,7 @@ Returns the size of the internal hash array (as specified in the constructor).
 .PP
 See also count().
 .SH "void QAsciiDict::statistics () const"
-Debugging-only function that prints out the dictionary distribution using tqDebug().
+Debugging-only function that prints out the dictionary distribution using qDebug().
 .SH "type * QAsciiDict::take ( const char * key )"
 Takes the item associated with \fIkey\fR out of the dictionary without deleting it (even if auto-deletion is enabled).
 .PP
diff --git a/doc/man/man3/qbytearray.3qt b/doc/man/man3/qbytearray.3qt
index 1470fbf..dffb9d1 100644
--- a/doc/man/man3/qbytearray.3qt
+++ b/doc/man/man3/qbytearray.3qt
@@ -53,11 +53,11 @@ Constructs an empty QByteArray.
 .SH "QByteArray::QByteArray ( int size )"
 Constructs a QByteArray of size \fIsize\fR.
 .SH RELATED FUNCTION DOCUMENTATION
-.SH "QByteArray tqCompress ( const QByteArray & data )"
+.SH "QByteArray qCompress ( const QByteArray & data )"
 Compresses the array \fIdata\fR and returns the compressed byte array using zlib.
 .PP
 See also qUncompress().
-.SH "QByteArray tqCompress ( const uchar * data, int nbytes )"
+.SH "QByteArray qCompress ( const uchar * data, int nbytes )"
 This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
 .PP
 Compresses the array \fIdata\fR which is \fInbytes\fR long and returns the compressed byte array.
@@ -66,7 +66,7 @@ Uncompresses the array \fIdata\fR and returns the uncompressed byte array.
 .PP
 Returns an empty QByteArray if the input data was corrupt.
 .PP
-See also tqCompress().
+See also qCompress().
 .SH "QByteArray qUncompress ( const uchar * data, int nbytes )"
 This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
 .PP
diff --git a/doc/man/man3/qcache.3qt b/doc/man/man3/qcache.3qt
index 0711a63..ddae368 100644
--- a/doc/man/man3/qcache.3qt
+++ b/doc/man/man3/qcache.3qt
@@ -175,7 +175,7 @@ See also maxCost() and totalCost().
 .SH "uint QCache::size () const"
 Returns the size of the hash array used to implement the cache. This should be a bit bigger than count() is likely to be.
 .SH "void QCache::statistics () const"
-A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using tqDebug(). This function does nothing in the release library.
+A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using qDebug(). This function does nothing in the release library.
 .SH "type * QCache::take ( const QString & k )"
 Takes the item associated with \fIk\fR out of the cache without deleting it, and returns a pointer to the item taken out, or 0 if the key does not exist in the cache.
 .PP
diff --git a/doc/man/man3/qcanvasview.3qt b/doc/man/man3/qcanvasview.3qt
index 78fc95d..7092663 100644
--- a/doc/man/man3/qcanvasview.3qt
+++ b/doc/man/man3/qcanvasview.3qt
@@ -68,7 +68,7 @@ If you want users to be able to interact with a canvas view, subclass QCanvasVie
 .br
             if ( (*it)->rtti() == QCanvasRectangle::RTTI )
 .br
-                tqDebug("A QCanvasRectangle lies somewhere at this point");
+                qDebug("A QCanvasRectangle lies somewhere at this point");
 .br
         }
 .br
diff --git a/doc/man/man3/qclipboard.3qt b/doc/man/man3/qclipboard.3qt
index 51b9992..fb91a21 100644
--- a/doc/man/man3/qclipboard.3qt
+++ b/doc/man/man3/qclipboard.3qt
@@ -125,7 +125,7 @@ Example:
 .br
     if ( !text.isNull() )
 .br
-        tqDebug( "The clipboard contains: " + text );
+        qDebug( "The clipboard contains: " + text );
 .br
 .br
     // Copy text into the clipboard
diff --git a/doc/man/man3/qcstring.3qt b/doc/man/man3/qcstring.3qt
index f8d8e64..f170c99 100644
--- a/doc/man/man3/qcstring.3qt
+++ b/doc/man/man3/qcstring.3qt
@@ -1041,7 +1041,7 @@ See also Note on character comparisons.
 Reads a string into \fIstr\fR from the stream \fIs\fR.
 .PP
 See also Format of the QDataStream operators.
-.SH "void * tqmemmove ( void * dst, const void * src, uint len )"
+.SH "void * qmemmove ( void * dst, const void * src, uint len )"
 This function is normally part of the C library. Qt implements memmove() for platforms that do not provide it.
 .PP
 memmove() copies \fIlen\fR bytes from \fIsrc\fR into \fIdst\fR. The data is copied correctly even if \fIsrc\fR and \fIdst\fR overlap.
@@ -1054,18 +1054,18 @@ Special case I: Returns 0 if \fIstr1\fR and \fIstr2\fR are both 0.
 .PP
 Special case II: Returns a random nonzero value if \fIstr1\fR is 0 or \fIstr2\fR is 0 (but not both).
 .PP
-See also qstrncmp(), tqstricmp(), tqstrnicmp(), and Note on character comparisons.
+See also qstrncmp(), qstricmp(), qstrnicmp(), and Note on character comparisons.
 .SH "char * qstrcpy ( char * dst, const char * src )"
 A safe strcpy() function.
 .PP
 Copies all characters up to and including the '&#92;0' from \fIsrc\fR into \fIdst\fR and returns a pointer to \fIdst\fR.
-.SH "char * tqstrdup ( const char * src )"
+.SH "char * qstrdup ( const char * src )"
 Returns a duplicate string.
 .PP
 Allocates space for a copy of \fIsrc\fR, copies it, and returns a pointer to the copy. If \fIsrc\fR is 0, it immediately returns 0.
 .PP
 The returned string must be deleted using \fCdelete[]\fR.
-.SH "int tqstricmp ( const char * str1, const char * str2 )"
+.SH "int qstricmp ( const char * str1, const char * str2 )"
 A safe stricmp() function.
 .PP
 Compares \fIstr1\fR and \fIstr2\fR ignoring the case.
@@ -1076,7 +1076,7 @@ Special case I: Returns 0 if \fIstr1\fR and \fIstr2\fR are both 0.
 .PP
 Special case II: Returns a random nonzero value if \fIstr1\fR is 0 or \fIstr2\fR is 0 (but not both).
 .PP
-See also qstrcmp(), qstrncmp(), tqstrnicmp(), and Note on character comparisons.
+See also qstrcmp(), qstrncmp(), qstrnicmp(), and Note on character comparisons.
 .SH "uint qstrlen ( const char * str )"
 A safe strlen function.
 .PP
@@ -1092,14 +1092,14 @@ Special case I: Returns 0 if \fIstr1\fR and \fIstr2\fR are both 0.
 .PP
 Special case II: Returns a random nonzero value if \fIstr1\fR is 0 or \fIstr2\fR is 0 (but not both).
 .PP
-See also qstrcmp(), tqstricmp(), tqstrnicmp(), and Note on character comparisons.
-.SH "char * tqstrncpy ( char * dst, const char * src, uint len )"
+See also qstrcmp(), qstricmp(), qstrnicmp(), and Note on character comparisons.
+.SH "char * qstrncpy ( char * dst, const char * src, uint len )"
 A safe strncpy() function.
 .PP
 Copies at most \fIlen\fR bytes from \fIsrc\fR (stopping at \fIlen\fR or the terminating '&#92;0' whichever comes first) into \fIdst\fR and returns a pointer to \fIdst\fR. Guarantees that \fIdst\fR is '&#92;0'-terminated. If \fIsrc\fR or \fIdst\fR is 0, returns 0 immediately.
 .PP
 See also qstrcpy().
-.SH "int tqstrnicmp ( const char * str1, const char * str2, uint len )"
+.SH "int qstrnicmp ( const char * str1, const char * str2, uint len )"
 A safe strnicmp() function.
 .PP
 Compares at most \fIlen\fR bytes of \fIstr1\fR and \fIstr2\fR ignoring the case.
@@ -1110,7 +1110,7 @@ Special case I: Returns 0 if \fIstr1\fR and \fIstr2\fR are both 0.
 .PP
 Special case II: Returns a random nonzero value if \fIstr1\fR is 0 or \fIstr2\fR is 0 (but not both).
 .PP
-See also qstrcmp(), qstrncmp(), tqstricmp(), and Note on character comparisons.
+See also qstrcmp(), qstrncmp(), qstricmp(), and Note on character comparisons.
 
 .SH "SEE ALSO"
 .BR http://doc.trolltech.com/qcstring.html
diff --git a/doc/man/man3/qdatetime.3qt b/doc/man/man3/qdatetime.3qt
index ea70baa..e9e057b 100644
--- a/doc/man/man3/qdatetime.3qt
+++ b/doc/man/man3/qdatetime.3qt
@@ -219,7 +219,7 @@ Example:
 .br
     QDateTime xmas( QDate(dt.date().year(),12,24), QTime(17,00) );
 .br
-    tqDebug( "There are %d seconds to Christmas", dt.secsTo(xmas) );
+    qDebug( "There are %d seconds to Christmas", dt.secsTo(xmas) );
 .br
 .fi
 .PP
diff --git a/doc/man/man3/qdict.3qt b/doc/man/man3/qdict.3qt
index 0522ad2..b0190e7 100644
--- a/doc/man/man3/qdict.3qt
+++ b/doc/man/man3/qdict.3qt
@@ -332,7 +332,7 @@ Returns the size of the internal hash array (as specified in the constructor).
 .PP
 See also count().
 .SH "void QDict::statistics () const"
-Debugging-only function that prints out the dictionary distribution using tqDebug().
+Debugging-only function that prints out the dictionary distribution using qDebug().
 .SH "type * QDict::take ( const QString & key )"
 Takes the item with \fIkey\fR out of the dictionary without deleting it (even if auto-deletion is enabled).
 .PP
diff --git a/doc/man/man3/qdir.3qt b/doc/man/man3/qdir.3qt
index cedc312..8e13ad2 100644
--- a/doc/man/man3/qdir.3qt
+++ b/doc/man/man3/qdir.3qt
@@ -233,7 +233,7 @@ See if a directory exists.
 .br
     if ( !d.exists() )
 .br
-        tqWarning( "Cannot find the example directory" );
+        qWarning( "Cannot find the example directory" );
 .br
 .fi
 .PP
@@ -245,7 +245,7 @@ Traversing directories and reading a file.
 .br
     if ( !d.cd("tmp") ) {                       // "/tmp"
 .br
-        tqWarning( "Cannot find the \\"/tmp\\" directory" );
+        qWarning( "Cannot find the \\"/tmp\\" directory" );
 .br
     } else {
 .br
@@ -253,7 +253,7 @@ Traversing directories and reading a file.
 .br
         if ( !f.open(IO_ReadWrite) )
 .br
-            tqWarning( "Cannot create the file %s", f.name() );
+            qWarning( "Cannot create the file %s", f.name() );
 .br
     }
 .br
@@ -615,7 +615,7 @@ Note: If the directory is a symbolic link to the root directory this function re
 .br
     if ( d.isRoot() )
 .br
-        tqWarning( "It is a root link" );
+        qWarning( "It is a root link" );
 .br
 .fi
 .PP
@@ -663,7 +663,7 @@ Example:
 .br
     if ( d1 != d2 )
 .br
-        tqDebug( "They differ" );
+        qDebug( "They differ" );
 .br
 .fi
 .SH "QDir & QDir::operator= ( const QDir & d )"
@@ -689,7 +689,7 @@ Example:
 .br
     if ( d1 == d2 )
 .br
-        tqDebug( "They're the same" );
+        qDebug( "They're the same" );
 .br
 .fi
 .SH "QString QDir::operator[] ( int index ) const"
diff --git a/doc/man/man3/qerrormessage.3qt b/doc/man/man3/qerrormessage.3qt
index 419a21f..662486c 100644
--- a/doc/man/man3/qerrormessage.3qt
+++ b/doc/man/man3/qerrormessage.3qt
@@ -43,7 +43,7 @@ There are two ways to use this class: <ol type=1>
 .IP 1
 For production applications. In this context the class can be used to display messages which you don't need the user to see more than once. To use QErrorMessage like this, you create the dialog in the usual way and call the message() slot, or connect signals to it.
 .IP 2
-For developers. In this context the static qtHandler() installs a message handler using qInstallMsgHandler() and creates a QErrorMessage that displays tqDebug(), tqWarning() and tqFatal() messages.
+For developers. In this context the static qtHandler() installs a message handler using qInstallMsgHandler() and creates a QErrorMessage that displays qDebug(), qWarning() and qFatal() messages.
 .PP
 In both cases QErrorMessage will queue pending messages, and display them (or not) in order, as soon as the user presses Enter or clicks OK after seeing each message.
 .PP
diff --git a/doc/man/man3/qfileinfo.3qt b/doc/man/man3/qfileinfo.3qt
index 74ca492..ddad3bf 100644
--- a/doc/man/man3/qfileinfo.3qt
+++ b/doc/man/man3/qfileinfo.3qt
@@ -429,11 +429,11 @@ Example:
 .br
         if ( fi.permission( QFileInfo::WriteUser | QFileInfo::ReadGroup ) )
 .br
-            tqWarning( "I can change the file; my group can read the file" );
+            qWarning( "I can change the file; my group can read the file" );
 .br
         if ( fi.permission( QFileInfo::WriteGroup | QFileInfo::WriteOther ) )
 .br
-            tqWarning( "The group or others can change the file" );
+            qWarning( "The group or others can change the file" );
 .br
 .fi
 .PP
diff --git a/doc/man/man3/qfontdatabase.3qt b/doc/man/man3/qfontdatabase.3qt
index 5b64bad..e1ae740 100644
--- a/doc/man/man3/qfontdatabase.3qt
+++ b/doc/man/man3/qfontdatabase.3qt
@@ -147,7 +147,7 @@ int main( int argc, char **argv )
 .br
         QString family = *f;
 .br
-        tqDebug( family );
+        qDebug( family );
 .br
         QStringList styles = fdb.styles( family );
 .br
@@ -169,7 +169,7 @@ int main( int argc, char **argv )
 .br
             dstyle = dstyle.left( dstyle.length() - 1 ) + ")";
 .br
-            tqDebug( dstyle );
+            qDebug( dstyle );
 .br
         }
 .br
diff --git a/doc/man/man3/qftp.3qt b/doc/man/man3/qftp.3qt
index d9966f6..f9a49a3 100644
--- a/doc/man/man3/qftp.3qt
+++ b/doc/man/man3/qftp.3qt
@@ -156,7 +156,7 @@ If you want to use QFtp with the QNetworkProtocol interface, you do not use it d
 .br
 .fi
 .PP
-This code will only work if the QFtp class is registered; to register the class, you must call tqInitNetworkProtocols() before using a QUrlOperator with QFtp.
+This code will only work if the QFtp class is registered; to register the class, you must call qInitNetworkProtocols() before using a QUrlOperator with QFtp.
 .PP
 The rest of this descrption describes the direct interface to FTP.
 .PP
diff --git a/doc/man/man3/qglformat.3qt b/doc/man/man3/qglformat.3qt
index 8fca56e..34d43eb 100644
--- a/doc/man/man3/qglformat.3qt
+++ b/doc/man/man3/qglformat.3qt
@@ -184,7 +184,7 @@ After the widget has been created, you can find out which of the requested featu
 .br
         if ( !w->format().hasOverlay() ) {
 .br
-            tqFatal( "Cool hardware required" );
+            qFatal( "Cool hardware required" );
 .br
         }
 .br
@@ -239,11 +239,11 @@ This constructor makes it easy to specify a certain desired format in classes de
 .br
         if ( !format().stencil() )
 .br
-            tqWarning( "Could not get stencil buffer; results will be suboptimal" );
+            qWarning( "Could not get stencil buffer; results will be suboptimal" );
 .br
         if ( !format().alphaChannel() )
 .br
-            tqWarning( "Could not get alpha channel; results will be suboptimal" );
+            qWarning( "Could not get alpha channel; results will be suboptimal" );
 .br
         ...
 .br
diff --git a/doc/man/man3/qguardedptr.3qt b/doc/man/man3/qguardedptr.3qt
index 6d5f380..7f13f89 100644
--- a/doc/man/man3/qguardedptr.3qt
+++ b/doc/man/man3/qguardedptr.3qt
@@ -75,7 +75,7 @@ Example:
 .br
         else
 .br
-            tqDebug("The label has been destroyed");
+            qDebug("The label has been destroyed");
 .br
 .fi
 .PP
diff --git a/doc/man/man3/qhttp.3qt b/doc/man/man3/qhttp.3qt
index f32c369..1348237 100644
--- a/doc/man/man3/qhttp.3qt
+++ b/doc/man/man3/qhttp.3qt
@@ -144,7 +144,7 @@ If you want to use QHttp with the QNetworkProtocol interface, you do not use it
 .br
 .fi
 .PP
-This code will only work if the QHttp class is registered; to register the class, you must call tqInitNetworkProtocols() before using a QUrlOperator with HTTP.
+This code will only work if the QHttp class is registered; to register the class, you must call qInitNetworkProtocols() before using a QUrlOperator with HTTP.
 .PP
 The QNetworkProtocol interface for HTTP only supports the operations operationGet() and operationPut(), i.e. QUrlOperator::get() and QUrlOperator::put(), if you use it with a QUrlOperator.
 .PP
diff --git a/doc/man/man3/qintcache.3qt b/doc/man/man3/qintcache.3qt
index dc96591..fdd9652 100644
--- a/doc/man/man3/qintcache.3qt
+++ b/doc/man/man3/qintcache.3qt
@@ -145,7 +145,7 @@ See also maxCost() and totalCost().
 .SH "uint QIntCache::size () const"
 Returns the size of the hash array used to implement the cache. This should be a bit larger than count() is likely to be.
 .SH "void QIntCache::statistics () const"
-A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using tqDebug(). This function does nothing in the release library.
+A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using qDebug(). This function does nothing in the release library.
 .SH "type * QIntCache::take ( long k )"
 Takes the item associated with \fIk\fR out of the cache without deleting it, and returns a pointer to the item taken out or 0 if the key does not exist in the cache.
 .PP
diff --git a/doc/man/man3/qintdict.3qt b/doc/man/man3/qintdict.3qt
index 171acfd..ca8e65d 100644
--- a/doc/man/man3/qintdict.3qt
+++ b/doc/man/man3/qintdict.3qt
@@ -271,7 +271,7 @@ Returns the size of the internal hash array (as specified in the constructor).
 .PP
 See also count().
 .SH "void QIntDict::statistics () const"
-Debugging-only function that prints out the dictionary distribution using tqDebug().
+Debugging-only function that prints out the dictionary distribution using qDebug().
 .SH "type * QIntDict::take ( long key )"
 Takes the item associated with \fIkey\fR out of the dictionary without deleting it (even if auto-deletion is enabled).
 .PP
diff --git a/doc/man/man3/qlocalfs.3qt b/doc/man/man3/qlocalfs.3qt
index 8d5a1d5..3fc7d2b 100644
--- a/doc/man/man3/qlocalfs.3qt
+++ b/doc/man/man3/qlocalfs.3qt
@@ -32,7 +32,7 @@ This class is derived from QNetworkProtocol. QLocalFs is not normally used direc
 .br
 .fi
 .PP
-This code will only work if the QLocalFs class is registered; to register the class, you must call tqInitNetworkProtocols() before using a QUrlOperator with QLocalFs.
+This code will only work if the QLocalFs class is registered; to register the class, you must call qInitNetworkProtocols() before using a QUrlOperator with QLocalFs.
 .PP
 If you really need to use QLocalFs directly, don't forget to set its QUrlOperator with setUrl().
 .PP
diff --git a/doc/man/man3/qmemarray.3qt b/doc/man/man3/qmemarray.3qt
index 92b8fce..40f2c20 100644
--- a/doc/man/man3/qmemarray.3qt
+++ b/doc/man/man3/qmemarray.3qt
@@ -203,12 +203,12 @@ Example:
 .br
         for ( int i = 0; i < a.size(); i++ )
 .br
-            tqDebug( "%d: %d", i, a[i] );
+            qDebug( "%d: %d", i, a[i] );
 .br
 .br
-        tqDebug( "1 is found %d times", a.contains(1) );
+        qDebug( "1 is found %d times", a.contains(1) );
 .br
-        tqDebug( "5 is found at index %d", a.find(5) );
+        qDebug( "5 is found at index %d", a.find(5) );
 .br
 .br
         return 0;
@@ -540,7 +540,7 @@ See also Format of the QDataStream operators.
 Reads a byte array into \fIa\fR from the stream \fIs\fR and returns a reference to the stream.
 .PP
 See also Format of the QDataStream operators.
-.SH "Q_UINT16 tqChecksum ( const char * data, uint len )"
+.SH "Q_UINT16 qChecksum ( const char * data, uint len )"
 Returns the CRC-16 checksum of \fIlen\fR bytes starting at \fIdata\fR.
 .PP
 The checksum is independent of the byte order (endianness).
diff --git a/doc/man/man3/qobject.3qt b/doc/man/man3/qobject.3qt
index d3de069..fe34d19 100644
--- a/doc/man/man3/qobject.3qt
+++ b/doc/man/man3/qobject.3qt
@@ -555,7 +555,7 @@ Example:
 .br
                 QKeyEvent *k = (QKeyEvent*)ev;
 .br
-                tqDebug( "Ate key press %d", k->key() );
+                qDebug( "Ate key press %d", k->key() );
 .br
                 return TRUE;
 .br
@@ -668,7 +668,7 @@ Here's a \fCKeyPressEater\fR class that eats the key presses of its monitored ob
 .br
             QKeyEvent *k = (QKeyEvent *)e;
 .br
-            tqDebug( "Ate key press %d", k->key() );
+            qDebug( "Ate key press %d", k->key() );
 .br
             return TRUE; // eat event
 .br
@@ -903,7 +903,7 @@ Example:
 .br
     {
 .br
-        tqDebug( "timer event, id %d", e->timerId() );
+        qDebug( "timer event, id %d", e->timerId() );
 .br
     }
 .br
@@ -945,11 +945,11 @@ You can find an object by name (and type) using child(). You can find a set of o
 .PP
 The object name is set by the constructor or by the setName() function. The object name is not very useful in the current version of Qt, but will become increasingly important in the future.
 .PP
-If the object does not have a name, the name() function returns" unnamed", so printf() (used in tqDebug()) will not be asked to output a null pointer. If you want a null pointer to be returned for unnamed objects, you can call name( 0 ).
+If the object does not have a name, the name() function returns" unnamed", so printf() (used in qDebug()) will not be asked to output a null pointer. If you want a null pointer to be returned for unnamed objects, you can call name( 0 ).
 .PP
 .nf
 .br
-        tqDebug( "MyClass::setPrecision(): (%s) invalid precision %f",
+        qDebug( "MyClass::setPrecision(): (%s) invalid precision %f",
 .br
                 name(), newPrecision );
 .br
diff --git a/doc/man/man3/qptrdict.3qt b/doc/man/man3/qptrdict.3qt
index c00544b..684e420 100644
--- a/doc/man/man3/qptrdict.3qt
+++ b/doc/man/man3/qptrdict.3qt
@@ -273,7 +273,7 @@ Returns the size of the internal hash table (as specified in the constructor).
 .PP
 See also count().
 .SH "void QPtrDict::statistics () const"
-Debugging-only function that prints out the dictionary distribution using tqDebug().
+Debugging-only function that prints out the dictionary distribution using qDebug().
 .SH "type * QPtrDict::take ( void * key )"
 Takes the item associated with \fIkey\fR out of the dictionary without deleting it (even if auto-deletion is enabled).
 .PP
diff --git a/doc/man/man3/qsqlcursor.3qt b/doc/man/man3/qsqlcursor.3qt
index 85a5192..c7067de 100644
--- a/doc/man/man3/qsqlcursor.3qt
+++ b/doc/man/man3/qsqlcursor.3qt
@@ -193,7 +193,7 @@ For example:
 .br
             while ( cur.next() ) {
 .br
-                tqDebug( cur.value( "id" ).toString() + ": " +
+                qDebug( cur.value( "id" ).toString() + ": " +
 .br
                         cur.value( "surname" ).toString() + " " +
 .br
diff --git a/doc/man/man3/qsqlquery.3qt b/doc/man/man3/qsqlquery.3qt
index 9a421cf..978e47e 100644
--- a/doc/man/man3/qsqlquery.3qt
+++ b/doc/man/man3/qsqlquery.3qt
@@ -358,7 +358,7 @@ The bound values can be examined in the following way:
 .br
     for ( it = vals.begin(); it != vals.end(); ++it )
 .br
-        tqWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() );
+        qWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() );
 .br
     ...
 .br
@@ -373,7 +373,7 @@ The bound values can be examined in the following way:
 .br
     for ( it = list.begin(); it != list.end(); ++it )
 .br
-        tqWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ );
+        qWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ );
 .br
     ...
 .br
diff --git a/doc/man/man3/qstring.3qt b/doc/man/man3/qstring.3qt
index bc01d97..1e41f0a 100644
--- a/doc/man/man3/qstring.3qt
+++ b/doc/man/man3/qstring.3qt
@@ -770,7 +770,7 @@ The following example shows how we could create a 'status' string when processin
 .PP
 It is generally fine to use filenames and numbers as we have done in the example above. But note that using arg() to construct natural language sentences does not usually translate well into other languages because sentence structure and word order often differ between languages.
 .PP
-If there is no place marker (\fC%1\fR, \fC%2\fR, etc.), a warning message (tqWarning()) is output and the result is undefined.
+If there is no place marker (\fC%1\fR, \fC%2\fR, etc.), a warning message (qWarning()) is output and the result is undefined.
 .PP
 \fBWarning:\fR If any placeholder occurs more than once, the result is undefined.
 .SH "QString QString::arg ( long a, int fieldWidth = 0, int base = 10 ) const"
diff --git a/doc/man/man3/qthread.3qt b/doc/man/man3/qthread.3qt
index ce662f0..8aa2ecf 100644
--- a/doc/man/man3/qthread.3qt
+++ b/doc/man/man3/qthread.3qt
@@ -99,7 +99,7 @@ A QThread represents a separate thread of control within the program; it shares
 .br
             sleep( 1 );
 .br
-            tqDebug( "Ping!" );
+            qDebug( "Ping!" );
 .br
         }
 .br
diff --git a/doc/man/man3/qtime.3qt b/doc/man/man3/qtime.3qt
index 33db5b4..1afd494 100644
--- a/doc/man/man3/qtime.3qt
+++ b/doc/man/man3/qtime.3qt
@@ -293,7 +293,7 @@ Sets this time to the current time. This is practical for timing:
 .br
     some_lengthy_task();
 .br
-    tqDebug( "Time elapsed: %d ms", t.elapsed() );
+    qDebug( "Time elapsed: %d ms", t.elapsed() );
 .br
 .fi
 .PP
diff --git a/doc/man/man3/qurloperator.3qt b/doc/man/man3/qurloperator.3qt
index 54ffa0b..5911200 100644
--- a/doc/man/man3/qurloperator.3qt
+++ b/doc/man/man3/qurloperator.3qt
@@ -149,7 +149,7 @@ If you want to be notified about success/failure, progress, etc., you can connec
 .PP
 The class uses the functionality of registered network protocols to perform these operations. Depending of the protocol of the URL, it uses an appropriate network protocol class for the operations. Each of the operation functions of QUrlOperator creates a QNetworkOperation object that describes the operation and puts it into the operation queue for the network protocol used. If no suitable protocol could be found (because no implementation of the necessary network protocol is registered), the URL operator emits errors. Not every protocol supports every operation, but error handling deals with this problem.
 .PP
-To register the available network protocols, use the tqInitNetworkProtocols() function. The protocols currently supported are:
+To register the available network protocols, use the qInitNetworkProtocols() function. The protocols currently supported are:
 .TP
 FTP,
 .TP
@@ -348,7 +348,7 @@ See also copy().
 .SH "void QUrlOperator::stop ()\fC [virtual]\fR"
 Stops the current network operation and removes all this QUrlOperator's waiting network operations.
 .SH RELATED FUNCTION DOCUMENTATION
-.SH "void tqInitNetworkProtocols ()"
+.SH "void qInitNetworkProtocols ()"
 This function registers the network protocols for FTP and HTTP. You must call this function before you use QUrlOperator for these protocols.
 .PP
 This function is declared in qnetwork.h.
diff --git a/doc/man/man3/qvariant.3qt b/doc/man/man3/qvariant.3qt
index 4308c88..becd6c4 100644
--- a/doc/man/man3/qvariant.3qt
+++ b/doc/man/man3/qvariant.3qt
@@ -441,7 +441,7 @@ Here is some example code to demonstrate the use of QVariant:
 .br
     int z = v.toInt();        // z = 123
 .br
-    tqDebug("Type is %s",      // prints "Type is int"
+    qDebug("Type is %s",      // prints "Type is int"
 .br
             v.typeName());
 .br
diff --git a/doc/network.doc b/doc/network.doc
index a51a1ea..f6b986d 100644
--- a/doc/network.doc
+++ b/doc/network.doc
@@ -148,9 +148,9 @@ void MyClass::slotOperationFinished( QNetworkOperation *op )
     switch ( op->operation() ) {
     case QNetworkProtocol::OpMkDir: 
         if ( op->state() == QNetworkProtocol::StFailed )
-            tqDebug( "Couldn't create directory %s", op->arg( 0 ).latin1() );
+            qDebug( "Couldn't create directory %s", op->arg( 0 ).latin1() );
         else
-            tqDebug( "Successfully created directory %s", op->arg( 0 ).latin1() );
+            qDebug( "Successfully created directory %s", op->arg( 0 ).latin1() );
 	break;
     // ... and so on
     }
@@ -179,24 +179,24 @@ void MyClass::slotInsertEntries( const QValueList<QUrlInfo> &info, QNetworkOpera
     QValueList<QUrlInfo>::ConstIterator it = info.begin();
     for ( ; it != info.end(); ++it ) {
         const QUrlInfo &inf = *it;
-        tqDebug( "Name: %s, Size: %d, Last Modified: %s",
+        qDebug( "Name: %s, Size: %d, Last Modified: %s",
 	    inf.name().latin1(), inf.size(), inf.lastModified().toString().latin1() );
     }
 }
 
 void MyClass::slotStart( QNetworkOperation * )
 {
-    tqDebug( "Start reading '%s'", op.toString().latin1() );
+    qDebug( "Start reading '%s'", op.toString().latin1() );
 }
 
 void MyClass::slotFinished( QNetworkOperation *operation )
 {
     if ( operation->operation() == QNetworkProtocol::OpListChildren ) {
         if ( operation->state() == QNetworkProtocol::StFailed )
-            tqDebug( "Couldn't read '%s'! Following error occurred: %s",
+            qDebug( "Couldn't read '%s'! Following error occurred: %s",
                 op.toString().latin1(), operation->protocolDetail().latin1() );
         else
-            tqDebug( "Finished reading '%s'!", op.toString().latin1() );
+            qDebug( "Finished reading '%s'!", op.toString().latin1() );
     }
 }
 
diff --git a/doc/networking.doc b/doc/networking.doc
index 41db5cf..e943e99 100644
--- a/doc/networking.doc
+++ b/doc/networking.doc
@@ -68,7 +68,7 @@ must register them before you can use QUrlOperator. For example, put
 the following call in your \c main() function, after creating your
 QApplication object:
 \code
-    tqInitNetworkProtocols();
+    qInitNetworkProtocols();
 \endcode
 
 \section1 Network- and Protocol-Transparent Operations
@@ -325,7 +325,7 @@ But, before we can use our new protocol, we have to register it first, so QUrlOp
 \skipto register
 \printline register
 
-This registers Qip protocol and bonds it to prefix "qip". You can use tqInitNetworkProtocols() which registers pre coded Ftp (for "ftp") and Http ("http") protocols. Local file system (QLocalFs) is always registered.
+This registers Qip protocol and bonds it to prefix "qip". You can use qInitNetworkProtocols() which registers pre coded Ftp (for "ftp") and Http ("http") protocols. Local file system (QLocalFs) is always registered.
 
 Client implementation (\c network/infoprotocol/infourlclient/client.cpp):
 
diff --git a/doc/plugins-howto.doc b/doc/plugins-howto.doc
index 1814980..15536f0 100644
--- a/doc/plugins-howto.doc
+++ b/doc/plugins-howto.doc
@@ -83,7 +83,7 @@ run, Qt will first treat the application's executable directory as the
 Files\MyApp} and has a style plugin, Qt will look in \c{C:\Program
 Files\MyApp\styles}. (See \l{QApplication::applicationDirPath()} for
 how to find out where the application's executable is.) Qt will also
-look in the directory given by \c{tqInstallPathPlugins()}. If you want
+look in the directory given by \c{qInstallPathPlugins()}. If you want
 Qt to look in additional places you can add as many paths as you need
 with calls to \c{QApplication::addLibraryPath()}. And if you want to
 set your own path or paths you can use
diff --git a/doc/porting3.doc b/doc/porting3.doc
index 804a745..9b7c012 100644
--- a/doc/porting3.doc
+++ b/doc/porting3.doc
@@ -348,8 +348,8 @@ Additionally, these preprocessor directives have been removed:
 \i \c {#define strcpy qstrcpy}
 \i \c {#define strcmp qstrcmp}
 \i \c {#define strncmp qstrncmp}
-\i \c {#define stricmp tqstricmp}
-\i \c {#define strnicmp tqstrnicmp}
+\i \c {#define stricmp qstricmp}
+\i \c {#define strnicmp qstrnicmp}
 \endlist
 
 See the changes-3.0.0 document for an explanation of why this had to be done.
diff --git a/doc/qasciicache.doc b/doc/qasciicache.doc
index 51612a9..be6cada 100644
--- a/doc/qasciicache.doc
+++ b/doc/qasciicache.doc
@@ -97,7 +97,7 @@
 
   \internal
 
-  Do not use. A QAsciiCache cannot be copied. Calls tqFatal() in debug version.
+  Do not use. A QAsciiCache cannot be copied. Calls qFatal() in debug version.
 */
 
 
@@ -139,7 +139,7 @@
 
   \internal
 
-  Do not use. A QAsciiCache cannot be copied. Calls tqFatal() in debug version.
+  Do not use. A QAsciiCache cannot be copied. Calls qFatal() in debug version.
 */
 
 /*!
@@ -292,7 +292,7 @@
     \fn void QAsciiCache::statistics() const
 
     A debug-only utility function. Prints out cache usage, hit/miss,
-    and distribution information using tqDebug(). This function does
+    and distribution information using qDebug(). This function does
     nothing in the release library.
 */
 
diff --git a/doc/qasciidict.doc b/doc/qasciidict.doc
index c855fd1..7667684 100644
--- a/doc/qasciidict.doc
+++ b/doc/qasciidict.doc
@@ -308,7 +308,7 @@
     \fn void QAsciiDict::statistics() const
 
     Debugging-only function that prints out the dictionary
-    distribution using tqDebug().
+    distribution using qDebug().
 */
 
 /*!
diff --git a/doc/qcache.doc b/doc/qcache.doc
index 354bc15..998bb20 100644
--- a/doc/qcache.doc
+++ b/doc/qcache.doc
@@ -98,7 +98,7 @@
 
   \internal
 
-  Do not use. A QCache cannot be copied. Calls tqFatal() in debug version.
+  Do not use. A QCache cannot be copied. Calls qFatal() in debug version.
 */
 
 
@@ -136,7 +136,7 @@
 
   \internal
 
-  Do not use. A QCache cannot be copied. Calls tqFatal() in debug version.
+  Do not use. A QCache cannot be copied. Calls qFatal() in debug version.
 */
 
 /*!
@@ -285,7 +285,7 @@
     \fn void QCache::statistics() const
 
     A debug-only utility function. Prints out cache usage, hit/miss,
-    and distribution information using tqDebug(). This function does
+    and distribution information using qDebug(). This function does
     nothing in the release library.
 */
 
diff --git a/doc/qdict.doc b/doc/qdict.doc
index 250f6be..c522624 100644
--- a/doc/qdict.doc
+++ b/doc/qdict.doc
@@ -383,7 +383,7 @@
     \fn void QDict::statistics() const
 
     Debugging-only function that prints out the dictionary
-    distribution using tqDebug().
+    distribution using qDebug().
 */
 
 /*!
diff --git a/doc/qintcache.doc b/doc/qintcache.doc
index 8d92c0e..e5960b3 100644
--- a/doc/qintcache.doc
+++ b/doc/qintcache.doc
@@ -91,7 +91,7 @@
 
   \internal
 
-  Do not use. A QCache cannot be copied. Calls tqFatal() in debug version.
+  Do not use. A QCache cannot be copied. Calls qFatal() in debug version.
 */
 
 /*!
@@ -125,7 +125,7 @@
 
   \internal
 
-  Do not use. A QIntCache cannot be copied. Calls tqFatal() in debug version.
+  Do not use. A QIntCache cannot be copied. Calls qFatal() in debug version.
 */
 
 /*!
@@ -273,7 +273,7 @@
     \fn void QIntCache::statistics() const
 
     A debug-only utility function. Prints out cache usage, hit/miss,
-    and distribution information using tqDebug(). This function does
+    and distribution information using qDebug(). This function does
     nothing in the release library.
 */
 
diff --git a/doc/qintdict.doc b/doc/qintdict.doc
index 6ad6c29..4f6ecc8 100644
--- a/doc/qintdict.doc
+++ b/doc/qintdict.doc
@@ -287,7 +287,7 @@
     \fn void QIntDict::statistics() const
 
     Debugging-only function that prints out the dictionary
-    distribution using tqDebug().
+    distribution using qDebug().
 */
 
 /*!
diff --git a/doc/qmemarray.doc b/doc/qmemarray.doc
index 8d12321..35c1893 100644
--- a/doc/qmemarray.doc
+++ b/doc/qmemarray.doc
@@ -96,10 +96,10 @@
     {
 	QMemArray<int> a = fib( 6 ); // get first 6 fibonaccis
 	for ( int i = 0; i < a.size(); i++ )
-	    tqDebug( "%d: %d", i, a[i] );
+	    qDebug( "%d: %d", i, a[i] );
 
-	tqDebug( "1 is found %d times", a.contains(1) );
-	tqDebug( "5 is found at index %d", a.find(5) );
+	qDebug( "1 is found %d times", a.contains(1) );
+	qDebug( "5 is found at index %d", a.find(5) );
 
 	return 0;
     }
diff --git a/doc/qptrdict.doc b/doc/qptrdict.doc
index 2c3efce..abc8f15 100644
--- a/doc/qptrdict.doc
+++ b/doc/qptrdict.doc
@@ -292,7 +292,7 @@
     \fn void QPtrDict::statistics() const
 
     Debugging-only function that prints out the dictionary
-    distribution using tqDebug().
+    distribution using qDebug().
 */
 
 /*!
diff --git a/doc/sql.doc b/doc/sql.doc
index 2ffabb7..5aa8266 100644
--- a/doc/sql.doc
+++ b/doc/sql.doc
@@ -453,7 +453,7 @@ retrieve data from it.
 \quotefile sql/overview/retrieve1/main.cpp
 \skipto if (
 \printline if (
-\printuntil tqDebug 
+\printuntil qDebug 
 \printline
 \printline
 \printline
@@ -644,7 +644,7 @@ setValue() to ensure that the value used is the one we want.
 \quotefile sql/overview/extract/main.cpp
 \skipto QSqlCursor
 \printline QSqlCursor
-\printuntil tqDebug
+\printuntil qDebug
 \printline
 \caption From \l sql/overview/extract/main.cpp
 
@@ -668,7 +668,7 @@ in the \c{ORDER BY} clause.
 
 Now we iterate through each matching record (if any). We retrieve the
 contents of the id, forename and surname fields and pass them on to
-some processing function, in this example a simple tqDebug() call.
+some processing function, in this example a simple qDebug() call.
 
 \target Manipulating_Records
 \section2 Manipulating Records
diff --git a/doc/tutorial.doc b/doc/tutorial.doc
index 4f5660d..8bd7218 100644
--- a/doc/tutorial.doc
+++ b/doc/tutorial.doc
@@ -916,8 +916,8 @@ have set up the QLCDNumber to always display two digits, we want to
 limit the possible range of \c minVal and \c maxVal to 0..99 to avoid
 overflow of the QLCDNumber. (We could have allowed values down to -9
 but chose not to.)  If the arguments are illegal, we use Qt's
-tqWarning() function to issue a warning to the user and return
-immediately. tqWarning() is a printf-like function that by default
+qWarning() function to issue a warning to the user and return
+immediately. qWarning() is a printf-like function that by default
 sends its output to \c stderr. If you want, you can install your own handler
 function using \l ::qInstallMsgHandler().
 
diff --git a/examples/canvas/canvas.cpp b/examples/canvas/canvas.cpp
index 748961b..1f33949 100644
--- a/examples/canvas/canvas.cpp
+++ b/examples/canvas/canvas.cpp
@@ -732,7 +732,7 @@ void Main::addMesh()
 #ifndef QT_NO_PROGRESSDIALOG
     progress.setProgress( rows );
 #endif
-    // tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() );
+    // qDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() );
 }
 
 void Main::addRectangle()
diff --git a/examples/canvas/makeimg.cpp b/examples/canvas/makeimg.cpp
index 335e7c0..c90ce8c 100644
--- a/examples/canvas/makeimg.cpp
+++ b/examples/canvas/makeimg.cpp
@@ -65,7 +65,7 @@ int main( int*, char**)
 #endif    
     *img = img->smoothScale( w/2, h/2 );
 
-    tqDebug( "saving out.png");
+    qDebug( "saving out.png");
     img->save( "out.png", "PNG" );
     
     w = img->width();
diff --git a/examples/demo/opengl/glinfo_x11.cpp b/examples/demo/opengl/glinfo_x11.cpp
index 58d5144..1137ef9 100644
--- a/examples/demo/opengl/glinfo_x11.cpp
+++ b/examples/demo/opengl/glinfo_x11.cpp
@@ -236,7 +236,7 @@ GLInfo::GLInfo()
 
     dpy = gl.x11Display();
     if ( !dpy ) {
-        tqWarning( "Error: unable to open display %s\n", displayName );
+        qWarning( "Error: unable to open display %s\n", displayName );
     }
 
     numScreens = ScreenCount( dpy );
diff --git a/examples/demo/opengl/gltexobj.cpp b/examples/demo/opengl/gltexobj.cpp
index 2844462..60627da 100644
--- a/examples/demo/opengl/gltexobj.cpp
+++ b/examples/demo/opengl/gltexobj.cpp
@@ -100,7 +100,7 @@ void GLTexobj::initializeGL()
     QImage tex1, tex2, buf;
 
     if ( !buf.load( "opengl/gllogo.bmp" ) ) {	// Load first image from file
-	tqWarning( "Could not read image file, using single-color instead." );
+	qWarning( "Could not read image file, using single-color instead." );
 	QImage dummy( 128, 128, 32 );
 	dummy.fill( Qt::green.rgb() );
 	buf = dummy;
@@ -108,7 +108,7 @@ void GLTexobj::initializeGL()
     tex1 = QGLWidget::convertToGLFormat( buf );  // flipped 32bit RGBA
 
     if ( !buf.load( "opengl/qtlogo.bmp" ) ) {	// Load first image from file
-	tqWarning( "Could not read image file, using single-color instead." );
+	qWarning( "Could not read image file, using single-color instead." );
 	QImage dummy( 128, 128, 32 );
 	dummy.fill( Qt::red.rgb() );
 	buf = dummy;
diff --git a/examples/fileiconview/qfileiconview.cpp b/examples/fileiconview/qfileiconview.cpp
index 54d672a..cc590fb 100644
--- a/examples/fileiconview/qfileiconview.cpp
+++ b/examples/fileiconview/qfileiconview.cpp
@@ -471,7 +471,7 @@ QtFileIconView::QtFileIconView( const QString &dir, QWidget *parent, const char
     : QIconView( parent, name ), viewDir( dir ), newFolderNum( 0 )
 {
     if ( !iconFolderLockedLarge ) {
-	tqAddPostRoutine( cleanup );
+	qAddPostRoutine( cleanup );
 	QWMatrix m;
 	m.scale( 0.6, 0.6 );
 	QPixmap iconpix( folder_locked_icon );
diff --git a/examples/iconview/main.cpp b/examples/iconview/main.cpp
index d16604f..8784e93 100644
--- a/examples/iconview/main.cpp
+++ b/examples/iconview/main.cpp
@@ -27,18 +27,18 @@ public:
 
 public slots:
     void dropped( QDropEvent *mime ) {
-        tqDebug( "Dropped Mimesource %p into the view %p", mime, view );
-        tqDebug( "  Formats:" );
+        qDebug( "Dropped Mimesource %p into the view %p", mime, view );
+        qDebug( "  Formats:" );
         int i = 0;
         const char *str = mime->format( i );
-        tqDebug( "    %s", str );
+        qDebug( "    %s", str );
         while ( str ) {
-            tqDebug( "    %s", str );
+            qDebug( "    %s", str );
             str = mime->format( ++i );
         }
     };
     void moved() {
-        tqDebug( "All selected items were moved to another widget" );
+        qDebug( "All selected items were moved to another widget" );
     }
 
 protected:
diff --git a/examples/life/main.cpp b/examples/life/main.cpp
index 67b0faa..3ee785e 100644
--- a/examples/life/main.cpp
+++ b/examples/life/main.cpp
@@ -13,7 +13,7 @@
  
 void usage()
 {
-    tqWarning( "Usage: life [-scale scale]" );
+    qWarning( "Usage: life [-scale scale]" );
 }
 
 int main( int argc, char **argv )
diff --git a/examples/network/clientserver/server/server.cpp b/examples/network/clientserver/server/server.cpp
index 5a69ad8..440647c 100644
--- a/examples/network/clientserver/server/server.cpp
+++ b/examples/network/clientserver/server/server.cpp
@@ -79,7 +79,7 @@ public:
 	QServerSocket( 4242, 1, parent )
     {
 	if ( !ok() ) {
-	    tqWarning("Failed to bind to port 4242");
+	    qWarning("Failed to bind to port 4242");
 	    exit(1);
 	}
     }
diff --git a/examples/network/httpd/httpd.cpp b/examples/network/httpd/httpd.cpp
index df9df6b..4c40961 100644
--- a/examples/network/httpd/httpd.cpp
+++ b/examples/network/httpd/httpd.cpp
@@ -27,7 +27,7 @@ public:
 	QServerSocket(8080,1,parent)
     {
 	if ( !ok() ) {
-	    tqWarning("Failed to bind to port 8080");
+	    qWarning("Failed to bind to port 8080");
 	    exit( 1 );
 	}
     }
diff --git a/examples/network/networkprotocol/main.cpp b/examples/network/networkprotocol/main.cpp
index bb9bc1d..8d636e4 100644
--- a/examples/network/networkprotocol/main.cpp
+++ b/examples/network/networkprotocol/main.cpp
@@ -17,7 +17,7 @@ int main( int argc, char **argv )
 {
     QApplication a( argc, argv );
 
-    tqInitNetworkProtocols();
+    qInitNetworkProtocols();
     QNetworkProtocol::registerNetworkProtocol( "nntp", new QNetworkProtocolFactory<Nntp> );
     
     View v;
diff --git a/examples/opengl/box/main.cpp b/examples/opengl/box/main.cpp
index 44c485b..897cd3f 100644
--- a/examples/opengl/box/main.cpp
+++ b/examples/opengl/box/main.cpp
@@ -30,7 +30,7 @@ int main( int argc, char **argv )
     QApplication a(argc,argv);
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
 
diff --git a/examples/opengl/gear/gear.cpp b/examples/opengl/gear/gear.cpp
index 3109ec8..8f138e9 100644
--- a/examples/opengl/gear/gear.cpp
+++ b/examples/opengl/gear/gear.cpp
@@ -278,7 +278,7 @@ int main( int argc, char **argv )
     QApplication a( argc, argv );
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
 
diff --git a/examples/opengl/glpixmap/globjwin.cpp b/examples/opengl/glpixmap/globjwin.cpp
index 7a50153..1b3269b 100644
--- a/examples/opengl/glpixmap/globjwin.cpp
+++ b/examples/opengl/glpixmap/globjwin.cpp
@@ -180,7 +180,7 @@ void GLObjectWindow::drawOnPixmap( QPixmap* pm )
     // Draw some text on the pixmap to differentiate it from the GL window
 
     if ( pm->isNull() ) {
-	tqWarning("Cannot draw on null pixmap");
+	qWarning("Cannot draw on null pixmap");
 	return;
     }
     else {
diff --git a/examples/opengl/glpixmap/main.cpp b/examples/opengl/glpixmap/main.cpp
index b4af120..25ee5b4 100644
--- a/examples/opengl/glpixmap/main.cpp
+++ b/examples/opengl/glpixmap/main.cpp
@@ -30,7 +30,7 @@ int main( int argc, char **argv )
     QApplication a(argc,argv);			
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
 
diff --git a/examples/opengl/overlay/main.cpp b/examples/opengl/overlay/main.cpp
index 5b6cf86..2939ecb 100644
--- a/examples/opengl/overlay/main.cpp
+++ b/examples/opengl/overlay/main.cpp
@@ -31,7 +31,7 @@ int main( int argc, char **argv )
     QApplication a(argc,argv);
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
 
diff --git a/examples/opengl/overlay_x11/gearwidget.cpp b/examples/opengl/overlay_x11/gearwidget.cpp
index 98fe110..e98938d 100644
--- a/examples/opengl/overlay_x11/gearwidget.cpp
+++ b/examples/opengl/overlay_x11/gearwidget.cpp
@@ -250,7 +250,7 @@ void GearWidget::resizeGL( int width, int height )
 
 void GearWidget::paintGL()
 {
-    tqDebug( "GearWidget: Doing GL rendering." );
+    qDebug( "GearWidget: Doing GL rendering." );
 #if defined (Q_GLX)
     static bool doneIt = FALSE;
     if ( !doneIt ) {
@@ -259,7 +259,7 @@ void GearWidget::paintGL()
 	// simpler in future versions of Qt!
 	XWindowAttributes a;
 	XGetWindowAttributes( x11Display(), winId(), &a );
-	tqDebug( "QGLWidget: using Visual ID: 0x%x.",
+	qDebug( "QGLWidget: using Visual ID: 0x%x.",
 	       (int)XVisualIDFromVisual( a.visual ) );
     }
 #endif
diff --git a/examples/opengl/overlay_x11/main.cpp b/examples/opengl/overlay_x11/main.cpp
index bb1dfe1..10ff6fc 100644
--- a/examples/opengl/overlay_x11/main.cpp
+++ b/examples/opengl/overlay_x11/main.cpp
@@ -36,7 +36,7 @@ QColor findOverlayTransparentColor()
     appVisual = (Visual*)QPaintDevice::x11AppVisual();
 #endif
 
-    tqDebug( "Default Visual ID: 0x%x", (int)XVisualIDFromVisual(appVisual) );
+    qDebug( "Default Visual ID: 0x%x", (int)XVisualIDFromVisual(appVisual) );
 
     typedef struct OverlayProp {
 	long  visual;
@@ -80,11 +80,11 @@ QColor findOverlayTransparentColor()
 	    return QColor( qRgb( 1, 2, 3 ), overlayProp[i].value );
     }
 
-    tqWarning( "Default visual is not in overlay plane" );
+    qWarning( "Default visual is not in overlay plane" );
     return invalidColor;
 
 #else // defined(Q_WS_X11)
-    tqWarning( "Wrong window system - Only X11 has overlay support." );
+    qWarning( "Wrong window system - Only X11 has overlay support." );
     return invalidColor;
 #endif
 }
@@ -96,13 +96,13 @@ int main( int argc, char **argv )
     QApplication a( argc, argv );
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
 
     QColor transparentColor = findOverlayTransparentColor();
     if ( !transparentColor.isValid() ) {
-	tqWarning( "Failed to get transparent color for overlay. Exiting." );
+	qWarning( "Failed to get transparent color for overlay. Exiting." );
 	return -1;
     }
 
diff --git a/examples/opengl/sharedbox/glbox.cpp b/examples/opengl/sharedbox/glbox.cpp
index 755e6e1..4d52ca5 100644
--- a/examples/opengl/sharedbox/glbox.cpp
+++ b/examples/opengl/sharedbox/glbox.cpp
@@ -57,18 +57,18 @@ void GLBox::initializeGL()
 	sharedDisplayList = makeObject();	// Make one
 	object = sharedDisplayList;		// Use it
 	sharedListUsers++;				// Keep reference count
-	tqDebug( "GLBox %s created shared display list.", name() );
+	qDebug( "GLBox %s created shared display list.", name() );
     }
     else {				// There is a shared diplay list
 	if ( isSharing() ) {		// Can we access it?
 	    object = sharedDisplayList;		// Yes, use it
 	    sharedListUsers++;			// Keep reference count
-	    tqDebug( "GLBox %s uses shared display list.", name() );
+	    qDebug( "GLBox %s uses shared display list.", name() );
 	}
 	else {				
 	    localDisplayList = makeObject();	// No, roll our own
 	    object = localDisplayList;		// and use that
-	    tqDebug( "GLBox %s uses private display list.", name() );
+	    qDebug( "GLBox %s uses private display list.", name() );
 	}
     }
 }
@@ -84,14 +84,14 @@ GLBox::~GLBox()
     makeCurrent();				// We're going to do gl calls
     if ( localDisplayList != 0 ) {		// Did we make our own?
 	glDeleteLists( localDisplayList, 1 );	// Yes, delete it
-	tqDebug( "GLBox %s deleted private display list.", name() );
+	qDebug( "GLBox %s deleted private display list.", name() );
     }
     else {
 	sharedListUsers--;	// No, we used the shared one; keep refcount
 	if ( sharedListUsers == 0 ) { 			// Any sharers left?
 	    glDeleteLists( sharedDisplayList, 1 );	// No, delete it
 	    sharedDisplayList = 0;
-	    tqDebug( "GLBox %s deleted shared display list.", name() );
+	    qDebug( "GLBox %s deleted shared display list.", name() );
 	}
     }
 }
diff --git a/examples/opengl/sharedbox/main.cpp b/examples/opengl/sharedbox/main.cpp
index b4af120..25ee5b4 100644
--- a/examples/opengl/sharedbox/main.cpp
+++ b/examples/opengl/sharedbox/main.cpp
@@ -30,7 +30,7 @@ int main( int argc, char **argv )
     QApplication a(argc,argv);			
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
 
diff --git a/examples/opengl/texture/gltexobj.cpp b/examples/opengl/texture/gltexobj.cpp
index 10a1f0f..2fc05d6 100644
--- a/examples/opengl/texture/gltexobj.cpp
+++ b/examples/opengl/texture/gltexobj.cpp
@@ -109,7 +109,7 @@ void GLTexobj::initializeGL()
     QImage tex1, tex2, buf;
 
     if ( !buf.load( "gllogo.bmp" ) ) {	// Load first image from file
-	tqWarning( "Could not read image file, using single-color instead." );
+	qWarning( "Could not read image file, using single-color instead." );
 	QImage dummy( 128, 128, 32 );
 	dummy.fill( Qt::green.rgb() );
 	buf = dummy;
@@ -117,7 +117,7 @@ void GLTexobj::initializeGL()
     tex1 = QGLWidget::convertToGLFormat( buf );  // flipped 32bit RGBA
 
     if ( !buf.load( "qtlogo.bmp" ) ) {	// Load first image from file
-	tqWarning( "Could not read image file, using single-color instead." );
+	qWarning( "Could not read image file, using single-color instead." );
 	QImage dummy( 128, 128, 32 );
 	dummy.fill( Qt::red.rgb() );
 	buf = dummy;
diff --git a/examples/opengl/texture/main.cpp b/examples/opengl/texture/main.cpp
index 043a057..0470d00 100644
--- a/examples/opengl/texture/main.cpp
+++ b/examples/opengl/texture/main.cpp
@@ -28,7 +28,7 @@ int main( int argc, char **argv )
     QApplication a(argc,argv);
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
     
diff --git a/examples/progress/progress.cpp b/examples/progress/progress.cpp
index cf3c5f6..f7e7232 100644
--- a/examples/progress/progress.cpp
+++ b/examples/progress/progress.cpp
@@ -272,7 +272,7 @@ private:
     {
 	if ( timer_driven ) {
 	    if ( pb ) {
-		tqWarning("This cannot happen!");
+		qWarning("This cannot happen!");
 		return;
 	    }
 	    rects = n;
diff --git a/examples/qdir/qdir.cpp b/examples/qdir/qdir.cpp
index 370d07a..346c3ed 100644
--- a/examples/qdir/qdir.cpp
+++ b/examples/qdir/qdir.cpp
@@ -307,7 +307,7 @@ int main( int argc, char ** argv )
 	else if ( arg == "-custom" )
 	    custom = TRUE;
 	else if ( arg[0] == '-' ) {
-	    tqDebug("Usage: qdir [-any | -dir | -custom] [-preview] [-default f] {-filter f} [caption ...]\n"
+	    qDebug("Usage: qdir [-any | -dir | -custom] [-preview] [-default f] {-filter f} [caption ...]\n"
 		   "      -any         Get any filename, need not exist.\n"
 		   "      -dir         Return a directory rather than a file.\n"
 		   "      -custom      Opens a customized QFileDialog with \n"
diff --git a/examples/sql/blob/main.cpp b/examples/sql/blob/main.cpp
index c6ce4d9..054d857 100644
--- a/examples/sql/blob/main.cpp
+++ b/examples/sql/blob/main.cpp
@@ -29,52 +29,52 @@ int main( int argc, char ** argv )
     db->setPassword( PASSWORD );
     db->setHostName( HOST );
     if ( !db->open() ) {
-	tqWarning( db->lastError().databaseText() );
+	qWarning( db->lastError().databaseText() );
 	return 1;
     }
 
     if ( argc < 2 ) {
-	tqWarning( "Usage: %s <filename>", argv[0] );
+	qWarning( "Usage: %s <filename>", argv[0] );
 	return 1;
     }
     
     // read a file which we want to insert into the database
     QFile f( argv[1] );
     if ( !f.open( IO_ReadOnly ) ) {
-	tqWarning( "Unable to open data file '%s' - exiting", argv[1] );
+	qWarning( "Unable to open data file '%s' - exiting", argv[1] );
 	return 1;
     }
     QByteArray binaryData = f.readAll();
-    tqWarning( "Data size: %d", binaryData.size() );
+    qWarning( "Data size: %d", binaryData.size() );
     
     // create a table with a binary field
     QSqlQuery q;
     if ( !q.exec( "CREATE TABLE blobexample ( id INT PRIMARY KEY, binfield LONGBLOB )" ) ) {
-	tqWarning( "Unable to create table - exiting" );
+	qWarning( "Unable to create table - exiting" );
 	return 1;
     }
 
     // insert a BLOB into the table
     if ( !q.prepare( "INSERT INTO blobexample ( id, binfield ) VALUES ( ?, ? )" ) ) {
-	tqWarning( "Unable to prepare query - exiting" );
+	qWarning( "Unable to prepare query - exiting" );
 	return 1;
     }
     q.bindValue( 0, 1 );
     q.bindValue( 1, binaryData );
     if ( !q.exec() ) {
-	tqWarning( "Unable to execute prepared query - exiting" );
+	qWarning( "Unable to execute prepared query - exiting" );
 	return 1;
     }
 
     // read the BLOB back from the database
     if ( !q.exec( "SELECT id, binfield FROM blobexample" ) ) {
-	tqWarning( "Unable to execute query - exiting" );
+	qWarning( "Unable to execute query - exiting" );
 	return 1;
     }
-    tqWarning( "\nQSqlQuery:" );
+    qWarning( "\nQSqlQuery:" );
     while ( q.next() ) {
-	tqWarning( "BLOB id: %d", q.value( 0 ).toInt() );
-	tqWarning( "BLOB size: %d", q.value( 1 ).toByteArray().size() );
+	qWarning( "BLOB id: %d", q.value( 0 ).toInt() );
+	qWarning( "BLOB size: %d", q.value( 1 ).toByteArray().size() );
     }
 
     // write another BLOB using QSqlCursor
@@ -83,23 +83,23 @@ int main( int argc, char ** argv )
     r->setValue( "id", 2 );
     r->setValue( "binfield", binaryData );
     if ( !cur.insert() ) {
-	tqWarning( "Unable to insert BLOB using QSqlCursor - exiting" );
+	qWarning( "Unable to insert BLOB using QSqlCursor - exiting" );
 	return 1;
     }
 
     // read the BLOBs back using QSqlCursor
     if ( !cur.select() ) {
-	tqWarning( "Unable retrieve blobexample table using QSqlCursor - exiting" );
+	qWarning( "Unable retrieve blobexample table using QSqlCursor - exiting" );
 	return 1;
     }
-    tqWarning( "\nQSqlCursor:" );
+    qWarning( "\nQSqlCursor:" );
     while ( cur.next() ) {
-	tqWarning( "BLOB id: %d", cur.value( "id" ).toInt() );
-	tqWarning( "BLOB size: %d", cur.value( "binfield" ).toByteArray().size() );
+	qWarning( "BLOB id: %d", cur.value( "id" ).toInt() );
+	qWarning( "BLOB size: %d", cur.value( "binfield" ).toByteArray().size() );
     }
         
     if ( !q.exec( "DROP TABLE blobexample" ) ) {
-	tqWarning( "Unable to drop table - exiting" );
+	qWarning( "Unable to drop table - exiting" );
 	return 1;
     }
     return 0;
diff --git a/examples/sql/overview/connection.cpp b/examples/sql/overview/connection.cpp
index e096204..6afaa53 100644
--- a/examples/sql/overview/connection.cpp
+++ b/examples/sql/overview/connection.cpp
@@ -18,7 +18,7 @@ bool createConnections()
     defaultDB->setPassword( DB_SALES_PASSWD );
     defaultDB->setHostName( DB_SALES_HOST );
     if ( ! defaultDB->open() ) {
-	tqWarning( "Failed to open sales database: " + defaultDB->lastError().text() );
+	qWarning( "Failed to open sales database: " + defaultDB->lastError().text() );
 	return FALSE;
     }
 
@@ -28,7 +28,7 @@ bool createConnections()
     oracle->setPassword( DB_ORDERS_PASSWD );
     oracle->setHostName( DB_ORDERS_HOST );
     if ( ! oracle->open() ) {
-	tqWarning( "Failed to open orders database: " + oracle->lastError().text() );
+	qWarning( "Failed to open orders database: " + oracle->lastError().text() );
 	return FALSE;
     }
 
diff --git a/examples/sql/overview/extract/main.cpp b/examples/sql/overview/extract/main.cpp
index d3dd194..3714c1a 100644
--- a/examples/sql/overview/extract/main.cpp
+++ b/examples/sql/overview/extract/main.cpp
@@ -33,7 +33,7 @@ int main( int argc, char *argv[] )
 	    int id = cur.value( "id" ).toInt();
 	    QString name = cur.value( "forename" ).toString() + " " +
 			   cur.value( "surname" ).toString();
-	    tqDebug( QString::number( id ) + ": " + name );
+	    qDebug( QString::number( id ) + ": " + name );
 	}
     }
 
diff --git a/examples/sql/overview/order1/main.cpp b/examples/sql/overview/order1/main.cpp
index 3d9b129..3d64748 100644
--- a/examples/sql/overview/order1/main.cpp
+++ b/examples/sql/overview/order1/main.cpp
@@ -22,7 +22,7 @@ int main( int argc, char *argv[] )
         QSqlIndex order = cur.index( fields );
         cur.select( order ); 
         while ( cur.next() ) {
-	    tqDebug( cur.value( "id" ).toString() + ": " +
+	    qDebug( cur.value( "id" ).toString() + ": " +
 		    cur.value( "surname" ).toString() + " " +
 		    cur.value( "forename" ).toString() );
         }
diff --git a/examples/sql/overview/order2/main.cpp b/examples/sql/overview/order2/main.cpp
index 43ae7a2..762562e 100644
--- a/examples/sql/overview/order2/main.cpp
+++ b/examples/sql/overview/order2/main.cpp
@@ -24,7 +24,7 @@ int main( int argc, char *argv[] )
 	cur.setValue( "surname", "Bloggs" );
 	cur.select( filter, order ); 
 	while ( cur.next() ) {
-	    tqDebug( cur.value( "id" ).toString() + ": " +
+	    qDebug( cur.value( "id" ).toString() + ": " +
 		    cur.value( "surname" ).toString() + " " +
 		    cur.value( "forename" ).toString() );
         }
diff --git a/examples/sql/overview/retrieve1/main.cpp b/examples/sql/overview/retrieve1/main.cpp
index 6b9f303..b1cc06b 100644
--- a/examples/sql/overview/retrieve1/main.cpp
+++ b/examples/sql/overview/retrieve1/main.cpp
@@ -20,7 +20,7 @@ int main( int argc, char *argv[] )
 	QSqlQuery query( "SELECT id, surname FROM staff" );
 	if ( query.isActive() ) {
 	    while ( query.next() ) {
-		tqDebug( query.value(0).toString() + ": " +
+		qDebug( query.value(0).toString() + ": " +
 		        query.value(1).toString() );
 	    }
 	}
diff --git a/examples/sql/overview/retrieve2/main.cpp b/examples/sql/overview/retrieve2/main.cpp
index 0821265..69b172b 100644
--- a/examples/sql/overview/retrieve2/main.cpp
+++ b/examples/sql/overview/retrieve2/main.cpp
@@ -20,7 +20,7 @@ int main( int argc, char *argv[] )
 	QSqlCursor cur( "staff" ); // Specify the table/view name
 	cur.select(); // We'll retrieve every record
 	while ( cur.next() ) {
-	    tqDebug( cur.value( "id" ).toString() + ": " +
+	    qDebug( cur.value( "id" ).toString() + ": " +
 		    cur.value( "surname" ).toString() + " " +
 		    cur.value( "salary" ).toString() );
 	}
diff --git a/examples/tablet/tabletstats.cpp b/examples/tablet/tabletstats.cpp
index 8e6360b..a6e91fb 100644
--- a/examples/tablet/tabletstats.cpp
+++ b/examples/tablet/tabletstats.cpp
@@ -89,11 +89,11 @@ void StatsCanvas::tabletEvent( QTabletEvent *e )
     e->accept();
     switch( e->type() ) {
     case QEvent::TabletPress:
-	tqDebug( "Tablet Press" );
+	qDebug( "Tablet Press" );
 	mousePressed = TRUE;
 	break;
     case QEvent::TabletRelease:
-	tqDebug( "Tablet Release" );
+	qDebug( "Tablet Release" );
 	mousePressed = FALSE;
 	clearScreen();
 	break;
@@ -115,7 +115,7 @@ void StatsCanvas::tabletEvent( QTabletEvent *e )
 
 void StatsCanvas::mouseMoveEvent( QMouseEvent *e )
 {
-    tqDebug( "Mouse Move" );
+    qDebug( "Mouse Move" );
     // do nothing
     QWidget::mouseMoveEvent( e );
 }
@@ -123,13 +123,13 @@ void StatsCanvas::mouseMoveEvent( QMouseEvent *e )
 
 void StatsCanvas::mousePressEvent( QMouseEvent *e )
 {
-    tqDebug( "Mouse Press" );
+    qDebug( "Mouse Press" );
     QWidget::mousePressEvent( e );
 }
 
 void StatsCanvas::mouseReleaseEvent( QMouseEvent *e )
 {
-    tqDebug( "Mouse Release" );
+    qDebug( "Mouse Release" );
     QWidget::mouseReleaseEvent( e );
 }
 
diff --git a/examples/thread/semaphores/main.cpp b/examples/thread/semaphores/main.cpp
index 521f27a..d583c57 100644
--- a/examples/thread/semaphores/main.cpp
+++ b/examples/thread/semaphores/main.cpp
@@ -255,7 +255,7 @@ void SemaphoreExample::customEvent(QCustomEvent *event) {
 
     default:
 	{
-	    tqWarning("Unknown custom event type: %d", event->type());
+	    qWarning("Unknown custom event type: %d", event->type());
 	}
     }
 }
diff --git a/examples/tictac/main.cpp b/examples/tictac/main.cpp
index 65f2bc9..a64703f 100644
--- a/examples/tictac/main.cpp
+++ b/examples/tictac/main.cpp
@@ -19,7 +19,7 @@ int main( int argc, char **argv )
     if ( argc == 2 )				// get board size n
         n = atoi(argv[1]);
     if ( n < 3 || n > 10 ) {			// out of range
-        tqWarning( "%s: Board size must be from 3x3 to 10x10", argv[0] );
+        qWarning( "%s: Board size must be from 3x3 to 10x10", argv[0] );
         return 1;
     }
     TicTacToe ttt( n );				// create game
diff --git a/examples/widgets/widgets.cpp b/examples/widgets/widgets.cpp
index 9966825..4f61edd 100644
--- a/examples/widgets/widgets.cpp
+++ b/examples/widgets/widgets.cpp
@@ -714,21 +714,21 @@ void WidgetView::dummy()
 
 void WidgetView::selectionChanged()
 {
-    //tqDebug("selectionChanged");
+    //qDebug("selectionChanged");
 }
 void WidgetView::selectionChanged( QListViewItem* /*item*/)
 {
-    //tqDebug("selectionChanged %p", item );
+    //qDebug("selectionChanged %p", item );
 }
 
 void WidgetView::clicked( QListViewItem* /*item*/ )
 {
-    //tqDebug("clicked %p", item );
+    //qDebug("clicked %p", item );
 }
 
 void WidgetView::mySelectionChanged( QListViewItem* /*item*/ )
 {
-    //tqDebug("mySelectionChanged %p", item );
+    //qDebug("mySelectionChanged %p", item );
 }
 
 void WidgetView::showProperties()
@@ -747,5 +747,5 @@ void WidgetView::showProperties()
 		     p->writable() ? "write" : "only", p->type() );
 	output += tmp;
     }
-    tqDebug( output );
+    qDebug( output );
 }
diff --git a/extensions/nsplugin/examples/grapher/grapher.cpp b/extensions/nsplugin/examples/grapher/grapher.cpp
index f0186df..84633e4 100644
--- a/extensions/nsplugin/examples/grapher/grapher.cpp
+++ b/extensions/nsplugin/examples/grapher/grapher.cpp
@@ -159,7 +159,7 @@ void Graph::timerEvent(QTimerEvent*)
 void Graph::setStyle(const char* stext)
 {
     for ( Style s = Pie; styleName[s]; s = Style(s+1) ) {
-	if ( tqstricmp(stext,styleName[s])==0 ) {
+	if ( qstricmp(stext,styleName[s])==0 ) {
 	    setStyle(s);
 	    return;
 	}
diff --git a/extensions/nsplugin/src/qnp.cpp b/extensions/nsplugin/src/qnp.cpp
index 3f135fe..5a5eb5c 100644
--- a/extensions/nsplugin/src/qnp.cpp
+++ b/extensions/nsplugin/src/qnp.cpp
@@ -800,7 +800,7 @@ QNPWidget::QNPWidget() :
      pi(next_pi)
 {
     if (!next_pi) {
-	tqFatal("QNPWidget must only be created within call to newWindow");
+	qFatal("QNPWidget must only be created within call to newWindow");
     }
     next_pi->widget = this;
     next_pi = 0;
@@ -942,7 +942,7 @@ QNPInstance::QNPInstance() :
     pi(next_pi)
 {
     if (!next_pi) {
-	tqFatal("QNPInstance must only be created within call to newInstance");
+	qFatal("QNPInstance must only be created within call to newInstance");
     }
     next_pi->instance = this;
     next_pi = 0;
@@ -1207,7 +1207,7 @@ const char* QNPInstance::arg(const char* name) const
 {
     for (int i=0; i<pi->argc; i++) {
 	// SGML: names are case insensitive
-	if ( tqstricmp( name, pi->argn[i] ) == 0 ) {
+	if ( qstricmp( name, pi->argn[i] ) == 0 ) {
 	    if (pi->argv[i].isEmpty())
 		return "";
 	    else
@@ -1558,7 +1558,7 @@ void* QNPlugin::getJavaClass()
 */
 void QNPlugin::unuseJavaClass()
 {
-    tqFatal("QNPlugin::unuseJavaClass() must be overridden along with getJavaClass()");
+    qFatal("QNPlugin::unuseJavaClass() must be overridden along with getJavaClass()");
 }
 
 /*!
@@ -1625,7 +1625,7 @@ bool QNPXt::redeliverEvent( XEvent *event )
 {
     // redeliver the event to Xt, NOT through Qt
     if ( static_d->dispatchers[ event->type ]( event ) ) {
-	// tqDebug( "Xt: redelivered event" );
+	// qDebug( "Xt: redelivered event" );
 	return TRUE;
     }
     return FALSE;
@@ -1709,11 +1709,11 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
 	if ( w ) {
 	    if ( !grabbed && ( event->type        == XFocusIn &&
 			       event->xfocus.mode == NotifyGrab ) ) {
-		// tqDebug( "Xt: grab started" );
+		// qDebug( "Xt: grab started" );
 		grabbed = TRUE;
 	    } else if ( grabbed && ( event->type        == XFocusOut &&
 				     event->xfocus.mode == NotifyUngrab ) ) {
-		// tqDebug( "Xt: grab ended" );
+		// qDebug( "Xt: grab ended" );
 		grabbed = FALSE;
 	    }
 	}
@@ -1760,7 +1760,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
     qnpxt_keep_alive();
 
     if ( delivered ) {
-	// tqDebug( "Qt: delivered event" );
+	// qDebug( "Qt: delivered event" );
 	return True;
     }
 
@@ -1775,7 +1775,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
 	case EnterNotify:
 	case LeaveNotify:
 	case ClientMessage:
-	    // tqDebug( "Qt: active popup - discarding event" );
+	    // qDebug( "Qt: active popup - discarding event" );
 	    return True;
 
 	default:
@@ -1787,7 +1787,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
 	if ( qnpxt ) {
 	    // send event through Qt modality handling...
 	    if ( !qt_try_modal( qnpxt, event ) ) {
-		// tqDebug( "Qt: active modal widget discarded event" );
+		// qDebug( "Qt: active modal widget discarded event" );
 		return True;
 	    }
 	} else if ( !grabbed ) {
@@ -1814,7 +1814,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
 		case EnterNotify:
 		case LeaveNotify:
 		case ClientMessage:
-		    // tqDebug( "Qt: active modal widget discarded unknown event" );
+		    // qDebug( "Qt: active modal widget discarded unknown event" );
 		    return True;
 		default:
 		    break;
@@ -1824,7 +1824,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
     }
 
     if ( static_d->dispatchers[ event->type ]( event ) ) {
-	// tqDebug( "Xt: delivered event" );
+	// qDebug( "Xt: delivered event" );
 	// Xt handled the event.
 	return True;
     }
@@ -1839,7 +1839,7 @@ QNPXt::QNPXt( const char *applicationClass, XtAppContext context,
 {
 #if defined(QT_CHECK_STATE)
     if ( static_d )
-	tqWarning( "QNPXt: should only have one QNPXt instance!" );
+	qWarning( "QNPXt: should only have one QNPXt instance!" );
 #endif
 
     d = static_d = new QNPXtPrivate;
@@ -1966,7 +1966,7 @@ void QNPXt::registerSocketNotifier( QSocketNotifier *notifier )
 	break;
 
     default:
-	tqWarning( "QNPXtEventLoop: socket notifier has invalid type" );
+	qWarning( "QNPXtEventLoop: socket notifier has invalid type" );
 	return;
     }
 
@@ -1985,7 +1985,7 @@ void QNPXt::unregisterSocketNotifier( QSocketNotifier *notifier )
 	++it;
     if ( ! it.current() ) {
 	// this shouldn't happen
-	tqWarning( "QNPXtEventLoop: failed to unregister socket notifier" );
+	qWarning( "QNPXtEventLoop: failed to unregister socket notifier" );
 	return;
     }
 
diff --git a/plugins/src/accessible/widgets/qaccessiblewidget.cpp b/plugins/src/accessible/widgets/qaccessiblewidget.cpp
index 1bcc05a..baa4503 100644
--- a/plugins/src/accessible/widgets/qaccessiblewidget.cpp
+++ b/plugins/src/accessible/widgets/qaccessiblewidget.cpp
@@ -164,7 +164,7 @@ QRect	QAccessibleWidget::rect( int control ) const
 {
 #if defined(QT_DEBUG)
     if ( control )
-	tqWarning( "QAccessibleWidget::rect: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() );
+	qWarning( "QAccessibleWidget::rect: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() );
 #else
     Q_UNUSED(control)
 #endif
@@ -179,7 +179,7 @@ int QAccessibleWidget::navigate( NavDirection dir, int startControl ) const
 {
 #if defined(QT_DEBUG)
     if ( startControl )
-	tqWarning( "QAccessibleWidget::navigate: This implementation does not support subelements! (ID %d unknown for %s)", startControl, widget()->className() );
+	qWarning( "QAccessibleWidget::navigate: This implementation does not support subelements! (ID %d unknown for %s)", startControl, widget()->className() );
 #else
     Q_UNUSED(startControl);
 #endif
@@ -249,7 +249,7 @@ int QAccessibleWidget::navigate( NavDirection dir, int startControl ) const
 	    return ( index != -1 ) ? index+1 : -1;
 	}
     default:
-	tqWarning( "QAccessibleWidget::navigate: unhandled request" );
+	qWarning( "QAccessibleWidget::navigate: unhandled request" );
 	break;
     };
     return -1;
@@ -297,7 +297,7 @@ bool QAccessibleWidget::doDefaultAction( int control )
 {
 #if defined(QT_DEBUG)
     if ( control )
-	tqWarning( "QAccessibleWidget::doDefaultAction: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() );
+	qWarning( "QAccessibleWidget::doDefaultAction: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() );
 #else
     Q_UNUSED(control)
 #endif
@@ -407,7 +407,7 @@ bool QAccessibleWidget::setFocus( int control )
 {
 #if defined(QT_DEBUG)
     if ( control )
-	tqWarning( "QAccessibleWidget::setFocus: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() );
+	qWarning( "QAccessibleWidget::setFocus: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() );
 #else
     Q_UNUSED(control)
 #endif
@@ -422,7 +422,7 @@ bool QAccessibleWidget::setFocus( int control )
 bool QAccessibleWidget::setSelected( int, bool, bool )
 {
 #if defined(QT_DEBUG)
-    tqWarning( "QAccessibleWidget::setSelected: This function not supported for simple widgets." );
+    qWarning( "QAccessibleWidget::setSelected: This function not supported for simple widgets." );
 #endif
     return FALSE;
 }
@@ -431,7 +431,7 @@ bool QAccessibleWidget::setSelected( int, bool, bool )
 void QAccessibleWidget::clearSelection()
 {
 #if defined(QT_DEBUG)
-    tqWarning( "QAccessibleWidget::clearSelection: This function not supported for simple widgets." );
+    qWarning( "QAccessibleWidget::clearSelection: This function not supported for simple widgets." );
 #endif
 }
 
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
index b1b294a..42791a4 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
@@ -306,7 +306,7 @@ void QMultiInputContext::changeInputMethod( QString key )
 
         currentIMKey = key;
 
-	//tqDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s",
+	//qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s",
 	//	imIndex, (const char *)_slave->identifierName() );
     }
 }
diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
index 0e1146d..07d6928 100644
--- a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
+++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
@@ -141,7 +141,7 @@ bool QSimpleInputContext::filterEvent( const QEvent *event )
         // only one character. See description of
         // QInputContext::filterEvent() about key compression.
         val = text[0].unicode();
-       // tqDebug( "str = %s", (const char*)keyevent->text().local8Bit() );
+       // qDebug( "str = %s", (const char*)keyevent->text().local8Bit() );
     }
 
     // Store value
@@ -165,13 +165,13 @@ bool QSimpleInputContext::filterEvent( const QEvent *event )
 
 void QSimpleInputContext::setFocus()
 {
-    //tqDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p",
+    //qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p",
             //this, focusWidget() );
 }
 
 void QSimpleInputContext::unsetFocus()
 {
-    //tqDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p",
+    //qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p",
             //this, focusWidget() );
     reset();
 }
@@ -189,7 +189,7 @@ void QSimpleInputContext::mouseHandler( int x, QEvent::Type type,
     case QEvent::MouseButtonRelease:
     case QEvent::MouseButtonDblClick:
     case QEvent::MouseMove:
-       // tqDebug( "QSimpleInputContext::mouseHandler: "
+       // qDebug( "QSimpleInputContext::mouseHandler: "
                // "x=%d, type=%d, button=%d, state=%d", x, type, button, state );
         break;
     default:
@@ -241,7 +241,7 @@ bool QSimpleInputContext::checkComposeTable( uint* composeBuffer, const QCompose
 
     // no entries were found
     if ( p == composeTable->data + composeTable->size ) {
-       // tqDebug( "no match" );
+       // qDebug( "no match" );
         clearComposeBuffer();
         return FALSE;
     }
@@ -251,18 +251,18 @@ bool QSimpleInputContext::checkComposeTable( uint* composeBuffer, const QCompose
 
         // check if partial match
         if ( composeBuffer[i] == 0 && p->keys[i] ) {
-            // tqDebug("partial match");
+            // qDebug("partial match");
             return TRUE;
         }
 
         if ( composeBuffer[i] != p->keys[i] ) {
-          // tqDebug("different entry");
+          // qDebug("different entry");
             clearComposeBuffer();
             return i!=0;
         }
     }
 
-   // tqDebug("match exactly");
+   // qDebug("match exactly");
 
     // match exactly
     commitChar( p->value );
diff --git a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
index a778d5f..a0438bc 100644
--- a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
+++ b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
@@ -86,7 +86,7 @@ extern "C" {
 				    XPointer /*client_data*/,
 				    XPointer /*call_data*/)
     {
-	// tqDebug("xim_create_callback");
+	// qDebug("xim_create_callback");
 	QXIMInputContext::create_xim();
     }
 
@@ -94,7 +94,7 @@ extern "C" {
 				     XPointer /*client_data*/,
 				     XPointer /*call_data*/)
     {
-	// tqDebug("xim_destroy_callback");
+	// qDebug("xim_destroy_callback");
 	QXIMInputContext::close_xim();
 	Display *dpy = QPaintDevice::x11AppDisplay();
 	XRegisterIMInstantiateCallback(dpy, 0, 0, 0,
@@ -170,7 +170,7 @@ extern "C" {
 	QXIMInputContext *qic = (QXIMInputContext *) client_data;
 	if (! qic) {
 #ifdef QT_XIM_DEBUG
-	    tqDebug("compose start: no qic");
+	    qDebug("compose start: no qic");
 #endif // QT_XIM_DEBUG
 
 	    return 0;
@@ -180,7 +180,7 @@ extern "C" {
 	qic->sendIMEvent( QEvent::IMStart );
 
 #ifdef QT_XIM_DEBUG
-	tqDebug("compose start");
+	qDebug("compose start");
 #endif // QT_XIM_DEBUG
 
 	return 0;
@@ -190,7 +190,7 @@ extern "C" {
 	QXIMInputContext *qic = (QXIMInputContext *) client_data;
 	if (! qic) {
 #ifdef QT_XIM_DEBUG
-	    tqDebug("compose event: invalid compose event %p", qic);
+	    qDebug("compose event: invalid compose event %p", qic);
 #endif // QT_XIM_DEBUG
 
 	    return 0;
@@ -202,7 +202,7 @@ extern "C" {
 	    send_imstart = TRUE;
 	} else if ( ! qic->isComposing() || ! qic->hasFocus() ) {
 #ifdef QT_XIM_DEBUG
-	    tqDebug( "compose event: invalid compose event composing=%d hasFocus=%d",
+	    qDebug( "compose event: invalid compose event composing=%d hasFocus=%d",
 		    qic->isComposing(), qic->hasFocus() );
 #endif // QT_XIM_DEBUG
 
@@ -221,7 +221,7 @@ extern "C" {
 	     ! drawstruct->chg_length && ! text ) {
 	    if( qic->composingText.isEmpty() ) {
 #ifdef QT_XIM_DEBUG
-		tqDebug( "compose emptied" );
+		qDebug( "compose emptied" );
 #endif // QT_XIM_DEBUG
 		// if the composition string has been emptied, we need
 		// to send an IMEnd event
@@ -296,7 +296,7 @@ extern "C" {
 	    bool qt_compose_emptied = qic->composingText.isEmpty();
 	    if ( qt_compose_emptied ) {
 #ifdef QT_XIM_DEBUG
-		tqDebug( "compose emptied" );
+		qDebug( "compose emptied" );
 #endif // QT_XIM_DEBUG
 		// if the composition string has been emptied, we need
 		// to send an IMEnd event
@@ -356,12 +356,12 @@ void QXIMInputContext::setHolderWidget( QWidget *widget )
 #if !defined(QT_NO_XIM)
     fontsetRefCount++;
     if (! qt_xim) {
-	tqWarning("QInputContext: no input method context available");
+	qWarning("QInputContext: no input method context available");
 	return;
     }
 
     if (! widget->isTopLevel()) {
-       // tqWarning("QInputContext: cannot create input context for non-toplevel widgets");
+       // qWarning("QInputContext: cannot create input context for non-toplevel widgets");
 	return;
     }
 
@@ -420,7 +420,7 @@ void QXIMInputContext::setHolderWidget( QWidget *widget )
 		       (char *) 0);
 
     if (! ic)
-	tqFatal("Failed to create XIM input context!");
+	qFatal("Failed to create XIM input context!");
 
     // when resetting the input context, preserve the input state
     (void) XSetICValues((XIC) ic, XNResetState, XIMPreserveState, (char *) 0);
@@ -483,11 +483,11 @@ void QXIMInputContext::init_xim()
 	ximServerName = "";
 
     if ( !XSupportsLocale() )
-	tqWarning("Qt: Locales not supported on X server");
+	qWarning("Qt: Locales not supported on X server");
 
 #ifdef USE_X11R6_XIM
     else if ( XSetLocaleModifiers (ximServerName.ascii()) == 0 )
-	tqWarning( "Qt: Cannot set locale modifiers: %s",
+	qWarning( "Qt: Cannot set locale modifiers: %s",
 		  ximServerName.ascii());
     else {
 	Display *dpy = QPaintDevice::x11AppDisplay();
@@ -499,7 +499,7 @@ void QXIMInputContext::init_xim()
     }
 #else // !USE_X11R6_XIM
     else if ( XSetLocaleModifiers ("") == 0 )
-	tqWarning("Qt: Cannot set locale modifiers");
+	qWarning("Qt: Cannot set locale modifiers");
     else
 	QXIMInputContext::create_xim();
 #endif // USE_X11R6_XIM
@@ -522,7 +522,7 @@ void QXIMInputContext::create_xim()
 	destroy.callback = (XIMProc) xim_destroy_callback;
 	destroy.client_data = 0;
 	if ( XSetIMValues( qt_xim, XNDestroyCallback, &destroy, (char *) 0 ) != 0 )
-	    tqWarning( "Xlib doesn't support destroy callback");
+	    qWarning( "Xlib doesn't support destroy callback");
 #endif // USE_X11R6_XIM
 
 	XIMStyles *styles = 0;
@@ -553,7 +553,7 @@ void QXIMInputContext::create_xim()
 		}
 	    }
 
-	    // tqDebug("QApplication: using im style %lx", qt_xim_style);
+	    // qDebug("QApplication: using im style %lx", qt_xim_style);
 	    XFree( (char *)styles );
 	}
 
@@ -566,7 +566,7 @@ void QXIMInputContext::create_xim()
 
 	} else {
 	    // Give up
-	    tqWarning( "No supported input style found."
+	    qWarning( "No supported input style found."
 		      "  See InputMethod documentation.");
 	    QXIMInputContext::close_xim();
 	}
@@ -714,7 +714,7 @@ void QXIMInputContext::reset()
 #if !defined(QT_NO_XIM)
     if ( focusWidget() && isComposing() && ! composingText.isNull() ) {
 #ifdef QT_XIM_DEBUG
-	tqDebug("QXIMInputContext::reset: composing - sending IMEnd (empty) to %p",
+	qDebug("QXIMInputContext::reset: composing - sending IMEnd (empty) to %p",
 	       focusWidget() );
 #endif // QT_XIM_DEBUG
 
@@ -742,7 +742,7 @@ void QXIMInputContext::resetClientState()
 
 void QXIMInputContext::close( const QString &errMsg )
 {
-    tqDebug( errMsg );
+    qDebug( errMsg );
     emit deletionRequested();
 }
 
diff --git a/qmake/book/qmake-tutorial.leaf b/qmake/book/qmake-tutorial.leaf
index 81e21d1..b300f05 100644
--- a/qmake/book/qmake-tutorial.leaf
+++ b/qmake/book/qmake-tutorial.leaf
@@ -193,7 +193,7 @@ processing.
 
 \section1 Checking for more than one condition
 
-Suppose you use Windows and you want to be able to see the tqDebug()
+Suppose you use Windows and you want to be able to see the qDebug()
 statements when you run your application on the command line.  Unless
 you build your application with the console setting, you won't see the
 output.  We can easily put \e console on the CONFIG line so that on
diff --git a/qmake/examples/precompile/myobject.cpp b/qmake/examples/precompile/myobject.cpp
index 96d0f13..4f1d1d8 100644
--- a/qmake/examples/precompile/myobject.cpp
+++ b/qmake/examples/precompile/myobject.cpp
@@ -10,5 +10,5 @@ MyObject::MyObject()
 
 MyObject::~MyObject()
 {
-    tqDebug("MyObject::~MyObject()");
+    qDebug("MyObject::~MyObject()");
 }
diff --git a/qmake/examples/tutorial/hello.cpp b/qmake/examples/tutorial/hello.cpp
index d4a2745..cec428b 100644
--- a/qmake/examples/tutorial/hello.cpp
+++ b/qmake/examples/tutorial/hello.cpp
@@ -3,5 +3,5 @@
 MyPushButton::MyPushButton( const QString& text ) 
     : QPushButton( text, 0, "mypushbutton" )
 {
-    tqDebug( "My PushButton has been constructed" );
+    qDebug( "My PushButton has been constructed" );
 }
diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 79f4187..5e1ca0f 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -70,7 +70,7 @@ MetrowerksMakefileGenerator::writeMakefile(QTextStream &t)
     }
     else if(project->first("TEMPLATE") == "subdirs") {
 	writeHeader(t);
-	tqDebug("Not supported!");
+	qDebug("Not supported!");
 	return TRUE;
     }
     return FALSE;
@@ -641,9 +641,9 @@ MetrowerksMakefileGenerator::createFork(const QString &f)
 	    if(FSGetCatalogInfo(&fref, kFSCatInfoNone, NULL, NULL, &fileSpec, NULL) == noErr) 
 		FSpCreateResFile(&fileSpec, 'CUTE', 'TEXT', smSystemScript);
 	    else 
-		tqDebug("bogus %d", __LINE__);
+		qDebug("bogus %d", __LINE__);
 	} else 
-	    tqDebug("bogus %d", __LINE__);
+	    qDebug("bogus %d", __LINE__);
 	fclose(o);
 	if(perms)
 	    chmod(f.latin1(), perms);
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 1f7f5bc..cd1c829 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -1511,7 +1511,7 @@ UnixMakefileGenerator::pkgConfigPrefix() const
 {
     if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX"))
 	return project->first("QMAKE_PKGCONFIG_PREFIX");
-    return tqInstallPath();
+    return qInstallPath();
 }
 
 QString
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index f11aa28..e17c66b 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -481,15 +481,15 @@ bool VCCLCompilerTool::parseOption( const char* option )
     switch ( first ) {
     case '?':
     case 'h':
-	tqWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" );
+	qWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" );
 	found = FALSE;
 	break;
     case '@':
-	tqWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" );
+	qWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" );
 	found = FALSE;
 	break;
     case 'l':
-	tqWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" );
+	qWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" );
 	found = FALSE;
 	break;
     case 'A':
@@ -585,7 +585,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	switch ( second ) {
 	case '3':
 	case '4':
-	    tqWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" );
+	    qWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" );
 	    found = FALSE; break;
         case '5':
 	    OptimizeForProcessor = procOptimizePentium;
@@ -773,7 +773,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	} else if ( second == 'P' ) {
 	    CompileAs = compileAsCPlusPlus;
 	} else {
-	    tqWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" );
+	    qWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" );
 	    found = FALSE; break;
 	}
 	break;
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 406bffd..f7fa84f 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -395,7 +395,7 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
 			    }
 			}
 #ifdef DEBUG_SOLUTION_GEN
-			tqDebug( "Deps for %20s: [%s]", newDep->target.latin1(), newDep->dependencies.join(" :: " ).latin1() );
+			qDebug( "Deps for %20s: [%s]", newDep->target.latin1(), newDep->dependencies.join(" :: " ).latin1() );
 #endif
 			solution_cleanup.append(newDep);
   			solution_depends.insert(newDep->target, newDep);
@@ -1533,9 +1533,9 @@ void VcprojGenerator::processPrlVariable(const QString &var, const QStringList &
 void VcprojGenerator::outputVariables()
 {
 #if 0
-    tqDebug( "Generator: MSVC.NET: List of current variables:" );
+    qDebug( "Generator: MSVC.NET: List of current variables:" );
     for ( QMap<QString, QStringList>::ConstIterator it = project->variables().begin(); it != project->variables().end(); ++it) {
-	tqDebug( "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() );
+	qDebug( "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() );
     }
 #endif
 }
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 75e8e0e..efc465d 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -90,19 +90,19 @@ QStringList qmake_mkspec_paths()
     ret << (QT_INSTALL_PREFIX + concat);
 #endif
 #if defined(HAVE_QCONFIG_CPP)
-    ret << (tqInstallPath() + concat);
+    ret << (qInstallPath() + concat);
 #endif
 #ifdef QT_INSTALL_DATA
     ret << (QT_INSTALL_DATA + concat);
 #endif
 #if defined(HAVE_QCONFIG_CPP)
-    ret << (tqInstallPathData() + concat);
+    ret << (qInstallPathData() + concat);
 #endif
 
     /* prefer $QTDIR if it is set */
     if (getenv("QTDIR"))
 	ret << getenv("QTDIR");
-    ret << tqInstallPathData();
+    ret << qInstallPathData();
     return ret;
 }
 
@@ -931,13 +931,13 @@ QMakeProject::doProjectTest(const QString& func, QStringList args, QMap<QString,
 		feature_roots << (QT_INSTALL_PREFIX + concat);
 #endif
 #if defined(HAVE_QCONFIG_CPP)
-		feature_roots << (tqInstallPath() + concat);
+		feature_roots << (qInstallPath() + concat);
 #endif
 #ifdef QT_INSTALL_DATA
 		feature_roots << (QT_INSTALL_DATA + concat);
 #endif
 #if defined(HAVE_QCONFIG_CPP)
-		feature_roots << (tqInstallPathData() + concat);
+		feature_roots << (qInstallPathData() + concat);
 #endif
 		for(QStringList::Iterator it = feature_roots.begin(); it != feature_roots.end(); ++it) {
 		    QString prf = (*it) + QDir::separator() + file;
diff --git a/qmake/property.cpp b/qmake/property.cpp
index d3d577f..fca4d1f 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -82,13 +82,13 @@ QMakeProperty::value(QString v, bool just_check)
 #ifdef QT_INSTALL_PREFIX
 	return QT_INSTALL_PREFIX;
 #elif defined(HAVE_QCONFIG_CPP)
-	return tqInstallPath();
+	return qInstallPath();
 #endif
     } else if(v == "QT_INSTALL_DATA") {
 #ifdef QT_INSTALL_DATA
 	return QT_INSTALL_DATA;
 #elif defined(HAVE_QCONFIG_CPP)
-	return tqInstallPathData();
+	return qInstallPathData();
 #endif
     } else if(v == "QMAKE_MKSPECS") {
 	return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
diff --git a/src/attic/qtmultilineedit.cpp b/src/attic/qtmultilineedit.cpp
index 517d3aa..3c8f346 100644
--- a/src/attic/qtmultilineedit.cpp
+++ b/src/attic/qtmultilineedit.cpp
@@ -725,7 +725,7 @@ static void cleanupMLBuffer()
 static QPixmap *getCacheBuffer( QSize sz )
 {
     if ( !buffer ) {
-	tqAddPostRoutine( cleanupMLBuffer );
+	qAddPostRoutine( cleanupMLBuffer );
 	buffer = new QPixmap;
     }
 
@@ -744,7 +744,7 @@ void QtMultiLineEdit::paintCell( QPainter *painter, int row, int )
     QFontMetrics fm( painter->font() );
     QString s = stringShown(row);
     if ( s.isNull() ) {
-	tqWarning( "QtMultiLineEdit::paintCell: (%s) no text at line %d",
+	qWarning( "QtMultiLineEdit::paintCell: (%s) no text at line %d",
 		  name( "unnamed" ), row );
 	return;
     }
@@ -2157,8 +2157,8 @@ void QtMultiLineEdit::mousePressEvent( QMouseEvent *e )
 	    if ( !isReadOnly() ) {
 		const char* fmt;
 		for (int i=0; !ps && (fmt=ms->format(i)); i++) {
-		    ps = tqstrnicmp(fmt,"text/",5)==0
-		      && tqstrnicmp(fmt+5,"plain",5)!=0;
+		    ps = qstrnicmp(fmt,"text/",5)==0
+		      && qstrnicmp(fmt+5,"plain",5)!=0;
 		}
 	    }
 	}
diff --git a/src/attic/qttableview.cpp b/src/attic/qttableview.cpp
index 227e04d..16fc836 100644
--- a/src/attic/qttableview.cpp
+++ b/src/attic/qttableview.cpp
@@ -272,7 +272,7 @@ void QtTableView::setNumRows( int rows )
 {
     if ( rows < 0 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QtTableView::setNumRows: (%s) Negative argument %d.",
+	qWarning( "QtTableView::setNumRows: (%s) Negative argument %d.",
 		 name( "unnamed" ), rows );
 #endif
 	return;
@@ -314,7 +314,7 @@ void QtTableView::setNumCols( int cols )
 {
     if ( cols < 0 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QtTableView::setNumCols: (%s) Negative argument %d.",
+	qWarning( "QtTableView::setNumCols: (%s) Negative argument %d.",
 		 name( "unnamed" ), cols );
 #endif
 	return;
@@ -580,7 +580,7 @@ void QtTableView::setCellWidth( int cellWidth )
 	return;
 #if defined(QT_CHECK_RANGE)
     if ( cellWidth < 0 || cellWidth > SHRT_MAX ) {
-	tqWarning( "QtTableView::setCellWidth: (%s) Argument out of range (%d)",
+	qWarning( "QtTableView::setCellWidth: (%s) Argument out of range (%d)",
 		 name( "unnamed" ), cellWidth );
 	return;
     }
@@ -634,7 +634,7 @@ void QtTableView::setCellHeight( int cellHeight )
 	return;
 #if defined(QT_CHECK_RANGE)
     if ( cellHeight < 0 || cellHeight > SHRT_MAX ) {
-	tqWarning( "QtTableView::setCellHeight: (%s) Argument out of range (%d)",
+	qWarning( "QtTableView::setCellHeight: (%s) Argument out of range (%d)",
 		 name( "unnamed" ), cellHeight );
 	return;
     }
@@ -1578,7 +1578,7 @@ int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY,
     if ( goOutsideView || yPos >= minViewY() && yPos <= maxViewY() ) {
 	if ( yPos < minViewY() ) {
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QtTableView::findRawRow: (%s) internal error: "
+	    qWarning( "QtTableView::findRawRow: (%s) internal error: "
 		     "yPos < minViewY() && goOutsideView "
 		     "not supported. (%d,%d)",
 		     name( "unnamed" ), yPos, yOffs );
@@ -1625,7 +1625,7 @@ int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX ,
     if ( goOutsideView || xPos >= minViewX() && xPos <= maxViewX() ) {
 	if ( xPos < minViewX() ) {
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QtTableView::findRawCol: (%s) internal error: "
+	    qWarning( "QtTableView::findRawCol: (%s) internal error: "
 		     "xPos < minViewX() && goOutsideView "
 		     "not supported. (%d,%d)",
 		     name( "unnamed" ), xPos, xOffs );
diff --git a/src/canvas/qcanvas.cpp b/src/canvas/qcanvas.cpp
index e70515a..401c5ba 100644
--- a/src/canvas/qcanvas.cpp
+++ b/src/canvas/qcanvas.cpp
@@ -3013,7 +3013,7 @@ QCanvasPixmapArray::QCanvasPixmapArray(QPtrList<QPixmap> list, QPtrList<QPoint>
     img(new QCanvasPixmap*[list.count()])
 {
     if (list.count() != hotspots.count()) {
-	tqWarning("QCanvasPixmapArray: lists have different lengths");
+	qWarning("QCanvasPixmapArray: lists have different lengths");
 	reset();
 	img = 0;
     } else {
@@ -3041,7 +3041,7 @@ QCanvasPixmapArray::QCanvasPixmapArray(QValueList<QPixmap> list, QPointArray hot
 {
     bool have_hotspots = ( hotspots.size() != 0 );
     if (have_hotspots && list.count() != hotspots.count()) {
-	tqWarning("QCanvasPixmapArray: lists have different lengths");
+	qWarning("QCanvasPixmapArray: lists have different lengths");
 	reset();
 	img = 0;
     } else {
@@ -3480,7 +3480,7 @@ void QCanvasSprite::draw(QPainter& painter)
 	QCanvasItemList l = canvas()->collisions(e->pos());
 	for (QCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) {
 	    if ( (*it)->rtti() == QCanvasRectangle::RTTI )
-		tqDebug("A QCanvasRectangle lies somewhere at this point");
+		qDebug("A QCanvasRectangle lies somewhere at this point");
 	}
     }
     \endcode
@@ -4295,7 +4295,7 @@ QCanvasSpline::~QCanvasSpline()
 void QCanvasSpline::setControlPoints(QPointArray ctrl, bool close)
 {
     if ( (int)ctrl.count() % 3 != (close ? 0 : 1) ) {
-	tqWarning( "QCanvasSpline::setControlPoints(): Number of points doesn't fit." );
+	qWarning( "QCanvasSpline::setControlPoints(): Number of points doesn't fit." );
 	int numCurves = (ctrl.count() - (close ? 0 : 1 ))/ 3;
 	ctrl.resize( numCurves*3 + ( close ? 0 : 1 ) );
     }
diff --git a/src/codecs/qbig5codec.cpp b/src/codecs/qbig5codec.cpp
index dd71604..d961dbf 100644
--- a/src/codecs/qbig5codec.cpp
+++ b/src/codecs/qbig5codec.cpp
@@ -531,7 +531,7 @@ static int qt_UnicodeToBig5(ushort ch, uchar *buf)
 int QBig5Codec::mibEnum() const
 {
     /* See http://www.iana.org/assignments/character-sets */
-    //tqDebug("QBig5Codec::mibEnum() = 2026");
+    //qDebug("QBig5Codec::mibEnum() = 2026");
     return 2026;
 }
 
@@ -539,7 +539,7 @@ int QBig5Codec::mibEnum() const
 /*! \reimp */
 const char* QBig5Codec::name() const
 {
-    //tqDebug("QBig5Codec::name() = \"Big5\"");
+    //qDebug("QBig5Codec::name() = \"Big5\"");
     return "Big5";
 }
 
@@ -554,7 +554,7 @@ public:
 
     QString toUnicode(const char* chars, int len)
     {
-	//tqDebug("QBig5Decoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
+	//qDebug("QBig5Decoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
 	QString result;
 	for (int i=0; i<len; i++) {
 	    uchar ch = chars[i];
@@ -599,7 +599,7 @@ public:
 /*! \reimp */
 QTextDecoder* QBig5Codec::makeDecoder() const
 {
-    //tqDebug("QBig5Codec::makeDecoder()");
+    //qDebug("QBig5Codec::makeDecoder()");
     return new QBig5Decoder();
 }
 
@@ -607,7 +607,7 @@ QTextDecoder* QBig5Codec::makeDecoder() const
 /*! \reimp */
 QCString QBig5Codec::fromUnicode(const QString& uc, int& lenInOut) const
 {
-    //tqDebug("QBig5Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QBig5Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     int l = QMIN((int)uc.length(),lenInOut);
     int rlen = l*3+1;
     QCString rstr(rlen);
@@ -639,7 +639,7 @@ QCString QBig5Codec::fromUnicode(const QString& uc, int& lenInOut) const
 /*! \reimp */
 QString QBig5Codec::toUnicode(const char* chars, int len) const
 {
-    //tqDebug("QBig5Codec::toUnicode(const char* chars \"%s\", int len = %d)", chars, len);
+    //qDebug("QBig5Codec::toUnicode(const char* chars \"%s\", int len = %d)", chars, len);
     QString result;
     for (int i=0; i<len; i++) {
 	uchar ch = chars[i];
@@ -677,7 +677,7 @@ QString QBig5Codec::toUnicode(const char* chars, int len) const
 /*! \reimp */
 int QBig5Codec::heuristicContentMatch(const char* chars, int len) const
 {
-    //tqDebug("QBig5Codec::heuristicContentMatch(const char* chars, int len = %d)", len);
+    //qDebug("QBig5Codec::heuristicContentMatch(const char* chars, int len = %d)", len);
     int score = 0;
     for (int i=0; i<len; i++) {
 	uchar ch = chars[i];
@@ -705,7 +705,7 @@ int QBig5Codec::heuristicContentMatch(const char* chars, int len) const
 	    return -1;
 	}
     }
-    //tqDebug("QBig5Codec::heuristicContentMatch() score = %d", score);
+    //qDebug("QBig5Codec::heuristicContentMatch() score = %d", score);
     return score;
 }
 
@@ -713,15 +713,15 @@ int QBig5Codec::heuristicContentMatch(const char* chars, int len) const
 /*! \reimp */
 int QBig5Codec::heuristicNameMatch(const char* hint) const
 {
-    //tqDebug("QBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    //qDebug("QBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
     int score = 0;
     bool zh = FALSE;
-    if (tqstrnicmp(hint, "zh_TW", 5) == 0) {
+    if (qstrnicmp(hint, "zh_TW", 5) == 0) {
 	score += 16;
 	zh = TRUE;
     }
-    else if ( tqstrnicmp(hint, "zh", 2) == 0     ||
-	      tqstrnicmp(hint, "chinese", 7) == 0) {
+    else if ( qstrnicmp(hint, "zh", 2) == 0     ||
+	      qstrnicmp(hint, "chinese", 7) == 0) {
 	score += 2;
 	zh = TRUE;
     }
@@ -735,11 +735,11 @@ int QBig5Codec::heuristicNameMatch(const char* hint) const
 	p = hint;
     }
     if (p) {
-	if ( tqstricmp(p, "Big5") == 0    ||
-	     tqstricmp(p, "TW-Big5") == 0 ) {
+	if ( qstricmp(p, "Big5") == 0    ||
+	     qstricmp(p, "TW-Big5") == 0 ) {
 	    return score + 10;
         }
-	else if ( tqstrnicmp(p, "Big5", 4) == 0 )
+	else if ( qstrnicmp(p, "Big5", 4) == 0 )
 	    return score + 2;
     }
     return QTextCodec::heuristicNameMatch(hint);
@@ -817,7 +817,7 @@ int QBig5hkscsCodec::mibEnum() const
 {
     /* See http://www.iana.org/assignments/character-sets         */
     /*     http://www.iana.org/assignments/charset-reg/Big5-HKSCS */
-    //tqDebug("QBig5hkscsCodec::mibEnum() = 2101");
+    //qDebug("QBig5hkscsCodec::mibEnum() = 2101");
     return 2101;
 }
 
@@ -825,7 +825,7 @@ int QBig5hkscsCodec::mibEnum() const
 /*! \reimp */
 const char* QBig5hkscsCodec::name() const
 {
-    //tqDebug("QBig5hkscsCodec::name() = \"Big5-HKSCS\"");
+    //qDebug("QBig5hkscsCodec::name() = \"Big5-HKSCS\"");
     return "Big5-HKSCS";
 }
 
@@ -840,7 +840,7 @@ public:
 
     QString toUnicode(const char* chars, int len)
     {
-	//tqDebug("QBig5hkscsDecoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
+	//qDebug("QBig5hkscsDecoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
 	QString result;
 	for (int i=0; i<len; i++) {
 	    uchar ch = chars[i];
@@ -885,7 +885,7 @@ public:
 /*! \reimp */
 QTextDecoder* QBig5hkscsCodec::makeDecoder() const
 {
-    //tqDebug("QBig5hkscsCodec::makeDecoder()");
+    //qDebug("QBig5hkscsCodec::makeDecoder()");
     return new QBig5hkscsDecoder();
 }
 
@@ -893,7 +893,7 @@ QTextDecoder* QBig5hkscsCodec::makeDecoder() const
 /*! \reimp */
 QCString QBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut) const
 {
-    //tqDebug("QBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     int l = QMIN((int)uc.length(),lenInOut);
     int rlen = l*3+1;
     QCString rstr(rlen);
@@ -922,7 +922,7 @@ QCString QBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut) const
 /*! \reimp */
 QString QBig5hkscsCodec::toUnicode(const char* chars, int len) const
 {
-    //tqDebug("QBig5hkscsCodec::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
+    //qDebug("QBig5hkscsCodec::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
     QString result;
     for (int i=0; i<len; i++) {
 	uchar ch = chars[i];
@@ -960,15 +960,15 @@ QString QBig5hkscsCodec::toUnicode(const char* chars, int len) const
 /*! \reimp */
 int QBig5hkscsCodec::heuristicNameMatch(const char* hint) const
 {
-    //tqDebug("QBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    //qDebug("QBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
     int score = 0;
     bool zh = FALSE;
-    if (tqstrnicmp(hint, "zh_HK", 5) == 0) {
+    if (qstrnicmp(hint, "zh_HK", 5) == 0) {
 	score += 16;
 	zh = TRUE;
     }
-    else if ( tqstrnicmp(hint, "zh", 2) == 0     ||
-	      tqstrnicmp(hint, "chinese", 7) == 0) {
+    else if ( qstrnicmp(hint, "zh", 2) == 0     ||
+	      qstrnicmp(hint, "chinese", 7) == 0) {
 	score += 2;
 	zh = TRUE;
     }
@@ -982,13 +982,13 @@ int QBig5hkscsCodec::heuristicNameMatch(const char* hint) const
 	p = hint;
     }
     if (p) {
-	if ( tqstricmp(p, "Big5-HKSCS") == 0 ||
-	     tqstricmp(p, "HKSCS-Big5") == 0 ||
-	     tqstricmp(p, "Big5HKSCS")  == 0 ||
-	     tqstricmp(p, "hkbig5")     == 0 ) {
+	if ( qstricmp(p, "Big5-HKSCS") == 0 ||
+	     qstricmp(p, "HKSCS-Big5") == 0 ||
+	     qstricmp(p, "Big5HKSCS")  == 0 ||
+	     qstricmp(p, "hkbig5")     == 0 ) {
 	    return score + 10;
         }
-	else if (tqstrnicmp(p, "Big5", 4) == 0) {
+	else if (qstrnicmp(p, "Big5", 4) == 0) {
 	    return score + 2;
         }
     }
@@ -999,7 +999,7 @@ int QBig5hkscsCodec::heuristicNameMatch(const char* hint) const
 /*! \reimp */
 int QBig5hkscsCodec::heuristicContentMatch(const char* chars, int len) const
 {
-    //tqDebug("QBig5hkscsCodec::heuristicContentMatch(const char* chars, int len = %d)", len);
+    //qDebug("QBig5hkscsCodec::heuristicContentMatch(const char* chars, int len = %d)", len);
     int score = 0;
     for (int i=0; i<len; i++) {
 	uchar ch = chars[i];
@@ -1027,7 +1027,7 @@ int QBig5hkscsCodec::heuristicContentMatch(const char* chars, int len) const
 	    return -1;
 	}
     }
-    //tqDebug("QBig5hkscsCodec::heuristicContentMatch() score = %d", score);
+    //qDebug("QBig5hkscsCodec::heuristicContentMatch() score = %d", score);
     return score;
 }
 
diff --git a/src/codecs/qeucjpcodec.cpp b/src/codecs/qeucjpcodec.cpp
index 7d9ab92..ca3d465 100644
--- a/src/codecs/qeucjpcodec.cpp
+++ b/src/codecs/qeucjpcodec.cpp
@@ -302,10 +302,10 @@ int QEucJpCodec::heuristicNameMatch(const char* hint) const
 {
     int score = 0;
     bool ja = FALSE;
-    if (tqstrnicmp(hint, "ja_JP", 5) == 0 || tqstrnicmp(hint, "japan", 5) == 0) {
+    if (qstrnicmp(hint, "ja_JP", 5) == 0 || qstrnicmp(hint, "japan", 5) == 0) {
 	score += 3;
 	ja = TRUE;
-    } else if (tqstrnicmp(hint, "ja", 2) == 0) {
+    } else if (qstrnicmp(hint, "ja", 2) == 0) {
 	score += 2;
 	ja = TRUE;
     }
@@ -320,16 +320,16 @@ int QEucJpCodec::heuristicNameMatch(const char* hint) const
 	p = hint;
     }
     if (p) {
-	if ((tqstricmp(p, "AJEC") == 0) ||
-	    (tqstricmp(p, "eucJP") == 0) ||
-	    (tqstricmp(p, "ujis") == 0) ||
+	if ((qstricmp(p, "AJEC") == 0) ||
+	    (qstricmp(p, "eucJP") == 0) ||
+	    (qstricmp(p, "ujis") == 0) ||
 	    (simpleHeuristicNameMatch(p, "eucJP") > 0) ||
 	    (simpleHeuristicNameMatch(p, "x-euc-jp") > 0)) {
 	    return score + 4;
 	}
 	// there exists ja_JP.EUC, ko_KR.EUC, zh_CN.EUC and zh_TW.EUC
 	// so "euc" may or may not be Japanese EUC.
-	if (tqstricmp(p, "euc") == 0 && ja) {
+	if (qstricmp(p, "euc") == 0 && ja) {
 	    return score + 4;
 	}
     }
diff --git a/src/codecs/qeuckrcodec.cpp b/src/codecs/qeuckrcodec.cpp
index 18efec7..fe06159 100644
--- a/src/codecs/qeuckrcodec.cpp
+++ b/src/codecs/qeuckrcodec.cpp
@@ -212,11 +212,11 @@ int QEucKrCodec::heuristicNameMatch(const char* hint) const
 {
   int score = 0;
   bool ko = FALSE;
-  if (tqstrnicmp(hint, "ko_KR", 5) == 0 ||
-      tqstrnicmp(hint, "korean", 5) == 0) {
+  if (qstrnicmp(hint, "ko_KR", 5) == 0 ||
+      qstrnicmp(hint, "korean", 5) == 0) {
     score += 3;
     ko = TRUE;
-  } else if (tqstrnicmp(hint, "ko", 2) == 0) {
+  } else if (qstrnicmp(hint, "ko", 2) == 0) {
     score += 2;
     ko = TRUE;
   }
@@ -231,10 +231,10 @@ int QEucKrCodec::heuristicNameMatch(const char* hint) const
     p = hint;
   }
   if (p) {
-    if (tqstricmp(p, "eucKR") == 0) {
+    if (qstricmp(p, "eucKR") == 0) {
       return score + 4;
     }
-    else if (tqstricmp(p, "euc") == 0 && ko) {
+    else if (qstricmp(p, "euc") == 0 && ko) {
       return score + 4;
     }
   }
diff --git a/src/codecs/qfontcncodec.cpp b/src/codecs/qfontcncodec.cpp
index 70cb846..0dca8bb 100644
--- a/src/codecs/qfontcncodec.cpp
+++ b/src/codecs/qfontcncodec.cpp
@@ -55,20 +55,20 @@ int QFontGb2312Codec::heuristicContentMatch(const char *, int) const
 
 QFontGb2312Codec::QFontGb2312Codec()
 {
-    //tqDebug("QFontGb2312Codec::QFontGb2312Codec()");
+    //qDebug("QFontGb2312Codec::QFontGb2312Codec()");
 }
 
 
 const char* QFontGb2312Codec::name() const
 {
-    //tqDebug("QFontGb2312Codec::name() = \"gb2312.1980-0\"");
+    //qDebug("QFontGb2312Codec::name() = \"gb2312.1980-0\"");
     return "gb2312.1980-0";
 }
 
 
 int QFontGb2312Codec::mibEnum() const
 {
-    //tqDebug("QFontGb2312Codec::mibEnum() = 57");
+    //qDebug("QFontGb2312Codec::mibEnum() = 57");
     return 57;
 }
 
@@ -93,7 +93,7 @@ QCString QFontGb2312Codec::fromUnicode(const QString& uc, int& lenInOut ) const
     uchar *rdata = (uchar *) result.data();
     const QChar *ucp = uc.unicode();
 
-    //tqDebug("QFontGb2312Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QFontGb2312Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     for ( int i = 0; i < lenInOut; i++ ) {
 	QChar ch(*ucp++);
 	uchar buf[8];
@@ -137,7 +137,7 @@ bool QFontGb2312Codec::canEncode( QChar ch ) const
 {
     uchar buf[4];
     int len = qt_UnicodeToGbk( ch.unicode(), buf );
-    //tqDebug("QFontGb2312Codec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
+    //qDebug("QFontGb2312Codec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
     return ( len == 2 && buf[0] > 0xa0 && buf[1] > 0xa0 );
 }
 
@@ -152,29 +152,29 @@ int QFontGbkCodec::heuristicContentMatch(const char *, int) const
 
 int QFontGbkCodec::heuristicNameMatch(const char* hint) const
 {
-    //tqDebug("QFontGbkCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
-    return ( tqstricmp(hint, "gbk-0") == 0 ||
-	     tqstricmp(hint, "gb18030.2000-0") == 0 )
+    //qDebug("QFontGbkCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    return ( qstricmp(hint, "gbk-0") == 0 ||
+	     qstricmp(hint, "gb18030.2000-0") == 0 )
         ? 13 : 0;
 }
 
 
 QFontGbkCodec::QFontGbkCodec()
 {
-    //tqDebug("QFontGbkCodec::QFontGbkCodec()");
+    //qDebug("QFontGbkCodec::QFontGbkCodec()");
 }
 
 
 const char* QFontGbkCodec::name() const
 {
-    //tqDebug("QFontGbkCodec::name() = \"gbk-0\"");
+    //qDebug("QFontGbkCodec::name() = \"gbk-0\"");
     return "gbk-0";
 }
 
 
 int QFontGbkCodec::mibEnum() const
 {
-    //tqDebug("QFontGbkCodec::mibEnum() = -113");
+    //qDebug("QFontGbkCodec::mibEnum() = -113");
     return -113;
 }
 
@@ -199,7 +199,7 @@ QCString QFontGbkCodec::fromUnicode(const QString& uc, int& lenInOut ) const
     uchar *rdata = (uchar *) result.data();
     const QChar *ucp = uc.unicode();
 
-    //tqDebug("QFontGbkCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QFontGbkCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     for ( int i = 0; i < lenInOut; i++ ) {
 	QChar ch(*ucp++);
 	uchar buf[8];
@@ -236,7 +236,7 @@ bool QFontGbkCodec::canEncode( QChar ch ) const
         return TRUE;
     uchar buf[4];
     int len = qt_UnicodeToGbk( ch.unicode(), buf );
-    //tqDebug("QFontGbkCodec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
+    //qDebug("QFontGbkCodec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
     return ( len == 2 );
 }
 
@@ -250,20 +250,20 @@ int QFontGb18030_0Codec::heuristicContentMatch(const char *, int) const
 
 QFontGb18030_0Codec::QFontGb18030_0Codec()
 {
-    //tqDebug("QFontGb18030_0Codec::QFontGb18030_0Codec()");
+    //qDebug("QFontGb18030_0Codec::QFontGb18030_0Codec()");
 }
 
 
 const char* QFontGb18030_0Codec::name() const
 {
-    //tqDebug("QFontGb18030_0Codec::name() = \"gb18030-0\"");
+    //qDebug("QFontGb18030_0Codec::name() = \"gb18030-0\"");
     return "gb18030-0";
 }
 
 
 int QFontGb18030_0Codec::mibEnum() const
 {
-    //tqDebug("QFontGb18030_0Codec::mibEnum() = -114");
+    //qDebug("QFontGb18030_0Codec::mibEnum() = -114");
     return -114;
 }
 
@@ -288,7 +288,7 @@ QCString QFontGb18030_0Codec::fromUnicode(const QString& uc, int& lenInOut ) con
     uchar *rdata = (uchar *) result.data();
     const QChar *ucp = uc.unicode();
 
-    //tqDebug("QFontGb18030_0Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QFontGb18030_0Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     for ( int i = 0; i < lenInOut; i++ ) {
 	QChar ch(*ucp++);
 	if (ch.row () > 0 && !(ch.row () >= 0xd8 && ch.row () < 0xe0)) {
@@ -317,7 +317,7 @@ void QFontGb18030_0Codec::fromUnicode(const QChar *in, unsigned short *out, int
 
 bool QFontGb18030_0Codec::canEncode( QChar ch ) const
 {
-    //tqDebug("QFontGb18030_0Codec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
+    //qDebug("QFontGb18030_0Codec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
     return (ch.row () > 0 && !(ch.row () >= 0xd8 && ch.row () < 0xe0));
 }
 
diff --git a/src/codecs/qfonthkcodec.cpp b/src/codecs/qfonthkcodec.cpp
index 9a229db..a0d32dd 100644
--- a/src/codecs/qfonthkcodec.cpp
+++ b/src/codecs/qfonthkcodec.cpp
@@ -54,29 +54,29 @@ int QFontBig5hkscsCodec::heuristicContentMatch(const char *, int) const
 
 int QFontBig5hkscsCodec::heuristicNameMatch(const char* hint) const
 {
-    //tqDebug("QFontBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
-    return ( tqstricmp(hint, "big5hkscs-0") == 0 ||
-	     tqstricmp(hint, "hkscs-1") == 0 )
+    //qDebug("QFontBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    return ( qstricmp(hint, "big5hkscs-0") == 0 ||
+	     qstricmp(hint, "hkscs-1") == 0 )
 	? 13 : 0;
 }
 
 
 QFontBig5hkscsCodec::QFontBig5hkscsCodec()
 {
-    //tqDebug("QFontBig5hkscsCodec::QFontBig5hkscsCodec()");
+    //qDebug("QFontBig5hkscsCodec::QFontBig5hkscsCodec()");
 }
 
 
 const char* QFontBig5hkscsCodec::name() const
 {
-    //tqDebug("QFontBig5hkscsCodec::name() = \"big5hkscs-0\"");
+    //qDebug("QFontBig5hkscsCodec::name() = \"big5hkscs-0\"");
     return "big5hkscs-0";
 }
 
 
 int QFontBig5hkscsCodec::mibEnum() const
 {
-    //tqDebug("QFontBig5hkscsCodec::mibEnum() = -2101");
+    //qDebug("QFontBig5hkscsCodec::mibEnum() = -2101");
     return -2101;
 }
 
@@ -97,7 +97,7 @@ QFontBig5hkscsCodec::characterFromUnicode(const QString &str, int pos) const
 
 QCString QFontBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut ) const
 {
-    //tqDebug("QFontBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QFontBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     QCString result(lenInOut * 2 + 1);
     uchar *rdata = (uchar *) result.data();
     const QChar *ucp = uc.unicode();
@@ -151,7 +151,7 @@ void QFontBig5hkscsCodec::fromUnicode(const QChar *in, unsigned short *out, int
 
 bool QFontBig5hkscsCodec::canEncode( QChar ch ) const
 {
-    //tqDebug("QFontBig5hkscsCodec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
+    //qDebug("QFontBig5hkscsCodec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
     uchar c[2];
     return ( qt_UnicodeToBig5hkscs( ch.unicode(), c ) == 2 );
 }
diff --git a/src/codecs/qfonttwcodec.cpp b/src/codecs/qfonttwcodec.cpp
index 1ffa161..050930d 100644
--- a/src/codecs/qfonttwcodec.cpp
+++ b/src/codecs/qfonttwcodec.cpp
@@ -54,29 +54,29 @@ int QFontBig5Codec::heuristicContentMatch(const char *, int) const
 
 int QFontBig5Codec::heuristicNameMatch(const char* hint) const
 {
-    //tqDebug("QFontBig5Codec::heuristicNameMatch(const char* hint = \"%s\")", hint);
-    return ( tqstricmp(hint, "big5-0") == 0 ||
-	     tqstricmp(hint, "big5.eten-0") == 0 )
+    //qDebug("QFontBig5Codec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    return ( qstricmp(hint, "big5-0") == 0 ||
+	     qstricmp(hint, "big5.eten-0") == 0 )
 	? 13 : 0;
 }
 
 
 QFontBig5Codec::QFontBig5Codec()
 {
-    //tqDebug("QFontBig5Codec::QFontBig5Codec()");
+    //qDebug("QFontBig5Codec::QFontBig5Codec()");
 }
 
 
 const char* QFontBig5Codec::name() const
 {
-    //tqDebug("QFontBig5Codec::name() = \"big5-0\"");
+    //qDebug("QFontBig5Codec::name() = \"big5-0\"");
     return "big5-0";
 }
 
 
 int QFontBig5Codec::mibEnum() const
 {
-    //tqDebug("QFontBig5Codec::mibEnum() = -2026");
+    //qDebug("QFontBig5Codec::mibEnum() = -2026");
     return -2026;
 }
 
@@ -97,7 +97,7 @@ unsigned short QFontBig5Codec::characterFromUnicode(const QString &str, int pos)
 
 QCString QFontBig5Codec::fromUnicode(const QString& uc, int& lenInOut ) const
 {
-    //tqDebug("QFontBig5Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QFontBig5Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     QCString result(lenInOut * 2 + 1);
     uchar *rdata = (uchar *) result.data();
     const QChar *ucp = uc.unicode();
@@ -152,7 +152,7 @@ void QFontBig5Codec::fromUnicode(const QChar *in, unsigned short *out, int lengt
 
 bool QFontBig5Codec::canEncode( QChar ch ) const
 {
-    //tqDebug("QFontBig5Codec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
+    //qDebug("QFontBig5Codec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
     uchar c[2];
     return ( qt_UnicodeToBig5hkscs( ch.unicode(), c ) == 2 &&
 	 c[0] >= 0xa1 && c[0] <= 0xf9 );
diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp
index ee99916..fe7b1e5 100644
--- a/src/codecs/qgb18030codec.cpp
+++ b/src/codecs/qgb18030codec.cpp
@@ -161,7 +161,7 @@ QGb18030Codec::QGb18030Codec()
 /*! \reimp */
 const char* QGb18030Codec::name() const
 {
-    //tqDebug("QGb18030Codec::name() = \"GB18030\"");
+    //qDebug("QGb18030Codec::name() = \"GB18030\"");
     return "GB18030";
 }
 
@@ -179,7 +179,7 @@ QCString QGb18030Codec::fromUnicode(const QString& uc, int& lenInOut) const
     QCString rstr(rlen);
     uchar* cursor = (uchar*)rstr.data();
 
-    //tqDebug("QGb18030Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QGb18030Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     for (int i=0; i<l; i++) {
 	QChar ch = uc[i];
 	int len;
@@ -231,7 +231,7 @@ QString QGb18030Codec::toUnicode(const char* chars, int len) const
     QString result;
     int clen;
 
-    //tqDebug("QGb18030Codec::toUnicode(const char* chars, int len = %d)", len);
+    //qDebug("QGb18030Codec::toUnicode(const char* chars, int len = %d)", len);
     for (int i=0; i<len; ) {
 	uchar ch = chars[i];
 
@@ -274,8 +274,8 @@ int QGb18030Codec::heuristicNameMatch(const char* hint) const
 {
     int score = 0;
     bool zh = FALSE;
-    //tqDebug("QGb18030Codec::heuristicNameMatch(const char* hint = \"%s\")", hint);
-    if (tqstrnicmp(hint, "zh_CN", 5) == 0){
+    //qDebug("QGb18030Codec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    if (qstrnicmp(hint, "zh_CN", 5) == 0){
 	score += 10;
 	zh = TRUE;
     }
@@ -289,7 +289,7 @@ int QGb18030Codec::heuristicNameMatch(const char* hint) const
     	p = hint;
     }
     if (p) {
-    	if (tqstricmp(p, "GB18030") == 0)
+    	if (qstricmp(p, "GB18030") == 0)
       	    return score + 14;
     }
     return QTextCodec::heuristicNameMatch(hint);
@@ -299,7 +299,7 @@ int QGb18030Codec::heuristicNameMatch(const char* hint) const
 int QGb18030Codec::heuristicContentMatch(const char* chars, int len) const
 {
     int score = 0;
-    //tqDebug("QGb18030Codec::heuristicContentMatch(const char* chars, int len = %d)", len);
+    //qDebug("QGb18030Codec::heuristicContentMatch(const char* chars, int len = %d)", len);
     for (int i=0; i<len; i++) {
 	uchar ch = chars[i];
 	// No nulls allowed.
@@ -351,7 +351,7 @@ public:
     QString toUnicode(const char* chars, int len)
     {
 	QString result;
-	//tqDebug("QGb18030Decoder::toUnicode(const char* chars, int len = %d)", len);
+	//qDebug("QGb18030Decoder::toUnicode(const char* chars, int len = %d)", len);
 	for (int i=0; i<len; i++) {
 	    uchar ch = chars[i];
 	    switch (nbuf) {
@@ -433,7 +433,7 @@ public:
 /*! \reimp */
 QTextDecoder* QGb18030Codec::makeDecoder() const
 {
-    //tqDebug("QGb18030Codec::makeDecoder()");
+    //qDebug("QGb18030Codec::makeDecoder()");
     return new QGb18030Decoder();
 }
 
@@ -480,15 +480,15 @@ int QGbkCodec::heuristicNameMatch(const char* hint) const
 {
 #if 0
     // these are needed so that the X11 fonts behave correctly.
-    if (tqstricmp (hint, "gbk-0") == 0 ||
-	tqstricmp (hint, "gb18030.2000-0") == 0)
+    if (qstricmp (hint, "gbk-0") == 0 ||
+	qstricmp (hint, "gb18030.2000-0") == 0)
         return 13;
 #endif
 
     int score = 0;
     bool zh = FALSE;
-    //tqDebug("QGbkCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
-    if (tqstrnicmp(hint, "zh_CN", 5) == 0){
+    //qDebug("QGbkCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    if (qstrnicmp(hint, "zh_CN", 5) == 0){
 	score += 10;
 	zh = TRUE;
     }
@@ -502,7 +502,7 @@ int QGbkCodec::heuristicNameMatch(const char* hint) const
     	p = hint;
     }
     if (p) {
-    	if (tqstricmp(p, "GBK") == 0)
+    	if (qstricmp(p, "GBK") == 0)
       	    return score + 6;
     }
     return QTextCodec::heuristicNameMatch(hint);
@@ -511,7 +511,7 @@ int QGbkCodec::heuristicNameMatch(const char* hint) const
 /*! \reimp */
 int QGbkCodec::heuristicContentMatch(const char* /*chars*/, int /*len*/) const
 {
-    //tqDebug("QGbkCodec::heuristicContentMatch(const char* /*chars*/, int /*len*/)");
+    //qDebug("QGbkCodec::heuristicContentMatch(const char* /*chars*/, int /*len*/)");
     return 0;
 }
 
@@ -526,7 +526,7 @@ public:
     {
 	QString result;
 
-	//tqDebug("QGbkDecoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
+	//qDebug("QGbkDecoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
 	for (int i=0; i<len; i++) {
 	    uchar ch = chars[i];
 	    switch (nbuf) {
@@ -570,7 +570,7 @@ public:
 /*! \reimp */
 QTextDecoder* QGbkCodec::makeDecoder() const
 {
-    //tqDebug("QGbkCodec::makeDecoder()");
+    //qDebug("QGbkCodec::makeDecoder()");
     return new QGbkDecoder();
 }
 
@@ -582,7 +582,7 @@ QCString QGbkCodec::fromUnicode(const QString& uc, int& lenInOut) const
     QCString rstr(rlen);
     uchar* cursor = (uchar*)rstr.data();
 
-    //tqDebug("QGbkCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QGbkCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     for (int i=0; i<l; i++) {
 	QChar ch = uc[i];
 	uchar buf[2];
@@ -610,7 +610,7 @@ QString QGbkCodec::toUnicode(const char* chars, int len) const
     QString result;
     int clen;
 
-    //tqDebug("QGbkCodec::toUnicode(const char* chars, int len = %d)", len);
+    //qDebug("QGbkCodec::toUnicode(const char* chars, int len = %d)", len);
     for (int i=0; i<len; ) {
 	uchar ch = chars[i];
 
@@ -681,8 +681,8 @@ int QGb2312Codec::heuristicNameMatch(const char* hint) const
 {
     int score = 0;
     bool zh = FALSE;
-    //tqDebug("QGb2312Codec::heuristicNameMatch(const char* hint = \"%s\")", hint);
-    if (tqstrnicmp(hint, "zh_CN", 5) == 0){
+    //qDebug("QGb2312Codec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    if (qstrnicmp(hint, "zh_CN", 5) == 0){
 	score += 10;
 	zh = TRUE;
     }
@@ -696,13 +696,13 @@ int QGb2312Codec::heuristicNameMatch(const char* hint) const
     	p = hint;
     }
     if (p) {
-	if (tqstricmp(p, "GB2312") == 0 ||
-	    tqstricmp(p, "hp15cn") == 0)
+	if (qstricmp(p, "GB2312") == 0 ||
+	    qstricmp(p, "hp15cn") == 0)
 	    return score + 7;
-	else if (tqstricmp(p, "eucCN") == 0)
+	else if (qstricmp(p, "eucCN") == 0)
 	    return score + 4;
 	// there exists ja_JP.EUC, ko_KR.EUC, zh_CN.EUC and zh_TW.EUC
-	else if (tqstricmp(p, "euc") == 0 && zh)
+	else if (qstricmp(p, "euc") == 0 && zh)
 	    return score + 4;
     }
     return QTextCodec::heuristicNameMatch(hint);
@@ -711,7 +711,7 @@ int QGb2312Codec::heuristicNameMatch(const char* hint) const
 /*! \reimp */
 int QGb2312Codec::heuristicContentMatch(const char* /*chars*/, int /*len*/) const
 {
-    //tqDebug("QGb2312Codec::heuristicContentMatch(const char* /*chars*/, int /*len*/)");
+    //qDebug("QGb2312Codec::heuristicContentMatch(const char* /*chars*/, int /*len*/)");
     return 0;
 }
 
@@ -725,7 +725,7 @@ public:
     QString toUnicode(const char* chars, int len)
     {
 	QString result;
-	//tqDebug("QGb2312Decoder::toUnicode(const char* chars, int len = %d)", len);
+	//qDebug("QGb2312Decoder::toUnicode(const char* chars, int len = %d)", len);
 	for (int i=0; i<len; i++) {
 	    uchar ch = chars[i];
 	    switch (nbuf) {
@@ -769,7 +769,7 @@ public:
 /*! \reimp */
 QTextDecoder* QGb2312Codec::makeDecoder() const
 {
-    //tqDebug("QGb2312Codec::makeDecoder()");
+    //qDebug("QGb2312Codec::makeDecoder()");
     return new QGb2312Decoder();
 }
 
@@ -781,7 +781,7 @@ QCString QGb2312Codec::fromUnicode(const QString& uc, int& lenInOut) const
     QCString rstr(rlen);
     uchar* cursor = (uchar*)rstr.data();
 
-    //tqDebug("QGb2312Codec::fromUnicode(const QString& uc, int& lenInOut = %d) const", lenInOut);
+    //qDebug("QGb2312Codec::fromUnicode(const QString& uc, int& lenInOut = %d) const", lenInOut);
     for (int i=0; i<l; i++) {
 	QChar ch = uc[i];
 	uchar buf[2];
@@ -810,7 +810,7 @@ QString QGb2312Codec::toUnicode(const char* chars, int len) const
     QString result;
     int clen;
 
-    //tqDebug("QGb2312Codec::toUnicode(const char* chars, int len = %d)", len);
+    //qDebug("QGb2312Codec::toUnicode(const char* chars, int len = %d)", len);
     for (int i=0; i<len; ) {
 	uchar ch = chars[i];
 
diff --git a/src/codecs/qjiscodec.cpp b/src/codecs/qjiscodec.cpp
index e685ab3..19cc94e 100644
--- a/src/codecs/qjiscodec.cpp
+++ b/src/codecs/qjiscodec.cpp
@@ -387,17 +387,17 @@ const char* QJisCodec::mimeName() const
 /*! \internal */
 int QJisCodec::heuristicNameMatch(const char* hint) const
 {
-    if ( tqstrnicmp( hint, "ISO-2022-JP", 11 ) == 0 )
+    if ( qstrnicmp( hint, "ISO-2022-JP", 11 ) == 0 )
 	return 10000;
     if ( simpleHeuristicNameMatch( "ISO-2022-JP-2", hint ) > 0 )
 	return 10;
 
     int score = 0;
     bool ja = FALSE;
-    if (tqstrnicmp(hint, "ja_JP", 5) == 0 || tqstrnicmp(hint, "japan", 5) == 0) {
+    if (qstrnicmp(hint, "ja_JP", 5) == 0 || qstrnicmp(hint, "japan", 5) == 0) {
 	score += 3;
 	ja = TRUE;
-    } else if (tqstrnicmp(hint, "ja", 2) == 0) {
+    } else if (qstrnicmp(hint, "ja", 2) == 0) {
 	score += 2;
 	ja = TRUE;
     }
@@ -412,8 +412,8 @@ int QJisCodec::heuristicNameMatch(const char* hint) const
 	p = hint;
     }
     if (p) {
-	if ((tqstricmp(p, "JIS") == 0) ||
-	    (tqstricmp(p, "JIS7") == 0) ||
+	if ((qstricmp(p, "JIS") == 0) ||
+	    (qstricmp(p, "JIS7") == 0) ||
 	    (simpleHeuristicNameMatch("ISO-2022-JP", p) > 0)) {
 	    return score + 4;
 	}
diff --git a/src/codecs/qjpunicode.cpp b/src/codecs/qjpunicode.cpp
index 3071dea..2d9033f 100644
--- a/src/codecs/qjpunicode.cpp
+++ b/src/codecs/qjpunicode.cpp
@@ -778,32 +778,32 @@ QJpUnicodeConv *QJpUnicodeConv::newConverter(int rule)
 		s = env.mid(i, j - i).stripWhiteSpace();
 		i = j + 1;
 	    }
-	    if (tqstricmp(s, "unicode-0.9") == 0) {
+	    if (qstricmp(s, "unicode-0.9") == 0) {
 		rule = (rule & 0xff00) | Unicode;
-	    } else if (tqstricmp(s, "unicode-0201") == 0) {
+	    } else if (qstricmp(s, "unicode-0201") == 0) {
 		rule = (rule & 0xff00) | Unicode_JISX0201;
-	    } else if (tqstricmp(s, "unicode-ascii") == 0) {
+	    } else if (qstricmp(s, "unicode-ascii") == 0) {
 		rule = (rule & 0xff00) | Unicode_ASCII;
-	    } else if (tqstricmp(s, "jisx0221-1995") == 0) {
+	    } else if (qstricmp(s, "jisx0221-1995") == 0) {
 		rule = (rule & 0xff00) | JISX0221_JISX0201;
-	    } else if ((tqstricmp(s, "open-0201") == 0) ||
-		       (tqstricmp(s, "open-19970715-0201") == 0)) {
+	    } else if ((qstricmp(s, "open-0201") == 0) ||
+		       (qstricmp(s, "open-19970715-0201") == 0)) {
 		rule = (rule & 0xff00) | JISX0221_JISX0201;
-	    } else if ((tqstricmp(s, "open-ascii") == 0) ||
-		       (tqstricmp(s, "open-19970715-ascii") == 0)) {
+	    } else if ((qstricmp(s, "open-ascii") == 0) ||
+		       (qstricmp(s, "open-19970715-ascii") == 0)) {
 		rule = (rule & 0xff00) | JISX0221_ASCII;
-	    } else if ((tqstricmp(s, "open-ms") == 0) ||
-		       (tqstricmp(s, "open-19970715-ms") == 0)) {
+	    } else if ((qstricmp(s, "open-ms") == 0) ||
+		       (qstricmp(s, "open-19970715-ms") == 0)) {
 		rule = (rule & 0xff00) | Microsoft_CP932;
-	    } else if (tqstricmp(s, "cp932") == 0) {
+	    } else if (qstricmp(s, "cp932") == 0) {
 		rule = (rule & 0xff00) | Microsoft_CP932;
-	    } else if (tqstricmp(s, "jdk1.1.7") == 0) {
+	    } else if (qstricmp(s, "jdk1.1.7") == 0) {
 		rule = (rule & 0xff00) | Sun_JDK117;
-	    } else if (tqstricmp(s, "nec-vdc") == 0) {
+	    } else if (qstricmp(s, "nec-vdc") == 0) {
 		rule = rule | NEC_VDC;
-	    } else if (tqstricmp(s, "ibm-vdc") == 0) {
+	    } else if (qstricmp(s, "ibm-vdc") == 0) {
 		rule = rule | IBM_VDC;
-	    } else if (tqstricmp(s, "udc") == 0) {
+	    } else if (qstricmp(s, "udc") == 0) {
 		rule = rule | UDC;
 	    }
 	}
diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/qrtlcodec.cpp
index 1d99edd..f77b0e6 100644
--- a/src/codecs/qrtlcodec.cpp
+++ b/src/codecs/qrtlcodec.cpp
@@ -217,7 +217,7 @@ static QString reverseLine(const QString &str, unsigned int from, unsigned int t
 		case QChar::DirL:
 		    if ( runDir != QChar::DirL && runDir != QChar::DirON ) {
 			out += run( str, from, pos, runDir );
-			tqDebug( "out = %s", out.latin1() );
+			qDebug( "out = %s", out.latin1() );
 			from = pos;
 		    }
 		    runDir = QChar::DirL;
@@ -233,7 +233,7 @@ static QString reverseLine(const QString &str, unsigned int from, unsigned int t
 		case QChar::DirEN:
 		    if ( runDir != QChar::DirR && runDir != QChar::DirON ) {
 			out += run( str, from, pos, runDir );
-			tqDebug( "out = %s", out.latin1() );
+			qDebug( "out = %s", out.latin1() );
 			from = pos;
 		    }
 		    runDir = QChar::DirR;
@@ -243,7 +243,7 @@ static QString reverseLine(const QString &str, unsigned int from, unsigned int t
 	    pos++;
 	}
 	out += run( str, from, pos, runDir );
-	tqDebug( "out = %s", out.latin1() );
+	qDebug( "out = %s", out.latin1() );
 	// second reversing for numbers
 	QString in = out;
 	out = "";
@@ -259,7 +259,7 @@ static QString reverseLine(const QString &str, unsigned int from, unsigned int t
 		case QChar::DirR:
 		    if ( runDir == QChar::DirEN && runDir != QChar::DirON ) {
 			out += run( in, from, pos, QChar::DirR ); //DirR ensures reversing
-			tqDebug( "out = %s", out.latin1() );
+			qDebug( "out = %s", out.latin1() );
 			runDir = QChar::DirR;
 			from = pos;
 		    }
@@ -269,7 +269,7 @@ static QString reverseLine(const QString &str, unsigned int from, unsigned int t
 		case QChar::DirEN:
 		    if ( runDir != QChar::DirEN && runDir != QChar::DirON ) {
 			out += in.mid(from, pos-from+1);
-			tqDebug( "out = %s", out.latin1() );
+			qDebug( "out = %s", out.latin1() );
 			from = pos;
 		    }
 		    runDir = QChar::DirEN;
@@ -437,7 +437,7 @@ static QString visualOrder(QString logical, QChar::Direction basicDir)
     }
     int i;
     for (i = 0; i < nitems; ++i) {
-	//tqDebug("item %d bidiLevel=%d", i,  e.items[i].analysis.bidiLevel);
+	//qDebug("item %d bidiLevel=%d", i,  e.items[i].analysis.bidiLevel);
 	levels[i] = e.items[i].analysis.bidiLevel;
     }
     e.bidiReorder(nitems, levels, visualOrder);
diff --git a/src/codecs/qsjiscodec.cpp b/src/codecs/qsjiscodec.cpp
index 581971d..d6c1102 100644
--- a/src/codecs/qsjiscodec.cpp
+++ b/src/codecs/qsjiscodec.cpp
@@ -249,10 +249,10 @@ int QSjisCodec::heuristicNameMatch(const char* hint) const
 {
     int score = 0;
     bool ja = FALSE;
-    if (tqstrnicmp(hint, "ja_JP", 5) == 0 || tqstrnicmp(hint, "japan", 5) == 0) {
+    if (qstrnicmp(hint, "ja_JP", 5) == 0 || qstrnicmp(hint, "japan", 5) == 0) {
 	score += 3;
 	ja = TRUE;
-    } else if (tqstrnicmp(hint, "ja", 2) == 0) {
+    } else if (qstrnicmp(hint, "ja", 2) == 0) {
 	score += 2;
 	ja = TRUE;
     }
@@ -267,9 +267,9 @@ int QSjisCodec::heuristicNameMatch(const char* hint) const
 	p = hint;
     }
     if (p) {
-	if ((tqstricmp(p, "mscode") == 0) ||
-	    (tqstricmp(p, "PCK") == 0) ||
-	    (tqstricmp(p, "SJIS") == 0) ||
+	if ((qstricmp(p, "mscode") == 0) ||
+	    (qstricmp(p, "PCK") == 0) ||
+	    (qstricmp(p, "SJIS") == 0) ||
 	    (simpleHeuristicNameMatch(p, "ShiftJIS") > 0) ||
 	    (simpleHeuristicNameMatch(p, "x-sjis") > 0)) {
 	    return score + 4;
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp
index 7e6b67e..1a4fb32 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/qtextcodec.cpp
@@ -443,7 +443,7 @@ QTextCodec::QTextCodec()
 QTextCodec::~QTextCodec()
 {
     if ( !destroying_is_ok )
-	tqWarning("QTextCodec::~QTextCodec() called by application");
+	qWarning("QTextCodec::~QTextCodec() called by application");
     if ( all )
 	all->remove( this );
 }
@@ -503,7 +503,7 @@ static QString lettersAndNumbers( const char * input )
 int QTextCodec::simpleHeuristicNameMatch(const char* name, const char* hint)
 {
     // if they're the same, return a perfect score.
-    if ( name && hint && *name && *hint && tqstricmp( name, hint ) == 0 )
+    if ( name && hint && *name && *hint && qstricmp( name, hint ) == 0 )
 	return qstrlen( hint );
 
     // if the letters and numbers are the same, we have an "almost"
@@ -667,7 +667,7 @@ public:
                 // character
                 buf[nbuf++] = *chars;
                 if (nbuf + 1 == sizeof buf) {
-                    tqWarning("QWindowsLocalDecoder: exceeded max internal buffer size");
+                    qWarning("QWindowsLocalDecoder: exceeded max internal buffer size");
                     nbuf = 0;
                 }
             }
@@ -793,7 +793,7 @@ static QTextCodec * ru_RU_hack( const char * i ) {
     } else {
 	// something else again... let's assume... *throws dice*
 	ru_RU_codec = QTextCodec::codecForName( "KOI8-R" );
-	tqWarning( "QTextCodec: using KOI8-R, probe failed (%02x %02x %s)",
+	qWarning( "QTextCodec: using KOI8-R, probe failed (%02x %02x %s)",
 		  koi8r, latin5, i );
     }
     setlocale( LC_CTYPE, origlocale.data() );
@@ -1297,15 +1297,15 @@ public:
 	char comm='%';
 	bool incmap = FALSE;
 	while (iod->readLine(line,maxlen) > 0) {
-	    if (0==tqstrnicmp(line,"<code_set_name>",15))
+	    if (0==qstrnicmp(line,"<code_set_name>",15))
 		n = line+15;
-	    else if (0==tqstrnicmp(line,"<escape_char> ",14))
+	    else if (0==qstrnicmp(line,"<escape_char> ",14))
 		esc = line[14];
-	    else if (0==tqstrnicmp(line,"<comment_char> ",15))
+	    else if (0==qstrnicmp(line,"<comment_char> ",15))
 		comm = line[15];
-	    else if (line[0]==comm && 0==tqstrnicmp(line+1," alias ",7)) {
+	    else if (line[0]==comm && 0==qstrnicmp(line+1," alias ",7)) {
 		aliases.append(line+8);
-	    } else if (0==tqstrnicmp(line,"CHARMAP",7)) {
+	    } else if (0==qstrnicmp(line,"CHARMAP",7)) {
 		if (!from_unicode_page) {
 		    from_unicode_page = new char*[256];
 		    for (int i=0; i<256; i++)
@@ -1315,7 +1315,7 @@ public:
 		    to_unicode = new ushort[256];
 		}
 		incmap = TRUE;
-	    } else if (0==tqstrnicmp(line,"END CHARMAP",11))
+	    } else if (0==qstrnicmp(line,"END CHARMAP",11))
 		break;
 	    else if (incmap) {
 		char* cursor = line;
@@ -1395,7 +1395,7 @@ public:
 			}
 			mb[nmb++] = 0;
 			from_unicode_page_multiByte[ch.row()][ch.cell()]
-			    = tqstrdup(mb);
+			    = qstrdup(mb);
 			*mb_unicode = unicode;
 		    } else {
 			from_unicode_page[ch.row()][ch.cell()] = (char)byte;
@@ -2442,7 +2442,7 @@ int QSimpleTextCodec::mibEnum() const
 
 int QSimpleTextCodec::heuristicNameMatch(const char* hint) const
 {
-    if ( tqstricmp( hint, mimeName() ) == 0 )
+    if ( qstricmp( hint, mimeName() ) == 0 )
 	return 10000; // return a large value
     if ( hint[0]=='k' ) {
 	QCString lhint = QCString(hint).lower();
@@ -2802,18 +2802,18 @@ static void setupLocaleMapper()
 	// First part is getting that locale name.  First try setlocale() which
 	// definitely knows it, but since we cannot fully trust it, get ready
 	// to fall back to environment variables.
-	char * ctype = tqstrdup( setlocale( LC_CTYPE, 0 ) );
+	char * ctype = qstrdup( setlocale( LC_CTYPE, 0 ) );
 
 	// Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG
 	// environment variables.
-	char * lang = tqstrdup( getenv("LC_ALL") );
+	char * lang = qstrdup( getenv("LC_ALL") );
 	if ( !lang || lang[0] == 0 || strcmp( lang, "C" ) == 0 ) {
 	    if ( lang ) delete [] lang;
-	    lang = tqstrdup( getenv("LC_CTYPE") );
+	    lang = qstrdup( getenv("LC_CTYPE") );
 	}
 	if ( !lang || lang[0] == 0 || strcmp( lang, "C" ) == 0 ) {
 	    if ( lang ) delete [] lang;
-	    lang = tqstrdup( getenv("LANG") );
+	    lang = qstrdup( getenv("LANG") );
 	}
 
 	// Now try these in order:
@@ -2905,7 +2905,7 @@ static void realSetup()
 {
 #if defined(QT_CHECK_STATE)
     if ( destroying_is_ok )
-	tqWarning( "QTextCodec: creating new codec during codec cleanup!" );
+	qWarning( "QTextCodec: creating new codec during codec cleanup!" );
 #endif
     all = new QValueList<QTextCodec*>;
 
diff --git a/src/codecs/qtsciicodec.cpp b/src/codecs/qtsciicodec.cpp
index 71a0c83..ad6a6ee 100644
--- a/src/codecs/qtsciicodec.cpp
+++ b/src/codecs/qtsciicodec.cpp
@@ -183,7 +183,7 @@ int QTsciiCodec::heuristicNameMatch(const char* hint) const
         p++;
     else
         p = hint;
-    if (tqstricmp(p, "TSCII") == 0)
+    if (qstricmp(p, "TSCII") == 0)
       	return 4;
     return QTextCodec::heuristicNameMatch(hint);
 }
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index d807f79..4ce83bb 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/qcolordialog.cpp
@@ -366,7 +366,7 @@ void QWellArray::setCellBrush( int row, int col, const QBrush &b )
 	d->brush[row*numCols()+col] = b;
 #ifdef QT_CHECK_RANGE
     else
-	tqWarning( "QWellArray::setCellBrush( %d, %d ) out of range", row, col );
+	qWarning( "QWellArray::setCellBrush( %d, %d ) out of range", row, col );
 #endif
 }
 
@@ -471,7 +471,7 @@ QRgb QColorDialog::customColor( int i )
     initRGB();
     if ( i < 0 || i >= customCount() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QColorDialog::customColor() index %d out of range", i );
+	qWarning( "QColorDialog::customColor() index %d out of range", i );
 #endif
 	i = 0;
     }
@@ -486,7 +486,7 @@ void QColorDialog::setCustomColor( int i, QRgb c )
     initRGB();
     if ( i < 0 || i >= customCount() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QColorDialog::setCustomColor() index %d out of range", i );
+	qWarning( "QColorDialog::setCustomColor() index %d out of range", i );
 #endif
 	return;
     }
@@ -503,7 +503,7 @@ void QColorDialog::setStandardColor( int i, QRgb c )
     initRGB();
     if ( i < 0 || i >= 6*8 ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QColorDialog::setStandardColor() index %d out of range", i );
+	qWarning( "QColorDialog::setStandardColor() index %d out of range", i );
 #endif
 	return;
     }
diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp
index 07f8cf1..a80f509 100644
--- a/src/dialogs/qdialog.cpp
+++ b/src/dialogs/qdialog.cpp
@@ -418,7 +418,7 @@ void QDialog::hideSpecial()
 int QDialog::exec()
 {
     if ( in_loop ) {
-	tqWarning( "QDialog::exec: Recursive call detected" );
+	qWarning( "QDialog::exec: Recursive call detected" );
 	return -1;
     }
 
diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp
index 20da497..4e4dc5a 100644
--- a/src/dialogs/qerrormessage.cpp
+++ b/src/dialogs/qerrormessage.cpp
@@ -95,7 +95,7 @@ message() slot, or connect signals to it.
 
 \i For developers. In this context the static qtHandler() installs
 a message handler using qInstallMsgHandler() and creates a QErrorMessage
-that displays tqDebug(), tqWarning() and tqFatal() messages.
+that displays qDebug(), qWarning() and qFatal() messages.
 \endlist
 
 In both cases QErrorMessage will queue pending messages, and display
@@ -224,7 +224,7 @@ QErrorMessage * QErrorMessage::qtHandler()
 {
     if ( !qtMessageHandler ) {
 	qtMessageHandler = new QErrorMessage( 0, "automatic message handler" );
-	tqAddPostRoutine( deleteStaticcQErrorMessage ); // clean up
+	qAddPostRoutine( deleteStaticcQErrorMessage ); // clean up
 #ifndef QT_NO_WIDGET_TOPEXTRA
 	if ( qApp->mainWidget() )
 	    qtMessageHandler->setCaption( qApp->mainWidget()->caption() );
diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp
index a0f39dd..fd73e0a 100644
--- a/src/dialogs/qinputdialog.cpp
+++ b/src/dialogs/qinputdialog.cpp
@@ -231,7 +231,7 @@ void QInputDialog::setType( Type t )
 	break;
     default:
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QInputDialog::setType: Invalid type" );
+	qWarning( "QInputDialog::setType: Invalid type" );
 #endif
 	break;
     }
diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp
index d287576..37407b0 100644
--- a/src/dialogs/qmessagebox.cpp
+++ b/src/dialogs/qmessagebox.cpp
@@ -614,7 +614,7 @@ void QMessageBox::init( int button0, int button1, int button2 )
 
     if ( (button2 && !button1) || (button1 && !button0) ) {
 #if defined(QT_CHECK_RANGE)
-        tqWarning( "QMessageBox: Inconsistent button parameters" );
+        qWarning( "QMessageBox: Inconsistent button parameters" );
 #endif
         button0 = button1 = button2 = 0;
     }
@@ -634,7 +634,7 @@ void QMessageBox::init( int button0, int button1, int button2 )
         if ( (b & Default) ) {
             if ( mbd->defButton >= 0 ) {
 #if defined(QT_CHECK_RANGE)
-                tqWarning( "QMessageBox: There can be at most one "
+                qWarning( "QMessageBox: There can be at most one "
                            "default button" );
 #endif
             } else {
@@ -644,7 +644,7 @@ void QMessageBox::init( int button0, int button1, int button2 )
         if ( (b & Escape) ) {
             if ( mbd->escButton >= 0 ) {
 #if defined(QT_CHECK_RANGE)
-                tqWarning( "QMessageBox: There can be at most one "
+                qWarning( "QMessageBox: There can be at most one "
                            "escape button" );
 #endif
             } else {
@@ -657,13 +657,13 @@ void QMessageBox::init( int button0, int button1, int button2 )
                 b = Ok;
         } else if ( b < 0 || b > LastButton ) {
 #if defined(QT_CHECK_RANGE)
-            tqWarning( "QMessageBox: Invalid button specifier" );
+            qWarning( "QMessageBox: Invalid button specifier" );
 #endif
             b = Ok;
         } else {
             if ( i > 0 && mbd->button[i-1] == 0 ) {
 #if defined(QT_CHECK_RANGE)
-                tqWarning( "QMessageBox: Inconsistent button parameters; "
+                qWarning( "QMessageBox: Inconsistent button parameters; "
                            "button %d defined but not button %d",
                            i+1, i );
 #endif
diff --git a/src/dialogs/qmessagebox.h b/src/dialogs/qmessagebox.h
index 781efd1..338525b 100644
--- a/src/dialogs/qmessagebox.h
+++ b/src/dialogs/qmessagebox.h
@@ -209,13 +209,13 @@ private:	// Disabled copy constructor and operator=
 *   }
 */
 #define QT_REQUIRE_VERSION( argc, argv, str ) { QString s=QString::fromLatin1(str);\
-QString sq=QString::fromLatin1(tqVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\
+QString sq=QString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\
 (sq.section('.',1,1).toInt()<<8)+sq.section('.',2,2).toInt()<(s.section('.',0,0).toInt()<<16)+\
 (s.section('.',1,1).toInt()<<8)+s.section('.',2,2).toInt() ){if ( !qApp){ int c=0; new \
 QApplication(argc,argv);} QString s = QApplication::tr("Executable '%1' requires Qt "\
  "%2, found Qt %3.").arg(QString::fromLatin1(qAppName())).arg(QString::fromLatin1(\
-str)).arg(QString::fromLatin1(tqVersion()) ); QMessageBox::critical( 0, QApplication::tr(\
-"Incompatible Qt Library Error" ), s, QMessageBox::Abort,0 ); tqFatal(s.ascii()); }}
+str)).arg(QString::fromLatin1(qVersion()) ); QMessageBox::critical( 0, QApplication::tr(\
+"Incompatible Qt Library Error" ), s, QMessageBox::Abort,0 ); qFatal(s.ascii()); }}
 
 
 #endif // QT_NO_MESSAGEBOX
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index 7c0e015..3f3e2a1 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -404,7 +404,7 @@ static char * parsePrintersConf( QListView * printers, bool *found = 0 )
 			j++;
 		    // that's our default printer
 		    defaultPrinter =
-			tqstrdup( printerDesc.mid( i, j-i ).ascii() );
+			qstrdup( printerDesc.mid( i, j-i ).ascii() );
 		    printerName = "";
 		    printerDesc = "";
 		} else if ( printerName == QString::fromLatin1("_all") ) {
@@ -807,7 +807,7 @@ static char * parseCupsOutput( QListView * printers )
 	    perhapsAddPrinter( printers, d[n].name,
 			       QPrintDialog::tr("Unknown Location"), 0 );
 	    if ( d[n].is_default && !defaultPrinter )
-		defaultPrinter = tqstrdup( d[n].instance );
+		defaultPrinter = qstrdup( d[n].instance );
 	    n++;
 	}
     }
@@ -977,7 +977,7 @@ void QPrintDialog::setGlobalPrintDialog( QPrintDialog *pd )
     if ( oldPd )
 	delete oldPd;
     else
-	tqAddPostRoutine( qpd_cleanup_globaldialog );
+	qAddPostRoutine( qpd_cleanup_globaldialog );
     globalPrintDialog->adjustSize();
 }
 
@@ -1375,7 +1375,7 @@ bool QPrintDialog::getPrinterSetup( QPrinter * p, QWidget* w  )
 #ifndef QT_NO_WIDGET_TOPEXTRA
 	globalPrintDialog->setCaption( QPrintDialog::tr( "Setup Printer" ) );
 #endif
-	tqAddPostRoutine( qpd_cleanup_globaldialog );
+	qAddPostRoutine( qpd_cleanup_globaldialog );
 	globalPrintDialog->setPrinter( p, TRUE );
 	globalPrintDialog->adjustSize();
     } else {
diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp
index b7d83eb..bdae310 100644
--- a/src/dialogs/qprogressdialog.cpp
+++ b/src/dialogs/qprogressdialog.cpp
@@ -456,7 +456,7 @@ void QProgressDialog::setBar( QProgressBar *bar )
 {
     if ( progress() > 0 ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QProgrssDialog::setBar: Cannot set a new progress bar "
+	qWarning( "QProgrssDialog::setBar: Cannot set a new progress bar "
 		 "while the old one is active" );
 #endif
     }
diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp
index 3197af7..32c386a 100644
--- a/src/dialogs/qwizard.cpp
+++ b/src/dialogs/qwizard.cpp
@@ -264,7 +264,7 @@ void QWizard::addPage( QWidget * page, const QString & title )
 	return;
     if ( d->page( page ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QWizard::addPage(): already added %s/%s to %s/%s",
+	qWarning( "QWizard::addPage(): already added %s/%s to %s/%s",
 		  page->className(), page->name(),
 		  className(), name() );
 #endif
@@ -293,7 +293,7 @@ void QWizard::insertPage( QWidget * page, const QString & title, int index )
 	return;
     if ( d->page( page ) ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QWizard::insertPage(): already added %s/%s to %s/%s",
+	qWarning( "QWizard::insertPage(): already added %s/%s to %s/%s",
 		  page->className(), page->name(),
 		  className(), name() );
 #endif
diff --git a/src/iconview/qiconview.cpp b/src/iconview/qiconview.cpp
index 3b75100..636fc61 100644
--- a/src/iconview/qiconview.cpp
+++ b/src/iconview/qiconview.cpp
@@ -6223,7 +6223,7 @@ void QIconView::updateItemContainer( QIconViewItem *item )
 
     if ( !c ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QIconViewItem::updateItemContainer(): No fitting container found!" );
+	qWarning( "QIconViewItem::updateItemContainer(): No fitting container found!" );
 #endif
 	return;
     }
diff --git a/src/kernel/qabstractlayout.cpp b/src/kernel/qabstractlayout.cpp
index 4607fd0..6921d49 100644
--- a/src/kernel/qabstractlayout.cpp
+++ b/src/kernel/qabstractlayout.cpp
@@ -606,7 +606,7 @@ QLayout::QLayout( QWidget *parent, int margin, int spacing, const char *name )
     init();
     if ( parent ) {
 	if ( parent->layout() ) {
-	    tqWarning( "QLayout \"%s\" added to %s \"%s\", which already has a"
+	    qWarning( "QLayout \"%s\" added to %s \"%s\", which already has a"
 		      " layout", QObject::name(), parent->className(),
 		      parent->name() );
 	    parent->removeChild( this );
@@ -1063,7 +1063,7 @@ void QLayout::addChildLayout( QLayout *l )
 {
     if ( l->parent() ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QLayout::addChildLayout: layout already has a parent" );
+	qWarning( "QLayout::addChildLayout: layout already has a parent" );
 #endif
 	return;
     }
@@ -1189,7 +1189,7 @@ bool QLayout::activate()
     QWidget *mw = mainWidget();
     if (!mw) {
 #if defined( QT_CHECK_NULL )
-	tqWarning( "QLayout::activate: %s \"%s\" does not have a main widget",
+	qWarning( "QLayout::activate: %s \"%s\" does not have a main widget",
 		  QObject::className(), QObject::name() );
 #endif
 	return FALSE;
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index 59beea2..53814dc 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -576,7 +576,7 @@ QAccel::QAccel( QWidget *parent, const char *name )
     d->watch = parent;
 #if defined(QT_CHECK_NULL)
     if ( !d->watch )
-	tqWarning( "QAccel: An accelerator must have a parent or a watch widget" );
+	qWarning( "QAccel: An accelerator must have a parent or a watch widget" );
 #endif
 }
 
@@ -594,7 +594,7 @@ QAccel::QAccel( QWidget* watch, QObject *parent, const char *name )
     d->watch = watch;
 #if defined(QT_CHECK_NULL)
     if ( !d->watch )
-	tqWarning( "QAccel: An accelerator must have a parent or a watch widget" );
+	qWarning( "QAccel: An accelerator must have a parent or a watch widget" );
 #endif
 }
 
diff --git a/src/kernel/qaccessible.cpp b/src/kernel/qaccessible.cpp
index 539caae..d037124 100644
--- a/src/kernel/qaccessible.cpp
+++ b/src/kernel/qaccessible.cpp
@@ -385,7 +385,7 @@ QRESULT QAccessible::queryAccessibleInterface( QObject *object, QAccessibleInter
     if ( !qAccessibleManager ) {
 	qAccessibleManager = new QPluginManager<QAccessibleFactoryInterface>( IID_QAccessibleFactory, QApplication::libraryPaths(), "/accessible" );
 	if ( !cleanupAdded ) {
-	    tqAddPostRoutine( qAccessibleCleanup );
+	    qAddPostRoutine( qAccessibleCleanup );
 	    cleanupAdded = TRUE;
 	}
     }
@@ -652,7 +652,7 @@ QAccessibleObject::QAccessibleObject( QObject *object )
     if ( !qAccessibleInterface ) {
 	qAccessibleInterface = new AccessibleCache;
 	if ( !cleanupAdded ) {
-	    tqAddPostRoutine( qAccessibleCleanup );
+	    qAddPostRoutine( qAccessibleCleanup );
 	    cleanupAdded = TRUE;
 	}
     }
@@ -703,7 +703,7 @@ QObject *QAccessibleObject::object() const
 {
 #if defined(QT_CHECK_RANGE)
     if ( !isValid() )
-	tqWarning( "QAccessibleInterface is invalid. Crash pending..." );
+	qWarning( "QAccessibleInterface is invalid. Crash pending..." );
 #endif
     return object_;
 }
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 66ab1dd..7296f4c 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -438,12 +438,12 @@ static QVFuncList *postRList = 0;		// list of post routines
     void init_ptr()
     {
 	global_ptr = new int[100];	// allocate data
-	tqAddPostRoutine( cleanup_ptr );	// delete later
+	qAddPostRoutine( cleanup_ptr );	// delete later
     }
   \endcode
 
   Note that for an application- or module-wide cleanup,
-  tqAddPostRoutine() is often not suitable. People have a tendency to
+  qAddPostRoutine() is often not suitable. People have a tendency to
   make such modules dynamically loaded, and then unload those modules
   long before the QApplication destructor is called, for example.
 
@@ -477,7 +477,7 @@ static QVFuncList *postRList = 0;		// list of post routines
   to clean up the module's data at the exact right moment.
 */
 
-Q_EXPORT void tqAddPostRoutine( QtCleanUpFunction p)
+Q_EXPORT void qAddPostRoutine( QtCleanUpFunction p)
 {
     if ( !postRList ) {
 	postRList = new QVFuncList;
@@ -487,7 +487,7 @@ Q_EXPORT void tqAddPostRoutine( QtCleanUpFunction p)
 }
 
 
-Q_EXPORT void tqRemovePostRoutine( QtCleanUpFunction p )
+Q_EXPORT void qRemovePostRoutine( QtCleanUpFunction p )
 {
     if ( !postRList ) return;
     QVFuncList::Iterator it = postRList->begin();
@@ -862,7 +862,7 @@ QApplication::QApplication( Display* dpy, HANDLE visual, HANDLE colormap )
 
     if ( ! dpy ) {
 #ifdef QT_CHECK_STATE
-	tqWarning( "QApplication: invalid Display* argument." );
+	qWarning( "QApplication: invalid Display* argument." );
 #endif // QT_CHECK_STATE
 
 	qt_init( &aargc, aargv, GuiClient );
@@ -903,7 +903,7 @@ QApplication::QApplication(Display *dpy, int argc, char **argv,
 
     if ( ! dpy ) {
 #ifdef QT_CHECK_STATE
-	tqWarning( "QApplication: invalid Display* argument." );
+	qWarning( "QApplication: invalid Display* argument." );
 #endif // QT_CHECK_STATE
 
 	qt_init( &argc, argv, GuiClient );
@@ -933,7 +933,7 @@ void QApplication::init_precmdline()
 #endif
 #if defined(QT_CHECK_STATE)
     if ( qApp )
-	tqWarning( "QApplication: There should be max one application object" );
+	qWarning( "QApplication: There should be max one application object" );
 #endif
     qApp = (QApplication*)this;
 }
@@ -1106,7 +1106,7 @@ QApplication::~QApplication()
     is_app_running = FALSE;
 
     if ( widgetCount ) {
-	tqDebug( "Widgets left: %i    Max widgets: %i \n", QWidget::instanceCounter, QWidget::maxInstances );
+	qDebug( "Widgets left: %i    Max widgets: %i \n", QWidget::instanceCounter, QWidget::maxInstances );
     }
 #ifndef QT_NO_SESSIONMANAGER
     delete session_manager;
@@ -1214,7 +1214,7 @@ QStyle& QApplication::style()
     if ( app_style )
 	return *app_style;
     if ( !qt_is_gui_used )
-	tqFatal( "No style available in non-gui applications!" );
+	qFatal( "No style available in non-gui applications!" );
 
 #if defined(Q_WS_X11)
     if(!qt_style_override)
@@ -1262,7 +1262,7 @@ QStyle& QApplication::style()
 	    && !(app_style = QStyleFactory::create( QStyleFactory::keys()[0]  ) )
 #endif
 	)
-	    tqFatal( "No %s style available!", style.latin1() );
+	    qFatal( "No %s style available!", style.latin1() );
     }
 
     QPalette app_pal_copy ( *app_pal );
@@ -1500,7 +1500,7 @@ void QApplication::setColorSpec( int spec )
 {
 #if defined(QT_CHECK_STATE)
     if ( qApp ) {
-	tqWarning( "QApplication::setColorSpec: This function must be "
+	qWarning( "QApplication::setColorSpec: This function must be "
 		 "called before the QApplication object is created" );
     }
 #endif
@@ -1723,7 +1723,7 @@ QStringList QApplication::libraryPaths()
 {
     if ( !app_libpaths ) {
 	app_libpaths = new QStringList;
-	QString installPathPlugins = QString::fromLocal8Bit(tqInstallPathPlugins());
+	QString installPathPlugins = QString::fromLocal8Bit(qInstallPathPlugins());
 	if ( QFile::exists(installPathPlugins) ) {
 #ifdef Q_WS_WIN
 	    installPathPlugins.replace('\\', '/');
@@ -1742,7 +1742,7 @@ QStringList QApplication::libraryPaths()
 #endif
 	if (!app_location.isEmpty()) {
 	    app_location.truncate( app_location.findRev( '/' ) );
-	    if ( app_location != tqInstallPathPlugins() && QFile::exists( app_location ) )
+	    if ( app_location != qInstallPathPlugins() && QFile::exists( app_location ) )
 		app_libpaths->append( app_location );
 	}
     }
@@ -1822,7 +1822,7 @@ QPalette QApplication::palette(const QWidget* w)
 {
 #if defined(QT_CHECK_STATE)
     if ( !qApp )
-	tqWarning( "QApplication::palette: This function can only be "
+	qWarning( "QApplication::palette: This function can only be "
 		  "called after the QApplication object has been created" );
 #endif
     if ( !app_pal ) {
@@ -2319,7 +2319,7 @@ bool QApplication::notify( QObject *receiver, QEvent *e )
 
     if ( receiver == 0 ) {			// serious error
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QApplication::notify: Unexpected null receiver" );
+	qWarning( "QApplication::notify: Unexpected null receiver" );
 #endif
 	return FALSE;
     }
@@ -3098,7 +3098,7 @@ void QApplication::postEvent( QObject *receiver, QEvent *event )
 {
     if ( receiver == 0 ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QApplication::postEvent: Unexpected null receiver" );
+	qWarning( "QApplication::postEvent: Unexpected null receiver" );
 #endif
 	delete event;
 	return;
@@ -3412,7 +3412,7 @@ void QApplication::removePostedEvent( QEvent *  event )
 
     if ( !globalPostedEvents ) {
 #if defined(QT_DEBUG)
-	tqDebug( "QApplication::removePostedEvent: %p %d is posted: impossible",
+	qDebug( "QApplication::removePostedEvent: %p %d is posted: impossible",
 		(void*)event, event->type() );
 	return;
 #endif
@@ -3493,7 +3493,7 @@ void QApplication::removePostedEvent( QEvent *  event )
 		n = "<other>";
 		break;
 	    }
-	    tqWarning("QEvent: Warning: %s event deleted while posted to %s %s",
+	    qWarning("QEvent: Warning: %s event deleted while posted to %s %s",
 		     n,
 		     pe->receiver ? pe->receiver->className() : "null",
 		     pe->receiver ? pe->receiver->name() : "object" );
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 5f5e23c..45d83df 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -131,7 +131,7 @@ extern "C" Bool XftInitFtLibrary(void);
 extern "C" char *_Xsetlocale(int category, const char *locale);
 char *_Xsetlocale(int category, const char *locale)
 {
-    //tqDebug("_Xsetlocale(%d,%s),category,locale");
+    //qDebug("_Xsetlocale(%d,%s),category,locale");
     return setlocale(category,locale);
 }
 # endif // setlocale
@@ -520,7 +520,7 @@ void qt_deferred_map_add( QWidget* w)
 {
     if ( !deferred_map_list ) {
 	deferred_map_list = new QPtrList<QWidget>;
-	tqAddPostRoutine( qt_deferred_map_cleanup );
+	qAddPostRoutine( qt_deferred_map_cleanup );
     }
     deferred_map_list->append( w );
 }
@@ -788,7 +788,7 @@ static int qt_x_errhandler( Display *dpy, XErrorEvent *err )
 
     char errstr[256];
     XGetErrorText( dpy, err->error_code, errstr, 256 );
-    tqWarning( "X Error: %s %d\n"
+    qWarning( "X Error: %s %d\n"
 	      "  Major opcode:  %d\n"
 	      "  Minor opcode:  %d\n"
 	      "  Resource id:  0x%lx",
@@ -806,7 +806,7 @@ static int qt_x_errhandler( Display *dpy, XErrorEvent *err )
 
 static int qt_xio_errhandler( Display * )
 {
-    tqWarning( "%s: Fatal IO error: client killed", appName );
+    qWarning( "%s: Fatal IO error: client killed", appName );
     qApp = 0;
     exit( 1 );
     //### give the application a chance for a proper shutdown instead,
@@ -866,7 +866,7 @@ static void qt_x11_process_intern_atoms()
 	while( it.current() ) {
 	    res[i] = 0;
 	    resp[i] = it.current();
-	    names[i] = tqstrdup(it.currentKey());
+	    names[i] = qstrdup(it.currentKey());
 	    i++;
 	    ++it;
 	}
@@ -1184,7 +1184,7 @@ static void qt_set_input_encoding()
 	qt_input_mapper = QTextCodec::codecForLocale();
 
     } else {
-	if ( !tqstricmp( data, "locale" ) )
+	if ( !qstricmp( data, "locale" ) )
 	    qt_input_mapper = QTextCodec::codecForLocale();
 	else
 	    qt_input_mapper = QTextCodec::codecForName( data );
@@ -1658,11 +1658,11 @@ void qt_init_internal( int *argcptr, char **argv,
 	appDpy  = display;
 
 	// Set application name and class
-	appName = tqstrdup( "Qt-subapplication" );
+	appName = qstrdup( "Qt-subapplication" );
 	char *app_class = 0;
 	if (argv) {
 	    const char* p = strrchr( argv[0], '/' );
-	    app_class = tqstrdup(p ? p + 1 : argv[0]);
+	    app_class = qstrdup(p ? p + 1 : argv[0]);
 	    if (app_class[0])
 		app_class[0] = toupper(app_class[0]);
 	}
@@ -1686,7 +1686,7 @@ void qt_init_internal( int *argcptr, char **argv,
 	if (argv) {
 	    const char *p = strrchr( argv[0], '/' );
 	    appName = p ? p + 1 : argv[0];
-	    app_class = tqstrdup(appName);
+	    app_class = qstrdup(appName);
 	    if (app_class[0])
 		app_class[0] = toupper(app_class[0]);
 	}
@@ -1795,7 +1795,7 @@ void qt_init_internal( int *argcptr, char **argv,
 		}
 		if ( s == "gdb" ) {
 		    appNoGrab = TRUE;
-		    tqDebug( "Qt: gdb: -nograb added to command-line options.\n"
+		    qDebug( "Qt: gdb: -nograb added to command-line options.\n"
 			    "\t Use the -dograb option to enforce grabbing." );
 		}
 		f.close();
@@ -1806,7 +1806,7 @@ void qt_init_internal( int *argcptr, char **argv,
 
 	if( qt_is_gui_used ) {
 	    if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) {
-		tqWarning( "%s: cannot connect to X server %s", appName,
+		qWarning( "%s: cannot connect to X server %s", appName,
 			  XDisplayName(appDpyName) );
 		qApp = 0;
 		exit( 1 );
@@ -2272,7 +2272,7 @@ void qt_init_internal( int *argcptr, char **argv,
 
 	devices = XListInputDevices( appDpy, &ndev);
 	if ( devices == NULL ) {
-	    tqWarning( "Failed to get list of devices" );
+	    qWarning( "Failed to get list of devices" );
 	    ndev = -1;
 	}
 	dev = NULL;
@@ -2305,7 +2305,7 @@ void qt_init_internal( int *argcptr, char **argv,
 		    ev_class = event_list_eraser;
 		}
 		if ( dev == NULL ) {
-		    tqWarning( "Failed to open device" );
+		    qWarning( "Failed to open device" );
 		} else {
 		    if ( dev->num_classes > 0 ) {
 			for ( ip = dev->classes, j = 0; j < devs->num_classes;
@@ -2689,7 +2689,7 @@ static GC create_gc( int scrn, bool monochrome )
 GC qt_xget_readonly_gc( int scrn, bool monochrome )	// get read-only GC
 {
     if ( scrn < 0 || scrn >= appScreenCount ) {
-	tqDebug("invalid screen %d %d", scrn, appScreenCount );
+	qDebug("invalid screen %d %d", scrn, appScreenCount );
 	QWidget* bla = 0;
 	bla->setName("hello");
     }
@@ -2713,7 +2713,7 @@ GC qt_xget_readonly_gc( int scrn, bool monochrome )	// get read-only GC
 GC qt_xget_temp_gc( int scrn, bool monochrome )		// get temporary GC
 {
     if ( scrn < 0 || scrn >= appScreenCount ) {
-	tqDebug("invalid screen (tmp) %d %d", scrn, appScreenCount );
+	qDebug("invalid screen (tmp) %d %d", scrn, appScreenCount );
 	QWidget* bla = 0;
 	bla->setName("hello");
     }
@@ -2773,7 +2773,7 @@ void QApplication::setMainWidget( QWidget *mainWidget )
 #if defined(QT_CHECK_STATE)
     if ( mainWidget && mainWidget->parentWidget() &&
 	 ! mainWidget->parentWidget()->isDesktop() )
-	tqWarning( "QApplication::setMainWidget(): New main widget (%s/%s) "
+	qWarning( "QApplication::setMainWidget(): New main widget (%s/%s) "
 		  "has a parent!",
 		  mainWidget->className(), mainWidget->name() );
 #endif
@@ -3567,7 +3567,7 @@ int QApplication::x11ProcessEvent( XEvent* event )
     case XKeyRelease:
 	{
 	    if ( keywidget && keywidget->isEnabled() ) { // should always exist
-	        // tqDebug( "sending key event" );
+	        // qDebug( "sending key event" );
 	        keywidget->translateKeyEvent( event, grabbed );
 	    }
 	    break;
@@ -4474,22 +4474,22 @@ bool QETWidget::translateXinputEvent( const XEvent *ev )
 	}
 	button = (XDeviceButtonEvent*)ev;
 /*
-	tqDebug( "\n\nXInput Button Event" );
-	tqDebug( "serial:\t%d", button->serial );
-	tqDebug( "send_event:\t%d", button->send_event );
-	tqDebug( "display:\t%p", button->display );
-	tqDebug( "window:\t%d", button->window );
-	tqDebug( "deviceID:\t%d", button->deviceid );
-	tqDebug( "root:\t%d", button->root );
-	tqDebug( "subwindot:\t%d", button->subwindow );
-	tqDebug( "x:\t%d", button->x );
-	tqDebug( "y:\t%d", button->y );
-	tqDebug( "x_root:\t%d", button->x_root );
-	tqDebug( "y_root:\t%d", button->y_root );
-	tqDebug( "state:\t%d", button->state );
-	tqDebug( "button:\t%d", button->button );
-	tqDebug( "same_screen:\t%d", button->same_screen );
-	tqDebug( "time:\t%d", button->time );
+	qDebug( "\n\nXInput Button Event" );
+	qDebug( "serial:\t%d", button->serial );
+	qDebug( "send_event:\t%d", button->send_event );
+	qDebug( "display:\t%p", button->display );
+	qDebug( "window:\t%d", button->window );
+	qDebug( "deviceID:\t%d", button->deviceid );
+	qDebug( "root:\t%d", button->root );
+	qDebug( "subwindot:\t%d", button->subwindow );
+	qDebug( "x:\t%d", button->x );
+	qDebug( "y:\t%d", button->y );
+	qDebug( "x_root:\t%d", button->x_root );
+	qDebug( "y_root:\t%d", button->y_root );
+	qDebug( "state:\t%d", button->state );
+	qDebug( "button:\t%d", button->button );
+	qDebug( "same_screen:\t%d", button->same_screen );
+	qDebug( "time:\t%d", button->time );
 */
 	curr = QPoint( button->x, button->y );
     }
@@ -5181,7 +5181,7 @@ bool QETWidget::translateKeyEventInternal( const XEvent *event, int& count,
 	keyDict->setAutoDelete( FALSE );
 	textDict = new QIntDict<void>( 13 );
 	textDict->setAutoDelete( FALSE );
-	tqAddPostRoutine( deleteKeyDicts );
+	qAddPostRoutine( deleteKeyDicts );
     }
 
     QWidget* tlw = topLevelWidget();
@@ -6375,7 +6375,7 @@ static void sm_performSaveYourself( QSessionManagerData* smd )
     // generate a restart and discard command that makes sense
     QStringList restart;
     restart  << qApp->argv()[0] << "-session" << smd->sessionId + "_" + smd->sessionKey;
-    if (tqstricmp(qAppName(), qAppClass()) != 0)
+    if (qstricmp(qAppName(), qAppClass()) != 0)
 	restart << "-name" << qAppName();
     sm->setRestartCommand( restart );
     QStringList discard;
@@ -6524,7 +6524,7 @@ QSessionManager::QSessionManager( QApplication * app, QString &id, QString& key
 
     QString error = cerror;
     if (!smcConnection ) {
-	tqWarning("Session management error: %s", error.latin1() );
+	qWarning("Session management error: %s", error.latin1() );
     }
     else {
 	sm_receiver = new QSmSocketReceiver(  IceConnectionNumber( SmcGetIceConnection( smcConnection ) ) );
diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp
index adfc0da..8ecd1eb 100644
--- a/src/kernel/qasyncimageio.cpp
+++ b/src/kernel/qasyncimageio.cpp
@@ -304,7 +304,7 @@ public:
 	    gif_decoder_factory = new QGIFFormatType;
 #endif
 	    qt_init_image_handlers();
-	    tqAddPostRoutine( cleanup );
+	    qAddPostRoutine( cleanup );
 	}
     }
 
@@ -438,7 +438,7 @@ QImageFormatType* QImageDecoder::format( const char* name )
 	f;
 	f = QImageDecoderPrivate::factories->next())
     {
-	if ( tqstricmp(name,f->formatName())==0 )
+	if ( qstricmp(name,f->formatName())==0 )
 	    return f;
     }
     return 0;
diff --git a/src/kernel/qasyncio.cpp b/src/kernel/qasyncio.cpp
index 6efea91..b29dfa6 100644
--- a/src/kernel/qasyncio.cpp
+++ b/src/kernel/qasyncio.cpp
@@ -187,7 +187,7 @@ bool QDataSource::rewindable() const
   is TRUE, then the data source must take measures to allow the rewind()
   function to subsequently operate as described.  If rewindable() is FALSE,
   the function should call QDataSource::enableRewind(), which aborts with
-  a tqFatal() error.
+  a qFatal() error.
 
   For example, a network connection may choose to use a disk cache
   of input only if rewinding is enabled before the first buffer-full of
@@ -196,7 +196,7 @@ bool QDataSource::rewindable() const
 */
 void QDataSource::enableRewind( bool /* on */ )
 {
-    tqFatal( "Attempted to make unrewindable QDataSource rewindable" );
+    qFatal( "Attempted to make unrewindable QDataSource rewindable" );
 }
 
 /*!
@@ -205,7 +205,7 @@ void QDataSource::enableRewind( bool /* on */ )
 */
 void QDataSource::rewind()
 {
-    tqFatal("Attempted to rewind unrewindable QDataSource");
+    qFatal("Attempted to rewind unrewindable QDataSource");
 }
 
 /*!
diff --git a/src/kernel/qclipboard.cpp b/src/kernel/qclipboard.cpp
index e36448e..b02d1ec 100644
--- a/src/kernel/qclipboard.cpp
+++ b/src/kernel/qclipboard.cpp
@@ -72,7 +72,7 @@
     // Copy text from the clipboard (paste)
     QString text = cb->text(QClipboard::Clipboard);
     if ( !text.isNull() )
-	tqDebug( "The clipboard contains: " + text );
+	qDebug( "The clipboard contains: " + text );
 
     // Copy text into the clipboard
     cb->setText( "This text can be pasted by other programs",
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp
index b3aadaa..73cdad4 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
@@ -42,15 +42,15 @@
 // #define QCLIPBOARD_DEBUG_VERBOSE
 
 #ifdef QCLIPBOARD_DEBUG
-#  define QDEBUG tqDebug
+#  define QDEBUG qDebug
 #else
-#  define QDEBUG if (FALSE) tqDebug
+#  define QDEBUG if (FALSE) qDebug
 #endif
 
 #ifdef QCLIPBOARD_DEBUG_VERBOSE
-#  define VQDEBUG tqDebug
+#  define VQDEBUG qDebug
 #else
-#  define VQDEBUG if (FALSE) tqDebug
+#  define VQDEBUG if (FALSE) qDebug
 #endif
 
 #include "qplatformdefs.h"
@@ -140,7 +140,7 @@ void setupOwner()
 	return;
     owner = new QWidget( 0, "internal clipboard owner" );
     requestor = new QWidget(0, "internal clipboard requestor");
-    tqAddPostRoutine( cleanup );
+    qAddPostRoutine( cleanup );
 }
 
 static
@@ -239,7 +239,7 @@ static QClipboardData *clipboardData()
     if ( internalCbData == 0 ) {
 	internalCbData = new QClipboardData;
 	Q_CHECK_PTR( internalCbData );
-	tqAddPostRoutine( cleanupClipboardData );
+	qAddPostRoutine( cleanupClipboardData );
     }
     return internalCbData;
 }
@@ -261,7 +261,7 @@ static QClipboardData *selectionData()
     if (internalSelData == 0) {
 	internalSelData = new QClipboardData;
 	Q_CHECK_PTR(internalSelData);
-	tqAddPostRoutine(cleanupSelectionData);
+	qAddPostRoutine(cleanupSelectionData);
     }
     return internalSelData;
 }
@@ -306,7 +306,7 @@ static int qt_xclb_transation_event_handler(XEvent *event)
 */
 static void qt_xclb_incr_timeout(void)
 {
-    tqWarning("QClipboard: timed out while sending data");
+    qWarning("QClipboard: timed out while sending data");
 
     while (transactions)
         delete *transactions->begin();
@@ -482,7 +482,7 @@ bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event,
 
     if (qApp->eventLoop()->inherits("QMotif")) { // yes yes, evil hack, we know
         if ( waiting_for_data )
-            tqFatal( "QClipboard: internal error, qt_xclb_wait_for_event recursed" );
+            qFatal( "QClipboard: internal error, qt_xclb_wait_for_event recursed" );
 
         waiting_for_data = TRUE;
         has_captured_event = FALSE;
@@ -1061,7 +1061,7 @@ bool QClipboard::event( QEvent *e )
 	    }
 	} else {
 #ifdef QT_CHECK_STATE
-	    tqWarning("QClipboard: Unknown SelectionClear event received.");
+	    qWarning("QClipboard: Unknown SelectionClear event received.");
 #endif
 	    return FALSE;
 	}
@@ -1110,7 +1110,7 @@ bool QClipboard::event( QEvent *e )
 		d = clipboardData();
 	    } else {
 #ifdef QT_CHECK_RANGE
-		tqWarning("QClipboard: unknown selection '%lx'", req->selection);
+		qWarning("QClipboard: unknown selection '%lx'", req->selection);
 #endif // QT_CHECK_RANGE
 
 		XSendEvent(dpy, req->requestor, False, NoEventMask, &event);
@@ -1119,7 +1119,7 @@ bool QClipboard::event( QEvent *e )
 
 	    if (! d->source()) {
 #ifdef QT_CHECK_STATE
-		tqWarning("QClipboard: cannot transfer data, no data available");
+		qWarning("QClipboard: cannot transfer data, no data available");
 #endif // QT_CHECK_STATE
 
 		XSendEvent(dpy, req->requestor, False, NoEventMask, &event);
@@ -1190,7 +1190,7 @@ bool QClipboard::event( QEvent *e )
 		    } else {
 
 #ifdef QT_CHECK_STATE
-			tqWarning("QClipboard: invalid data timestamp");
+			qWarning("QClipboard: invalid data timestamp");
 #endif // QT_CHECK_STATE
 		    }
 		} else if (target == xa_targets) {
@@ -1262,7 +1262,7 @@ QClipboardWatcher::QClipboardWatcher( QClipboard::Mode mode )
 
 #ifdef QT_CHECK_RANGE
     default:
-	tqWarning( "QClipboardWatcher: internal error, unknown clipboard mode" );
+	qWarning( "QClipboardWatcher: internal error, unknown clipboard mode" );
 	break;
 #endif // QT_CHECK_RANGE
     }
@@ -1285,7 +1285,7 @@ bool QClipboardWatcher::empty() const
 
 #ifdef QT_CHECK_STATE
     if( win == requestor->winId()) {
-        tqWarning( "QClipboardWatcher::empty: internal error, app owns the selection" );
+        qWarning( "QClipboardWatcher::empty: internal error, app owns the selection" );
         return TRUE;
     }
 #endif // QT_CHECK_STATE
@@ -1371,10 +1371,10 @@ QByteArray QClipboardWatcher::encodedData( const char* fmt ) const
 
     Atom fmtatom = 0;
 
-    if ( 0==tqstricmp(fmt,"text/plain;charset=iso-8859-1") ) {
+    if ( 0==qstricmp(fmt,"text/plain;charset=iso-8859-1") ) {
 	// ICCCM section 2.6.2 says STRING is latin1 text
 	fmtatom = XA_STRING;
-    } else if ( 0==tqstricmp(fmt,"text/plain;charset=utf-8") ) {
+    } else if ( 0==qstricmp(fmt,"text/plain;charset=utf-8") ) {
 	// proprosed UTF8_STRING conversion type
 	fmtatom = *qt_xdnd_str_to_atom( "UTF8_STRING" );
     } else if ( 0==qstrcmp(fmt,"text/plain") ) {
@@ -1476,7 +1476,7 @@ QMimeSource* QClipboard::data( Mode mode ) const
 
     default:
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QClipboard::data: invalid mode '%d'", mode );
+	qWarning( "QClipboard::data: invalid mode '%d'", mode );
 #endif // QT_CHECK_RANGE
 	return 0;
     }
@@ -1526,7 +1526,7 @@ void QClipboard::setData( QMimeSource* src, Mode mode )
 
     default:
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QClipboard::data: invalid mode '%d'", mode );
+	qWarning( "QClipboard::data: invalid mode '%d'", mode );
 #endif // QT_CHECK_RANGE
 	return;
     }
@@ -1557,7 +1557,7 @@ void QClipboard::setData( QMimeSource* src, Mode mode )
 
     if (XGetSelectionOwner(dpy, atom) != newOwner) {
 #ifdef QT_CHECK_STATE
-	tqWarning("QClipboard::setData: Cannot set X11 selection owner for %s",
+	qWarning("QClipboard::setData: Cannot set X11 selection owner for %s",
 		 qt_xdnd_atom_to_str(atom));
 #endif // QT_CHECK_STATE
 
diff --git a/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp
index e022d54..309915e 100644
--- a/src/kernel/qcolor.cpp
+++ b/src/kernel/qcolor.cpp
@@ -564,7 +564,7 @@ void QColor::setNamedColor( const QString &name )
 	    d.d32.argb = Invalid;
 	    d.d32.pix = Dirt;
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QColor::setNamedColor: could not parse color '%s'",
+	    qWarning( "QColor::setNamedColor: could not parse color '%s'",
 		      name.local8Bit().data() );
 #endif
 	} else {
@@ -668,7 +668,7 @@ void QColor::setHsv( int h, int s, int v )
 {
     if ( h < -1 || (uint)s > 255 || (uint)v > 255 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QColor::setHsv: HSV parameters out of range" );
+	qWarning( "QColor::setHsv: HSV parameters out of range" );
 #endif
 	return;
     }
@@ -745,7 +745,7 @@ void QColor::setRgb( int r, int g, int b )
 {
     if ( (uint)r > 255 || (uint)g > 255 || (uint)b > 255 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QColor::setRgb: RGB parameter(s) out of range" );
+	qWarning( "QColor::setRgb: RGB parameter(s) out of range" );
 #endif
 	return;
     }
diff --git a/src/kernel/qcolor_p.cpp b/src/kernel/qcolor_p.cpp
index b3fd1b3..266f553 100644
--- a/src/kernel/qcolor_p.cpp
+++ b/src/kernel/qcolor_p.cpp
@@ -728,7 +728,7 @@ static int __cdecl rgb_cmp( const void *d1, const void *d2 )
 static int rgb_cmp( const void *d1, const void *d2 )
 #endif
 {
-    return tqstricmp( ((RGBData *)d1)->name, ((RGBData *)d2)->name );
+    return qstricmp( ((RGBData *)d1)->name, ((RGBData *)d2)->name );
 }
 
 #if defined(Q_C_CALLBACKS)
diff --git a/src/kernel/qcolor_x11.cpp b/src/kernel/qcolor_x11.cpp
index 8dc7921..eeaee5e 100644
--- a/src/kernel/qcolor_x11.cpp
+++ b/src/kernel/qcolor_x11.cpp
@@ -640,7 +640,7 @@ void QColor::setSystemNamedColor( const QString& name )
 	}
     } else if ( !color_init ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QColor::setSystemNamedColor: Cannot perform this operation "
+	qWarning( "QColor::setSystemNamedColor: Cannot perform this operation "
 		  "because QApplication does not exist" );
 #endif
 	// set color to invalid
@@ -737,7 +737,7 @@ int QColor::enterAllocContext()
     init_context_stack();
     if ( context_ptr+1 == MAX_CONTEXTS ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QColor::enterAllocContext: Context stack overflow" );
+	qWarning( "QColor::enterAllocContext: Context stack overflow" );
 #endif
 	return 0;
     }
@@ -759,7 +759,7 @@ void QColor::leaveAllocContext()
     init_context_stack();
     if ( context_ptr == 0 ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QColor::leaveAllocContext: Context stack underflow" );
+	qWarning( "QColor::leaveAllocContext: Context stack underflow" );
 #endif
 	return;
     }
diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp
index d49c57f..7956a94 100644
--- a/src/kernel/qcursor.cpp
+++ b/src/kernel/qcursor.cpp
@@ -165,7 +165,7 @@ QDataStream &operator<<( QDataStream &s, const QCursor &c )
 	s << *c.bitmap() << *c.mask();
 	s << c.hotSpot();
 #else
-	tqWarning("No Image Cursor I/O");
+	qWarning("No Image Cursor I/O");
 #endif
     }
     return s;
@@ -189,7 +189,7 @@ QDataStream &operator>>( QDataStream &s, QCursor &c )
 	s >> bm >> bmm >> hot;
 	c = QCursor( bm, bmm, hot.x(), hot.y() );
 #else
-	tqWarning("No Image Cursor I/O");
+	qWarning("No Image Cursor I/O");
 #endif
     } else {
 	c.setShape( (int)shape );		// create cursor with shape
diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp
index ec98020..7d359a3 100644
--- a/src/kernel/qcursor_x11.cpp
+++ b/src/kernel/qcursor_x11.cpp
@@ -166,7 +166,7 @@ void QCursor::initialize()
     for( shape = 0; shape <= LastCursor; shape++ )
 	cursorTable[shape].data = new QCursorData( shape );
     initialized = TRUE;
-    tqAddPostRoutine( cleanup );
+    qAddPostRoutine( cleanup );
 }
 
 
@@ -234,7 +234,7 @@ void QCursor::setBitmap( const QBitmap &bitmap, const QBitmap &mask,
     if ( bitmap.depth() != 1 || mask.depth() != 1 ||
 	 bitmap.size() != mask.size() ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QCursor: Cannot create bitmap cursor; invalid bitmap(s)" );
+	qWarning( "QCursor: Cannot create bitmap cursor; invalid bitmap(s)" );
 #endif
 	QCursor *c = &cursorTable[arrowCursorIdx];
 	c->data->ref();
@@ -825,7 +825,7 @@ void QCursor::update() const
 #endif /* QT_USE_APPROXIMATE_CURSORS */
     default:
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QCursor::update: Invalid cursor shape %d", d->cshape );
+	qWarning( "QCursor::update: Invalid cursor shape %d", d->cshape );
 #endif
 	return;
     }
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index 0764793..607a358 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -460,7 +460,7 @@ void qt_xdnd_setup() {
     qt_x11_intern_atom( "QT_SELECTION", &qt_selection_property );
     qt_x11_intern_atom( "INCR", &qt_incr_atom );
 
-    tqAddPostRoutine( qt_xdnd_cleanup );
+    qAddPostRoutine( qt_xdnd_cleanup );
 }
 
 
@@ -616,7 +616,7 @@ void qt_handle_xdnd_position( QWidget *w, const XEvent * xe, bool passive )
     }
 
     if ( l[0] != qt_xdnd_dragsource_xid ) {
-	//tqDebug( "xdnd drag position from unexpected source (%08lx not %08lx)",
+	//qDebug( "xdnd drag position from unexpected source (%08lx not %08lx)",
 	//     l[0], qt_xdnd_dragsource_xid );
 	return;
     }
@@ -761,7 +761,7 @@ void qt_handle_xdnd_status( QWidget * w, const XEvent * xe, bool /*passive*/ )
 
 void qt_handle_xdnd_leave( QWidget *w, const XEvent * xe, bool /*passive*/ )
 {
-    //tqDebug( "xdnd leave" );
+    //qDebug( "xdnd leave" );
     if ( !qt_xdnd_current_widget ||
 	 w->topLevelWidget() != qt_xdnd_current_widget->topLevelWidget() ) {
 	return; // sanity
@@ -780,7 +780,7 @@ void qt_handle_xdnd_leave( QWidget *w, const XEvent * xe, bool /*passive*/ )
 
     if ( l[0] != qt_xdnd_dragsource_xid ) {
 	// This often happens - leave other-process window quickly
-	//tqDebug( "xdnd drag leave from unexpected source (%08lx not %08lx",
+	//qDebug( "xdnd drag leave from unexpected source (%08lx not %08lx",
 	       //l[0], qt_xdnd_dragsource_xid );
 	qt_xdnd_current_widget = 0;
 	return;
@@ -839,10 +839,10 @@ void qt_handle_xdnd_drop( QWidget *, const XEvent * xe, bool passive )
     }
     const unsigned long *l = (const unsigned long *)xe->xclient.data.l;
 
-    //tqDebug( "xdnd drop" );
+    //qDebug( "xdnd drop" );
 
     if ( l[0] != qt_xdnd_dragsource_xid ) {
-	//tqDebug( "xdnd drop from unexpected source (%08lx not %08lx",
+	//qDebug( "xdnd drop from unexpected source (%08lx not %08lx",
 	//       l[0], qt_xdnd_dragsource_xid );
 	return;
     }
@@ -1509,7 +1509,7 @@ bool qt_xdnd_handle_badwindow()
 
 bool QDropEvent::provides( const char *mimeType ) const
 {
-    if ( qt_motifdnd_active && tqstrnicmp( mimeType, "text/", 5 ) == 0 )
+    if ( qt_motifdnd_active && qstrnicmp( mimeType, "text/", 5 ) == 0 )
 	return TRUE;
 
     int n=0;
@@ -1519,7 +1519,7 @@ bool QDropEvent::provides( const char *mimeType ) const
 	if ( !f )
 	    return FALSE;
 	n++;
-    } while( tqstricmp( mimeType, f ) );
+    } while( qstricmp( mimeType, f ) );
     return TRUE;
 }
 
@@ -1617,7 +1617,7 @@ static QByteArray qt_xdnd_obtain_data( const char *format )
 								qt_xdnd_selection,
 								nbytes, FALSE );
 		} else if ( type != *a ) {
-		    // (includes None) tqDebug( "Qt clipboard: unknown atom %ld", type);
+		    // (includes None) qDebug( "Qt clipboard: unknown atom %ld", type);
 		}
 #if 0
 		// this needs to be matched by a qt_xdnd_target_data->clear()
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp
index 71ee26f..44e340f 100644
--- a/src/kernel/qdragobject.cpp
+++ b/src/kernel/qdragobject.cpp
@@ -814,7 +814,7 @@ QTextCodec* findcodec(const QMimeSource* e)
     const char* f;
     int i;
     for ( i=0; (f=e->format(i)); i++ ) {
-	bool html = !tqstrnicmp(f, "text/html", 9);
+	bool html = !qstrnicmp(f, "text/html", 9);
 	if (html)
 	    r = codecForHTML(QCString(e->encodedData(f)));
 	if (!r)
@@ -833,7 +833,7 @@ QTextCodec* findcodec(const QMimeSource* e)
 QByteArray QTextDrag::encodedData(const char* mime) const
 {
     QCString r;
-    if ( 0==tqstrnicmp(mime,"text/",5) ) {
+    if ( 0==qstrnicmp(mime,"text/",5) ) {
 	QCString m(mime);
 	m = m.lower();
 	QTextCodec *codec = qt_findcharset(m);
@@ -872,7 +872,7 @@ bool QTextDrag::canDecode( const QMimeSource* e )
 {
     const char* f;
     for (int i=0; (f=e->format(i)); i++) {
-	if ( 0==tqstrnicmp(f,"text/",5) ) {
+	if ( 0==qstrnicmp(f,"text/",5) ) {
 	    return findcodec(e) != 0;
 	}
     }
@@ -912,7 +912,7 @@ bool QTextDrag::decode( const QMimeSource* e, QString& str, QCString& subtype )
 
     const char* mime;
     for (int i=0; (mime = e->format(i)); i++) {
-	if ( 0==tqstrnicmp(mime,"text/",5) ) {
+	if ( 0==qstrnicmp(mime,"text/",5) ) {
 	    QCString m(mime);
 	    m = m.lower();
 	    int semi = m.find(';');
@@ -920,7 +920,7 @@ bool QTextDrag::decode( const QMimeSource* e, QString& str, QCString& subtype )
 		semi = m.length();
 	    QCString foundst = m.mid(5,semi-5);
 	    if ( subtype.isNull() || foundst == subtype ) {
-		bool html = !tqstrnicmp(mime, "text/html", 9);
+		bool html = !qstrnicmp(mime, "text/html", 9);
 		QTextCodec* codec = 0;
                 if (html) {
                     QByteArray bytes = e->encodedData(mime);
@@ -1087,7 +1087,7 @@ const char * QImageDrag::format(int i) const
 */
 QByteArray QImageDrag::encodedData(const char* fmt) const
 {
-    if ( tqstrnicmp( fmt, "image/", 6 )==0 ) {
+    if ( qstrnicmp( fmt, "image/", 6 )==0 ) {
 	QCString f = fmt+6;
 	QByteArray data;
 	QBuffer w( data );
@@ -1233,7 +1233,7 @@ QStoredDrag::QStoredDrag( const char* mimeType, QWidget * dragSource, const char
     QDragObject(dragSource,name)
 {
     d = new QStoredDragData();
-    d->fmt = tqstrdup(mimeType);
+    d->fmt = qstrdup(mimeType);
 }
 
 /*!
@@ -1278,7 +1278,7 @@ void QStoredDrag::setEncodedData( const QByteArray & encodedData )
 */
 QByteArray QStoredDrag::encodedData(const char* m) const
 {
-    if ( !tqstricmp(m,d->fmt) )
+    if ( !qstricmp(m,d->fmt) )
 	return d->enc;
     else
 	return QByteArray();
@@ -1588,7 +1588,7 @@ QString QUriDrag::uriToLocalFile(const char* uri)
 
     if (!uri)
 	return file;
-    if (0==tqstrnicmp(uri,"file:/",6)) // It is a local file uri
+    if (0==qstrnicmp(uri,"file:/",6)) // It is a local file uri
 	uri += 6;
     else if (QString(uri).find(":/") != -1) // It is a different scheme uri
 	return file;
diff --git a/src/kernel/qdrawutil.cpp b/src/kernel/qdrawutil.cpp
index 0db4ebd..bcac422 100644
--- a/src/kernel/qdrawutil.cpp
+++ b/src/kernel/qdrawutil.cpp
@@ -86,7 +86,7 @@ void qDrawShadeLine( QPainter *p, int x1, int y1, int x2, int y2,
 {
     if (!( p && lineWidth >= 0 && midLineWidth >= 0 ) )	{
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "qDrawShadeLine invalid parameters." );
+	qWarning( "qDrawShadeLine invalid parameters." );
 #endif
 	return;
     }
@@ -209,7 +209,7 @@ void qDrawShadeRect( QPainter *p, int x, int y, int w, int h,
 	return;
     if ( ! ( w > 0 && h > 0 && lineWidth >= 0 && midLineWidth >= 0 ) ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "qDrawShadeRect(): Invalid parameters" );
+	qWarning( "qDrawShadeRect(): Invalid parameters" );
 #endif
 	return;
     }
@@ -309,7 +309,7 @@ void qDrawShadePanel( QPainter *p, int x, int y, int w, int h,
 	return;
     if ( !( w > 0 && h > 0 && lineWidth >= 0 ) ) {
 #if defined(QT_CHECK_RANGE)
-    	tqWarning( "qDrawShadePanel() Invalid parameters." );
+    	qWarning( "qDrawShadePanel() Invalid parameters." );
 #endif
     }
     QColor shade = g.dark();
@@ -538,7 +538,7 @@ void qDrawPlainRect( QPainter *p, int x, int y, int w, int h, const QColor &c,
 	return;
     if ( !( w > 0 && h > 0 && lineWidth >= 0 ) ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "qDrawPlainRect() Invalid parameters." );
+	qWarning( "qDrawPlainRect() Invalid parameters." );
 #endif
     }
     QPen   oldPen   = p->pen();
@@ -948,7 +948,7 @@ void qDrawArrow( QPainter *p, Qt::ArrowType type, Qt::GUIStyle style, bool down,
 #endif
 	default:
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "qDrawArrow: Requested GUI style not supported" );
+	    qWarning( "qDrawArrow: Requested GUI style not supported" );
 #else
 	    ;
 #endif
diff --git a/src/kernel/qeventloop.cpp b/src/kernel/qeventloop.cpp
index 2aef262..1f6a130 100644
--- a/src/kernel/qeventloop.cpp
+++ b/src/kernel/qeventloop.cpp
@@ -101,7 +101,7 @@ QEventLoop::QEventLoop( QObject *parent, const char *name )
 {
 #if defined(QT_CHECK_STATE)
     if ( QApplication::eventloop )
-	tqFatal( "QEventLoop: there must be only one event loop object. \nConstruct it before QApplication." );
+	qFatal( "QEventLoop: there must be only one event loop object. \nConstruct it before QApplication." );
     // for now ;)
 #endif // QT_CHECK_STATE
 
diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/qeventloop_unix.cpp
index 63940ec..743eb1d 100644
--- a/src/kernel/qeventloop_unix.cpp
+++ b/src/kernel/qeventloop_unix.cpp
@@ -184,7 +184,7 @@ static void insertTimer( const TimerInfo *ti )	// insert timer info into list
     timerList->insert( index, ti );		// inserts sorted
 #if defined(QT_DEBUG)
     if ( dangerCount > 16 )
-	tqDebug( "QObject: %d timers now exist for object %s::%s",
+	qDebug( "QObject: %d timers now exist for object %s::%s",
 	       dangerCount, ti->obj->className(), ti->obj->name() );
 #endif
 }
@@ -367,7 +367,7 @@ void QEventLoop::registerSocketNotifier( QSocketNotifier *notifier )
     int type = notifier->type();
     if ( sockfd < 0 || sockfd >= FD_SETSIZE || type < 0 || type > 2 || notifier == 0 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QSocketNotifier: Internal error" );
+	qWarning( "QSocketNotifier: Internal error" );
 #endif
 	return;
     }
@@ -399,7 +399,7 @@ void QEventLoop::registerSocketNotifier( QSocketNotifier *notifier )
 #if defined(QT_CHECK_STATE)
 	if ( p && p->fd == sockfd ) {
 	    static const char *t[] = { "read", "write", "exception" };
-	    tqWarning( "QSocketNotifier: Multiple socket notifiers for "
+	    qWarning( "QSocketNotifier: Multiple socket notifiers for "
 		      "same socket %d and type %s", sockfd, t[type] );
 	}
 #endif
@@ -419,7 +419,7 @@ void QEventLoop::unregisterSocketNotifier( QSocketNotifier *notifier )
     int type = notifier->type();
     if ( sockfd < 0 || type < 0 || type > 2 || notifier == 0 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QSocketNotifier: Internal error" );
+	qWarning( "QSocketNotifier: Internal error" );
 #endif
 	return;
     }
@@ -456,7 +456,7 @@ void QEventLoop::setSocketNotifierPending( QSocketNotifier *notifier )
     int type = notifier->type();
     if ( sockfd < 0 || type < 0 || type > 2 || notifier == 0 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QSocketNotifier: Internal error" );
+	qWarning( "QSocketNotifier: Internal error" );
 #endif
 	return;
     }
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp
index fddb906..e3b43a6 100644
--- a/src/kernel/qeventloop_x11.cpp
+++ b/src/kernel/qeventloop_x11.cpp
@@ -337,7 +337,7 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags )
 		    if (ret == -1 && errno == EBADF) {
 			// disable the invalid socket notifier
 			static const char *t[] = { "Read", "Write", "Exception" };
-			tqWarning("QSocketNotifier: invalid socket %d and type '%s', disabling...",
+			qWarning("QSocketNotifier: invalid socket %d and type '%s', disabling...",
 				 sn->fd, t[type]);
 			sn->obj->setEnabled(FALSE);
 		    }
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index a4a998b..66ba453 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -63,9 +63,9 @@
 
 // #define QFONTCACHE_DEBUG
 #ifdef QFONTCACHE_DEBUG
-#  define FC_DEBUG tqDebug
+#  define FC_DEBUG qDebug
 #else
-#  define FC_DEBUG if (FALSE) tqDebug
+#  define FC_DEBUG if (FALSE) qDebug
 #endif
 
 
@@ -733,7 +733,7 @@ void QFont::setPointSize( int pointSize )
     if ( pointSize <= 0 ) {
 
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QFont::setPointSize: Point size <= 0 (%d)", pointSize );
+	qWarning( "QFont::setPointSize: Point size <= 0 (%d)", pointSize );
 #endif
 
 	return;
@@ -758,7 +758,7 @@ void QFont::setPointSizeFloat( float pointSize )
 {
     if ( pointSize <= 0.0 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QFont::setPointSize: Point size <= 0 (%f)", pointSize );
+	qWarning( "QFont::setPointSize: Point size <= 0 (%f)", pointSize );
 #endif
 	return;
     }
@@ -795,7 +795,7 @@ void QFont::setPixelSize( int pixelSize )
 {
     if ( pixelSize <= 0 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QFont::setPixelSize: Pixel size <= 0 (%d)", pixelSize );
+	qWarning( "QFont::setPixelSize: Pixel size <= 0 (%d)", pixelSize );
 #endif
 	return;
     }
@@ -892,7 +892,7 @@ void QFont::setWeight( int weight )
     if ( weight < 0 || weight > 99 ) {
 
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QFont::setWeight: Value out of range (%d)", weight );
+	qWarning( "QFont::setWeight: Value out of range (%d)", weight );
 #endif
 
 	return;
@@ -1203,7 +1203,7 @@ void QFont::setStretch( int factor )
 {
     if ( factor < 1 || factor > 4000 ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QFont::setStretch(): parameter '%d' out of range", factor );
+	qWarning( "QFont::setStretch(): parameter '%d' out of range", factor );
 #endif // QT_CHECK_RANGE
 
 	return;
@@ -1658,7 +1658,7 @@ bool QFont::fromString(const QString &descrip)
     if ( !count || ( count > 2 && count < 9 ) || count > 11 ) {
 
 #ifdef QT_CHECK_STATE
-	tqWarning("QFont::fromString: invalid description '%s'",
+	qWarning("QFont::fromString: invalid description '%s'",
                  descrip.isEmpty() ? "(empty)" : descrip.latin1());
 #endif
 
@@ -1917,7 +1917,7 @@ QFontMetrics::QFontMetrics( const QPainter *p )
 {
 #if defined(CHECK_STATE)
     if ( !painter->isActive() )
-	tqWarning( "QFontMetrics: Get font metrics between QPainter::begin() "
+	qWarning( "QFontMetrics: Get font metrics between QPainter::begin() "
 		  "and QPainter::end()" );
 #endif
 
@@ -2676,7 +2676,7 @@ QFontInfo::QFontInfo( const QPainter *p )
 
 #if defined(CHECK_STATE)
     if ( !painter->isActive() )
-	tqWarning( "QFontInfo: Get font info between QPainter::begin() "
+	qWarning( "QFontInfo: Get font info between QPainter::begin() "
 		  "and QPainter::end()" );
 #endif
 
diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp
index b14d953..fea0b58 100644
--- a/src/kernel/qfont_x11.cpp
+++ b/src/kernel/qfont_x11.cpp
@@ -350,7 +350,7 @@ void QFontPrivate::load( QFont::Script script )
 #ifdef QT_CHECK_STATE
     // sanity checks
     if (!QFontCache::instance)
-	tqWarning("Must construct a QApplication before a QFont");
+	qWarning("Must construct a QApplication before a QFont");
     Q_ASSERT( script >= 0 && script < QFont::LastPrivateScript );
 #endif // QT_CHECK_STATE
 
@@ -521,7 +521,7 @@ void QFont::setRawName( const QString &name )
 
     if ( ! qt_fillFontDef( qt_fixXLFD( name.latin1() ), &d->request, d->screen ) ) {
 #ifdef QT_CHECK_STATE
-	tqWarning("QFont::setRawName(): Invalid XLFD: \"%s\"", name.latin1());
+	qWarning("QFont::setRawName(): Invalid XLFD: \"%s\"", name.latin1());
 #endif // QT_CHECK_STATE
 
 	setFamily( name );
@@ -650,7 +650,7 @@ QString QFont::lastResortFont() const
     }
 
 #if defined(CHECK_NULL)
-    tqFatal( "QFontPrivate::lastResortFont: Cannot find any reasonable font" );
+    qFatal( "QFontPrivate::lastResortFont: Cannot find any reasonable font" );
 #endif
 
     return last;
diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp
index 8639190..e326657 100644
--- a/src/kernel/qfontdatabase.cpp
+++ b/src/kernel/qfontdatabase.cpp
@@ -57,16 +57,16 @@
 
 //#define QFONTDATABASE_DEBUG
 #ifdef QFONTDATABASE_DEBUG
-#  define FD_DEBUG tqDebug
+#  define FD_DEBUG qDebug
 #else
-#  define FD_DEBUG if (FALSE) tqDebug
+#  define FD_DEBUG if (FALSE) qDebug
 #endif
 
 //#define FONT_MATCH_DEBUG
 #ifdef FONT_MATCH_DEBUG
-#  define FM_DEBUG tqDebug
+#  define FM_DEBUG qDebug
 #else
-#  define FM_DEBUG if (FALSE) tqDebug
+#  define FM_DEBUG if (FALSE) qDebug
 #endif
 
 #if defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET)
@@ -307,7 +307,7 @@ QtFontStyle *QtFontFoundry::style( const QtFontStyle::Key &key, bool create )
     if ( !create )
 	return 0;
 
-//     tqDebug("adding key (weight=%d, italic=%d, oblique=%d stretch=%d) at %d",  key.weight, key.italic, key.oblique, key.stretch, pos );
+//     qDebug("adding key (weight=%d, italic=%d, oblique=%d stretch=%d) at %d",  key.weight, key.italic, key.oblique, key.stretch, pos );
     if ( !(count % 8) )
 	styles = (QtFontStyle **)
 		 realloc( styles, (((count+8) >> 3 ) << 3) * sizeof( QtFontStyle * ) );
@@ -439,7 +439,7 @@ QtFontFamily *QFontDatabasePrivate::family( const QString &f, bool create )
     if ( res < 0 )
 	pos++;
 
-    // tqDebug("adding family %s at %d total=%d",  f.latin1(), pos, count);
+    // qDebug("adding family %s at %d total=%d",  f.latin1(), pos, count);
     if ( !(count % 8) )
 	families = (QtFontFamily **)
 		   realloc( families,
@@ -1343,7 +1343,7 @@ int main( int argc, char **argv )
     QStringList families = fdb.families();
     for ( QStringList::Iterator f = families.begin(); f != families.end(); ++f ) {
 	QString family = *f;
-	tqDebug( family );
+	qDebug( family );
 	QStringList styles = fdb.styles( family );
 	for ( QStringList::Iterator s = styles.begin(); s != styles.end(); ++s ) {
 	    QString style = *s;
@@ -1354,7 +1354,7 @@ int main( int argc, char **argv )
 		dstyle += QString::number( *points ) + " ";
 	    }
 	    dstyle = dstyle.left( dstyle.length() - 1 ) + ")";
-	    tqDebug( dstyle );
+	    qDebug( dstyle );
 	}
     }
     return 0;
diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp
index 18074d4..05bdbb8 100644
--- a/src/kernel/qfontdatabase_x11.cpp
+++ b/src/kernel/qfontdatabase_x11.cpp
@@ -65,9 +65,9 @@
 #endif
 
 #ifdef QFONTDATABASE_DEBUG
-#  define FD_DEBUG tqDebug
+#  define FD_DEBUG qDebug
 #else
-#  define FD_DEBUG if (FALSE) tqDebug
+#  define FD_DEBUG if (FALSE) qDebug
 #endif // QFONTDATABASE_DEBUG
 
 // from qfont_x11.cpp
@@ -450,7 +450,7 @@ const int numEncodings = sizeof( xlfd_encoding ) / sizeof( XlfdEncoding ) - 1;
 
 int qt_xlfd_encoding_id( const char *encoding )
 {
-    // tqDebug("looking for encoding id for '%s'", encoding );
+    // qDebug("looking for encoding id for '%s'", encoding );
     int len = strlen( encoding );
     if ( len < 4 )
 	return -1;
@@ -468,11 +468,11 @@ int qt_xlfd_encoding_id( const char *encoding )
 	const char *n = enc->name;
 	const char *e = encoding;
 	while ( 1 ) {
- 	    // tqDebug("bol: *e='%c', *n='%c'", *e,  *n );
+ 	    // qDebug("bol: *e='%c', *n='%c'", *e,  *n );
 	    if ( *e == '\0' ) {
 		if ( *n )
 		    break;
-		// tqDebug( "found encoding id %d", enc->id );
+		// qDebug( "found encoding id %d", enc->id );
 		return enc->id;
 	    }
 	    if ( *e == *n ) {
@@ -483,12 +483,12 @@ int qt_xlfd_encoding_id( const char *encoding )
 	    if ( *n != '*' )
 		break;
 	    ++n;
- 	    // tqDebug("skip: *e='%c', *n='%c'", *e,  *n );
+ 	    // qDebug("skip: *e='%c', *n='%c'", *e,  *n );
 	    while ( *e && *e != *n )
 		++e;
 	}
     }
-    // tqDebug( "couldn't find encoding %s", encoding );
+    // qDebug( "couldn't find encoding %s", encoding );
     return -1;
 }
 
@@ -734,7 +734,7 @@ static void loadXlfds( const char *reqFamily, int encoding_id )
     char **fontList = XListFonts( QPaintDevice::x11AppDisplay(),
 				  xlfd_pattern.data(),
 				  0xffff, &fontCount );
-    // tqDebug("requesting xlfd='%s', got %d fonts", xlfd_pattern.data(), fontCount );
+    // qDebug("requesting xlfd='%s', got %d fonts", xlfd_pattern.data(), fontCount );
 
 
     char *tokens[NFontFields];
@@ -787,9 +787,9 @@ static void loadXlfds( const char *reqFamily, int encoding_id )
 	QtFontStyle *style = foundry->style( styleKey, TRUE );
 
 	delete [] style->weightName;
-	style->weightName = tqstrdup( tokens[Weight] );
+	style->weightName = qstrdup( tokens[Weight] );
 	delete [] style->setwidthName;
-	style->setwidthName = tqstrdup( tokens[Width] );
+	style->setwidthName = qstrdup( tokens[Width] );
 
 	if ( smooth_scalable ) {
 	    style->smoothScalable = TRUE;
@@ -1095,7 +1095,7 @@ static Q_UINT16 getGlyphIndex( unsigned char *table, Q_UINT16 format, unsigned s
 	if ( unicode < 256 )
 	    return (int) *(table+6+unicode);
     } else if ( format == 2 ) {
-	tqWarning("format 2 encoding table for Unicode, not implemented!");
+	qWarning("format 2 encoding table for Unicode, not implemented!");
     } else if ( format == 4 ) {
 	Q_UINT16 segCountX2 = getUShort( table + 6 );
 	unsigned char *ends = table + 14;
@@ -1137,7 +1137,7 @@ static inline void checkXftCoverage( QtFontFamily *family )
     QCString ext = family->fontFilename.mid( family->fontFilename.findRev( '.' ) ).lower();
     if ( family->fontFileIndex == 0 && ( ext == ".ttf" || ext == ".otf" ) ) {
 	void *map;
-	// tqDebug("using own ttf code coverage checking of '%s'!", family->name.latin1() );
+	// qDebug("using own ttf code coverage checking of '%s'!", family->name.latin1() );
 	int fd = open( family->fontFilename.data(), O_RDONLY );
 	size_t pagesize = getpagesize();
 	off_t offset = 0;
@@ -1152,7 +1152,7 @@ static inline void checkXftCoverage( QtFontFamily *family )
 	    unsigned char *ttf = (unsigned char *)map;
 	    Q_UINT32 version = getUInt( ttf );
 	    if ( version != 0x00010000 ) {
-		// tqDebug("file has wrong version %x",  version );
+		// qDebug("file has wrong version %x",  version );
 		goto error1;
 	    }
 	    Q_UINT16 numTables =  getUShort( ttf+4 );
@@ -1169,7 +1169,7 @@ static inline void checkXftCoverage( QtFontFamily *family )
 		}
 	    }
 	    if ( !cmap_offset ) {
-		// tqDebug("no cmap found" );
+		// qDebug("no cmap found" );
 		goto error1;
 	    }
 
@@ -1186,7 +1186,7 @@ static inline void checkXftCoverage( QtFontFamily *family )
 
 	    version = getUShort( cmap );
 	    if ( version != 0 ) {
-		// tqDebug("wrong cmap version" );
+		// qDebug("wrong cmap version" );
 		goto error1;
 	    }
 	    numTables = getUShort( cmap + 2 );
@@ -1205,7 +1205,7 @@ static inline void checkXftCoverage( QtFontFamily *family )
 	    }
 
 	    if ( !unicode_table ) {
-		// tqDebug("no unicode table found" );
+		// qDebug("no unicode table found" );
 		goto error1;
 	    }
 
@@ -1230,7 +1230,7 @@ static inline void checkXftCoverage( QtFontFamily *family )
 		        }
 		    }
 		    if ( supported ){
-			// tqDebug("font can render script %d",  i );
+			// qDebug("font can render script %d",  i );
 			family->scripts[i] = QtFontFamily::Supported;
 		    } else {
 			family->scripts[i] |= QtFontFamily::UnSupported_Xft;
@@ -1451,7 +1451,7 @@ static void initializeDb()
 		else if ( style->bitmapScalable )
 		    FD_DEBUG("\t\t\t\tbitmap scalable" );
 		if ( style->pixelSizes ) {
-		    tqDebug("\t\t\t\t%d pixel sizes",  style->count );
+		    qDebug("\t\t\t\t%d pixel sizes",  style->count );
 		    for ( int z = 0; z < style->count; ++z ) {
 			QtFontSize *size = style->pixelSizes + z;
 			for ( int e = 0; e < size->count; ++e ) {
@@ -1809,7 +1809,7 @@ static QFontEngine *loadFontConfigFont(const QFontPrivate *fp, const QFontDef &r
 
     double scale = addPatternProps(pattern, key, FALSE, TRUE, fp, request);
 #ifdef FONT_MATCH_DEBUG
-    tqDebug("original pattern contains:");
+    qDebug("original pattern contains:");
     FcPatternPrint(pattern);
 #endif
 
@@ -1818,7 +1818,7 @@ static QFontEngine *loadFontConfigFont(const QFontPrivate *fp, const QFontDef &r
     FcConfigSubstitute(0, pattern, FcMatchPattern);
     XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
 
-//     tqDebug("1: pattern contains:");
+//     qDebug("1: pattern contains:");
 //     FcPatternPrint(pattern);
 
     {
@@ -1951,7 +1951,7 @@ static QFontEngine *loadFontConfigFont(const QFontPrivate *fp, const QFontDef &r
 
 	if ( !xftfs ) {
 	    // Xft couldn't find a font?
-	    tqDebug("couldn't open fontconfigs chosen font with Xft!!!");
+	    qDebug("couldn't open fontconfigs chosen font with Xft!!!");
 	} else {
 	    fe = new QFontEngineXft( xftfs, result, 0 );
 	    if (fp->paintdevice
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index c9f5f08..ae27f9a 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -139,7 +139,7 @@ static QBitmap transform(Display *dpy, const QBitmap &source, int xoff,  int yof
         bm = QBitmap( w, h, dptr, QImage::systemBitOrder() != QImage::BigEndian );
     } else {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QFontEngineXft::tranform: xform failed");
+	qWarning( "QFontEngineXft::tranform: xform failed");
 #endif
     }
 
@@ -266,7 +266,7 @@ void QFontEngineBox::draw( QPainter *p, int x, int y, const QTextEngine *engine,
     glyph_metrics_t ci = boundingBox( glyphs, offsets, numGlyphs );
     p->drawRect( x + ci.x, y + ci.y, ci.width, ci.height );
     p->drawRect( x + ci.x, y + 50 + ci.y, ci.width, ci.height );
-    tqDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height );
+    qDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height );
     p->restore();
     int xp = x;
     int yp = y;
@@ -323,7 +323,7 @@ void QFontEngineBox::draw( QPainter *p, int x, int y, const QTextEngine *engine,
 	x += offsets[i].x;
 	y += offsets[i].y;
 	p->drawRect( x + ci.x, y + 50 + ci.y, ci.width, ci.height );
-	tqDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d   offset=(%d/%d)", i, ci.x, ci.y, ci.width, ci.height,
+	qDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d   offset=(%d/%d)", i, ci.x, ci.y, ci.width, ci.height,
 	       ci.xoff, ci.yoff, offsets[i].x, offsets[i].y );
 	x += ci.xoff;
 	y += ci.yoff;
@@ -558,7 +558,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine
     if ( !si->num_glyphs )
 	return;
 
-//     tqDebug("QFontEngineXLFD::draw( %d, %d, numglyphs=%d", x, y, si->num_glyphs );
+//     qDebug("QFontEngineXLFD::draw( %d, %d, numglyphs=%d", x, y, si->num_glyphs );
 
     Display *dpy = QPaintDevice::x11AppDisplay();
     Qt::HANDLE hd = p->device()->handle();
@@ -633,7 +633,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine
 		    matrix += ' ';
 		}
 		matrix += ']';
-		//tqDebug("m: %2.2f %2.2f %2.2f %2.2f, matrix=%s", p->m11(), p->m12(), p->m21(), p->m22(), matrix.data());
+		//qDebug("m: %2.2f %2.2f %2.2f %2.2f, matrix=%s", p->m11(), p->m12(), p->m21(), p->m22(), matrix.data());
 		xlfd_transformed.replace( pos, endPos-pos, matrix );
 
 		x_font_load_error = FALSE;
@@ -642,7 +642,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine
 		XSync( dpy, FALSE );
 		XSetErrorHandler( old_handler );
 		if ( x_font_load_error ) {
-		    //tqDebug( "couldn't load transformed font" );
+		    //qDebug( "couldn't load transformed font" );
 		    font_id = _fs->fid;
 		    xlfd_transformations = XlfdTrUnsupported;
 		} else {
@@ -678,7 +678,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine
     glyph_metrics_t ci = boundingBox( glyphs, advances, offsets, si->num_glyphs );
     p->drawRect( x + ci.x, y + ci.y, ci.width, ci.height );
     p->drawRect( x + ci.x, y + 100 + ci.y, ci.width, ci.height );
-    tqDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height );
+    qDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height );
     p->restore();
     int xp = x;
     int yp = y;
@@ -705,7 +705,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine
 	int i = si->num_glyphs;
 	while( i-- ) {
 	    advance_t adv = advances[i];
-	    // 	    tqDebug("advance = %d/%d", adv.x, adv.y );
+	    // 	    qDebug("advance = %d/%d", adv.x, adv.y );
 	    x += adv;
 	    glyph_metrics_t gi = boundingBox( glyphs[i] );
 	    int xp = x-offsets[i].x-gi.xoff;
@@ -726,7 +726,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine
 		if (!glyphAttributes[i].zeroWidth && xp < SHRT_MAX && xp > SHRT_MIN)
 		    XDrawString16(dpy, hd, gc, xp, yp, chars+i, 1 );
 		advance_t adv = advances[i];
-		// 	    tqDebug("advance = %d/%d", adv.x, adv.y );
+		// 	    qDebug("advance = %d/%d", adv.x, adv.y );
 		x += adv;
 		i++;
 	    }
@@ -760,7 +760,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine
     for ( int i = 0; i < si->num_glyphs; i++ ) {
 	glyph_metrics_t ci = boundingBox( glyphs[i] );
 	p->drawRect( x + ci.x + offsets[i].x, y + 100 + ci.y + offsets[i].y, ci.width, ci.height );
-	tqDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d   offs=(%d/%d) advance=(%d/%d)", i, ci.x, ci.y, ci.width, ci.height,
+	qDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d   offs=(%d/%d) advance=(%d/%d)", i, ci.x, ci.y, ci.width, ci.height,
 	       ci.xoff, ci.yoff, offsets[i].x, offsets[i].y,
 	       advances[i].x, advances[i].y);
 	x += advances[i].x;
@@ -1505,10 +1505,10 @@ QFontEngineXft::QFontEngineXft( XftFont *font, XftPattern *pattern, int cmap )
     // Xft maps Unicode and adobe roman for us.
     for (int i = 0; i < _face->num_charmaps; ++i) {
         FT_CharMap cm = _face->charmaps[i];
-//          tqDebug("font has charmap %x", cm->encoding);
+//          qDebug("font has charmap %x", cm->encoding);
         if (cm->encoding == ft_encoding_adobe_custom
             || cm->encoding == ft_encoding_symbol) {
-//              tqDebug("font has adobe custom or ms symbol charmap");
+//              qDebug("font has adobe custom or ms symbol charmap");
             _cmap = i;
             break;
         }
@@ -1855,13 +1855,13 @@ void QFontEngineXft::draw( QPainter *p, int x, int y, const QTextEngine *engine,
     col.color.alpha = 0xffff;
     col.pixel = pen.pixel();
 #ifdef FONTENGINE_DEBUG
-    tqDebug("===== drawing %d glyphs reverse=%s ======", si->num_glyphs, si->analysis.bidiLevel % 2?"TRUE":"FALSE" );
+    qDebug("===== drawing %d glyphs reverse=%s ======", si->num_glyphs, si->analysis.bidiLevel % 2?"TRUE":"FALSE" );
     p->save();
     p->setBrush( Qt::white );
     glyph_metrics_t ci = boundingBox( glyphs, advances, offsets, si->num_glyphs );
     p->drawRect( x + ci.x, y + ci.y, ci.width, ci.height );
     p->drawRect( x + ci.x, y + 100 + ci.y, ci.width, ci.height );
-    tqDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height );
+    qDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height );
     p->restore();
     int yp = y;
     int xp = x;
@@ -1895,7 +1895,7 @@ void QFontEngineXft::draw( QPainter *p, int x, int y, const QTextEngine *engine,
 		p->drawRect( x+offsets[i].x+gi.x, y+offsets[i].y+100+gi.y, gi.width, gi.height );
 		p->drawLine( x+offsets[i].x, y + 150 + 5*i , x+offsets[i].x+advances[i], y + 150 + 5*i );
 		p->drawLine( x+offsets[i].x, y + 152 + 5*i , x+offsets[i].x+gi.xoff, y + 152 + 5*i );
-		tqDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d   offs=(%d/%d) advance=%d", i, gi.x, gi.y, gi.width, gi.height,
+		qDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d   offs=(%d/%d) advance=%d", i, gi.x, gi.y, gi.width, gi.height,
 		       gi.xoff, gi.yoff, offsets[i].x, offsets[i].y, advances[i]);
 #endif
 		x += advances[i];
@@ -1915,7 +1915,7 @@ void QFontEngineXft::draw( QPainter *p, int x, int y, const QTextEngine *engine,
 		if (!glyphAttributes[i].zeroWidth && xp < SHRT_MAX && xp > SHRT_MIN)
 		    XftDrawString16( draw, &col, fnt, xp, yp, (XftChar16 *) (glyphs+i), 1 );
 #endif // QT_XFT2
-		// 	    tqDebug("advance = %d/%d", adv.x, adv.y );
+		// 	    qDebug("advance = %d/%d", adv.x, adv.y );
 		x += advances[i];
 		i++;
 	    }
@@ -1980,7 +1980,7 @@ void QFontEngineXft::draw( QPainter *p, int x, int y, const QTextEngine *engine,
 	for ( int i = 0; i < si->num_glyphs; i++ ) {
 	    glyph_metrics_t ci = boundingBox( glyphs[i] );
 	    p->drawRect( x + ci.x + offsets[i].x, y + 100 + ci.y + offsets[i].y, ci.width, ci.height );
-	    tqDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d   offs=(%d/%d) advance=%d", i, ci.x, ci.y, ci.width, ci.height,
+	    qDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d   offs=(%d/%d) advance=%d", i, ci.x, ci.y, ci.width, ci.height,
 		   ci.xoff, ci.yoff, offsets[i].x, offsets[i].y, advances[i]);
 	    x += advances[i];
 	}
@@ -2208,7 +2208,7 @@ bool QFontEngineXft::canRender( const QChar *string, int len )
 
 QOpenType *QFontEngineXft::openType() const
 {
-//     tqDebug("openTypeIface requested!");
+//     qDebug("openTypeIface requested!");
     if ( _openType )
 	return _openType;
 
@@ -2390,7 +2390,7 @@ QOpenType::QOpenType(QFontEngineXft *fe)
     FT_Error error;
     if ((error = TT_Load_GDEF_Table(face, &gdef))) {
 #ifdef OT_DEBUG
-        tqDebug("error loading gdef table: %d", error);
+        qDebug("error loading gdef table: %d", error);
 #endif
         gdef = 0;
     }
@@ -2399,9 +2399,9 @@ QOpenType::QOpenType(QFontEngineXft *fe)
         gsub = 0;
 #ifdef OT_DEBUG
         if (error != FT_Err_Table_Missing) {
-            tqDebug("error loading gsub table: %d", error);
+            qDebug("error loading gsub table: %d", error);
         } else {
-            tqDebug("face doesn't have a gsub table");
+            qDebug("face doesn't have a gsub table");
         }
 #endif
     }
@@ -2409,7 +2409,7 @@ QOpenType::QOpenType(QFontEngineXft *fe)
     if ((error = TT_Load_GPOS_Table(face, &gpos, gdef))) {
         gpos = 0;
 #ifdef OT_DEBUG
-        tqDebug("error loading gpos table: %d", error);
+        qDebug("error loading gpos table: %d", error);
 #endif
     }
 
@@ -2448,7 +2448,7 @@ bool QOpenType::checkScript(unsigned int script)
         FT_Error error = TT_GSUB_Select_Script(gsub, tag, &script_index);
         if (error) {
 #ifdef OT_DEBUG
-            tqDebug("could not select script %d in GSub table: %d", (int)script, error);
+            qDebug("could not select script %d in GSub table: %d", (int)script, error);
 #endif
             return FALSE;
         }
@@ -2462,7 +2462,7 @@ bool QOpenType::checkScript(unsigned int script)
         FT_Error error = TT_GPOS_Select_Script(gpos, script, &script_index);
         if (error) {
 #ifdef OT_DEBUG
-            tqDebug("could not select script in gpos table: %d", error);
+            qDebug("could not select script in gpos table: %d", error);
 #endif
             return FALSE;
         }
@@ -2486,10 +2486,10 @@ void QOpenType::selectScript(unsigned int script, const Features *features)
         {
             TTO_FeatureList featurelist = gsub->FeatureList;
             int numfeatures = featurelist.FeatureCount;
-            tqDebug("gsub table has %d features", numfeatures);
+            qDebug("gsub table has %d features", numfeatures);
             for(int i = 0; i < numfeatures; i++) {
                 TTO_FeatureRecord *r = featurelist.FeatureRecord + i;
-                tqDebug("   feature '%s'", tag_to_string(r->FeatureTag));
+                qDebug("   feature '%s'", tag_to_string(r->FeatureTag));
             }
         }
 #endif
@@ -2498,14 +2498,14 @@ void QOpenType::selectScript(unsigned int script, const Features *features)
         FT_Error error = TT_GSUB_Select_Script(gsub, tag, &script_index);
         if (!error) {
 #ifdef OT_DEBUG
-            tqDebug("script %s has script index %d", tag_to_string(script), script_index);
+            qDebug("script %s has script index %d", tag_to_string(script), script_index);
 #endif
             while (features->tag) {
                 FT_UShort feature_index;
                 error = TT_GSUB_Select_Feature(gsub, features->tag, script_index, 0xffff, &feature_index);
                 if (!error) {
 #ifdef OT_DEBUG
-                    tqDebug("  adding feature %s", tag_to_string(features->tag));
+                    qDebug("  adding feature %s", tag_to_string(features->tag));
 #endif
                     TT_GSUB_Add_Feature(gsub, feature_index, features->property);
                 }
@@ -2523,12 +2523,12 @@ void QOpenType::selectScript(unsigned int script, const Features *features)
             {
                 TTO_FeatureList featurelist = gpos->FeatureList;
                 int numfeatures = featurelist.FeatureCount;
-                tqDebug("gpos table has %d features", numfeatures);
+                qDebug("gpos table has %d features", numfeatures);
                 for(int i = 0; i < numfeatures; i++) {
                     TTO_FeatureRecord *r = featurelist.FeatureRecord + i;
                     FT_UShort feature_index;
                     TT_GPOS_Select_Feature(gpos, r->FeatureTag, script_index, 0xffff, &feature_index);
-                    tqDebug("   feature '%s'", tag_to_string(r->FeatureTag));
+                    qDebug("   feature '%s'", tag_to_string(r->FeatureTag));
                 }
             }
 #endif
@@ -2553,7 +2553,7 @@ void QOpenType::selectScript(unsigned int script, const Features *features)
 static void dump_string(OTL_Buffer buffer)
 {
     for (uint i = 0; i < buffer->in_length; ++i) {
-        tqDebug("    %x: cluster=%d", buffer->in_string[i].gindex, buffer->in_string[i].cluster);
+        qDebug("    %x: cluster=%d", buffer->in_string[i].gindex, buffer->in_string[i].cluster);
     }
 }
 #endif
@@ -2575,13 +2575,13 @@ bool QOpenType::shape(QShaperItem *item, const unsigned int *properties)
     }
 
 #ifdef OT_DEBUG
-    tqDebug("-----------------------------------------");
-//     tqDebug("log clusters before shaping:");
+    qDebug("-----------------------------------------");
+//     qDebug("log clusters before shaping:");
 //     for (int j = 0; j < length; j++)
-//         tqDebug("    log[%d] = %d", j, item->log_clusters[j]);
-    tqDebug("original glyphs: %p", item->glyphs);
+//         qDebug("    log[%d] = %d", j, item->log_clusters[j]);
+    qDebug("original glyphs: %p", item->glyphs);
     for (int i = 0; i < length; ++i)
-        tqDebug("   glyph=%4x", otl_buffer->in_string[i].gindex);
+        qDebug("   glyph=%4x", otl_buffer->in_string[i].gindex);
 //     dump_string(otl_buffer);
 #endif
 
@@ -2594,13 +2594,13 @@ bool QOpenType::shape(QShaperItem *item, const unsigned int *properties)
     }
 
 #ifdef OT_DEBUG
-//     tqDebug("log clusters before shaping:");
+//     qDebug("log clusters before shaping:");
 //     for (int j = 0; j < length; j++)
-//         tqDebug("    log[%d] = %d", j, item->log_clusters[j]);
-    tqDebug("shaped glyphs:");
+//         qDebug("    log[%d] = %d", j, item->log_clusters[j]);
+    qDebug("shaped glyphs:");
     for (int i = 0; i < length; ++i)
-        tqDebug("   glyph=%4x", otl_buffer->in_string[i].gindex);
-    tqDebug("-----------------------------------------");
+        qDebug("   glyph=%4x", otl_buffer->in_string[i].gindex);
+    qDebug("-----------------------------------------");
 //     dump_string(otl_buffer);
 #endif
 
@@ -2643,7 +2643,7 @@ bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters)
         int oldCi = 0;
         for (unsigned int i = 0; i < otl_buffer->in_length; ++i) {
             int ci = otl_buffer->in_string[i].cluster;
-            //         tqDebug("   ci[%d] = %d mark=%d, cmb=%d, cs=%d",
+            //         qDebug("   ci[%d] = %d mark=%d, cmb=%d, cs=%d",
             //                i, ci, glyphAttributes[i].mark, glyphAttributes[i].combiningClass, glyphAttributes[i].clusterStart);
             if (!item->attributes[i].mark && item->attributes[i].clusterStart && ci != oldCi) {
                 for (int j = oldCi; j < ci; j++)
@@ -2657,7 +2657,7 @@ bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters)
     }
 
     // calulate the advances for the shaped glyphs
-//     tqDebug("unpositioned: ");
+//     qDebug("unpositioned: ");
     static_cast<QFontEngineXft *>(item->font)->recalcAdvances(item->num_glyphs, item->glyphs, item->advances);
 
     // positioning code:
@@ -2665,9 +2665,9 @@ bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters)
 	float scale = item->font->scale();
         OTL_Position positions = otl_buffer->positions;
 
-//         tqDebug("positioned glyphs:");
+//         qDebug("positioned glyphs:");
         for (unsigned int i = 0; i < otl_buffer->in_length; i++) {
-//             tqDebug("    %d:\t orig advance: (%d/%d)\tadv=(%d/%d)\tpos=(%d/%d)\tback=%d\tnew_advance=%d", i,
+//             qDebug("    %d:\t orig advance: (%d/%d)\tadv=(%d/%d)\tpos=(%d/%d)\tback=%d\tnew_advance=%d", i,
 //                    glyphs[i].advance.x.toInt(), glyphs[i].advance.y.toInt(),
 //                    (int)(positions[i].x_advance >> 6), (int)(positions[i].y_advance >> 6),
 //                    (int)(positions[i].x_pos >> 6), (int)(positions[i].y_pos >> 6),
@@ -2695,7 +2695,7 @@ bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters)
                     --back;
                 }
             }
-//             tqDebug("   ->\tadv=%d\tpos=(%d/%d)",
+//             qDebug("   ->\tadv=%d\tpos=(%d/%d)",
 //                    glyphs[i].advance.x.toInt(), glyphs[i].offset.x.toInt(), glyphs[i].offset.y.toInt());
         }
         item->has_positioning = TRUE;
@@ -2705,18 +2705,18 @@ bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters)
 
 #ifdef OT_DEBUG
 //     if (doLogClusters) {
-//         tqDebug("log clusters after shaping:");
+//         qDebug("log clusters after shaping:");
 //         for (int j = 0; j < length; j++)
-//             tqDebug("    log[%d] = %d", j, item->log_clusters[j]);
+//             qDebug("    log[%d] = %d", j, item->log_clusters[j]);
 //     }
-    tqDebug("final glyphs:");
+    qDebug("final glyphs:");
     for (int i = 0; i < (int)otl_buffer->in_length; ++i)
-        tqDebug("   glyph=%4x char_index=%d mark: %d cmp: %d, clusterStart: %d advance=%d offset=%d/%d",
+        qDebug("   glyph=%4x char_index=%d mark: %d cmp: %d, clusterStart: %d advance=%d offset=%d/%d",
                item->glyphs[i], otl_buffer->in_string[i].cluster, item->attributes[i].mark,
                item->attributes[i].combiningClass, item->attributes[i].clusterStart,
                item->advances[i],
                item->offsets[i].x, item->offsets[i].y);
-    tqDebug("-----------------------------------------");
+    qDebug("-----------------------------------------");
 #endif
     return TRUE;
 }
diff --git a/src/kernel/qguardedptr.cpp b/src/kernel/qguardedptr.cpp
index a42f073..0d51e96 100644
--- a/src/kernel/qguardedptr.cpp
+++ b/src/kernel/qguardedptr.cpp
@@ -68,7 +68,7 @@
 	if ( label)
 	    label->show();
 	else
-	    tqDebug("The label has been destroyed");
+	    qDebug("The label has been destroyed");
     \endcode
 
     The program will output \c{The label has been destroyed} rather
diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp
index 3984e67..b55a0e7 100644
--- a/src/kernel/qimage.cpp
+++ b/src/kernel/qimage.cpp
@@ -427,9 +427,9 @@ QImage::QImage( const char * const xpm[] )
 #ifndef QT_NO_IMAGEIO_XPM
     read_xpm_image_or_array( 0, xpm, *this );
 #else
-    // We use a tqFatal rather than disabling the whole function, as this
+    // We use a qFatal rather than disabling the whole function, as this
     // constructor may be ambiguous.
-    tqFatal("XPM not supported");
+    qFatal("XPM not supported");
 #endif
 }
 
@@ -588,7 +588,7 @@ QImage QImage::fromMimeSource( const QString &abs_name )
     const QMimeSource *m = QMimeSourceFactory::defaultFactory()->data( abs_name );
     if ( !m ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning("QImage::fromMimeSource: Cannot find image \"%s\" in the mime source factory", abs_name.latin1() );
+	qWarning("QImage::fromMimeSource: Cannot find image \"%s\" in the mime source factory", abs_name.latin1() );
 #endif
 	return QImage();
     }
@@ -944,7 +944,7 @@ QImage QImage::copy(int x, int y, int w, int h, int conversion_flags) const
 void QImage::warningIndexRange( const char *func, int i )
 {
 #if defined(QT_CHECK_RANGE)
-    tqWarning( "QImage::%s: Index %d out of range", func, i );
+    qWarning( "QImage::%s: Index %d out of range", func, i );
 #else
     Q_UNUSED( func )
     Q_UNUSED( i )
@@ -1091,7 +1091,7 @@ QImage::Endian QImage::systemByteOrder()
     if ( sbo == IgnoreEndian ) {		// initialize
 	int  ws;
 	bool be;
-	tqSysInfo( &ws, &be );
+	qSysInfo( &ws, &be );
 	sbo = be ? BigEndian : LittleEndian;
     }
     return sbo;
@@ -1242,7 +1242,7 @@ bool QImage::create( int width, int height, int depth, int numColors,
 	return FALSE;				// invalid parameter(s)
     if ( depth == 1 && bitOrder == IgnoreEndian ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QImage::create: Bit order is required for 1 bpp images" );
+	qWarning( "QImage::create: Bit order is required for 1 bpp images" );
 #endif
 	return FALSE;
     }
@@ -1251,7 +1251,7 @@ bool QImage::create( int width, int height, int depth, int numColors,
 
 #if defined(QT_CHECK_RANGE)
     if ( depth == 24 )
-	tqWarning( "QImage::create: 24-bpp images no longer supported, "
+	qWarning( "QImage::create: 24-bpp images no longer supported, "
 		  "use 32-bpp instead" );
 #endif
     switch ( depth ) {
@@ -2162,9 +2162,9 @@ QImage QImage::convertDepth( int depth, int conversion_flags ) const
     else {
 #if defined(QT_CHECK_RANGE)
 	if ( isNull() )
-	    tqWarning( "QImage::convertDepth: Image is a null image" );
+	    qWarning( "QImage::convertDepth: Image is a null image" );
 	else
-	    tqWarning( "QImage::convertDepth: Depth %d not supported", depth );
+	    qWarning( "QImage::convertDepth: Depth %d not supported", depth );
 #endif
     }
     return image;
@@ -2206,7 +2206,7 @@ int QImage::pixelIndex( int x, int y ) const
 {
 #if defined(QT_CHECK_RANGE)
     if ( x < 0 || x >= width() ) {
-	tqWarning( "QImage::pixel: x=%d out of range", x );
+	qWarning( "QImage::pixel: x=%d out of range", x );
 	return -12345;
     }
 #endif
@@ -2225,7 +2225,7 @@ int QImage::pixelIndex( int x, int y ) const
 #endif
     case 32:
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QImage::pixelIndex: Not applicable for %d-bpp images "
+	qWarning( "QImage::pixelIndex: Not applicable for %d-bpp images "
 		 "(no palette)", depth() );
 #endif
 	return 0;
@@ -2248,7 +2248,7 @@ QRgb QImage::pixel( int x, int y ) const
 {
 #if defined(QT_CHECK_RANGE)
     if ( x < 0 || x >= width() ) {
-	tqWarning( "QImage::pixel: x=%d out of range", x );
+	qWarning( "QImage::pixel: x=%d out of range", x );
 	return 12345;
     }
 #endif
@@ -2292,7 +2292,7 @@ void QImage::setPixel( int x, int y, uint index_or_rgb )
 {
     if ( x < 0 || x >= width() ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QImage::setPixel: x=%d out of range", x );
+	qWarning( "QImage::setPixel: x=%d out of range", x );
 #endif
 	return;
     }
@@ -2300,7 +2300,7 @@ void QImage::setPixel( int x, int y, uint index_or_rgb )
 	uchar * s = scanLine( y );
 	if ( index_or_rgb > 1) {
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QImage::setPixel: index=%d out of range",
+	    qWarning( "QImage::setPixel: index=%d out of range",
 		     index_or_rgb );
 #endif
 	} else if ( bitOrder() == QImage::LittleEndian ) {
@@ -2317,7 +2317,7 @@ void QImage::setPixel( int x, int y, uint index_or_rgb )
     } else if ( depth() == 8 ) {
 	if (index_or_rgb > (uint)numColors()) {
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QImage::setPixel: index=%d out of range",
+	    qWarning( "QImage::setPixel: index=%d out of range",
 		     index_or_rgb );
 #endif
 	    return;
@@ -2789,7 +2789,7 @@ QImage QImage::smoothScale( const QSize& s, ScaleMode mode ) const
 {
     if ( isNull() ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QImage::smoothScale: Image is a null image" );
+	qWarning( "QImage::smoothScale: Image is a null image" );
 #endif
 	return copy();
     }
@@ -2854,7 +2854,7 @@ QImage QImage::scale( const QSize& s, ScaleMode mode ) const
 {
     if ( isNull() ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QImage::scale: Image is a null image" );
+	qWarning( "QImage::scale: Image is a null image" );
 #endif
 	return copy();
     }
@@ -2892,7 +2892,7 @@ QImage QImage::scaleWidth( int w ) const
 {
     if ( isNull() ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QImage::scaleWidth: Image is a null image" );
+	qWarning( "QImage::scaleWidth: Image is a null image" );
 #endif
 	return copy();
     }
@@ -2921,7 +2921,7 @@ QImage QImage::scaleHeight( int h ) const
 {
     if ( isNull() ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QImage::scaleHeight: Image is a null image" );
+	qWarning( "QImage::scaleHeight: Image is a null image" );
 #endif
 	return copy();
     }
@@ -3336,7 +3336,7 @@ QImage QImage::swapRGB() const
 	    }
 #ifndef QT_NO_IMAGE_16_BIT
 	} else if ( depth() == 16 ) {
-	    tqWarning( "QImage::swapRGB not implemented for 16bpp" );
+	    qWarning( "QImage::swapRGB not implemented for 16bpp" );
 #endif
 	} else
 #endif //QT_NO_IMAGE_TRUECOLOR
@@ -3562,7 +3562,7 @@ bool QImage::doImageIO( QImageIO* io, int quality ) const
     io->setImage( *this );
 #if defined(QT_CHECK_RANGE)
     if ( quality > 100  || quality < -1 )
-	tqWarning( "QPixmap::save: quality out of range [-1,100]" );
+	qWarning( "QPixmap::save: quality out of range [-1,100]" );
 #endif
     if ( quality >= 0 )
 	io->setQuality( QMIN(quality,100) );
@@ -3899,7 +3899,7 @@ void qt_init_image_handlers()		// initialize image handlers
 	imageHandlers = new QIHList;
 	Q_CHECK_PTR( imageHandlers );
 	imageHandlers->setAutoDelete( TRUE );
-	tqAddPostRoutine( cleanup );
+	qAddPostRoutine( cleanup );
 #ifndef QT_NO_IMAGEIO_BMP
 	QImageIO::defineIOHandler( "BMP", "^BM", 0,
 				   read_bmp_image, write_bmp_image );
@@ -4199,7 +4199,7 @@ void QImageIO::setParameters( const char *parameters )
 {
     if ( d && d->parameters )
 	delete [] (char*)d->parameters;
-    d->parameters = tqstrdup( parameters );
+    d->parameters = qstrdup( parameters );
 }
 
 /*!
@@ -4502,7 +4502,7 @@ bool QImageIO::write()
     }
     if ( !h || !h->write_image ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QImageIO::write: No such image format handler: %s",
+	qWarning( "QImageIO::write: No such image format handler: %s",
 		 format() );
 #endif
 	return FALSE;
@@ -4637,19 +4637,19 @@ bool read_dib( QDataStream& s, int offset, int startpos, QImage& image )
     if ( d->atEnd() )				// end of stream/file
 	return FALSE;
 #if 0
-    tqDebug( "offset...........%d", offset );
-    tqDebug( "startpos.........%d", startpos );
-    tqDebug( "biSize...........%d", bi.biSize );
-    tqDebug( "biWidth..........%d", bi.biWidth );
-    tqDebug( "biHeight.........%d", bi.biHeight );
-    tqDebug( "biPlanes.........%d", bi.biPlanes );
-    tqDebug( "biBitCount.......%d", bi.biBitCount );
-    tqDebug( "biCompression....%d", bi.biCompression );
-    tqDebug( "biSizeImage......%d", bi.biSizeImage );
-    tqDebug( "biXPelsPerMeter..%d", bi.biXPelsPerMeter );
-    tqDebug( "biYPelsPerMeter..%d", bi.biYPelsPerMeter );
-    tqDebug( "biClrUsed........%d", bi.biClrUsed );
-    tqDebug( "biClrImportant...%d", bi.biClrImportant );
+    qDebug( "offset...........%d", offset );
+    qDebug( "startpos.........%d", startpos );
+    qDebug( "biSize...........%d", bi.biSize );
+    qDebug( "biWidth..........%d", bi.biWidth );
+    qDebug( "biHeight.........%d", bi.biHeight );
+    qDebug( "biPlanes.........%d", bi.biPlanes );
+    qDebug( "biBitCount.......%d", bi.biBitCount );
+    qDebug( "biCompression....%d", bi.biCompression );
+    qDebug( "biSizeImage......%d", bi.biSizeImage );
+    qDebug( "biXPelsPerMeter..%d", bi.biXPelsPerMeter );
+    qDebug( "biYPelsPerMeter..%d", bi.biYPelsPerMeter );
+    qDebug( "biClrUsed........%d", bi.biClrUsed );
+    qDebug( "biClrImportant...%d", bi.biClrImportant );
 #endif
     int w = bi.biWidth,	 h = bi.biHeight,  nbits = bi.biBitCount;
     int t = bi.biSize,	 comp = bi.biCompression;
@@ -5758,7 +5758,7 @@ static void read_xpm_image_or_array( QImageIO * iio, const char * const * source
     for( currentColor=0; currentColor < ncols; ++currentColor ) {
 	if ( !read_xpm_string( buf, d, source, index ) ) {
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QImage: XPM color specification missing");
+	    qWarning( "QImage: XPM color specification missing");
 #endif
 	    return;
 	}
@@ -5769,7 +5769,7 @@ static void read_xpm_image_or_array( QImageIO * iio, const char * const * source
 	i = nextColorSpec(buf);
 	if ( i < 0 ) {
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QImage: XPM color specification is missing: %s", buf.data());
+	    qWarning( "QImage: XPM color specification is missing: %s", buf.data());
 #endif
 	    return;	// no c/g/g4/m/s specification at all
 	}
@@ -5809,7 +5809,7 @@ static void read_xpm_image_or_array( QImageIO * iio, const char * const * source
     for( int y=0; y<h; y++ ) {
 	if ( !read_xpm_string( buf, d, source, index ) ) {
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QImage: XPM pixels missing on image line %d", y);
+	    qWarning( "QImage: XPM pixels missing on image line %d", y);
 #endif
 	    return;
 	}
@@ -6478,7 +6478,7 @@ QGfx * QImage::graphicsContext()
 	int h = qt_screen->mapToDevice( QSize(width(),height()) ).height();
 	ret=QGfx::createGfx(depth(),bits(),w,h,bytesPerLine());
     } else {
-	tqDebug("Trying to create image for null depth");
+	qDebug("Trying to create image for null depth");
 	return 0;
     }
     if(depth()<=8) {
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index 62c8570..5433ae4 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -526,15 +526,15 @@ void QInputContext::sendIMEventInternal( QEvent::Type type,
 	return;
 
     if ( type == QEvent::IMStart ) {
-	tqDebug( "sending IMStart with %d chars to %p",
+	qDebug( "sending IMStart with %d chars to %p",
 		text.length(), receiver );
 	event = new QIMEvent( type, text, cursorPosition );
     } else if ( type == QEvent::IMEnd ) {
-	tqDebug( "sending IMEnd with %d chars to %p, text=%s",
+	qDebug( "sending IMEnd with %d chars to %p, text=%s",
 		text.length(), receiver, (const char*)text.local8Bit() );
 	event = new QIMEvent( type, text, cursorPosition );
     } else if ( type == QEvent::IMCompose ) {
-	tqDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s",
+	qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s",
 		receiver, text.length(), cursorPosition, selLength,
 		(const char*)text.local8Bit() );
 	event = new QIMComposeEvent( type, text, cursorPosition, selLength );
diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp
index 1e0fd7c..cf1e037 100644
--- a/src/kernel/qinternal.cpp
+++ b/src/kernel/qinternal.cpp
@@ -183,7 +183,7 @@ bool QSharedDoubleBufferCleaner::event( QEvent *e )
     }
 #ifdef QT_CHECK_STATE
     else {
-	tqWarning( "QSharedDoubleBufferCleaner::event: invalid timer event received." );
+	qWarning( "QSharedDoubleBufferCleaner::event: invalid timer event received." );
 	return FALSE;
     }
 #endif // QT_CHECK_STATE
@@ -335,7 +335,7 @@ bool QSharedDoubleBuffer::begin( QPainter* painter, int x, int y, int w, int h )
 {
     if ( isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QSharedDoubleBuffer::begin: Buffer is already active."
+        qWarning( "QSharedDoubleBuffer::begin: Buffer is already active."
                   "\n\tYou must end() the buffer before a second begin()" );
 #endif // QT_CHECK_STATE
         return FALSE;
@@ -390,7 +390,7 @@ bool QSharedDoubleBuffer::begin( QWidget* widget, int x, int y, int w, int h )
 {
     if ( isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QSharedDoubleBuffer::begin: Buffer is already active."
+        qWarning( "QSharedDoubleBuffer::begin: Buffer is already active."
                   "\n\tYou must end() the buffer before a second begin()" );
 #endif // QT_CHECK_STATE
         return FALSE;
@@ -447,7 +447,7 @@ bool QSharedDoubleBuffer::end()
 {
     if ( ! isActive() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSharedDoubleBuffer::end: Buffer is not active."
+	qWarning( "QSharedDoubleBuffer::end: Buffer is not active."
 		  "\n\tYou must call begin() before calling end()." );
 #endif // QT_CHECK_STATE
 	return FALSE;
@@ -584,7 +584,7 @@ void QSharedDoubleBuffer::releasePixmap()
 	// sanity check
 
 #ifdef QT_CHECK_STATE
-	tqWarning( "QSharedDoubleBuffer::releasePixmap: internal error."
+	qWarning( "QSharedDoubleBuffer::releasePixmap: internal error."
 		  "\n\t%p does not own shared pixmap, %p does.",
 		  (void*)this, (void*)qdb_owner );
 #endif // QT_CHECK_STATE
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index 361d413..5d2a1b1 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -80,7 +80,7 @@ void my_error_exit (j_common_ptr cinfo)
     my_error_mgr* myerr = (my_error_mgr*) cinfo->err;
     char buffer[JMSG_LENGTH_MAX];
     (*cinfo->err->format_message)(cinfo, buffer);
-    tqWarning(buffer);
+    qWarning(buffer);
     longjmp(myerr->setjmp_buffer, 1);
 }
 
@@ -249,13 +249,13 @@ void read_jpeg_image(QImageIO* iio)
 	    } else if ( sModeQStr == "ScaleMax" ) {
 		sMode = QImage::ScaleMax;
 	    } else {
-		tqDebug("read_jpeg_image: invalid scale mode \"%s\", see QImage::ScaleMode documentation", sModeStr);
+		qDebug("read_jpeg_image: invalid scale mode \"%s\", see QImage::ScaleMode documentation", sModeStr);
 		sMode = QImage::ScaleFree;
 	    }
 
-//	    tqDebug( "Parameters ask to scale the image to %i x %i ScaleMode: %s", sWidth, sHeight, sModeStr );
+//	    qDebug( "Parameters ask to scale the image to %i x %i ScaleMode: %s", sWidth, sHeight, sModeStr );
 	    scaleSize( sWidth, sHeight, cinfo.output_width, cinfo.output_height, sMode );
-//	    tqDebug( "Scaling the jpeg to %i x %i", sWidth, sHeight, sModeStr );
+//	    qDebug( "Scaling the jpeg to %i x %i", sWidth, sHeight, sModeStr );
 
 	    bool created = FALSE;
 	    if ( cinfo.output_components == 3 || cinfo.output_components == 4) {
diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp
index a303d0a..7263d4a 100644
--- a/src/kernel/qkeysequence.cpp
+++ b/src/kernel/qkeysequence.cpp
@@ -300,7 +300,7 @@ void QKeySequence::setKey( int key, int index )
 {
 #ifdef QT_CHECK_STATE
     if ( 0 > index && 4 < index ) {
-	tqWarning( "QKeySequence::setKey: index %u out of range", index );
+	qWarning( "QKeySequence::setKey: index %u out of range", index );
 	return;
     }
 #endif // QT_CHECK_STATE
@@ -620,7 +620,7 @@ int QKeySequence::operator[]( uint index ) const
 {
 #ifdef QT_CHECK_STATE
     if ( index > 4 ) {
-	tqWarning( "QKeySequence::operator[]: index %u out of range", index );
+	qWarning( "QKeySequence::operator[]: index %u out of range", index );
 	return 0;
     }
 #endif // QT_CHECK_STATE
@@ -707,7 +707,7 @@ QDataStream &operator>>( QDataStream &s, QKeySequence &keysequence )
 
 #ifdef QT_CHECK_STATE
     if ( 1 != list.count() && 4 != list.count() ) {
-	tqWarning( "Invalid QKeySequence data in the datastream." );
+	qWarning( "Invalid QKeySequence data in the datastream." );
 	return s;
     }
 #endif
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp
index e7ca24d..de9f5b9 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/qlayout.cpp
@@ -468,9 +468,9 @@ void QGridLayoutData::add( QGridBox *box, int row1, int row2, int col1,
 {
 #ifdef QT_CHECK_RANGE
     if ( row2 >= 0 && row2 < row1 )
-	tqWarning( "QGridLayout: Multi-cell fromRow greater than toRow" );
+	qWarning( "QGridLayout: Multi-cell fromRow greater than toRow" );
     if ( col2 >= 0 && col2 < col1 )
-	tqWarning( "QGridLayout: Multi-cell fromCol greater than toCol" );
+	qWarning( "QGridLayout: Multi-cell fromCol greater than toCol" );
 #endif
     if ( row1 == row2 && col1 == col2 ) {
 	add( box, row1, col1 );
@@ -1216,7 +1216,7 @@ static bool checkWidget( QLayout *l, QWidget *w )
 {
     if ( !w ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QLayout: Cannot add null widget to %s/%s", l->className(),
+	qWarning( "QLayout: Cannot add null widget to %s/%s", l->className(),
 		  l->name() );
 #endif
 	return FALSE;
@@ -1224,12 +1224,12 @@ static bool checkWidget( QLayout *l, QWidget *w )
     if ( w->parentWidget() != l->mainWidget() && l->mainWidget() ) {
 #if defined(QT_CHECK_STATE)
 	if ( w->parentWidget() )
-	    tqWarning( "QLayout: Adding %s/%s (child of %s/%s) to layout for "
+	    qWarning( "QLayout: Adding %s/%s (child of %s/%s) to layout for "
 		      "%s/%s", w->className(), w->name(),
 		      w->parentWidget()->className(), w->parentWidget()->name(),
 		      l->mainWidget()->className(), l->mainWidget()->name() );
 	else
-	    tqWarning( "QLayout: Adding %s/%s (top-level widget) to layout for"
+	    qWarning( "QLayout: Adding %s/%s (top-level widget) to layout for"
 		      " %s/%s", w->className(), w->name(),
 		      l->mainWidget()->className(), l->mainWidget()->name() );
 #endif
@@ -1264,7 +1264,7 @@ void QGridLayout::addWidget( QWidget *w, int row, int col, int alignment )
 	return;
     if ( row < 0 || col < 0 ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QGridLayout: Cannot add %s/%s to %s/%s at row %d col %d",
+	qWarning( "QGridLayout: Cannot add %s/%s to %s/%s at row %d col %d",
 		  w->className(), w->name(), className(), name(), row, col );
 #endif
 	return;
diff --git a/src/kernel/qlocalfs.cpp b/src/kernel/qlocalfs.cpp
index e3b4334..e6017f6 100644
--- a/src/kernel/qlocalfs.cpp
+++ b/src/kernel/qlocalfs.cpp
@@ -73,7 +73,7 @@
     \endcode
 
     This code will only work if the QLocalFs class is registered; to
-    register the class, you must call tqInitNetworkProtocols() before
+    register the class, you must call qInitNetworkProtocols() before
     using a QUrlOperator with QLocalFs.
 
     If you really need to use QLocalFs directly, don't forget
@@ -122,7 +122,7 @@ static int convertPermissions(QFileInfo *fi)
 void QLocalFs::operationListChildren( QNetworkOperation *op )
 {
 #ifdef QLOCALFS_DEBUG
-    tqDebug( "QLocalFs: operationListChildren" );
+    qDebug( "QLocalFs: operationListChildren" );
 #endif
     op->setState( StInProgress );
 
@@ -171,7 +171,7 @@ void QLocalFs::operationListChildren( QNetworkOperation *op )
 void QLocalFs::operationMkDir( QNetworkOperation *op )
 {
 #ifdef QLOCALFS_DEBUG
-    tqDebug( "QLocalFs: operationMkDir" );
+    qDebug( "QLocalFs: operationMkDir" );
 #endif
     op->setState( StInProgress );
     QString dirname = op->arg( 0 );
@@ -202,7 +202,7 @@ void QLocalFs::operationMkDir( QNetworkOperation *op )
 void QLocalFs::operationRemove( QNetworkOperation *op )
 {
 #ifdef QLOCALFS_DEBUG
-    tqDebug( "QLocalFs: operationRemove" );
+    qDebug( "QLocalFs: operationRemove" );
 #endif
     op->setState( StInProgress );
     QString name = QUrl( op->arg( 0 ) ).path();
@@ -236,7 +236,7 @@ void QLocalFs::operationRemove( QNetworkOperation *op )
 void QLocalFs::operationRename( QNetworkOperation *op )
 {
 #ifdef QLOCALFS_DEBUG
-    tqDebug( "QLocalFs: operationRename" );
+    qDebug( "QLocalFs: operationRename" );
 #endif
     op->setState( StInProgress );
     QString oldname = op->arg( 0 );
@@ -263,7 +263,7 @@ void QLocalFs::operationRename( QNetworkOperation *op )
 void QLocalFs::operationGet( QNetworkOperation *op )
 {
 #ifdef QLOCALFS_DEBUG
-    tqDebug( "QLocalFs: operationGet" );
+    qDebug( "QLocalFs: operationGet" );
 #endif
     op->setState( StInProgress );
     QString from = QUrl( op->arg( 0 ) ).path();
@@ -271,7 +271,7 @@ void QLocalFs::operationGet( QNetworkOperation *op )
     QFile f( from );
     if ( !f.open( IO_ReadOnly ) ) {
 #ifdef QLOCALFS_DEBUG
-	tqDebug( "QLocalFs: could not open %s", from.latin1() );
+	qDebug( "QLocalFs: could not open %s", from.latin1() );
 #endif
 	QString msg = tr( "Could not open\n%1" ).arg( from );
 	op->setState( StFailed );
@@ -291,7 +291,7 @@ void QLocalFs::operationGet( QNetworkOperation *op )
 	    emit data( s, op );
 	    emit dataTransferProgress( f.size(), f.size(), op );
 #ifdef QLOCALFS_DEBUG
-	    tqDebug( "QLocalFs: got all %d bytes at once", f.size() );
+	    qDebug( "QLocalFs: got all %d bytes at once", f.size() );
 #endif
 	} else {
 	    s.resize( blockSize );
@@ -317,7 +317,7 @@ void QLocalFs::operationGet( QNetworkOperation *op )
 	    if (!that)
 		return;
 #ifdef QLOCALFS_DEBUG
-	    tqDebug( "QLocalFs: got all %d bytes step by step", f.size() );
+	    qDebug( "QLocalFs: got all %d bytes step by step", f.size() );
 #endif
 	    emit dataTransferProgress( f.size(), f.size(), op );
 	}
@@ -334,7 +334,7 @@ void QLocalFs::operationGet( QNetworkOperation *op )
 void QLocalFs::operationPut( QNetworkOperation *op )
 {
 #ifdef QLOCALFS_DEBUG
-    tqDebug( "QLocalFs: operationPut" );
+    qDebug( "QLocalFs: operationPut" );
 #endif
     op->setState( StInProgress );
     QString to = QUrl( op->arg( 0 ) ).path();
diff --git a/src/kernel/qlock.cpp b/src/kernel/qlock.cpp
index 0a3f98c..56faa1d 100644
--- a/src/kernel/qlock.cpp
+++ b/src/kernel/qlock.cpp
@@ -138,9 +138,9 @@ QLock::QLock( const QString &filename, char id, bool create )
     }
 #endif
     if ( data->id == -1 ) {
-	tqWarning( "Cannot %s semaphore %s \'%c\'",
+	qWarning( "Cannot %s semaphore %s \'%c\'",
 	    create ? "create" : "get", filename.latin1(), id );
-	tqDebug("Error %d %s\n",errno,strerror(errno));
+	qDebug("Error %d %s\n",errno,strerror(errno));
     }
 #endif
 }
@@ -211,7 +211,7 @@ void QLock::lock( Type t )
 	for( int rv=1; rv; ) {
 	    rv = flock(data->id, op);
 	    if (rv == -1 && errno != EINTR)
-		tqDebug("Semop lock failure %s",strerror(errno));
+		qDebug("Semop lock failure %s",strerror(errno));
 	}
 #else
 	sembuf sops;
@@ -230,7 +230,7 @@ void QLock::lock( Type t )
 	do {
 	    rv = semop(data->id,&sops,1);
 	    if (rv == -1 && errno != EINTR)
-		tqDebug("Semop lock failure %s",strerror(errno));
+		qDebug("Semop lock failure %s",strerror(errno));
 	} while ( rv == -1 && errno == EINTR );
 #endif
     }
@@ -256,7 +256,7 @@ void QLock::unlock()
 	    for( int rv=1; rv; ) {
 		rv = flock(data->id, LOCK_UN);
 		if (rv == -1 && errno != EINTR)
-		    tqDebug("Semop lock failure %s",strerror(errno));
+		    qDebug("Semop lock failure %s",strerror(errno));
 	    }
 #else
 	    sembuf sops;
@@ -270,12 +270,12 @@ void QLock::unlock()
 	    do {
 		rv = semop(data->id,&sops,1);
 		if (rv == -1 && errno != EINTR)
-		    tqDebug("Semop unlock failure %s",strerror(errno));
+		    qDebug("Semop unlock failure %s",strerror(errno));
 	    } while ( rv == -1 && errno == EINTR );
 #endif
 	}
     } else {
-	tqDebug("Unlock without corresponding lock");
+	qDebug("Unlock without corresponding lock");
     }
 #endif
 }
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index 1c5640f..9a86686 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -423,7 +423,7 @@ int QMetaObject::findSignal( const char* n, bool super ) const
 	if ( md ) {
 #if defined(QT_CHECK_RANGE)
 	    if ( offset != -1 ) {
-		tqWarning( "QMetaObject::findSignal:%s: Conflict with %s::%s",
+		qWarning( "QMetaObject::findSignal:%s: Conflict with %s::%s",
 			  className(), mo->className(), n );
 		return offset;
 	    }
@@ -1245,7 +1245,7 @@ void QMetaObjectCleanUp::setMetaObject( QMetaObject *&mo )
 {
 #if defined(QT_CHECK_RANGE)
     if ( metaObject )
-	tqWarning( "QMetaObjectCleanUp::setMetaObject: Double use of QMetaObjectCleanUp!" );
+	qWarning( "QMetaObjectCleanUp::setMetaObject: Double use of QMetaObjectCleanUp!" );
 #endif
     metaObject = &mo;
 }
diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp
index d6ab853..e50757d 100644
--- a/src/kernel/qmime.cpp
+++ b/src/kernel/qmime.cpp
@@ -139,7 +139,7 @@ bool QMimeSource::provides(const char* mimeType) const
 {
     const char* fmt;
     for (int i=0; (fmt = format(i)); i++) {
-	if ( !tqstricmp(mimeType,fmt) )
+	if ( !qstricmp(mimeType,fmt) )
 	    return TRUE;
     }
     return FALSE;
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index ac0513d..2644270 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -122,7 +122,7 @@ public:
 		   mng_int32   iExtra2,
 		   mng_pchar   zErrortext )
     {
-	tqWarning("MNG error %d: %s; chunk %c%c%c%c; subcode %d:%d",
+	qWarning("MNG error %d: %s; chunk %c%c%c%c; subcode %d:%d",
 	    iErrorcode, zErrortext ? zErrortext : "",
 	    (iChunkname>>24)&0xff,
 	    (iChunkname>>16)&0xff,
@@ -456,7 +456,7 @@ void qInitMngIO()
 	done = TRUE;
 #ifndef QT_NO_ASYNC_IMAGE_IO
 	globalMngFormatTypeObject = new QMNGFormatType;
-	tqAddPostRoutine( qCleanupMngIO );
+	qAddPostRoutine( qCleanupMngIO );
 #endif
     }
 }
diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp
index 201ac33..c9399f9 100644
--- a/src/kernel/qmotifdnd_x11.cpp
+++ b/src/kernel/qmotifdnd_x11.cpp
@@ -597,12 +597,12 @@ static DndTargetsTable TargetsTable(Display *display)
 			     &type, &format,	&size, &bytes_after,
 			     (unsigned char **) &target_prop) != Success) ||
 	type == None) {
-	tqWarning("QMotifDND: cannot get property on motif window");
+	qWarning("QMotifDND: cannot get property on motif window");
 	return 0;
     }
 
     if (target_prop->protocol_version != DND_PROTOCOL_VERSION) {
-	tqWarning("QMotifDND: protocol mismatch");
+	qWarning("QMotifDND: protocol mismatch");
     }
 
     if (target_prop->byte_order != DndByteOrder()) {
@@ -726,7 +726,7 @@ QByteArray qt_motifdnd_obtain_data( const char *mimeType )
     QByteArray result;
 
     // try to convert the selection to the requested property
-    // tqDebug( "trying to convert to '%s'", mimeType );
+    // qDebug( "trying to convert to '%s'", mimeType );
 
     int n=0;
     const char* f;
@@ -735,18 +735,18 @@ QByteArray qt_motifdnd_obtain_data( const char *mimeType )
 	if ( !f )
 	    return result;
 	n++;
-    } while( tqstricmp( mimeType, f ) );
+    } while( qstricmp( mimeType, f ) );
 
     // found one
     Atom conversion_type;
 
-    if ( tqstrnicmp( f, "text/", 5 ) == 0 ) {
+    if ( qstrnicmp( f, "text/", 5 ) == 0 ) {
 	// always convert text to XA_STRING for compatibility with
 	// prior Qt versions
 	conversion_type = XA_STRING;
     } else {
 	conversion_type = *qt_xdnd_str_to_atom( f );
-	// tqDebug( "found format '%s' 0x%lx '%s'", f, conversion_type,
+	// qDebug( "found format '%s' 0x%lx '%s'", f, conversion_type,
 	// qt_xdnd_atom_to_str( conversion_type ) );
     }
 
diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp
index 97e039a..4173584 100644
--- a/src/kernel/qnetworkprotocol.cpp
+++ b/src/kernel/qnetworkprotocol.cpp
@@ -51,9 +51,9 @@
 //#define QNETWORKPROTOCOL_DEBUG
 #define NETWORK_OP_DELAY 1000
 
-extern Q_EXPORT QNetworkProtocolDict *tqNetworkProtocolRegister;
+extern Q_EXPORT QNetworkProtocolDict *qNetworkProtocolRegister;
 
-QNetworkProtocolDict *tqNetworkProtocolRegister = 0;
+QNetworkProtocolDict *qNetworkProtocolRegister = 0;
 
 class QNetworkProtocolPrivate
 {
@@ -542,7 +542,7 @@ int QNetworkProtocol::supportedOperations() const
 void QNetworkProtocol::addOperation( QNetworkOperation *op )
 {
 #ifdef QNETWORKPROTOCOL_DEBUG
-    tqDebug( "QNetworkOperation: addOperation: %p %d", op, op->operation() );
+    qDebug( "QNetworkOperation: addOperation: %p %d", op, op->operation() );
 #endif
     d->operationQueue.enqueue( op );
     if ( !d->opInProgress )
@@ -566,12 +566,12 @@ void QNetworkProtocol::addOperation( QNetworkOperation *op )
 void QNetworkProtocol::registerNetworkProtocol( const QString &protocol,
 						QNetworkProtocolFactoryBase *protocolFactory )
 {
-    if ( !tqNetworkProtocolRegister ) {
-	tqNetworkProtocolRegister = new QNetworkProtocolDict;
+    if ( !qNetworkProtocolRegister ) {
+	qNetworkProtocolRegister = new QNetworkProtocolDict;
 	QNetworkProtocol::registerNetworkProtocol( "file", new QNetworkProtocolFactory< QLocalFs > );
     }
 
-    tqNetworkProtocolRegister->insert( protocol, protocolFactory );
+    qNetworkProtocolRegister->insert( protocol, protocolFactory );
 }
 
 /*!
@@ -596,15 +596,15 @@ void QNetworkProtocol::registerNetworkProtocol( const QString &protocol,
 
 QNetworkProtocol *QNetworkProtocol::getNetworkProtocol( const QString &protocol )
 {
-    if ( !tqNetworkProtocolRegister ) {
-	tqNetworkProtocolRegister = new QNetworkProtocolDict;
+    if ( !qNetworkProtocolRegister ) {
+	qNetworkProtocolRegister = new QNetworkProtocolDict;
 	QNetworkProtocol::registerNetworkProtocol( "file", new QNetworkProtocolFactory< QLocalFs > );
     }
 
     if ( protocol.isNull() )
 	return 0;
 
-    QNetworkProtocolFactoryBase *factory = tqNetworkProtocolRegister->find( protocol );
+    QNetworkProtocolFactoryBase *factory = qNetworkProtocolRegister->find( protocol );
     if ( factory )
 	return factory->createObject();
 
@@ -619,10 +619,10 @@ QNetworkProtocol *QNetworkProtocol::getNetworkProtocol( const QString &protocol
 
 bool QNetworkProtocol::hasOnlyLocalFileSystem()
 {
-    if ( !tqNetworkProtocolRegister )
+    if ( !qNetworkProtocolRegister )
 	return FALSE;
 
-    QDictIterator< QNetworkProtocolFactoryBase > it( *tqNetworkProtocolRegister );
+    QDictIterator< QNetworkProtocolFactoryBase > it( *qNetworkProtocolRegister );
     for ( ; it.current(); ++it )
 	if ( it.currentKey() != "file" )
 	    return FALSE;
@@ -637,7 +637,7 @@ bool QNetworkProtocol::hasOnlyLocalFileSystem()
 void QNetworkProtocol::startOps()
 {
 #ifdef QNETWORKPROTOCOL_DEBUG
-    tqDebug( "QNetworkOperation: start processing operations" );
+    qDebug( "QNetworkOperation: start processing operations" );
 #endif
     processNextOperation( 0 );
 }
@@ -826,7 +826,7 @@ void QNetworkProtocol::operationPutChunk( QNetworkOperation * )
 void QNetworkProtocol::processNextOperation( QNetworkOperation *old )
 {
 #ifdef QNETWORKPROTOCOL_DEBUG
-    tqDebug( "QNetworkOperation: process next operation, old: %p", old );
+    qDebug( "QNetworkOperation: process next operation, old: %p", old );
 #endif
     d->removeTimer->stop();
 
@@ -949,7 +949,7 @@ void QNetworkProtocol::removeMe()
 {
     if ( d->autoDelete ) {
 #ifdef QNETWORKPROTOCOL_DEBUG
-	tqDebug( "QNetworkOperation:  autodelete of QNetworkProtocol %p", this );
+	qDebug( "QNetworkOperation:  autodelete of QNetworkProtocol %p", this );
 #endif
 	delete d->url; // destructor deletes the network protocol
     }
diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp
index 285fc51..7e01dec 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/qobject.cpp
@@ -335,7 +335,7 @@ static void cleanup_object_trees()
 static void ensure_object_trees()
 {
     object_trees = new QObjectList;
-    tqAddPostRoutine( cleanup_object_trees );
+    qAddPostRoutine( cleanup_object_trees );
 }
 
 static void insert_tree( QObject* obj )
@@ -418,7 +418,7 @@ QObject::QObject( QObject *parent, const char *name )
     blockSig( FALSE ),      			// not blocking signals
     wasDeleted( FALSE ),       			// double-delete catcher
     isTree( FALSE ), 				// no tree yet
-    objname( name ? tqstrdup(name) : 0 ),        // set object name
+    objname( name ? qstrdup(name) : 0 ),        // set object name
     parentObj( 0 ),				// no parent yet. It is set by insertChild()
     childObjects( 0 ), 				// no children yet
     connections( 0 ),				// no connections yet
@@ -463,7 +463,7 @@ QObject::~QObject()
 {
     if ( wasDeleted ) {
 #if defined(QT_DEBUG)
-	tqWarning( "Double QObject deletion detected." );
+	qWarning( "Double QObject deletion detected." );
 #endif
 	return;
     }
@@ -643,12 +643,12 @@ void *qt_inheritedBy( QMetaObject *superClass, const QObject *object )
     future.
 
     If the object does not have a name, the name() function returns
-    "unnamed", so printf() (used in tqDebug()) will not be asked to
+    "unnamed", so printf() (used in qDebug()) will not be asked to
     output a null pointer. If you want a null pointer to be returned
     for unnamed objects, you can call name( 0 ).
 
     \code
-	tqDebug( "MyClass::setPrecision(): (%s) invalid precision %f",
+	qDebug( "MyClass::setPrecision(): (%s) invalid precision %f",
 		name(), newPrecision );
     \endcode
 
@@ -668,7 +668,7 @@ void QObject::setName( const char *name )
 {
     if ( objname )
 	delete [] (char*) objname;
-    objname = name ? tqstrdup(name) : 0;
+    objname = name ? qstrdup(name) : 0;
 }
 
 /*!
@@ -756,7 +756,7 @@ bool QObject::event( QEvent *e )
 {
 #if defined(QT_CHECK_NULL)
     if ( e == 0 )
-	tqWarning( "QObject::event: Null events are not permitted" );
+	qWarning( "QObject::event: Null events are not permitted" );
 #endif
     if ( eventFilters ) {			// try filters
 	if ( activate_filters(e) )		// stopped by a filter
@@ -883,7 +883,7 @@ void QObject::customEvent( QCustomEvent * )
         if ( obj == textEdit ) {
             if ( e->type() == QEvent::KeyPress ) {
                 QKeyEvent *k = (QKeyEvent*)ev;
-                tqDebug( "Ate key press %d", k->key() );
+                qDebug( "Ate key press %d", k->key() );
                 return TRUE;
             } else {
                 return FALSE;
@@ -1005,7 +1005,7 @@ void QObject::blockSignals( bool block )
 
     void MyObject::timerEvent( QTimerEvent *e )
     {
-	tqDebug( "timer event, id %d", e->timerId() );
+	qDebug( "timer event, id %d", e->timerId() );
     }
     \endcode
 
@@ -1282,7 +1282,7 @@ void QObject::insertChild( QObject *obj )
     if ( obj->parentObj && obj->parentObj != this ) {
 #if defined(QT_CHECK_STATE)
 	if ( obj->parentObj != this && obj->isWidgetType() )
-	    tqWarning( "QObject::insertChild: Cannot reparent a widget, "
+	    qWarning( "QObject::insertChild: Cannot reparent a widget, "
 		     "use QWidget::reparent() instead" );
 #endif
 	obj->parentObj->removeChild( obj );
@@ -1293,7 +1293,7 @@ void QObject::insertChild( QObject *obj )
 	Q_CHECK_PTR( childObjects );
     } else if ( obj->parentObj == this ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QObject::insertChild: Object %s::%s already in list",
+	qWarning( "QObject::insertChild: Object %s::%s already in list",
 		 obj->className(), obj->name( "unnamed" ) );
 #endif
 	return;
@@ -1368,7 +1368,7 @@ void QObject::removeChild( QObject *obj )
 	if ( e->type() == QEvent::KeyPress ) {
 	    // special processing for key press
 	    QKeyEvent *k = (QKeyEvent *)e;
-	    tqDebug( "Ate key press %d", k->key() );
+	    qDebug( "Ate key press %d", k->key() );
 	    return TRUE; // eat event
 	} else {
 	    // standard event processing
@@ -1453,10 +1453,10 @@ static bool check_signal_macro( const QObject *sender, const char *signal,
     int sigcode = (int)(*signal) - '0';
     if ( sigcode != QSIGNAL_CODE ) {
 	if ( sigcode == QSLOT_CODE )
-	    tqWarning( "QObject::%s: Attempt to %s non-signal %s::%s",
+	    qWarning( "QObject::%s: Attempt to %s non-signal %s::%s",
 		     func, op, sender->className(), signal+1 );
 	else
-	    tqWarning( "QObject::%s: Use the SIGNAL macro to %s %s::%s",
+	    qWarning( "QObject::%s: Use the SIGNAL macro to %s %s::%s",
 		     func, op, sender->className(), signal );
 	return FALSE;
     }
@@ -1467,7 +1467,7 @@ static bool check_member_code( int code, const QObject *object,
 			       const char *member, const char *func )
 {
     if ( code != QSLOT_CODE && code != QSIGNAL_CODE ) {
-	tqWarning( "QObject::%s: Use the SLOT or SIGNAL macro to "
+	qWarning( "QObject::%s: Use the SLOT or SIGNAL macro to "
 		 "%s %s::%s", func, func, object->className(), member );
 	return FALSE;
     }
@@ -1483,10 +1483,10 @@ static void err_member_notfound( int code, const QObject *object,
 	case QSIGNAL_CODE: type = "signal"; break;
     }
     if ( strchr(member,')') == 0 )		// common typing mistake
-	tqWarning( "QObject::%s: Parentheses expected, %s %s::%s",
+	qWarning( "QObject::%s: Parentheses expected, %s %s::%s",
 		 func, type, object->className(), member );
     else
-	tqWarning( "QObject::%s: No such %s %s::%s",
+	qWarning( "QObject::%s: No such %s %s::%s",
 		 func, type, object->className(), member );
 }
 
@@ -1497,9 +1497,9 @@ static void err_info_about_objects( const char * func,
 {
     const char * a = sender->name(), * b = receiver->name();
     if ( a )
-	tqWarning( "QObject::%s:  (sender name:   '%s')", func, a );
+	qWarning( "QObject::%s:  (sender name:   '%s')", func, a );
     if ( b )
-	tqWarning( "QObject::%s:  (receiver name: '%s')", func, b );
+	qWarning( "QObject::%s:  (receiver name: '%s')", func, b );
 }
 
 static void err_info_about_candidates( int code,
@@ -1524,7 +1524,7 @@ static void err_info_about_candidates( int code,
 	    break;
 	}
 	if ( rm ) {
-	    tqWarning("QObject::%s:  Candidate: %s", func, newname.data());
+	    qWarning("QObject::%s:  Candidate: %s", func, newname.data());
 	}
     }
 }
@@ -1748,7 +1748,7 @@ bool QObject::connect( const QObject *sender,	const char *signal,
 {
 #if defined(QT_CHECK_NULL)
     if ( sender == 0 || receiver == 0 || signal == 0 || member == 0 ) {
-	tqWarning( "QObject::connect: Cannot connect %s::%s to %s::%s",
+	qWarning( "QObject::connect: Cannot connect %s::%s to %s::%s",
 		 sender ? sender->className() : "(null)",
 		 signal ? signal+1 : "(null)",
 		 receiver ? receiver->className() : "(null)",
@@ -1825,7 +1825,7 @@ bool QObject::connect( const QObject *sender,	const char *signal,
     }
 #if defined(QT_CHECK_RANGE)
     if ( !s->checkConnectArgs(signal,receiver,member) ) {
-	tqWarning( "QObject::connect: Incompatible sender/receiver arguments"
+	qWarning( "QObject::connect: Incompatible sender/receiver arguments"
 		 "\n\t%s::%s --> %s::%s",
 		 s->className(), signal,
 		 r->className(), member );
@@ -1849,7 +1849,7 @@ bool QObject::connect( const QObject *sender,	const char *signal,
 			|| ( QUType::isEqual( sm->method->parameters[si-1].type, &static_QUType_varptr )
 			     && QUType::isEqual( rm->method->parameters[ri-1].type, &static_QUType_ptr ) ) )
 			continue; // varptr got introduced in 3.1 and is binary compatible with ptr
-		    tqWarning( "QObject::connect: Incompatible sender/receiver marshalling"
+		    qWarning( "QObject::connect: Incompatible sender/receiver marshalling"
 			      "\n\t%s::%s --> %s::%s",
 			      s->className(), signal,
 			      r->className(), member );
@@ -1989,7 +1989,7 @@ bool QObject::disconnect( const QObject *sender,   const char *signal,
 {
 #if defined(QT_CHECK_NULL)
     if ( sender == 0 || (receiver == 0 && member != 0) ) {
-	tqWarning( "QObject::disconnect: Unexpected null parameter" );
+	qWarning( "QObject::disconnect: Unexpected null parameter" );
 	return FALSE;
     }
 #endif
@@ -2061,7 +2061,7 @@ bool QObject::disconnect( const QObject *sender,   const char *signal,
 	}
 	if ( signal_index < 0 ) {
 #if defined(QT_CHECK_RANGE)
-		tqWarning( "QObject::disconnect: No such signal %s::%s",
+		qWarning( "QObject::disconnect: No such signal %s::%s",
 			 s->className(), signal );
 #endif
 		return FALSE;
@@ -2504,7 +2504,7 @@ static void dumpRecursive( int level, QObject *object )
 		flags += 'I';
 	    }
 	}
-	tqDebug( "%s%s::%s %s", (const char*)buf, object->className(), name,
+	qDebug( "%s%s::%s %s", (const char*)buf, object->className(), name,
 	    flags.latin1() );
 	if ( object->children() ) {
 	    QObjectListIt it(*object->children());
@@ -2546,41 +2546,41 @@ void QObject::dumpObjectTree()
 void QObject::dumpObjectInfo()
 {
 #if defined(QT_DEBUG)
-    tqDebug( "OBJECT %s::%s", className(), name( "unnamed" ) );
+    qDebug( "OBJECT %s::%s", className(), name( "unnamed" ) );
     int n = 0;
-    tqDebug( "  SIGNALS OUT" );
+    qDebug( "  SIGNALS OUT" );
     if ( connections ) {
 	QConnectionList *clist;
 	for ( uint i = 0; i < connections->size(); i++ ) {
 	    if ( ( clist = connections->at( i ) ) ) {
-		tqDebug( "\t%s", metaObject()->signal( i, TRUE )->name );
+		qDebug( "\t%s", metaObject()->signal( i, TRUE )->name );
 		n++;
 		register QConnection *c;
 		QConnectionListIt cit(*clist);
 		while ( (c=cit.current()) ) {
 		    ++cit;
-		    tqDebug( "\t  --> %s::%s %s", c->object()->className(),
+		    qDebug( "\t  --> %s::%s %s", c->object()->className(),
 			    c->object()->name( "unnamed" ), c->memberName() );
 		}
 	    }
 	}
     }
     if ( n == 0 )
-	tqDebug( "\t<None>" );
+	qDebug( "\t<None>" );
 
-    tqDebug( "  SIGNALS IN" );
+    qDebug( "  SIGNALS IN" );
     n = 0;
     if ( senderObjects ) {
 	QObject *sender = senderObjects->first();
 	while ( sender ) {
-	    tqDebug( "\t%s::%s",
+	    qDebug( "\t%s::%s",
 		   sender->className(), sender->name( "unnamed" ) );
 	    n++;
 	    sender = senderObjects->next();
 	}
     }
     if ( n == 0 )
-	tqDebug( "\t<None>" );
+	qDebug( "\t<None>" );
 #endif
 }
 
@@ -2610,7 +2610,7 @@ bool QObject::setProperty( const char *name, const QVariant& value )
     int id = meta->findProperty( name, TRUE );
     const QMetaProperty* p = meta->property( id, TRUE );
     if ( !p || !p->isValid() || !p->writable() ) {
-	tqWarning( "%s::setProperty( \"%s\", value ) failed: property invalid, read-only or does not exist",
+	qWarning( "%s::setProperty( \"%s\", value ) failed: property invalid, read-only or does not exist",
 		  className(), name );
 	return FALSE;
     }
@@ -2662,7 +2662,7 @@ QVariant QObject::property( const char *name ) const
     int id = meta->findProperty( name, TRUE );
     const QMetaProperty* p = meta->property( id, TRUE );
     if ( !p || !p->isValid() ) {
-	tqWarning( "%s::property( \"%s\" ) failed: property invalid or does not exist",
+	qWarning( "%s::property( \"%s\" ) failed: property invalid or does not exist",
 		  className(), name );
 	return v;
     }
diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp
index b17c003..a755c01 100644
--- a/src/kernel/qpaintdevice_x11.cpp
+++ b/src/kernel/qpaintdevice_x11.cpp
@@ -133,7 +133,7 @@ QPaintDevice::QPaintDevice( uint devflags )
 {
     if ( !qApp ) {				// global constructor
 #if defined(QT_CHECK_STATE)
-	tqFatal( "QPaintDevice: Must construct a QApplication before a "
+	qFatal( "QPaintDevice: Must construct a QApplication before a "
 		"QPaintDevice" );
 #endif
 	return;
@@ -153,7 +153,7 @@ QPaintDevice::~QPaintDevice()
 {
 #if defined(QT_CHECK_STATE)
     if ( paintingActive() )
-	tqWarning( "QPaintDevice: Cannot destroy paint device that is being "
+	qWarning( "QPaintDevice: Cannot destroy paint device that is being "
 		  "painted" );
 #endif
     if ( x11Data && x11Data->deref() ) {
@@ -699,7 +699,7 @@ int QPaintDevice::x11AppDpiY()
 bool QPaintDevice::cmd( int, QPainter *, QPDevCmdParam * )
 {
 #if defined(QT_CHECK_STATE)
-    tqWarning( "QPaintDevice::cmd: Device has no command interface" );
+    qWarning( "QPaintDevice::cmd: Device has no command interface" );
 #endif
     return FALSE;
 }
@@ -715,7 +715,7 @@ bool QPaintDevice::cmd( int, QPainter *, QPDevCmdParam * )
 int QPaintDevice::metric( int ) const
 {
 #if defined(QT_CHECK_STATE)
-    tqWarning( "QPaintDevice::metrics: Device has no metric information" );
+    qWarning( "QPaintDevice::metrics: Device has no metric information" );
 #endif
     return 0;
 }
@@ -778,7 +778,7 @@ static GC cache_mask_gc( Display *dpy, Drawable hd, int mask_no, Pixmap mask )
 {
     if ( !init_mask_gc ) {			// first time initialization
 	init_mask_gc = TRUE;
-	tqAddPostRoutine( cleanup_mask_gc );
+	qAddPostRoutine( cleanup_mask_gc );
 	for ( int i=0; i<max_mask_gcs; i++ )
 	    gc_vec[i].gc = 0;
     }
@@ -885,7 +885,7 @@ void bitBlt( QPaintDevice *dst, int dx, int dy,
 	    bitBlt( pm, 0, 0, src, sx, sy, sw, sh );
 	} else {
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "bitBlt: Cannot bitBlt from device" );
+	    qWarning( "bitBlt: Cannot bitBlt from device" );
 #endif
 	    return;
 	}
@@ -906,7 +906,7 @@ void bitBlt( QPaintDevice *dst, int dx, int dy,
 	break;
     default:
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "bitBlt: Cannot bitBlt from device type %x", ts );
+	qWarning( "bitBlt: Cannot bitBlt from device type %x", ts );
 #endif
 	return;
     }
@@ -917,7 +917,7 @@ void bitBlt( QPaintDevice *dst, int dx, int dy,
 	break;
     default:
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "bitBlt: Cannot bitBlt to device type %x", td );
+	qWarning( "bitBlt: Cannot bitBlt to device type %x", td );
 #endif
 	return;
     }
@@ -930,14 +930,14 @@ void bitBlt( QPaintDevice *dst, int dx, int dy,
     };
     if ( rop > Qt::LastROP ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "bitBlt: Invalid ROP code" );
+	qWarning( "bitBlt: Invalid ROP code" );
 #endif
 	return;
     }
 
     if ( dst->handle() == 0 ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "bitBlt: Cannot bitBlt to device" );
+	qWarning( "bitBlt: Cannot bitBlt to device" );
 #endif
 	return;
     }
@@ -975,7 +975,7 @@ void bitBlt( QPaintDevice *dst, int dx, int dy,
 
     if ( mono_dst && !mono_src ) {	// dest is 1-bit pixmap, source is not
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "bitBlt: Incompatible destination pixmap" );
+	qWarning( "bitBlt: Incompatible destination pixmap" );
 #endif
 	return;
     }
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 138ead6..e5e9026 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -601,7 +601,7 @@ bool QPainter::begin( const QPaintDevice *pd, const QWidget *copyAttributes, boo
 {
     if ( copyAttributes == 0 ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QPainter::begin: The widget to copy attributes from cannot "
+	qWarning( "QPainter::begin: The widget to copy attributes from cannot "
 		 "be null" );
 #endif
 	return FALSE;
@@ -684,7 +684,7 @@ void QPainter::killPStack()
 {
 #if defined(QT_CHECK_STATE)
     if ( ps_stack && !((QPStateStack *)ps_stack)->isEmpty() )
-	tqWarning( "QPainter::killPStack: non-empty save/restore stack when "
+	qWarning( "QPainter::killPStack: non-empty save/restore stack when "
 		  "end() was called" );
 #endif
     delete (QPStateStack *)ps_stack;
@@ -763,7 +763,7 @@ void QPainter::restore()
     QPStateStack *pss = (QPStateStack *)ps_stack;
     if ( pss == 0 || pss->isEmpty() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QPainter::restore: Empty stack error" );
+	qWarning( "QPainter::restore: Empty stack error" );
 #endif
 	return;
     }
@@ -842,7 +842,7 @@ void QPainter::redirect( QPaintDevice *pdev, QPaintDevice *replacement )
     }
 #if defined(QT_CHECK_NULL)
     if ( pdev == 0 )
-        tqWarning( "QPainter::redirect: The pdev argument cannot be 0" );
+        qWarning( "QPainter::redirect: The pdev argument cannot be 0" );
 #endif
     if ( replacement ) {
         pdev_dict->insert( pdev, replacement );
@@ -920,7 +920,7 @@ void QPainter::setPen( const QPen &pen )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-	tqWarning( "QPainter::setPen: Will be reset by begin()" );
+	qWarning( "QPainter::setPen: Will be reset by begin()" );
 #endif
     if ( cpen == pen )
 	return;
@@ -941,7 +941,7 @@ void QPainter::setPen( PenStyle style )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-	tqWarning( "QPainter::setPen: Will be reset by begin()" );
+	qWarning( "QPainter::setPen: Will be reset by begin()" );
 #endif
     QPen::QPenData *d = cpen.data;	// low level access
     if ( d->style == style && d->linest == style && !d->width && d->color == Qt::black )
@@ -970,7 +970,7 @@ void QPainter::setPen( const QColor &color )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-	tqWarning( "QPainter::setPen: Will be reset by begin()" );
+	qWarning( "QPainter::setPen: Will be reset by begin()" );
 #endif
     QPen::QPenData *d = cpen.data;	// low level access
     if ( d->color == color && !d->width && d->style == SolidLine && d->linest == SolidLine )
@@ -1008,7 +1008,7 @@ void QPainter::setBrush( const QBrush &brush )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-	tqWarning( "QPainter::setBrush: Will be reset by begin()" );
+	qWarning( "QPainter::setBrush: Will be reset by begin()" );
 #endif
     if ( cbrush == brush )
 	return;
@@ -1027,7 +1027,7 @@ void QPainter::setBrush( BrushStyle style )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-	tqWarning( "QPainter::setBrush: Will be reset by begin()" );
+	qWarning( "QPainter::setBrush: Will be reset by begin()" );
 #endif
     QBrush::QBrushData *d = cbrush.data; // low level access
     if ( d->style == style && d->color == Qt::black && !d->pixmap )
@@ -1058,7 +1058,7 @@ void QPainter::setBrush( const QColor &color )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-	tqWarning( "QPainter::setBrush: Will be reset by begin()" );
+	qWarning( "QPainter::setBrush: Will be reset by begin()" );
 #endif
     QBrush::QBrushData *d = cbrush.data; // low level access
     if ( d->color == color && d->style == SolidPattern && !d->pixmap )
@@ -1136,7 +1136,7 @@ void QPainter::setTabStops( int ts )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-	tqWarning( "QPainter::setTabStops: Will be reset by begin()" );
+	qWarning( "QPainter::setTabStops: Will be reset by begin()" );
 #endif
     tabstops = ts;
     if ( isActive() && testf(ExtDev) ) {	// tell extended device
@@ -1167,7 +1167,7 @@ void QPainter::setTabArray( int *ta )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-	tqWarning( "QPainter::setTabArray: Will be reset by begin()" );
+	qWarning( "QPainter::setTabArray: Will be reset by begin()" );
 #endif
     if ( ta != tabarray ) {
 	tabarraylen = 0;
@@ -1218,7 +1218,7 @@ void QPainter::setViewXForm( bool enable )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-	tqWarning( "QPainter::setViewXForm: Will be reset by begin()" );
+	qWarning( "QPainter::setViewXForm: Will be reset by begin()" );
 #endif
     if ( !isActive() || enable == testf(VxF) )
 	return;
@@ -1272,7 +1272,7 @@ void QPainter::setWindow( int x, int y, int w, int h )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-	tqWarning( "QPainter::setWindow: Will be reset by begin()" );
+	qWarning( "QPainter::setWindow: Will be reset by begin()" );
 #endif
     wx = x;
     wy = y;
@@ -1322,7 +1322,7 @@ void QPainter::setViewport( int x, int y, int w, int h )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-	tqWarning( "QPainter::setViewport: Will be reset by begin()" );
+	qWarning( "QPainter::setViewport: Will be reset by begin()" );
 #endif
     vx = x;
     vy = y;
@@ -1354,7 +1354,7 @@ void QPainter::setWorldXForm( bool enable )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-	tqWarning( "QPainter::setWorldXForm: Will be reset by begin()" );
+	qWarning( "QPainter::setWorldXForm: Will be reset by begin()" );
 #endif
     if ( !isActive() || enable == testf(WxF) )
 	return;
@@ -1440,7 +1440,7 @@ void QPainter::setWorldMatrix( const QWMatrix &m, bool combine )
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QPainter::setWorldMatrix: Will be reset by begin()" );
+	qWarning( "QPainter::setWorldMatrix: Will be reset by begin()" );
 #endif
 	return;
     }
@@ -1493,7 +1493,7 @@ void QPainter::restoreWorldMatrix()
     QWMatrixStack *stack = (QWMatrixStack *)wm_stack;
     if ( stack == 0 || stack->isEmpty() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QPainter::restoreWorldMatrix: Empty stack error" );
+	qWarning( "QPainter::restoreWorldMatrix: Empty stack error" );
 #endif
 	return;
     }
@@ -1774,7 +1774,7 @@ void QPainter::map( int x, int y, int w, int h,
 	    } break;
 	    default:
 #if defined(QT_CHECK_STATE)
-		tqWarning( "QPainter::map: Internal error" );
+		qWarning( "QPainter::map: Internal error" );
 #endif
 		break;
 	}
@@ -1797,7 +1797,7 @@ void QPainter::map( int x, int y, int w, int h,
 		break;
 	    default:
 #if defined(QT_CHECK_STATE)
-		tqWarning( "QPainter::map: Internal error" );
+		qWarning( "QPainter::map: Internal error" );
 #endif
 		break;
 	}
@@ -1819,7 +1819,7 @@ void QPainter::mapInv( int x, int y, int *rx, int *ry ) const
 #ifndef QT_NO_TRANSFORMATIONS
 #if defined(QT_CHECK_STATE)
     if ( !txinv )
-	tqWarning( "QPainter::mapInv: Internal error" );
+	qWarning( "QPainter::mapInv: Internal error" );
 #endif
     if ( qt_old_transformations ) {
 	double tx = im11()*x + im21()*y+idx();
@@ -1848,7 +1848,7 @@ void QPainter::mapInv( int x, int y, int w, int h,
 #ifndef QT_NO_TRANSFORMATIONS
 #if defined(QT_CHECK_STATE)
     if ( !txinv || txop == TxRotShear )
-	tqWarning( "QPainter::mapInv: Internal error" );
+	qWarning( "QPainter::mapInv: Internal error" );
 #endif
     if ( qt_old_transformations ) {
 	double tx = im11()*x + idx();
@@ -2939,20 +2939,20 @@ void qt_format_text( const QFont& font, const QRect &_r,
 	int desc = fm.descent();
 	height = -leading;
 
-	//tqDebug("\n\nbeginLayout: lw = %d, rectwidth=%d", lineWidth , r.width());
+	//qDebug("\n\nbeginLayout: lw = %d, rectwidth=%d", lineWidth , r.width());
 	while ( !textLayout.atEnd() ) {
 	    height += leading;
 	    textLayout.beginLine( lineWidth == INT_MAX ? lineWidth : lineWidth );
-	    //tqDebug("-----beginLine( %d )-----",  lineWidth );
+	    //qDebug("-----beginLine( %d )-----",  lineWidth );
 	    bool linesep = FALSE;
 	    while ( 1 ) {
 		QTextItem ti = textLayout.currentItem();
- 		//tqDebug("item: from=%d, ch=%x", ti.from(), text.unicode()[ti.from()].unicode() );
+ 		//qDebug("item: from=%d, ch=%x", ti.from(), text.unicode()[ti.from()].unicode() );
 		if ( expandtabs && ti.isTab() ) {
 		    int tw = 0;
 		    int x = textLayout.widthUsed();
 		    if ( tabarraylen ) {
-// 			tqDebug("tabarraylen=%d", tabarraylen );
+// 			qDebug("tabarraylen=%d", tabarraylen );
 			int tab = 0;
 			while ( tab < tabarraylen ) {
 			    if ( tabarray[tab] > x ) {
@@ -2964,7 +2964,7 @@ void qt_format_text( const QFont& font, const QRect &_r,
 		    } else {
 			tw = tabstops - (x % tabstops);
 		    }
- 		    //tqDebug("tw = %d",  tw );
+ 		    //qDebug("tw = %d",  tw );
 		    if ( tw )
 			ti.setWidth( tw );
 		}
@@ -2979,7 +2979,7 @@ void qt_format_text( const QFont& font, const QRect &_r,
 	    textLayout.setLineWidth( r.width()-rb-lb );
 	    textLayout.endLine( 0, height, tf, &ascent, &descent,
 				&lineLeft, &lineRight );
-	    //tqDebug("finalizing line: lw=%d ascent = %d, descent=%d lineleft=%d lineright=%d", lineWidth, ascent, descent,lineLeft, lineRight  );
+	    //qDebug("finalizing line: lw=%d ascent = %d, descent=%d lineleft=%d lineright=%d", lineWidth, ascent, descent,lineLeft, lineRight  );
 	    left = QMIN( left, lineLeft );
 	    right = QMAX( right, lineRight );
 	    height += ascent + descent + 1;
@@ -2996,7 +2996,7 @@ void qt_format_text( const QFont& font, const QRect &_r,
 
     if ( brect ) {
 	*brect = QRect( r.x() + left, r.y() + yoff, right-left + lb+rb, height );
-	//tqDebug("br = %d %d %d/%d, left=%d, right=%d", brect->x(), brect->y(), brect->width(), brect->height(), left, right);
+	//qDebug("br = %d %d %d/%d, left=%d, right=%d", brect->x(), brect->y(), brect->width(), brect->height(), left, right);
     }
 
     if (!(tf & QPainter::DontPrint)) {
@@ -3032,10 +3032,10 @@ void qt_format_text( const QFont& font, const QRect &_r,
 	if (fnt.overline()) _tf |= Qt::Overline;
 	if (fnt.strikeOut()) _tf |= Qt::StrikeOut;
 
-	//tqDebug("have %d items",textLayout.numItems());
+	//qDebug("have %d items",textLayout.numItems());
 	for ( int i = 0; i < textLayout.numItems(); i++ ) {
 	    QTextItem ti = textLayout.itemAt( i );
- 	    //tqDebug("Item %d: from=%d,  length=%d,  space=%d x=%d", i, ti.from(),  ti.length(), ti.isSpace(), ti.x() );
+ 	    //qDebug("Item %d: from=%d,  length=%d,  space=%d x=%d", i, ti.from(),  ti.length(), ti.isSpace(), ti.x() );
 	    if ( ti.isTab() || ti.isObject() )
 		continue;
 	    int textFlags = _tf;
@@ -3803,7 +3803,7 @@ void QBrush::setStyle( BrushStyle s )		// set brush style
 	return;
 #if defined(QT_CHECK_RANGE)
     if ( s == CustomPattern )
-	tqWarning( "QBrush::setStyle: CustomPattern is for internal use" );
+	qWarning( "QBrush::setStyle: CustomPattern is for internal use" );
 #endif
     detach();
     data->style = s;
@@ -3930,7 +3930,7 @@ QDataStream &operator<<( QDataStream &s, const QBrush &b )
 #ifndef QT_NO_IMAGEIO
 	s << *b.pixmap();
 #else
-	tqWarning("No Image Brush I/O");
+	qWarning("No Image Brush I/O");
 #endif
     return s;
 }
@@ -3956,7 +3956,7 @@ QDataStream &operator>>( QDataStream &s, QBrush &b )
 	s >> pm;
 	b = QBrush( color, pm );
 #else
-	tqWarning("No Image Brush I/O");
+	qWarning("No Image Brush I/O");
 #endif
     }
     else
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index 59a598b..206bffc 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -347,7 +347,7 @@ static GC alloc_gc( Display *dpy, int scrn, Drawable hd, bool monochrome=FALSE,
         p++;
     }
 #if defined(QT_CHECK_NULL)
-    tqWarning( "QPainter: Internal error; no available GC" );
+    qWarning( "QPainter: Internal error; no available GC" );
 #endif
     GC gc = XCreateGC( dpy, hd, 0, 0 );
     XSetGraphicsExposures( dpy, gc, False );
@@ -449,9 +449,9 @@ static void cleanup_gc_cache()
     if ( !gc_cache_init )
         return;
 #if defined(GC_CACHE_STAT)
-    tqDebug( "Number of cache hits = %d", g_numhits );
-    tqDebug( "Number of cache creates = %d", g_numcreates );
-    tqDebug( "Number of cache faults = %d", g_numfaults );
+    qDebug( "Number of cache hits = %d", g_numhits );
+    qDebug( "Number of cache creates = %d", g_numcreates );
+    qDebug( "Number of cache faults = %d", g_numfaults );
     for ( int i=0; i<gc_cache_size; i++ ) {
         QCString    str;
         QBuffer     buf( str );
@@ -464,7 +464,7 @@ static void cleanup_gc_cache()
               << g->count << '\t';
         }
         s << '\0';
-        tqDebug( str );
+        qDebug( str );
         buf.close();
     }
 #endif
@@ -640,7 +640,7 @@ void QPainter::setFont( const QFont &font )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-        tqWarning( "QPainter::setFont: Will be reset by begin()" );
+        qWarning( "QPainter::setFont: Will be reset by begin()" );
 #endif
     if ( cfont.d != font.d ) {
         cfont = font;
@@ -1013,14 +1013,14 @@ bool QPainter::begin( const QPaintDevice *pd, bool unclipped )
 {
     if ( isActive() ) {                         // already active painting
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::begin: Painter is already active."
+        qWarning( "QPainter::begin: Painter is already active."
                   "\n\tYou must end() the painter before a second begin()" );
 #endif
         return FALSE;
     }
     if ( pd == 0 ) {
 #if defined(QT_CHECK_NULL)
-        tqWarning( "QPainter::begin: Paint device cannot be null" );
+        qWarning( "QPainter::begin: Paint device cannot be null" );
 #endif
         return FALSE;
     }
@@ -1039,7 +1039,7 @@ bool QPainter::begin( const QPaintDevice *pd, bool unclipped )
     if ( pdev->isExtDev() && pdev->paintingActive() ) {
         // somebody else is already painting
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::begin: Another QPainter is already painting "
+        qWarning( "QPainter::begin: Another QPainter is already painting "
                   "this device;\n\tAn extended paint device can only be "
                   "painted by one QPainter at a time." );
 #endif
@@ -1129,7 +1129,7 @@ bool QPainter::begin( const QPaintDevice *pd, bool unclipped )
         QPixmap *pm = (QPixmap*)pdev;
         if ( pm->isNull() ) {
 #if defined(QT_CHECK_NULL)
-            tqWarning( "QPainter::begin: Cannot paint null pixmap" );
+            qWarning( "QPainter::begin: Cannot paint null pixmap" );
 #endif
             end();
             return FALSE;
@@ -1189,7 +1189,7 @@ bool QPainter::end()                            // end painting
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::end: Missing begin() or begin() failed" );
+        qWarning( "QPainter::end: Missing begin() or begin() failed" );
 #endif
         return FALSE;
     }
@@ -1290,7 +1290,7 @@ void QPainter::setBackgroundColor( const QColor &c )
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::setBackgroundColor: Call begin() first" );
+        qWarning( "QPainter::setBackgroundColor: Call begin() first" );
 #endif
         return;
     }
@@ -1325,13 +1325,13 @@ void QPainter::setBackgroundMode( BGMode m )
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::setBackgroundMode: Call begin() first" );
+        qWarning( "QPainter::setBackgroundMode: Call begin() first" );
 #endif
         return;
     }
     if ( m != TransparentMode && m != OpaqueMode ) {
 #if defined(QT_CHECK_RANGE)
-        tqWarning( "QPainter::setBackgroundMode: Invalid mode" );
+        qWarning( "QPainter::setBackgroundMode: Invalid mode" );
 #endif
         return;
     }
@@ -1379,13 +1379,13 @@ void QPainter::setRasterOp( RasterOp r )
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::setRasterOp: Call begin() first" );
+        qWarning( "QPainter::setRasterOp: Call begin() first" );
 #endif
         return;
     }
     if ( (uint)r > LastROP ) {
 #if defined(QT_CHECK_RANGE)
-        tqWarning( "QPainter::setRasterOp: Invalid ROP code" );
+        qWarning( "QPainter::setRasterOp: Invalid ROP code" );
 #endif
         return;
     }
@@ -1420,7 +1420,7 @@ void QPainter::setBrushOrigin( int x, int y )
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::setBrushOrigin: Call begin() first" );
+        qWarning( "QPainter::setBrushOrigin: Call begin() first" );
 #endif
         return;
     }
@@ -1449,7 +1449,7 @@ void QPainter::setClipping( bool enable )
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::setClipping: Will be reset by begin()" );
+        qWarning( "QPainter::setClipping: Will be reset by begin()" );
 #endif
         return;
     }
@@ -1514,7 +1514,7 @@ void QPainter::setClipRegion( const QRegion &rgn, CoordinateMode m )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-        tqWarning( "QPainter::setClipRegion: Will be reset by begin()" );
+        qWarning( "QPainter::setClipRegion: Will be reset by begin()" );
 #endif
     if ( m == CoordDevice )
 	crgn = rgn;
@@ -2501,7 +2501,7 @@ void QPainter::drawCubicBezier( const QPointArray &a, int index )
         return;
     if ( a.size() - index < 4 ) {
 #if defined(QT_CHECK_RANGE)
-        tqWarning( "QPainter::drawCubicBezier: Cubic Bezier needs 4 control "
+        qWarning( "QPainter::drawCubicBezier: Cubic Bezier needs 4 control "
                   "points" );
 #endif
         return;
diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp
index 85ec2d9..a9e07f7 100644
--- a/src/kernel/qpalette.cpp
+++ b/src/kernel/qpalette.cpp
@@ -1100,13 +1100,13 @@ const QBrush &QPalette::directBrush( ColorGroup gr, QColorGroup::ColorRole r ) c
 {
     if ( (uint)gr > (uint)QPalette::NColorGroups ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPalette::directBrush: colorGroup(%i) out of range", gr );
+	qWarning( "QPalette::directBrush: colorGroup(%i) out of range", gr );
 #endif
 	return data->active.br[QColorGroup::Foreground];
     }
     if ( (uint)r >= (uint)QColorGroup::NColorRoles ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPalette::directBrush: colorRole(%i) out of range", r );
+	qWarning( "QPalette::directBrush: colorRole(%i) out of range", r );
 #endif
 	return data->active.br[QColorGroup::Foreground];
     }
@@ -1124,7 +1124,7 @@ const QBrush &QPalette::directBrush( ColorGroup gr, QColorGroup::ColorRole r ) c
 	break;
     }
 #if defined(QT_CHECK_RANGE)
-    tqWarning( "QPalette::directBrush: colorGroup(%i) internal error", gr );
+    qWarning( "QPalette::directBrush: colorGroup(%i) internal error", gr );
 #endif
     return data->active.br[QColorGroup::Foreground]; // Satisfy compiler
 }
@@ -1133,13 +1133,13 @@ void QPalette::directSetBrush( ColorGroup gr, QColorGroup::ColorRole r, const QB
 {
     if ( (uint)gr > (uint)QPalette::NColorGroups ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPalette::directBrush: colorGroup(%i) out of range", gr );
+	qWarning( "QPalette::directBrush: colorGroup(%i) out of range", gr );
 #endif
 	return;
     }
     if ( (uint)r >= (uint)QColorGroup::NColorRoles ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPalette::directBrush: colorRole(%i) out of range", r );
+	qWarning( "QPalette::directBrush: colorRole(%i) out of range", r );
 #endif
 	return;
     }
@@ -1155,7 +1155,7 @@ void QPalette::directSetBrush( ColorGroup gr, QColorGroup::ColorRole r, const QB
 	break;
     default:
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPalette::directBrush: colorGroup(%i) internal error", gr );
+	qWarning( "QPalette::directBrush: colorGroup(%i) internal error", gr );
 #endif
 	break;
     }
diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp
index c6364e0..d434516 100644
--- a/src/kernel/qpicture.cpp
+++ b/src/kernel/qpicture.cpp
@@ -138,7 +138,7 @@ QPicture::QPicture( int formatVersion )
 
 #if defined(QT_CHECK_RANGE)
     if ( formatVersion == 0 )
-	tqWarning( "QPicture: invalid format version 0" );
+	qWarning( "QPicture: invalid format version 0" );
 #endif
 
     // still accept the 0 default from before Qt 3.0.
@@ -260,7 +260,7 @@ bool QPicture::load( QIODevice *dev, const char *format )
     }
 #endif
     if ( format ) {
-	tqWarning( "QPicture::load: No such picture format: %s", format );
+	qWarning( "QPicture::load: No such picture format: %s", format );
 	return FALSE;
     }
 
@@ -291,7 +291,7 @@ bool QPicture::save( const QString &fileName, const char *format )
 {
     if ( paintingActive() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QPicture::save: still being painted on. "
+	qWarning( "QPicture::save: still being painted on. "
 		  "Call QPainter::end() first" );
 #endif
 	return FALSE;
@@ -300,7 +300,7 @@ bool QPicture::save( const QString &fileName, const char *format )
 #ifndef QT_NO_SVG
     // identical to QIODevice* code below but the file name
     // makes a difference when it comes to saving pixmaps
-    if ( tqstricmp( format, "svg" ) == 0 ) {
+    if ( qstricmp( format, "svg" ) == 0 ) {
 	QSvgDevice svg;
 	QPainter p( &svg );
 	if ( !play( &p ) )
@@ -326,14 +326,14 @@ bool QPicture::save( QIODevice *dev, const char *format )
 {
     if ( paintingActive() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QPicture::save: still being painted on. "
+	qWarning( "QPicture::save: still being painted on. "
 		  "Call QPainter::end() first" );
 #endif
 	return FALSE;
     }
 
 #ifndef QT_NO_SVG
-    if ( tqstricmp( format, "svg" ) == 0 ) {
+    if ( qstricmp( format, "svg" ) == 0 ) {
 	QSvgDevice svg;
 	QPainter p( &svg );
 	if ( !play( &p ) )
@@ -343,7 +343,7 @@ bool QPicture::save( QIODevice *dev, const char *format )
     }
 #endif
     if ( format ) {
-	tqWarning( "QPicture::save: No such picture format: %s", format );
+	qWarning( "QPicture::save: No such picture format: %s", format );
 	return FALSE;
     }
 
@@ -409,7 +409,7 @@ bool QPicture::play( QPainter *painter )
     s >> nrecords;
     if ( !exec( painter, s, nrecords ) ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPicture::play: Format error" );
+	qWarning( "QPicture::play: Format error" );
 #endif
 	d->pictb.close();
 	return FALSE;
@@ -669,13 +669,13 @@ bool QPicture::exec( QPainter *painter, QDataStream &s, int nrecords )
 		break;
 	    default:
 #if defined(QT_CHECK_RANGE)
-		tqWarning( "QPicture::play: Invalid command %d", c );
+		qWarning( "QPicture::play: Invalid command %d", c );
 #endif
 		if ( len )			// skip unknown command
 		    s.device()->at( s.device()->at()+len );
 	}
 #if defined(QT_DEBUG)
-	//tqDebug( "device->at(): %i, strm_pos: %i len: %i", s.device()->at(), strm_pos, len );
+	//qDebug( "device->at(): %i, strm_pos: %i len: %i", s.device()->at(), strm_pos, len );
 	Q_ASSERT( Q_INT32(s.device()->at() - strm_pos) == len );
 #endif
     }
@@ -736,7 +736,7 @@ bool QPicture::QPicturePrivate::cmd( int c, QPainter *pt, QPDevCmdParam *p )
 	}
 	s << (Q_UINT32)trecs;			// write number of records
 	pictb.at( cs_start );
-	Q_UINT16 cs = (Q_UINT16)tqChecksum( buf.data()+data_start, pos-data_start );
+	Q_UINT16 cs = (Q_UINT16)qChecksum( buf.data()+data_start, pos-data_start );
 	s << cs;				// write checksum
 	pictb.close();
 	return TRUE;
@@ -899,7 +899,7 @@ bool QPicture::QPicturePrivate::cmd( int c, QPainter *pt, QPDevCmdParam *p )
 	    break;
 #if defined(QT_CHECK_RANGE)
 	default:
-	    tqWarning( "QPicture::cmd: Command %d not recognized", c );
+	    qWarning( "QPicture::cmd: Command %d not recognized", c );
 #endif
     }
     int newpos = (int)pictb.at();		// new position
@@ -985,7 +985,7 @@ int QPicture::metric( int m ) const
 	default:
 	    val = 0;
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QPicture::metric: Invalid metric command" );
+	    qWarning( "QPicture::metric: Invalid metric command" );
 #endif
     }
     return val;
@@ -1120,7 +1120,7 @@ bool QPicture::QPicturePrivate::checkFormat()
     s.readRawBytes( mf_id, 4 );			// read actual tag
     if ( memcmp(mf_id, mfhdr_tag, 4) != 0 ) { 	// wrong header id
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPicture::checkFormat: Incorrect header" );
+	qWarning( "QPicture::checkFormat: Incorrect header" );
 #endif
 	pictb.close();
 	return FALSE;
@@ -1131,10 +1131,10 @@ bool QPicture::QPicturePrivate::checkFormat()
     Q_UINT16 cs,ccs;
     QByteArray buf = pictb.buffer();	// pointer to data
     s >> cs;				// read checksum
-    ccs = tqChecksum( buf.data() + data_start, buf.size() - data_start );
+    ccs = qChecksum( buf.data() + data_start, buf.size() - data_start );
     if ( ccs != cs ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QPicture::checkFormat: Invalid checksum %x, %x expected",
+	qWarning( "QPicture::checkFormat: Invalid checksum %x, %x expected",
 		  ccs, cs );
 #endif
 	pictb.close();
@@ -1145,7 +1145,7 @@ bool QPicture::QPicturePrivate::checkFormat()
     s >> major >> minor;			// read version number
     if ( major > mfhdr_maj ) {		// new, incompatible version
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPicture::checkFormat: Incompatible version %d.%d",
+	qWarning( "QPicture::checkFormat: Incompatible version %d.%d",
 		  major, minor);
 #endif
 	pictb.close();
@@ -1163,7 +1163,7 @@ bool QPicture::QPicturePrivate::checkFormat()
 	}
     } else {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPicture::checkFormat: Format error" );
+	qWarning( "QPicture::checkFormat: Format error" );
 #endif
 	pictb.close();
 	return FALSE;
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index d388137..ecc9b46 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -405,7 +405,7 @@ QPixmap QPixmap::fromMimeSource( const QString &abs_name )
 	    return QPixmap( abs_name );
 #if defined(QT_CHECK_STATE)
 	if ( !abs_name.isEmpty() )
-	    tqWarning( "QPixmap::fromMimeSource: Cannot find pixmap \"%s\" in the mime source factory",
+	    qWarning( "QPixmap::fromMimeSource: Cannot find pixmap \"%s\" in the mime source factory",
 		      abs_name.latin1() );
 #endif
 	return QPixmap();
@@ -459,7 +459,7 @@ QPixmap &QPixmap::operator=( const QPixmap &pixmap )
 {
     if ( paintingActive() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning("QPixmap::operator=: Cannot assign to pixmap during painting");
+	qWarning("QPixmap::operator=: Cannot assign to pixmap during painting");
 #endif
 	return *this;
     }
@@ -673,7 +673,7 @@ void QPixmap::resize( int w, int h )
     } else
 #elif defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
     if (data->alphapm)
-	tqWarning("QPixmap::resize: TODO: resize alpha data");
+	qWarning("QPixmap::resize: TODO: resize alpha data");
     else
 #endif // Q_WS_X11
 	if ( data->mask ) {				// resize mask as well
@@ -746,7 +746,7 @@ void QPixmap::setMask( const QBitmap &newmask )
 
     if ( newmask.width() != width() || newmask.height() != height() ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPixmap::setMask: The pixmap and the mask must have "
+	qWarning( "QPixmap::setMask: The pixmap and the mask must have "
 		  "the same size" );
 #endif
 	return;
@@ -1054,7 +1054,7 @@ bool QPixmap::doImageIO( QImageIO* io, int quality ) const
     io->setImage( convertToImage() );
 #if defined(QT_CHECK_RANGE)
     if ( quality > 100  || quality < -1 )
-	tqWarning( "QPixmap::save: quality out of range [-1,100]" );
+	qWarning( "QPixmap::save: quality out of range [-1,100]" );
 #endif
     if ( quality >= 0 )
 	io->setQuality( QMIN(quality,100) );
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index cec8ad8..d0a16c5 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
@@ -141,7 +141,7 @@ static bool qt_create_mitshm_buffer( const QPaintDevice* dev, int w, int h )
     } else {
 	if ( !XShmQueryVersion(dpy, &major, &minor, &pixmaps_ok) )
 	    return FALSE;			// MIT Shm not supported
-	tqAddPostRoutine( qt_cleanup_mitshm );
+	qAddPostRoutine( qt_cleanup_mitshm );
 	xshminit = TRUE;
     }
 
@@ -350,14 +350,14 @@ static void build_scale_table( uint **table, uint nBits )
 {
     if ( nBits > 7 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "build_scale_table: internal error, nBits = %i", nBits );
+	qWarning( "build_scale_table: internal error, nBits = %i", nBits );
 #endif
 	return;
     }
     if (!*table) {
 	static bool firstTable = TRUE;
 	if ( firstTable ) {
-	    tqAddPostRoutine( cleanup_scale_tables );
+	    qAddPostRoutine( cleanup_scale_tables );
 	    firstTable = FALSE;
 	}
 	*table = new uint[256];
@@ -394,7 +394,7 @@ void QPixmap::init( int w, int h, int d, bool bitmap, Optimization optim )
 {
 #if defined(QT_CHECK_STATE)
     if ( qApp->type() == QApplication::Tty ) {
-	tqWarning( "QPixmap: Cannot create a QPixmap when no GUI "
+	qWarning( "QPixmap: Cannot create a QPixmap when no GUI "
 		  "is being used" );
     }
 #endif
@@ -441,7 +441,7 @@ void QPixmap::init( int w, int h, int d, bool bitmap, Optimization optim )
 	rendhd = 0;
 #if defined(QT_CHECK_RANGE)
 	if ( !make_null )
-	    tqWarning( "QPixmap: Invalid pixmap parameters" );
+	    qWarning( "QPixmap: Invalid pixmap parameters" );
 #endif
 	return;
     }
@@ -690,7 +690,7 @@ int QPixmap::metric( int m ) const
 	    default:
 		val = 0;
 #if defined(QT_CHECK_RANGE)
-		tqWarning( "QPixmap::metric: Invalid metric command" );
+		qWarning( "QPixmap::metric: Invalid metric command" );
 #endif
 	}
     }
@@ -889,7 +889,7 @@ QImage QPixmap::convertToImage() const
 		    y = h;
 		    pixel = 0;		// eliminate compiler warning
 #if defined(QT_CHECK_RANGE)
-		    tqWarning( "QPixmap::convertToImage: Invalid depth %d",
+		    qWarning( "QPixmap::convertToImage: Invalid depth %d",
 			      bppc );
 #endif
 		}
@@ -938,7 +938,7 @@ QImage QPixmap::convertToImage() const
     } else {
 	/* Typically 2 or 4 bits display depth */
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPixmap::convertToImage: Display not supported (bpp=%d)",
+	qWarning( "QPixmap::convertToImage: Display not supported (bpp=%d)",
 		  xi->bits_per_pixel );
 #endif
 	image.reset();
@@ -1098,7 +1098,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags )
 {
     if ( img.isNull() ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QPixmap::convertFromImage: Cannot convert a null image" );
+	qWarning( "QPixmap::convertFromImage: Cannot convert a null image" );
 #endif
 	return FALSE;
     }
@@ -1352,7 +1352,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags )
 
         int wordsize;
         bool bigendian;
-        tqSysInfo( &wordsize, &bigendian );
+        qSysInfo( &wordsize, &bigendian );
         bool same_msb_lsb = ( xi->byte_order == MSBFirst ) == ( bigendian );
         
         if( bppc == 8 ) // 8 bit
@@ -1375,7 +1375,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags )
             else
                 mode = bppc == 33 ? BPP32_LSB : BPP32_MSB;
         } else
-	    tqFatal("Logic error 3");
+	    qFatal("Logic error 3");
 
 #define GET_PIXEL \
                 int pixel; \
@@ -1494,7 +1494,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags )
                     )
 		    break;
 		default:
-		    tqFatal("Logic error");
+		    qFatal("Logic error");
 		}
 	} else {
 	    switch ( mode ) {
@@ -1591,7 +1591,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags )
                     )
   		    break;
   		default:
-  		    tqFatal("Logic error 2");
+  		    qFatal("Logic error 2");
   	    }
   	}
   	xi->data = (char *)newbits;
@@ -1756,7 +1756,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags )
 	    newbits = (uchar *)newerbits;
 	} else if ( xi->bits_per_pixel != 8 ) {
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QPixmap::convertFromImage: Display not supported "
+	    qWarning( "QPixmap::convertFromImage: Display not supported "
 		      "(bpp=%d)", xi->bits_per_pixel );
 #endif
 	}
@@ -2155,17 +2155,17 @@ QPixmap QPixmap::xForm( const QWMatrix &matrix ) const
 
     // #define QT_DEBUG_XIMAGE
 #if defined(QT_DEBUG_XIMAGE)
-    tqDebug( "----IMAGE--INFO--------------" );
-    tqDebug( "width............. %d", xi->width );
-    tqDebug( "height............ %d", xi->height );
-    tqDebug( "xoffset........... %d", xi->xoffset );
-    tqDebug( "format............ %d", xi->format );
-    tqDebug( "byte order........ %d", xi->byte_order );
-    tqDebug( "bitmap unit....... %d", xi->bitmap_unit );
-    tqDebug( "bitmap bit order.. %d", xi->bitmap_bit_order );
-    tqDebug( "depth............. %d", xi->depth );
-    tqDebug( "bytes per line.... %d", xi->bytes_per_line );
-    tqDebug( "bits per pixel.... %d", xi->bits_per_pixel );
+    qDebug( "----IMAGE--INFO--------------" );
+    qDebug( "width............. %d", xi->width );
+    qDebug( "height............ %d", xi->height );
+    qDebug( "xoffset........... %d", xi->xoffset );
+    qDebug( "format............ %d", xi->format );
+    qDebug( "byte order........ %d", xi->byte_order );
+    qDebug( "bitmap unit....... %d", xi->bitmap_unit );
+    qDebug( "bitmap bit order.. %d", xi->bitmap_bit_order );
+    qDebug( "depth............. %d", xi->depth );
+    qDebug( "bytes per line.... %d", xi->bytes_per_line );
+    qDebug( "bits per pixel.... %d", xi->bits_per_pixel );
 #endif
 
     int type;
@@ -2188,7 +2188,7 @@ QPixmap QPixmap::xForm( const QWMatrix &matrix ) const
 
     if ( !qt_xForm_helper( mat, xi->xoffset, type, bpp, dptr, xbpl, p_inc, h, sptr, sbpl, ws, hs ) ){
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPixmap::xForm: display not supported (bpp=%d)",bpp);
+	qWarning( "QPixmap::xForm: display not supported (bpp=%d)",bpp);
 #endif
 	QPixmap pm;
 	return pm;
@@ -2325,7 +2325,7 @@ void QPixmap::x11SetScreen( int screen )
 	return;
     }
 #if 0
-    tqDebug("QPixmap::x11SetScreen for %p from %d to %d. Size is %d/%d", data, x11Screen(), screen, width(), height() );
+    qDebug("QPixmap::x11SetScreen for %p from %d to %d. Size is %d/%d", data, x11Screen(), screen, width(), height() );
 #endif
 
     QImage img = convertToImage();
diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
index 9cfcadb..ee70e19 100644
--- a/src/kernel/qpixmapcache.cpp
+++ b/src/kernel/qpixmapcache.cpp
@@ -307,7 +307,7 @@ void QPixmapCache::setCacheLimit( int n )
 {
 #ifdef Q_WS_MAC9
     if(n > 256)
-        tqWarning("QPixmapCache::setCacheLimit: Setting cache limits high is harmfull to mac9's health");
+        qWarning("QPixmapCache::setCacheLimit: Setting cache limits high is harmfull to mac9's health");
 #endif
     cache_limit = n;
     if ( pm_cache )
diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp
index 447a6d4..58e6e7e 100644
--- a/src/kernel/qpngio.cpp
+++ b/src/kernel/qpngio.cpp
@@ -309,7 +309,7 @@ extern "C" {
 #endif
 static void CALLBACK_CALL_TYPE qt_png_warning(png_structp /*png_ptr*/, png_const_charp message)
 {
-    tqWarning("libpng warning: %s", message);
+    qWarning("libpng warning: %s", message);
 }
 
 #if defined(Q_C_CALLBACKS)
@@ -502,7 +502,7 @@ static void set_text(const QImage& image, png_structp png_ptr, png_infop info_pt
 		    text_ptr[i].compression = PNG_TEXT_COMPRESSION_zTXt;
 		text_ptr[i].key = (png_charp)(*it).key.data();
 		text_ptr[i].text = (png_charp)t.latin1();
-		//text_ptr[i].text = tqstrdup(t.latin1());
+		//text_ptr[i].text = qstrdup(t.latin1());
 		i++;
 	    }
 	}
@@ -555,7 +555,7 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
     if (quality >= 0) {
 	if (quality > 9) {
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "PNG: Quality %d out of range", quality );
+	    qWarning( "PNG: Quality %d out of range", quality );
 #endif
 	    quality = 9;
 	}
@@ -1268,7 +1268,7 @@ int QPNGFormat::user_chunk(png_structp png,
 	    png_bytep data, png_uint_32 length)
 {
 #if 0 // NOT SUPPORTED: experimental PNG animation.
-    // tqDebug("Got %ld-byte %s chunk", length, png->chunk_name);
+    // qDebug("Got %ld-byte %s chunk", length, png->chunk_name);
     if ( 0==qstrcmp((char*)png->chunk_name, "gIFg")
 	    && length == 4 ) {
 
@@ -1351,7 +1351,7 @@ void qInitPngIO()
 #ifndef QT_NO_ASYNC_IMAGE_IO
 	globalPngFormatTypeObject = new QPNGFormatType;
 #endif
-	tqAddPostRoutine( qCleanupPngIO );
+	qAddPostRoutine( qCleanupPngIO );
     }
 }
 
diff --git a/src/kernel/qpoint.cpp b/src/kernel/qpoint.cpp
index 7e08a70..5313307 100644
--- a/src/kernel/qpoint.cpp
+++ b/src/kernel/qpoint.cpp
@@ -376,7 +376,7 @@
 void QPoint::warningDivByZero()
 {
 #if defined(QT_CHECK_MATH)
-    tqWarning( "QPoint: Division by zero error" );
+    qWarning( "QPoint: Division by zero error" );
 #endif
 }
 
diff --git a/src/kernel/qpointarray.cpp b/src/kernel/qpointarray.cpp
index bb8656c..d1c7569 100644
--- a/src/kernel/qpointarray.cpp
+++ b/src/kernel/qpointarray.cpp
@@ -915,7 +915,7 @@ QPointArray QPointArray::cubicBezier() const
 #ifdef USE_SIMPLE_QBEZIER_CODE
     if ( size() != 4 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPointArray::bezier: The array must have 4 control points" );
+	qWarning( "QPointArray::bezier: The array must have 4 control points" );
 #endif
 	QPointArray p;
 	return p;
@@ -969,7 +969,7 @@ QPointArray QPointArray::cubicBezier() const
 
     if ( size() != 4 ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPointArray::bezier: The array must have 4 control points" );
+	qWarning( "QPointArray::bezier: The array must have 4 control points" );
 #endif
 	QPointArray pa;
 	return pa;
diff --git a/src/kernel/qprinter.cpp b/src/kernel/qprinter.cpp
index 0ebe075..0db6dce 100644
--- a/src/kernel/qprinter.cpp
+++ b/src/kernel/qprinter.cpp
@@ -367,7 +367,7 @@ void QPrinter::setOutputToFile( bool enable )
 {
     if ( state != 0 ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPrinter::setOutputToFile: Cannot do this during printing" );
+        qWarning( "QPrinter::setOutputToFile: Cannot do this during printing" );
 #endif
         return;
     }
@@ -400,7 +400,7 @@ void QPrinter::setOutputFileName( const QString &fileName )
 {
     if ( state != 0 ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning("QPrinter::setOutputFileName: Cannot do this during printing");
+        qWarning("QPrinter::setOutputFileName: Cannot do this during printing");
 #endif
         return;
     }
@@ -457,7 +457,7 @@ void QPrinter::setDocName( const QString &name )
 {
     if ( state != 0 ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPrinter::setDocName: Cannot do this during printing" );
+        qWarning( "QPrinter::setDocName: Cannot do this during printing" );
 #endif
         return;
     }
@@ -550,7 +550,7 @@ void QPrinter::setPageSize( PageSize newPageSize )
 {
     if ( newPageSize > NPageSize ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning("QPrinter::SetPageSize: illegal page size %d", newPageSize );
+        qWarning("QPrinter::SetPageSize: illegal page size %d", newPageSize );
 #endif
         return;
     }
@@ -674,7 +674,7 @@ void QPrinter::setFromTo( int fromPage, int toPage )
 {
     if ( state != 0 ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPrinter::setFromTo: Cannot do this during printing" );
+        qWarning( "QPrinter::setFromTo: Cannot do this during printing" );
 #endif
         return;
     }
diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp
index 44c30b2..5dcfa93 100644
--- a/src/kernel/qprinter_unix.cpp
+++ b/src/kernel/qprinter_unix.cpp
@@ -226,7 +226,7 @@ void QPrinter::setPrinterName( const QString &name )
 {
     if ( state != 0 ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QPrinter::setPrinterName: Cannot do this during printing" );
+	qWarning( "QPrinter::setPrinterName: Cannot do this during printing" );
 #endif
 	return;
     }
@@ -258,7 +258,7 @@ bool QPrinter::setup( QWidget * parent )
     if ( result ) {
 	if ( !globalPrinterDefaults ) {
 	    globalPrinterDefaults = new PrinterDefaults;
-	    tqAddPostRoutine( deleteGlobalPrinterDefaults );
+	    qAddPostRoutine( deleteGlobalPrinterDefaults );
 	}
 	globalPrinterDefaults->printerName = printerName();
 	globalPrinterDefaults->outputToFile = outputToFile();
@@ -331,7 +331,7 @@ bool QPrinter::cmd( int c, QPainter *paint, QPDevCmdParam *p )
 		QApplication::flushX();
 		int fds[2];
 		if ( pipe( fds ) != 0 ) {
-		    tqWarning( "QPSPrinter: could not open pipe to print" );
+		    qWarning( "QPSPrinter: could not open pipe to print" );
 		    state = PST_ERROR;
 		    return FALSE;
 		}
@@ -587,7 +587,7 @@ int QPrinter::metric( int m ) const
     default:
 	val = 0;
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QPixmap::metric: Invalid metric command" );
+	qWarning( "QPixmap::metric: Invalid metric command" );
 #endif
     }
     return val;
diff --git a/src/kernel/qprocess.cpp b/src/kernel/qprocess.cpp
index e0e060d..653327d 100644
--- a/src/kernel/qprocess.cpp
+++ b/src/kernel/qprocess.cpp
@@ -748,28 +748,28 @@ void QProcess::writeToStdin( const QString& buf )
 void QProcess::connectNotify( const char * signal )
 {
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcess::connectNotify(): signal %s has been connected", signal );
+    qDebug( "QProcess::connectNotify(): signal %s has been connected", signal );
 #endif
     if ( !ioRedirection )
 	if ( qstrcmp( signal, SIGNAL(readyReadStdout()) )==0 ||
 		qstrcmp( signal, SIGNAL(readyReadStderr()) )==0
 	   ) {
 #if defined(QT_QPROCESS_DEBUG)
-	    tqDebug( "QProcess::connectNotify(): set ioRedirection to TRUE" );
+	    qDebug( "QProcess::connectNotify(): set ioRedirection to TRUE" );
 #endif
 	    setIoRedirection( TRUE );
 	    return;
 	}
     if ( !notifyOnExit && qstrcmp( signal, SIGNAL(processExited()) )==0 ) {
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcess::connectNotify(): set notifyOnExit to TRUE" );
+	qDebug( "QProcess::connectNotify(): set notifyOnExit to TRUE" );
 #endif
 	setNotifyOnExit( TRUE );
 	return;
     }
     if ( !wroteToStdinConnected && qstrcmp( signal, SIGNAL(wroteToStdin()) )==0 ) {
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcess::connectNotify(): set wroteToStdinConnected to TRUE" );
+	qDebug( "QProcess::connectNotify(): set wroteToStdinConnected to TRUE" );
 #endif
 	setWroteStdinConnected( TRUE );
 	return;
@@ -785,19 +785,19 @@ void QProcess::disconnectNotify( const char * )
 	    receivers( SIGNAL(readyReadStderr()) ) ==0
 	    ) {
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcess::disconnectNotify(): set ioRedirection to FALSE" );
+	qDebug( "QProcess::disconnectNotify(): set ioRedirection to FALSE" );
 #endif
 	setIoRedirection( FALSE );
     }
     if ( notifyOnExit && receivers( SIGNAL(processExited()) ) == 0 ) {
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcess::disconnectNotify(): set notifyOnExit to FALSE" );
+	qDebug( "QProcess::disconnectNotify(): set notifyOnExit to FALSE" );
 #endif
 	setNotifyOnExit( FALSE );
     }
     if ( wroteToStdinConnected && receivers( SIGNAL(wroteToStdin()) ) == 0 ) {
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcess::disconnectNotify(): set wroteToStdinConnected to FALSE" );
+	qDebug( "QProcess::disconnectNotify(): set wroteToStdinConnected to FALSE" );
 #endif
 	setWroteStdinConnected( FALSE );
     }
diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp
index 21f3d98..40476d3 100644
--- a/src/kernel/qprocess_unix.cpp
+++ b/src/kernel/qprocess_unix.cpp
@@ -134,7 +134,7 @@ public:
     QProc( pid_t p, QProcess *proc=0 ) : pid(p), process(proc)
     {
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProc: Constructor for pid %d and QProcess %p", pid, process );
+	qDebug( "QProc: Constructor for pid %d and QProcess %p", pid, process );
 #endif
 	socketStdin = 0;
 	socketStdout = 0;
@@ -143,7 +143,7 @@ public:
     ~QProc()
     {
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProc: Destructor for pid %d and QProcess %p", pid, process );
+	qDebug( "QProc: Destructor for pid %d and QProcess %p", pid, process );
 #endif
 	if ( process ) {
 	    if ( process->d->notifierStdin )
@@ -273,7 +273,7 @@ QProcessManager::QProcessManager() : sn(0)
 	sigchldFd[1] = 0;
     } else {
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcessManager: install socket notifier (%d)", sigchldFd[1] );
+	qDebug( "QProcessManager: install socket notifier (%d)", sigchldFd[1] );
 #endif
 	sn = new QSocketNotifier( sigchldFd[1],
 		QSocketNotifier::Read, this );
@@ -286,7 +286,7 @@ QProcessManager::QProcessManager() : sn(0)
     struct sigaction act;
 
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcessManager: install a SIGCHLD handler" );
+    qDebug( "QProcessManager: install a SIGCHLD handler" );
 #endif
     act.sa_handler = qt_C_sigchldHnd;
     sigemptyset( &(act.sa_mask) );
@@ -296,17 +296,17 @@ QProcessManager::QProcessManager() : sn(0)
     act.sa_flags |= SA_RESTART;
 #endif
     if ( sigaction( SIGCHLD, &act, &oldactChld ) != 0 )
-	tqWarning( "Error installing SIGCHLD handler" );
+	qWarning( "Error installing SIGCHLD handler" );
 
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcessManager: install a SIGPIPE handler (SIG_IGN)" );
+    qDebug( "QProcessManager: install a SIGPIPE handler (SIG_IGN)" );
 #endif
     act.sa_handler = QT_SIGNAL_IGNORE;
     sigemptyset( &(act.sa_mask) );
     sigaddset( &(act.sa_mask), SIGPIPE );
     act.sa_flags = 0;
     if ( sigaction( SIGPIPE, &act, &oldactPipe ) != 0 )
-	tqWarning( "Error installing SIGPIPE handler" );
+	qWarning( "Error installing SIGPIPE handler" );
 }
 
 QProcessManager::~QProcessManager()
@@ -320,23 +320,23 @@ QProcessManager::~QProcessManager()
 
     // restore SIGCHLD handler
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcessManager: restore old sigchild handler" );
+    qDebug( "QProcessManager: restore old sigchild handler" );
 #endif
     if ( sigaction( SIGCHLD, &oldactChld, 0 ) != 0 )
-	tqWarning( "Error restoring SIGCHLD handler" );
+	qWarning( "Error restoring SIGCHLD handler" );
 
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcessManager: restore old sigpipe handler" );
+    qDebug( "QProcessManager: restore old sigpipe handler" );
 #endif
     if ( sigaction( SIGPIPE, &oldactPipe, 0 ) != 0 )
-	tqWarning( "Error restoring SIGPIPE handler" );
+	qWarning( "Error restoring SIGPIPE handler" );
 }
 
 void QProcessManager::append( QProc *p )
 {
     procList->append( p );
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcessManager: append process (procList.count(): %d)", procList->count() );
+    qDebug( "QProcessManager: append process (procList.count(): %d)", procList->count() );
 #endif
 }
 
@@ -344,7 +344,7 @@ void QProcessManager::remove( QProc *p )
 {
     procList->remove( p );
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcessManager: remove process (procList.count(): %d)", procList->count() );
+    qDebug( "QProcessManager: remove process (procList.count(): %d)", procList->count() );
 #endif
     cleanup();
 }
@@ -359,7 +359,7 @@ void QProcessManager::cleanup()
 void QProcessManager::removeMe()
 {
     if ( procList->count() == 0 ) {
-	tqRemovePostRoutine(qprocess_cleanup);
+	qRemovePostRoutine(qprocess_cleanup);
 	QProcessPrivate::procManager = 0;
 	delete this;
     }
@@ -381,7 +381,7 @@ void QProcessManager::sigchldHnd( int fd )
     char tmp;
     ::read( fd, &tmp, sizeof(tmp) );
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcessManager::sigchldHnd()" );
+    qDebug( "QProcessManager::sigchldHnd()" );
 #endif
     QProc *proc;
     QProcess *process;
@@ -393,7 +393,7 @@ void QProcessManager::sigchldHnd( int fd )
 	if ( process != 0 ) {
 	    if ( !process->isRunning() ) {
 #if defined(QT_QPROCESS_DEBUG)
-		tqDebug( "QProcessManager::sigchldHnd() (PID: %d): process exited (QProcess available)", proc->pid );
+		qDebug( "QProcessManager::sigchldHnd() (PID: %d): process exited (QProcess available)", proc->pid );
 #endif
 		/*
 		  Apparently, there is not consistency among different
@@ -415,14 +415,14 @@ void QProcessManager::sigchldHnd( int fd )
 		// read pending data
 		if ( proc->socketStdout && ::ioctl(proc->socketStdout, FIONREAD, (char*)&nbytes)==0 && nbytes>0 ) {
 #if defined(QT_QPROCESS_DEBUG)
-		    tqDebug( "QProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stdout", proc->pid, nbytes );
+		    qDebug( "QProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stdout", proc->pid, nbytes );
 #endif
 		    process->socketRead( proc->socketStdout );
 		}
 		nbytes = 0;
 		if ( proc->socketStderr && ::ioctl(proc->socketStderr, FIONREAD, (char*)&nbytes)==0 && nbytes>0 ) {
 #if defined(QT_QPROCESS_DEBUG)
-		    tqDebug( "QProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stderr", proc->pid, nbytes );
+		    qDebug( "QProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stderr", proc->pid, nbytes );
 #endif
 		    process->socketRead( proc->socketStderr );
 		}
@@ -450,7 +450,7 @@ void QProcessManager::sigchldHnd( int fd )
 	    int status;
 	    if ( ::waitpid( proc->pid, &status, WNOHANG ) == proc->pid ) {
 #if defined(QT_QPROCESS_DEBUG)
-		tqDebug( "QProcessManager::sigchldHnd() (PID: %d): process exited (QProcess not available)", proc->pid );
+		qDebug( "QProcessManager::sigchldHnd() (PID: %d): process exited (QProcess not available)", proc->pid );
 #endif
 		removeProc = TRUE;
 	    }
@@ -480,7 +480,7 @@ QProcessManager *QProcessPrivate::procManager = 0;
 QProcessPrivate::QProcessPrivate()
 {
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcessPrivate: Constructor" );
+    qDebug( "QProcessPrivate: Constructor" );
 #endif
     stdinBufRead = 0;
 
@@ -497,7 +497,7 @@ QProcessPrivate::QProcessPrivate()
 QProcessPrivate::~QProcessPrivate()
 {
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcessPrivate: Destructor" );
+    qDebug( "QProcessPrivate: Destructor" );
 #endif
 
     if ( proc != 0 ) {
@@ -543,7 +543,7 @@ void QProcessPrivate::newProc( pid_t pid, QProcess *process )
     proc = new QProc( pid, process );
     if ( procManager == 0 ) {
 	procManager = new QProcessManager;
-	tqAddPostRoutine(qprocess_cleanup);
+	qAddPostRoutine(qprocess_cleanup);
     }
     // the QProcessManager takes care of deleting the QProc instances
     procManager->append( proc );
@@ -700,7 +700,7 @@ QProcess::~QProcess()
 bool QProcess::start( QStringList *env )
 {
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcess::start()" );
+    qDebug( "QProcess::start()" );
 #endif
     reset();
 
@@ -760,7 +760,7 @@ bool QProcess::start( QStringList *env )
 	arglistQ[i] = (*it).local8Bit();
 	arglist[i] = arglistQ[i];
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcess::start(): arg %d = %s", i, arglist[i] );
+	qDebug( "QProcess::start(): arg %d = %s", i, arglist[i] );
 #endif
 	i++;
     }
@@ -788,7 +788,7 @@ bool QProcess::start( QStringList *env )
     // in case the process exits quickly.
     if ( d->procManager == 0 ) {
 	d->procManager = new QProcessManager;
-	tqAddPostRoutine(qprocess_cleanup);
+	qAddPostRoutine(qprocess_cleanup);
     }
 
     // fork and exec
@@ -969,7 +969,7 @@ bool QProcess::start( QStringList *env )
 
 error:
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcess::start(): error starting process" );
+    qDebug( "QProcess::start(): error starting process" );
 #endif
     if ( d->procManager )
 	d->procManager->cleanup();
@@ -1050,7 +1050,7 @@ bool QProcess::isRunning() const
 {
     if ( d->exitValuesCalculated ) {
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcess::isRunning(): FALSE (already computed)" );
+	qDebug( "QProcess::isRunning(): FALSE (already computed)" );
 #endif
 	return FALSE;
     }
@@ -1080,12 +1080,12 @@ bool QProcess::isRunning() const
 	}
 
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcess::isRunning() (PID: %d): FALSE", d->proc->pid );
+	qDebug( "QProcess::isRunning() (PID: %d): FALSE", d->proc->pid );
 #endif
 	return FALSE;
     }
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcess::isRunning() (PID: %d): TRUE", d->proc->pid );
+    qDebug( "QProcess::isRunning() (PID: %d): TRUE", d->proc->pid );
 #endif
     return TRUE;
 }
@@ -1142,7 +1142,7 @@ bool QProcess::canReadLineStderr() const
 void QProcess::writeToStdin( const QByteArray& buf )
 {
 #if defined(QT_QPROCESS_DEBUG)
-//    tqDebug( "QProcess::writeToStdin(): write to stdin (%d)", d->socketStdin );
+//    qDebug( "QProcess::writeToStdin(): write to stdin (%d)", d->socketStdin );
 #endif
     d->stdinBuf.enqueue( new QByteArray(buf) );
     if ( d->notifierStdin != 0 )
@@ -1169,10 +1169,10 @@ void QProcess::closeStdin()
 	delete d->notifierStdin;
 	d->notifierStdin = 0;
 	if ( ::close( d->proc->socketStdin ) != 0 ) {
-	    tqWarning( "Could not close stdin of child process" );
+	    qWarning( "Could not close stdin of child process" );
 	}
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcess::closeStdin(): stdin (%d) closed", d->proc->socketStdin );
+	qDebug( "QProcess::closeStdin(): stdin (%d) closed", d->proc->socketStdin );
 #endif
 	d->proc->socketStdin = 0;
     }
@@ -1193,7 +1193,7 @@ void QProcess::socketRead( int fd )
     }
 
 #if defined(QT_QPROCESS_DEBUG)
-    tqDebug( "QProcess::socketRead(): %d", fd );
+    qDebug( "QProcess::socketRead(): %d", fd );
 #endif
     if ( fd == 0 )
 	return;
@@ -1229,7 +1229,7 @@ void QProcess::socketRead( int fd )
     if ( n == 0 || n == -1 ) {
 	if ( fd == d->proc->socketStdout ) {
 #if defined(QT_QPROCESS_DEBUG)
-	    tqDebug( "QProcess::socketRead(): stdout (%d) closed", fd );
+	    qDebug( "QProcess::socketRead(): stdout (%d) closed", fd );
 #endif
 	    d->notifierStdout->setEnabled( FALSE );
 	    delete d->notifierStdout;
@@ -1239,7 +1239,7 @@ void QProcess::socketRead( int fd )
 	    return;
 	} else if ( fd == d->proc->socketStderr ) {
 #if defined(QT_QPROCESS_DEBUG)
-	    tqDebug( "QProcess::socketRead(): stderr (%d) closed", fd );
+	    qDebug( "QProcess::socketRead(): stderr (%d) closed", fd );
 #endif
 	    d->notifierStderr->setEnabled( FALSE );
 	    delete d->notifierStderr;
@@ -1279,13 +1279,13 @@ void QProcess::socketRead( int fd )
     d->socketReadCalled = TRUE;
     if ( fd == d->proc->socketStdout ) {
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcess::socketRead(): %d bytes read from stdout (%d)",
+	qDebug( "QProcess::socketRead(): %d bytes read from stdout (%d)",
 		buffer->size()-oldSize, fd );
 #endif
 	emit readyReadStdout();
     } else if ( fd == d->proc->socketStderr ) {
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcess::socketRead(): %d bytes read from stderr (%d)",
+	qDebug( "QProcess::socketRead(): %d bytes read from stderr (%d)",
 		buffer->size()-oldSize, fd );
 #endif
 	emit readyReadStderr();
@@ -1309,7 +1309,7 @@ void QProcess::socketWrite( int fd )
 		d->stdinBuf.head()->data() + d->stdinBufRead,
 		d->stdinBuf.head()->size() - d->stdinBufRead );
 #if defined(QT_QPROCESS_DEBUG)
-	tqDebug( "QProcess::socketWrite(): wrote %d bytes to stdin (%d)", ret, fd );
+	qDebug( "QProcess::socketWrite(): wrote %d bytes to stdin (%d)", ret, fd );
 #endif
 	if ( ret == -1 )
 	    return;
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index 6f00db3..039b587 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -1668,7 +1668,7 @@ unsigned short QPSPrinterFontPrivate::insertIntoSubset( unsigned short u )
             pageSubsetCount++;
         }
     } else {
-        tqWarning("QPSPrinterFont::internal error");
+        qWarning("QPSPrinterFont::internal error");
     }
     return retval;
 }
@@ -1677,7 +1677,7 @@ void QPSPrinterFontPrivate::restore()
 {
     page_subset.clear();
     pageSubsetCount = 0;
-    //tqDebug("restore for font %s\n",psname.latin1());
+    //qDebug("restore for font %s\n",psname.latin1());
 }
 
 static inline const char *toHex( uchar u )
@@ -1814,7 +1814,7 @@ unsigned short QPSPrinterFontPrivate::mapUnicode( unsigned short unicode )
     if ( !found ) {
         return insertIntoSubset( unicode );
     }
-    //tqDebug("mapping unicode %x to %x", unicode, offset+*res);
+    //qDebug("mapping unicode %x to %x", unicode, offset+*res);
     return offset + *res;
 }
 
@@ -2289,7 +2289,7 @@ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFontEngine *f, QByteArray& d)
     else if (QString(environment_preference) == "3")
       target_type = 3;
     else
-      tqWarning("The value of QT_TTFTOPS must be 42 or 3");
+      qWarning("The value of QT_TTFTOPS must be 42 or 3");
   }
 #endif
   offset_table = (unsigned char*) data.data(); /* first 12 bytes */
@@ -2318,12 +2318,12 @@ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFontEngine *f, QByteArray& d)
   ury = topost( getFWord( ptr + 42 ) );
   indexToLocFormat = getSHORT( ptr + 50 );      /* size of 'loca' data */
   if(indexToLocFormat != 0 && indexToLocFormat != 1) {
-    tqWarning("TrueType font is unusable because indexToLocFormat != 0");
+    qWarning("TrueType font is unusable because indexToLocFormat != 0");
     defective = TRUE;
     return;
   }
   if( getSHORT(ptr+52) != 0 ) {
-    tqWarning("TrueType font is unusable because glyphDataFormat != 0");
+    qWarning("TrueType font is unusable because glyphDataFormat != 0");
     defective = TRUE;
     return;
   }
@@ -2340,7 +2340,7 @@ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFontEngine *f, QByteArray& d)
   BYTE* table_ptr = getTable("name");           /* pointer to table */
   if ( !table_ptr ) {
       defective = TRUE;
-      tqDebug("couldn't find name table" );
+      qDebug("couldn't find name table" );
       return;
   }
   int numrecords = getUSHORT( table_ptr + 2 );  /* number of names */
@@ -2392,8 +2392,8 @@ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFontEngine *f, QByteArray& d)
       Fixed post_format = getFixed( post_table );
 
       if( post_format.whole != 2 || post_format.fraction != 0 ) {
-          tqWarning("TrueType font does not have a format 2.0 'post' table");
-          tqWarning("post format is %d.%d",post_format.whole,post_format.fraction);
+          qWarning("TrueType font does not have a format 2.0 'post' table");
+          qWarning("post format is %d.%d",post_format.whole,post_format.fraction);
           // Sivan Feb 2001: no longer defective.
           // defective = TRUE;
       }
@@ -2402,11 +2402,11 @@ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFontEngine *f, QByteArray& d)
   BYTE *maxp = getTable("maxp");
   if ( !maxp ) {
       defective = TRUE;
-      tqDebug("no maxp table in font");
+      qDebug("no maxp table in font");
       return;
   }
   numGlyphs = getUSHORT( maxp + 4 );
-//  tqDebug("number of glyphs is %d", numGlyphs);
+//  qDebug("number of glyphs is %d", numGlyphs);
   replacementList = makePSFontNameList( f, psname );
   uni2glyphSetup();
 }
@@ -2505,8 +2505,8 @@ void QPSPrinterFontTTF::download(QTextStream& s,bool global)
         return;
     }
     
-    //tqDebug("downloading ttf font %s", psname.latin1() );
-    //tqDebug("target type=%d", target_type);
+    //qDebug("downloading ttf font %s", psname.latin1() );
+    //qDebug("target type=%d", target_type);
     global_dict = global;
     QMap<unsigned short, unsigned short> *subsetDict = &subset;
     if ( !global )
@@ -2716,7 +2716,7 @@ void QPSPrinterFontTTF::download(QTextStream& s,bool global)
         } else { /* type 3 */
             if (!glyphset[x]) continue;
 
-	    //tqDebug("emitting charproc for glyph %d, name=%s", x, glyphName(x).latin1() );
+	    //qDebug("emitting charproc for glyph %d, name=%s", x, glyphName(x).latin1() );
             s << "/";
             s << glyphName( x, glyphset );
             s << "{";
@@ -2916,7 +2916,7 @@ void QPSPrinterFontTTF::uni2glyphSetup()
 	   }
   }
   if (map==nmaps) {
-    tqWarning("Font does not have unicode encoding\n");
+    qWarning("Font does not have unicode encoding\n");
     return; // no unicode encoding!
   }
 
@@ -2928,7 +2928,7 @@ void QPSPrinterFontTTF::uni2glyphSetup()
   //fprintf(stderr,"Unicode cmap format %d\n",format);
 
   if (format != 4) {
-    //tqWarning("Unicode cmap format is not 4");
+    //qWarning("Unicode cmap format is not 4");
     return;
   }
 
@@ -3145,7 +3145,7 @@ void QPSPrinterFontTTF::sfnts_glyf_table(ULONG oldoffset,
     ** two byte boundary.
     */
     if( length % 2 ) {
-      tqWarning("TrueType font contains a 'glyf' table without 2 byte padding");
+      qWarning("TrueType font contains a 'glyf' table without 2 byte padding");
       defective = TRUE;
       return;
     }
@@ -3168,7 +3168,7 @@ void QPSPrinterFontTTF::sfnts_glyf_table(ULONG oldoffset,
 
   /* Look for unexplainable descrepancies between sizes */
   if( total != correct_total_length ) {
-    tqWarning("QPSPrinterFontTTF::sfnts_glyf_table: total != correct_total_length");
+    qWarning("QPSPrinterFontTTF::sfnts_glyf_table: total != correct_total_length");
     defective = TRUE;
     return;
   }
@@ -3260,7 +3260,7 @@ void QPSPrinterFontTTF::download_sfnts(QTextStream& s)
     sfnts_pputUSHORT(81,s, string_len, line_len, in_string);            /* rangeShift */
   }
   else {
-    tqWarning("Fewer than 9 tables selected");
+    qWarning("Fewer than 9 tables selected");
   }
 
   /* Now, emmit the table directory. */
@@ -3297,7 +3297,7 @@ void QPSPrinterFontTTF::download_sfnts(QTextStream& s)
                        string_len, line_len, in_string);
     } else { // other tables should not exceed 64K (not always true; Sivan)
       if( tables[x].length > 65535 ) {
-        tqWarning("TrueType font has a table which is too long");
+        qWarning("TrueType font has a table which is too long");
         defective = TRUE;
         return;
       }
@@ -3699,7 +3699,7 @@ void QPSPrinterFontTTF::charprocLoad(BYTE *glyph, charproc_data* cd)
       ct = *(glyph++);
 
       if( (x + ct) > cd->num_pts ) {
-        tqWarning("Fatal Error in TT flags");
+        qWarning("Fatal Error in TT flags");
         return;
       }
 
@@ -4053,7 +4053,7 @@ QPSPrinterFontPFA::QPSPrinterFontPFA(const QFontEngine *f, QByteArray& d)
   QString fontname;
 
   if (p[ pos ] != '%' || p[ pos+1 ] != '!') { // PFA marker
-    tqWarning("invalid pfa file");
+    qWarning("invalid pfa file");
     return;
   }
 
@@ -4079,7 +4079,7 @@ void QPSPrinterFontPFA::download(QTextStream& s, bool global)
         return;
     }
     
-    //tqDebug("downloading pfa font %s", psname.latin1() );
+    //qDebug("downloading pfa font %s", psname.latin1() );
     char* p = data.data();
     
     s << "% Font resource\n";
@@ -4111,7 +4111,7 @@ QPSPrinterFontPFB::QPSPrinterFontPFB(const QFontEngine *f, QByteArray& d)
   QString fontname;
 
   if (p[ pos ] != 0x80) { // PFB marker
-    tqWarning("pfb file does not start with 0x80");
+    qWarning("pfb file does not start with 0x80");
     return;
   }
   pos++;
@@ -4146,7 +4146,7 @@ void QPSPrinterFontPFB::download(QTextStream& s, bool global)
         return;
     }
     
-    //tqDebug("downloading pfb font %s", psname.latin1() );
+    //qDebug("downloading pfb font %s", psname.latin1() );
     unsigned char* p = (unsigned char*) data.data();
     int pos;
     int len;
@@ -4173,7 +4173,7 @@ void QPSPrinterFontPFB::download(QTextStream& s, bool global)
 	len |= (p[ pos ] << 16); pos++;
 	len |= (p[ pos ] << 24); pos++;
 
-	//tqDebug("font block type %d len %d",typ,len);
+	//qDebug("font block type %d len %d",typ,len);
 
 	int end = pos + len;
 	if (typ==1) {
@@ -4182,7 +4182,7 @@ void QPSPrinterFontPFB::download(QTextStream& s, bool global)
 		    s << "\n";
 		    hexcol = 0;
 		}
-		//tqWarning(QString::fromLatin1((char*)(p+pos),1));
+		//qWarning(QString::fromLatin1((char*)(p+pos),1));
 		if (p[pos] == '\r' || p[pos] == '\n') {
 		    s << "\n";
 		    while (pos < end && (p[pos] == '\r' || p[pos] == '\n'))
@@ -4233,7 +4233,7 @@ QPSPrinterFontNotFound::QPSPrinterFontNotFound(const QFontEngine* f)
 
 void QPSPrinterFontNotFound::download(QTextStream& s, bool)
 {
-    //tqDebug("downloading not found font %s", psname.latin1() );
+    //qDebug("downloading not found font %s", psname.latin1() );
     emitPSFontNameList( s, psname, replacementList );
     s << "% No embeddable font for ";
     s << psname;
@@ -4350,7 +4350,7 @@ QString QPSPrinterFontAsian::defineFont( QTextStream &stream, const QString &ps,
 
 void QPSPrinterFontAsian::download(QTextStream& s, bool)
 {
-    //tqDebug("downloading asian font %s", psname.latin1() );
+    //qDebug("downloading asian font %s", psname.latin1() );
     s << "% Asian postscript font requested. Using "
       << psname << endl;
     emitPSFontNameList( s, psname, replacementList );
@@ -4871,7 +4871,7 @@ QPSPrinterFontSimplifiedChinese::QPSPrinterFontSimplifiedChinese(const QFontEngi
 	psname = SongGBK2K[type].psname;
 	appendReplacements( replacementList, SimplifiedReplacements, type );
     }
-    //tqDebug("simplified chinese: fontname is %s, psname=%s", f.family().latin1(), psname.latin1() );
+    //qDebug("simplified chinese: fontname is %s, psname=%s", f.family().latin1(), psname.latin1() );
 }
 
 QString QPSPrinterFontSimplifiedChinese::extension() const
@@ -4921,14 +4921,14 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr
 
 #if defined( Q_WS_X11 )
     bool xlfd = FALSE;
-    //tqDebug("engine = %p name=%s, script=%d", engine, engine ? engine->name() : "(null)", script);
+    //qDebug("engine = %p name=%s, script=%d", engine, engine ? engine->name() : "(null)", script);
 
 #ifndef QT_NO_XFTFREETYPE
     if ( qt_has_xft && engine && engine->type() == QFontEngine::Xft ) {
         XftPattern *pattern = static_cast<QFontEngineXft *>( engine )->pattern();
         char *filename = 0;
         XftPatternGetString (pattern, XFT_FILE, 0, &filename);
-        //tqDebug("filename for font is '%s'", filename);
+        //qDebug("filename for font is '%s'", filename);
         if ( filename ) {
             fontfilename = QString::fromLocal8Bit( filename );
             xfontname = fontfilename;
@@ -4996,7 +4996,7 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr
 	xfontname += "/" + toString( script );
 #endif
 
-    //tqDebug("looking for font %s in dict", xfontname.latin1() );
+    //qDebug("looking for font %s in dict", xfontname.latin1() );
     p = priv->fonts.find(xfontname);
     if ( p )
 	return;
@@ -5014,15 +5014,15 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr
 		    fontmapname = (*it) + "/fonts.scale";
 		else
 		    fontmapname = (*it) + "/fonts.dir";
-		//tqWarning(fontmapname);
+		//qWarning(fontmapname);
 		QFile fontmap(fontmapname);
 		if (fontmap.open(IO_ReadOnly)) {
 		    while (!fontmap.atEnd()) {
 			QString mapping;
 			fontmap.readLine(mapping,512);
 			// fold to lower (since X folds to lowercase)
-			//tqWarning(xfontname);
-			//tqWarning(mapping);
+			//qWarning(xfontname);
+			//qWarning(mapping);
 			if (mapping.lower().contains(searchname.lower())) {
 			    int index = mapping.find(' ',0);
 			    QString ffn = mapping.mid(0,index);
@@ -5031,7 +5031,7 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr
 				!ffn.contains( ".spd" ) && !ffn.contains( ".phont" ) ) {
 				fontfilename = (*it) + QString("/") + ffn;
 				if ( QFile::exists(fontfilename) ) {
-				    //tqDebug("found font file %s", fontfilename.latin1());
+				    //qDebug("found font file %s", fontfilename.latin1());
 				    break;
 				} else // unset fontfilename
 				    fontfilename = QString();
@@ -5046,7 +5046,7 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr
     }
 #endif
 
-    //tqDebug("font=%s, fontname=%s, file=%s, p=%p", f.family().latin1(), xfontname.latin1(), fontfilename.latin1(), p);
+    //qDebug("font=%s, fontname=%s, file=%s, p=%p", f.family().latin1(), xfontname.latin1(), fontfilename.latin1(), p);
 
     // memory mapping would be better here
     if (fontfilename.length() > 0) { // maybe there is no file name
@@ -5074,7 +5074,7 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr
     } else
         type = NONE;
 
-    //tqDebug("font is of type %d", type );
+    //qDebug("font is of type %d", type );
     switch (type) {
     case TTF :
         p = new QPSPrinterFontTTF(engine, data);
@@ -5116,7 +5116,7 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr
             }
         } else
 #endif
-            //tqDebug("didnt find font for %s", xfontname.latin1());
+            //qDebug("didnt find font for %s", xfontname.latin1());
             p = new QPSPrinterFontNotFound( engine );
         break;
     }
@@ -5128,14 +5128,14 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr
     QDictIterator<QPSPrinterFontPrivate> it( priv->fonts );
     for( it.toFirst(); it.current(); ++it ) {
 	if ( *(*it) == *p ) {
-//	    tqWarning("Post script driver: font already in dict");
+//	    qWarning("Post script driver: font already in dict");
 	    delete p;
 	    p = *it;
 	    return;
 	}
     }
 
-    //tqDebug("inserting font %s in dict psname=%s", xfontname.latin1(), p->postScriptFontName().latin1() );
+    //qDebug("inserting font %s in dict psname=%s", xfontname.latin1(), p->postScriptFontName().latin1() );
     priv->fonts.insert( xfontname, p );
 }
 
@@ -5235,7 +5235,7 @@ void QPSPrinterPrivate::setFont( const QFont & fnt, int script )
     }
     if ( f.pointSize() == 0 ) {
 #if defined(CHECK_RANGE)
-        tqWarning( "QPrinter: Cannot set a font with zero point size." );
+        qWarning( "QPrinter: Cannot set a font with zero point size." );
 #endif
         f.setPointSize(QApplication::font().pointSize());
         if ( f.pointSize() == 0 )
@@ -5529,7 +5529,7 @@ static QByteArray compress( const QImage & image, bool gray ) {
 #if 0
                     /* this should never happen: both the start and
                        the end pointers ran off their tracks. */
-                    tqDebug( "oops! %06x %06x %06x %06x %5d %5d %5d %d",
+                    qDebug( "oops! %06x %06x %06x %06x %5d %5d %5d %d",
                             pixel[start], pixel[end],
                             pixel[index], pixel[index+bestLength],
                             start, end, index, bestLength );
@@ -5716,20 +5716,20 @@ static QByteArray compress( const QImage & image, bool gray ) {
     delete [] pixel;
 
 #ifdef DEBUG_COMPRESS
-    tqDebug( "------------- image compression statistics ----------------" );
-    tqDebug(" compression time %d", t.elapsed() );
-    tqDebug( "Size dist of uncompressed blocks:" );
-    tqDebug( "\t%d\t%d\t%d\t%d\t%d\t%d\n", sizeUncompressed[0], sizeUncompressed[1],
+    qDebug( "------------- image compression statistics ----------------" );
+    qDebug(" compression time %d", t.elapsed() );
+    qDebug( "Size dist of uncompressed blocks:" );
+    qDebug( "\t%d\t%d\t%d\t%d\t%d\t%d\n", sizeUncompressed[0], sizeUncompressed[1],
 	    sizeUncompressed[2], sizeUncompressed[3], sizeUncompressed[4], sizeUncompressed[5]);
-    tqDebug( "\t%d\t%d\t%d\t%d\t%d\n", sizeUncompressed[6], sizeUncompressed[7],
+    qDebug( "\t%d\t%d\t%d\t%d\t%d\n", sizeUncompressed[6], sizeUncompressed[7],
 	    sizeUncompressed[8], sizeUncompressed[9], sizeUncompressed[10] );
-    tqDebug( "Size dist of compressed blocks:" );
-    tqDebug( "\t%d\t%d\t%d\t%d\t%d\t%d\n", sizeCompressed[0], sizeCompressed[1],
+    qDebug( "Size dist of compressed blocks:" );
+    qDebug( "\t%d\t%d\t%d\t%d\t%d\t%d\n", sizeCompressed[0], sizeCompressed[1],
 	    sizeCompressed[2], sizeCompressed[3], sizeCompressed[4], sizeCompressed[5]);
-    tqDebug( "\t%d\t%d\t%d\t%d\t%d\n", sizeCompressed[6], sizeCompressed[7],
+    qDebug( "\t%d\t%d\t%d\t%d\t%d\n", sizeCompressed[6], sizeCompressed[7],
 	    sizeCompressed[8], sizeCompressed[9], sizeCompressed[10] );
-    tqDebug( "===> total compression ratio %d/%d = %f", outOffset, size, (float)outOffset/(float)size );
-    tqDebug( "-----------------------------------------------------------" );
+    qDebug( "===> total compression ratio %d/%d = %f", outOffset, size, (float)outOffset/(float)size );
+    qDebug( "-----------------------------------------------------------" );
 #endif
 
     return outarr;
@@ -6061,7 +6061,7 @@ void QPSPrinterPrivate::resetDrawingTools( QPainter *paint )
     if ( b != defaultBrush ) {
         if ( b == Qt::CustomPattern ) {
 #if defined(CHECK_RANGE)
-            tqWarning( "QPrinter: Pixmap brush not supported" );
+            qWarning( "QPrinter: Pixmap brush not supported" );
 #endif
         } else {
             cbrush = b;
@@ -6171,7 +6171,7 @@ void QPSPrinterPrivate::flushPage( bool last )
          (last || buffer->size() > 50000000)
 #endif
         ) {
-//        tqDebug("emiting header at page %d", pageCount );
+//        qDebug("emiting header at page %d", pageCount );
         emitHeader( last );
     }
     outStream << "%%Page: "
@@ -6180,7 +6180,7 @@ void QPSPrinterPrivate::flushPage( bool last )
               << "QI\n";
     if (!dirtyNewPage) {
         if ( pageFonts ) {
-            //tqDebug("page fonts for page %d", pageCount);
+            //qDebug("page fonts for page %d", pageCount);
             // we have already downloaded the header. Maybe we have page fonts here
             QDictIterator<QPSPrinterFontPrivate> it(fonts);
             while (it.current()) {
@@ -6243,7 +6243,7 @@ static void ignoreSigPipe(bool b)
     	    return; // not ignoring sigpipe
 
 	if (sigaction(SIGPIPE, users_sigpipe_handler, 0) == -1)
-	    tqWarning("QPSPrinter: could not restore SIGPIPE handler");
+	    qWarning("QPSPrinter: could not restore SIGPIPE handler");
 
 	delete users_sigpipe_handler;
 	users_sigpipe_handler = 0;
@@ -6513,7 +6513,7 @@ bool QPSPrinter::cmd( int c , QPainter *paint, QPDevCmdParam *p )
     case PdcSetROP:
 #if defined(CHECK_RANGE)
         if ( p[0].ival != Qt::CopyROP )
-            tqWarning( "QPrinter: Raster operation setting not supported" );
+            qWarning( "QPrinter: Raster operation setting not supported" );
 #endif
         break;
     case PdcSetBrushOrigin:
@@ -6534,7 +6534,7 @@ bool QPSPrinter::cmd( int c , QPainter *paint, QPDevCmdParam *p )
     case PdcSetBrush:
         if ( p[0].brush->style() == Qt::CustomPattern ) {
 #if defined(CHECK_RANGE)
-            tqWarning( "QPrinter: Pixmap brush not supported" );
+            qWarning( "QPrinter: Pixmap brush not supported" );
 #endif
             return FALSE;
         }
diff --git a/src/kernel/qregion.cpp b/src/kernel/qregion.cpp
index 8a0f8de..603ab44 100644
--- a/src/kernel/qregion.cpp
+++ b/src/kernel/qregion.cpp
@@ -174,7 +174,7 @@ void QRegion::exec( const QByteArray &buffer, int ver )
 	}
 #if defined(QT_CHECK_STATE)
 	if ( test_cnt > 0 && id != QRGN_TRANSLATE )
-	    tqWarning( "QRegion::exec: Internal error" );
+	    qWarning( "QRegion::exec: Internal error" );
 	test_cnt++;
 #endif
 	if ( id == QRGN_SETRECT || id == QRGN_SETELLIPSE ) {
diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp
index 40bb023..7b04a15 100644
--- a/src/kernel/qregion_x11.cpp
+++ b/src/kernel/qregion_x11.cpp
@@ -2433,7 +2433,7 @@ static void cleanup_empty_region()
 QRegion::QRegion()
 {
     if ( !empty_region ) {			// avoid too many allocs
-	tqAddPostRoutine( cleanup_empty_region );
+	qAddPostRoutine( cleanup_empty_region );
 	empty_region = new QRegion( TRUE );
 	Q_CHECK_PTR( empty_region );
     }
@@ -2469,7 +2469,7 @@ QRegion::QRegion( const QRect &r, RegionType t )
 {
     if ( r.isEmpty() ) {
 	if ( !empty_region ) {			// avoid too many allocs
-	    tqAddPostRoutine( cleanup_empty_region );
+	    qAddPostRoutine( cleanup_empty_region );
 	    empty_region = new QRegion( TRUE );
 	    Q_CHECK_PTR( empty_region );
 	}
@@ -2516,7 +2516,7 @@ QRegion::QRegion( const QPointArray &a, bool winding )
 				    winding ? WindingRule : EvenOddRule );
     } else {
 	if ( !empty_region ) {
-	    tqAddPostRoutine( cleanup_empty_region );
+	    qAddPostRoutine( cleanup_empty_region );
 	    empty_region = new QRegion( TRUE );
 	    Q_CHECK_PTR( empty_region );
 	}
@@ -2551,7 +2551,7 @@ QRegion::QRegion( const QBitmap & bm )
 {
     if ( bm.isNull() ) {
 	if ( !empty_region ) {			// avoid too many allocs
-	    tqAddPostRoutine( cleanup_empty_region );
+	    qAddPostRoutine( cleanup_empty_region );
 	    empty_region = new QRegion( TRUE );
 	    Q_CHECK_PTR( empty_region );
 	}
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index 37d2493..eb43f3c 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -214,7 +214,7 @@ QTextCursor *QTextDeleteCommand::execute( QTextCursor *c )
 {
     QTextParagraph *s = doc ? doc->paragAt( id ) : parag;
     if ( !s ) {
-	tqWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() );
+	qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() );
 	return 0;
     }
 
@@ -242,7 +242,7 @@ QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c )
 {
     QTextParagraph *s = doc ? doc->paragAt( id ) : parag;
     if ( !s ) {
-	tqWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() );
+	qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() );
 	return 0;
     }
 
@@ -1733,10 +1733,10 @@ void QTextDocument::setRichTextInternal( const QString &text, QTextCursor* curso
 			    QString bg = attr["background"];
 			    const QMimeSource* m = factory_->data( bg, contxt );
 			    if ( !m ) {
-				tqWarning("QRichText: no mimesource for %s", bg.latin1() );
+				qWarning("QRichText: no mimesource for %s", bg.latin1() );
 			    } else {
 				if ( !QImageDrag::decode( m, img ) ) {
-				    tqWarning("QTextImage: cannot decode %s", bg.latin1() );
+				    qWarning("QTextImage: cannot decode %s", bg.latin1() );
 				}
 			    }
 			    if ( !img.isNull() ) {
@@ -2370,7 +2370,7 @@ QString QTextDocument::richText() const
     QStyleSheetItem* item_ol = styleSheet()->item("ol");
     QStyleSheetItem* item_li = styleSheet()->item("li");
     if ( !item_p || !item_div || !item_ul || !item_ol || !item_li ) {
-	tqWarning( "QTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, div, ul, ol, or li)" );
+	qWarning( "QTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, div, ul, ol, or li)" );
 	return QString::null;
     }
     int pastListDepth = 0;
@@ -4415,7 +4415,7 @@ int QTextParagraph::lineHeightOfChar( int i, int *bl, int *y ) const
 	--it;
     }
 
-    tqWarning( "QTextParagraph::lineHeightOfChar: couldn't find lh for %d", i );
+    qWarning( "QTextParagraph::lineHeightOfChar: couldn't find lh for %d", i );
     return 15;
 }
 
@@ -4441,7 +4441,7 @@ QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line )
 	--l;
     }
 
-    tqWarning( "QTextParagraph::lineStartOfChar: couldn't find %d", i );
+    qWarning( "QTextParagraph::lineStartOfChar: couldn't find %d", i );
     return 0;
 }
 
@@ -4468,7 +4468,7 @@ QTextStringChar *QTextParagraph::lineStartOfLine( int line, int *index ) const
 	return &str->at( i );
     }
 
-    tqWarning( "QTextParagraph::lineStartOfLine: couldn't find %d", line );
+    qWarning( "QTextParagraph::lineStartOfLine: couldn't find %d", line );
     return 0;
 }
 
@@ -5407,12 +5407,12 @@ QTextLineStart *QTextFormatter::bidiReorderLine( QTextParagraph * /*parag*/, QTe
 	visual = (int *)malloc( length*sizeof( int ) );
     }
 
-    //tqDebug("bidiReorderLine: length=%d (%d-%d)", length, start, last );
+    //qDebug("bidiReorderLine: length=%d (%d-%d)", length, start, last );
 
     QTextStringChar *ch = startChar;
     unsigned char *l = levels;
     while ( ch <= lastChar ) {
-	//tqDebug( "  level: %d", ch->bidiLevel );
+	//qDebug( "  level: %d", ch->bidiLevel );
 	*(l++) = (ch++)->bidiLevel;
     }
 
@@ -5472,7 +5472,7 @@ QTextLineStart *QTextFormatter::bidiReorderLine( QTextParagraph * /*parag*/, QTe
 
  	ch->x = x + toAdd;
         ch->rightToLeft = ch->bidiLevel % 2;
-	//tqDebug("visual: %d (%x) placed at %d rightToLeft=%d", visual[i], ch->c.unicode(), x +toAdd, ch->rightToLeft  );
+	//qDebug("visual: %d (%x) placed at %d rightToLeft=%d", visual[i], ch->c.unicode(), x +toAdd, ch->rightToLeft  );
 	int ww = 0;
 	if ( ch->c.unicode() >= 32 || ch->c == '\t' || ch->c == '\n' || ch->isCustom() ) {
 	    ww = text->width( start+visual[i] );
@@ -6178,7 +6178,7 @@ QTextFormat *QTextFormatCollection::format( const QFont &f, const QColor &c )
     cachedFormat->collection = this;
     cKey.insert( cachedFormat->key(), cachedFormat );
     if ( cachedFormat->key() != key )
-	tqWarning("ASSERT: keys for format not identical: '%s '%s'", cachedFormat->key().latin1(), key.latin1() );
+	qWarning("ASSERT: keys for format not identical: '%s '%s'", cachedFormat->key().latin1(), key.latin1() );
     return cachedFormat;
 }
 
@@ -6597,11 +6597,11 @@ QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, co
 	    const QMimeSource* m =
 		factory.data( imageName, context );
 	    if ( !m ) {
-		tqWarning("QTextImage: no mimesource for %s", imageName.latin1() );
+		qWarning("QTextImage: no mimesource for %s", imageName.latin1() );
 	    }
 	    else {
 		if ( !QImageDrag::decode( m, img ) ) {
-		    tqWarning("QTextImage: cannot decode %s", imageName.latin1() );
+		    qWarning("QTextImage: cannot decode %s", imageName.latin1() );
 		}
 	    }
 
@@ -7229,7 +7229,7 @@ static QMap<QString, QChar> *htmlMap()
 {
     if ( !html_map ) {
 	html_map = new QMap<QString, QChar>;
-	tqAddPostRoutine( qt_cleanup_html_map );
+	qAddPostRoutine( qt_cleanup_html_map );
 
 	const Entity *ent = entitylist;
 	while( ent->code ) {
diff --git a/src/kernel/qrichtext_p.cpp b/src/kernel/qrichtext_p.cpp
index f71cc39..cf79a51 100644
--- a/src/kernel/qrichtext_p.cpp
+++ b/src/kernel/qrichtext_p.cpp
@@ -151,7 +151,7 @@ void QTextCursor::gotoPosition( QTextParagraph* p, int index )
     para = p;
     if ( index < 0 || index >= para->length() ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QTextCursor::gotoParagraph Index: %d out of range", index );
+	qWarning( "QTextCursor::gotoParagraph Index: %d out of range", index );
 #endif
 	if ( index < 0 || para->length() == 0 )
 	    index = 0;
@@ -506,7 +506,7 @@ bool QTextParagraph::fullSelected( int id ) const
 int QTextParagraph::lineY( int l ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-	tqWarning( "QTextParagraph::lineY: line %d out of range!", l );
+	qWarning( "QTextParagraph::lineY: line %d out of range!", l );
 	return 0;
     }
 
@@ -522,7 +522,7 @@ int QTextParagraph::lineY( int l ) const
 int QTextParagraph::lineBaseLine( int l ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-	tqWarning( "QTextParagraph::lineBaseLine: line %d out of range!", l );
+	qWarning( "QTextParagraph::lineBaseLine: line %d out of range!", l );
 	return 10;
     }
 
@@ -538,7 +538,7 @@ int QTextParagraph::lineBaseLine( int l ) const
 int QTextParagraph::lineHeight( int l ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-	tqWarning( "QTextParagraph::lineHeight: line %d out of range!", l );
+	qWarning( "QTextParagraph::lineHeight: line %d out of range!", l );
 	return 15;
     }
 
@@ -554,8 +554,8 @@ int QTextParagraph::lineHeight( int l ) const
 void QTextParagraph::lineInfo( int l, int &y, int &h, int &bl ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-	tqWarning( "QTextParagraph::lineInfo: line %d out of range!", l );
-	tqDebug( "%d %d", (int)lineStarts.count() - 1, l );
+	qWarning( "QTextParagraph::lineInfo: line %d out of range!", l );
+	qDebug( "%d %d", (int)lineStarts.count() - 1, l );
 	y = 0;
 	h = 15;
 	bl = 10;
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index c5bc09e..614841e 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -1981,7 +1981,7 @@ inline void QTextParagraph::setParagId( int i )
 inline int QTextParagraph::paragId() const
 {
     if ( id == -1 )
-	tqWarning( "invalid parag id!!!!!!!! (%p)", (void*)this );
+	qWarning( "invalid parag id!!!!!!!! (%p)", (void*)this );
     return id;
 }
 
diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp
index 4bee84a..66aa07b 100644
--- a/src/kernel/qscriptengine.cpp
+++ b/src/kernel/qscriptengine.cpp
@@ -120,7 +120,7 @@ static inline void positionCluster(QShaperItem *item, int gfrom,  int glast)
 {
     int nmarks = glast - gfrom;
     if (nmarks <= 0) {
-        tqWarning("positionCluster: no marks to position!");
+        qWarning("positionCluster: no marks to position!");
         return;
     }
 
@@ -134,12 +134,12 @@ static inline void positionCluster(QShaperItem *item, int gfrom,  int glast)
 
     QRect baseRect(baseInfo.x, baseInfo.y, baseInfo.width, baseInfo.height);
 
-//      tqDebug("---> positionCluster: cluster from %d to %d", gfrom, glast);
-//     tqDebug("baseInfo: %f/%f (%f/%f) off=%f/%f", baseInfo.x, baseInfo.y, baseInfo.width, baseInfo.height, baseInfo.xoff, baseInfo.yoff);
+//      qDebug("---> positionCluster: cluster from %d to %d", gfrom, glast);
+//     qDebug("baseInfo: %f/%f (%f/%f) off=%f/%f", baseInfo.x, baseInfo.y, baseInfo.width, baseInfo.height, baseInfo.xoff, baseInfo.yoff);
 
     int size = (f->ascent()/10);
     int offsetBase = (size - 4) / 4 + QMIN(size, 4) + 1;
-//     tqDebug("offset = %f", offsetBase);
+//     qDebug("offset = %f", offsetBase);
 
     bool rightToLeft = item->flags & QTextEngine::RightToLeft;
 
@@ -152,7 +152,7 @@ static inline void positionCluster(QShaperItem *item, int gfrom,  int glast)
         QPoint p;
         glyph_metrics_t markInfo = f->boundingBox(mark);
         QRect markRect(markInfo.x, markInfo.y, markInfo.width, markInfo.height);
-//          tqDebug("markInfo: %f/%f (%f/%f) off=%f/%f", markInfo.x, markInfo.y, markInfo.width, markInfo.height, markInfo.xoff, markInfo.yoff);
+//          qDebug("markInfo: %f/%f (%f/%f) off=%f/%f", markInfo.x, markInfo.y, markInfo.width, markInfo.height, markInfo.xoff, markInfo.yoff);
 
         int offset = offsetBase;
         unsigned char cmb = item->attributes[gfrom+i].combiningClass;
@@ -192,7 +192,7 @@ static inline void positionCluster(QShaperItem *item, int gfrom,  int glast)
 
         // combining marks of different class don't interact. Reset the rectangle.
         if (cmb != lastCmb) {
-            //tqDebug("resetting rect");
+            //qDebug("resetting rect");
             attachmentRect = baseRect;
         }
 
@@ -246,7 +246,7 @@ static inline void positionCluster(QShaperItem *item, int gfrom,  int glast)
             default:
                 break;
         }
-//         tqDebug("char=%x combiningClass = %d offset=%d/%d", mark, cmb, p.x(), p.y());
+//         qDebug("char=%x combiningClass = %d offset=%d/%d", mark, cmb, p.x(), p.y());
         markRect.moveBy(p.x(), p.y());
         attachmentRect |= markRect;
         lastCmb = cmb;
@@ -287,7 +287,7 @@ static void heuristicSetGlyphAttributes(QShaperItem *item, const QChar *uc, int
     // justification is missing here!!!!!
 
     if ( item->num_glyphs != length )
-       tqWarning("QScriptEngine::heuristicSetGlyphAttributes: char length and num glyphs disagree" );
+       qWarning("QScriptEngine::heuristicSetGlyphAttributes: char length and num glyphs disagree" );
 
     unsigned short *logClusters = item->log_clusters;
 
@@ -899,7 +899,7 @@ struct QArabicProperties {
 
 static void getArabicProperties(const unsigned short *chars, int len, QArabicProperties *properties)
 {
-//     tqDebug("arabicSyriacOpenTypeShape: properties:");
+//     qDebug("arabicSyriacOpenTypeShape: properties:");
     int lastPos = 0;
     int lastGroup = ArabicNone;
 
@@ -1005,7 +1005,7 @@ static void getArabicProperties(const unsigned short *chars, int len, QArabicPro
 
 
 //     for (int i = 0; i < len; ++i)
-//         tqDebug("arabic properties(%d): uc=%x shape=%d, justification=%d", i, chars[i], properties[i].shape, properties[i].justification);
+//         qDebug("arabic properties(%d): uc=%x shape=%d, justification=%d", i, chars[i], properties[i].shape, properties[i].justification);
 }
 
 
@@ -1326,7 +1326,7 @@ static inline int getShape(uchar cell, int shape)
 */
 static inline const QChar prevChar(const QString *str, int pos)
 {
-    //tqDebug("leftChar: pos=%d", pos);
+    //qDebug("leftChar: pos=%d", pos);
     pos--;
     const QChar *ch = str->unicode() + pos;
     while(pos > -1) {
@@ -1344,7 +1344,7 @@ static inline const QChar nextChar(const QString *str, int pos)
     int len = str->length();
     const QChar *ch = str->unicode() + pos;
     while(pos < len) {
-        //tqDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining());
+        //qDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining());
         if(::category(*ch) != QChar::Mark_NonSpacing)
             return *ch;
         // assume it's a transparent char, this might not be 100% correct
@@ -1402,7 +1402,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe
             uchar c = ch->cell();
             int pos = i + from;
             int shape = properties[i].shape;
-//            tqDebug("mapping U+%x to shape %d glyph=0x%x", ch->unicode(), shape, getShape(c, shape));
+//            qDebug("mapping U+%x to shape %d glyph=0x%x", ch->unicode(), shape, getShape(c, shape));
             // take care of lam-alef ligatures (lam right of alef)
             ushort map;
             switch (c) {
@@ -1414,7 +1414,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe
                             case 0x23:
                             case 0x25:
                             case 0x27:
-//                                 tqDebug(" lam of lam-alef ligature");
+//                                 qDebug(" lam of lam-alef ligature");
                                 map = arabicUnicodeLamAlefMapping[pch.cell() - 0x22][shape];
                                 goto next;
                             default:
@@ -1429,7 +1429,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe
                 case 0x27: // alef
                     if (prevChar(uc, pos).unicode() == 0x0644) {
                         // have a lam alef ligature
-                        //tqDebug(" alef of lam-alef ligature");
+                        //qDebug(" alef of lam-alef ligature");
                         goto skip;
                     }
                 default:
@@ -1443,7 +1443,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe
         //attributes[gpos].zeroWidth = zeroWidth;
         if (::category(*ch) == QChar::Mark_NonSpacing) {
             attributes[gpos].mark = TRUE;
-//             tqDebug("glyph %d (char %d) is mark!", gpos, i);
+//             qDebug("glyph %d (char %d) is mark!", gpos, i);
         } else {
             attributes[gpos].mark = FALSE;
             clusterStart = data - shapeBuffer;
@@ -1451,7 +1451,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe
         attributes[gpos].clusterStart = !attributes[gpos].mark;
         attributes[gpos].combiningClass = combiningClass(*ch);
         attributes[gpos].justification = properties[i].justification;
-//         tqDebug("data[%d] = %x (from %x)", gpos, (uint)data->unicode(), ch->unicode());
+//         qDebug("data[%d] = %x (from %x)", gpos, (uint)data->unicode(), ch->unicode());
         data++;
     skip:
         ch++;
diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/qscriptengine_x11.cpp
index 842c390..7d2b77d 100644
--- a/src/kernel/qscriptengine_x11.cpp
+++ b/src/kernel/qscriptengine_x11.cpp
@@ -1124,7 +1124,7 @@ static const unsigned short split_matras[]  = {
 static inline void splitMatra(unsigned short *reordered, int matra, int &len, int &base)
 {
     unsigned short matra_uc = reordered[matra];
-    //tqDebug("matra=%d, reordered[matra]=%x", matra, reordered[matra]);
+    //qDebug("matra=%d, reordered[matra]=%x", matra, reordered[matra]);
 
     const unsigned short *split = split_matras;
     while (split[0] < matra_uc)
@@ -1189,9 +1189,9 @@ static const QOpenType::Features indic_features[] = {
 
 // #define INDIC_DEBUG
 #ifdef INDIC_DEBUG
-#define IDEBUG tqDebug
+#define IDEBUG qDebug
 #else
-#define IDEBUG if(0) tqDebug
+#define IDEBUG if(0) qDebug
 #endif
 
 #ifdef INDIC_DEBUG
@@ -1665,7 +1665,7 @@ static bool indic_shape_syllable(QOpenType *openType, QShaperItem *item, bool in
         {
             IDEBUG("OT properties:");
             for (int i = 0; i < len; ++i)
-                tqDebug("    i: %s", ::propertiesToString(properties[i]).toLatin1().data());
+                qDebug("    i: %s", ::propertiesToString(properties[i]).toLatin1().data());
         }
 #endif
 
@@ -1678,14 +1678,14 @@ static bool indic_shape_syllable(QOpenType *openType, QShaperItem *item, bool in
 
         // move the left matra back to it's correct position in malayalam and tamil
         if ((script == QFont::Malayalam || script == QFont::Tamil) && (form(reordered[0]) == Matra)) {
-//             tqDebug("reordering matra, len=%d", newLen);
+//             qDebug("reordering matra, len=%d", newLen);
             // need to find the base in the shaped string and move the matra there
             int basePos = 0;
             while (basePos < newLen && (int)otl_glyphs[basePos].cluster <= base)
                 basePos++;
             --basePos;
             if (basePos < newLen && basePos > 1) {
-//                 tqDebug("moving prebase matra to position %d in syllable newlen=%d", basePos, newLen);
+//                 qDebug("moving prebase matra to position %d in syllable newlen=%d", basePos, newLen);
                 OTL_GlyphItemRec m = otl_glyphs[0];
                 --basePos;
                 for (i = 0; i < basePos; ++i)
@@ -2092,7 +2092,7 @@ static int tibetan_nextSyllableBoundary(const QString &s, int start, int end, bo
     int pos = 0;
     TibetanForm state = tibetan_form(*uc);
 
-//     tqDebug("state[%d]=%d (uc=%4x)", pos, state, uc[pos].unicode());
+//     qDebug("state[%d]=%d (uc=%4x)", pos, state, uc[pos].unicode());
     pos++;
 
     if (state != TibetanHeadConsonant) {
@@ -2473,9 +2473,9 @@ static const signed char khmerStateTable[][CC_COUNT] =
 
 //  #define KHMER_DEBUG
 #ifdef KHMER_DEBUG
-#define KHDEBUG tqDebug
+#define KHDEBUG qDebug
 #else
-#define KHDEBUG if(0) tqDebug
+#define KHDEBUG if(0) qDebug
 #endif
 
 //  Given an input string of characters and a location in which to start looking
@@ -2551,9 +2551,9 @@ static bool khmer_shape_syllable(QOpenType *openType, QShaperItem *item)
     memset(properties, 0, 16*sizeof(unsigned char));
 
 #ifdef KHMER_DEBUG
-    tqDebug("original:");
+    qDebug("original:");
     for (int i = from; i < syllableEnd; i++) {
-        tqDebug("    %d: %4x", i, string[i].unicode());
+        qDebug("    %d: %4x", i, string[i].unicode());
     }
 #endif
 
@@ -3001,9 +3001,9 @@ static const signed char mymrStateTable[][Mymr_CC_COUNT] =
 
 // #define MYANMAR_DEBUG
 #ifdef MYANMAR_DEBUG
-#define MMDEBUG tqDebug
+#define MMDEBUG qDebug
 #else
-#define MMDEBUG if(0) tqDebug
+#define MMDEBUG if(0) qDebug
 #endif
 
 //  Given an input string of characters and a location in which to start looking
@@ -3082,9 +3082,9 @@ static bool myanmar_shape_syllable(QOpenType *openType, QShaperItem *item, bool
 
     const QChar *uc = item->string->unicode() + item->from;
 #ifdef MYANMAR_DEBUG
-    tqDebug("original:");
+    qDebug("original:");
     for (int i = 0; i < item->length; i++) {
-        tqDebug("    %d: %4x", i, uc[i].unicode());
+        qDebug("    %d: %4x", i, uc[i].unicode());
     }
 #endif
     int vowel_e = -1;
diff --git a/src/kernel/qsize.cpp b/src/kernel/qsize.cpp
index 868c38a..8dc25e4 100644
--- a/src/kernel/qsize.cpp
+++ b/src/kernel/qsize.cpp
@@ -381,7 +381,7 @@ void QSize::scale( const QSize &s, ScaleMode mode )
 void QSize::warningDivByZero()
 {
 #if defined(QT_CHECK_MATH)
-    tqWarning( "QSize: Division by zero error" );
+    qWarning( "QSize: Division by zero error" );
 #endif
 }
 
diff --git a/src/kernel/qsocketnotifier.cpp b/src/kernel/qsocketnotifier.cpp
index 2749b75..a5cdbbd 100644
--- a/src/kernel/qsocketnotifier.cpp
+++ b/src/kernel/qsocketnotifier.cpp
@@ -146,10 +146,10 @@ QSocketNotifier::QSocketNotifier( int socket, Type type, QObject *parent,
 {
 #if defined(QT_CHECK_RANGE)
     if ( socket < 0 )
-	tqWarning( "QSocketNotifier: Invalid socket specified" );
+	qWarning( "QSocketNotifier: Invalid socket specified" );
 #  if defined(Q_OS_UNIX)
     if ( socket >= FD_SETSIZE )
-	tqWarning( "QSocketNotifier: Socket descriptor too large for select()" );
+	qWarning( "QSocketNotifier: Socket descriptor too large for select()" );
 #  endif
 #endif
     sockfd = socket;
diff --git a/src/kernel/qtextengine.cpp b/src/kernel/qtextengine.cpp
index 421a709..5f00fb7 100644
--- a/src/kernel/qtextengine.cpp
+++ b/src/kernel/qtextengine.cpp
@@ -157,7 +157,7 @@ static void qAppendItems(QTextEngine *engine, int &start, int &stop, BidiControl
 
     if ( start > stop ) {
 	// #### the algorithm is currently not really safe against this. Still needs fixing.
-// 	tqWarning( "Bidi: appendItems() internal error" );
+// 	qWarning( "Bidi: appendItems() internal error" );
 	return;
     }
 
@@ -177,7 +177,7 @@ static void qAppendItems(QTextEngine *engine, int &start, int &stop, BidiControl
     }
 
 #if (BIDI_DEBUG >= 1)
-    tqDebug("new run: dir=%s from %d, to %d level = %d\n", directions[dir], start, stop, level);
+    qDebug("new run: dir=%s from %d, to %d level = %d\n", directions[dir], start, stop, level);
 #endif
     QFont::Script script = QFont::NoScript;
     QScriptItem item;
@@ -279,8 +279,8 @@ static void bidiItemize( QTextEngine *engine, bool rightToLeft, int mode )
     status.last = status.lastStrong;
     status.dir = sdir;
 #if (BIDI_DEBUG >= 2)
-    tqDebug("---- bidiReorder --- '%s'", engine->string.utf8().data());
-    tqDebug("rightToLeft = %d", rightToLeft);
+    qDebug("---- bidiReorder --- '%s'", engine->string.utf8().data());
+    qDebug("rightToLeft = %d", rightToLeft);
 #endif
 
 
@@ -861,7 +861,7 @@ static void calcLineBreaks(const QString &str, QCharAttributes *charAttributes)
 		softBreak = (cls == QUnicodeTables::LineBreak_SP);
 	    else
 		softBreak = (brk == Dbk);
-//        tqDebug("char = %c %04x, cls=%d, ncls=%d, brk=%d soft=%d", uc[i].cell(), uc[i].unicode(), cls, ncls, brk, charAttributes[i].softBreak);
+//        qDebug("char = %c %04x, cls=%d, ncls=%d, brk=%d soft=%d", uc[i].cell(), uc[i].unicode(), cls, ncls, brk, charAttributes[i].softBreak);
 	    charAttributes[i].softBreak = softBreak;
 	    charAttributes[i].whiteSpace = FALSE;
 	    charAttributes[i].charStop = TRUE;
@@ -1044,7 +1044,7 @@ void QTextEngine::splitItem( int item, int pos )
 	oldItem.width = w;
     }
 
-//     tqDebug("split at position %d itempos=%d", pos, item );
+//     qDebug("split at position %d itempos=%d", pos, item );
 }
 
 
@@ -1052,12 +1052,12 @@ int QTextEngine::width( int from, int len ) const
 {
     int w = 0;
 
-//     tqDebug("QTextEngine::width( from = %d, len = %d ), numItems=%d, strleng=%d", from,  len, items.size(), string.length() );
+//     qDebug("QTextEngine::width( from = %d, len = %d ), numItems=%d, strleng=%d", from,  len, items.size(), string.length() );
     for ( int i = 0; i < items.size(); i++ ) {
 	QScriptItem *si = &items[i];
 	int pos = si->position;
 	int ilen = length( i );
-//  	tqDebug("item %d: from %d len %d", i, pos, ilen );
+//  	qDebug("item %d: from %d len %d", i, pos, ilen );
 	if ( pos >= from + len )
 	    break;
 	if ( pos + ilen > from ) {
@@ -1089,13 +1089,13 @@ int QTextEngine::width( int from, int len ) const
 		    charEnd++;
 		glyphEnd = (charEnd == ilen) ? si->num_glyphs : logClusters[charEnd];
 
-// 		tqDebug("char: start=%d end=%d / glyph: start = %d, end = %d", charFrom, charEnd, glyphStart, glyphEnd );
+// 		qDebug("char: start=%d end=%d / glyph: start = %d, end = %d", charFrom, charEnd, glyphStart, glyphEnd );
 		for ( int i = glyphStart; i < glyphEnd; i++ )
 		    w += advances[i];
 	    }
 	}
     }
-//     tqDebug("   --> w= %d ", w );
+//     qDebug("   --> w= %d ", w );
     return w;
 }
 
diff --git a/src/kernel/qtextengine_unix.cpp b/src/kernel/qtextengine_unix.cpp
index bfa7a7e..64d0a77 100644
--- a/src/kernel/qtextengine_unix.cpp
+++ b/src/kernel/qtextengine_unix.cpp
@@ -96,10 +96,10 @@ void QTextEngine::shape( int item ) const
         shaper_item.has_positioning = FALSE;
 
         while (1) {
-//         tqDebug("    . num_glyphs=%d, used=%d, item.num_glyphs=%d", num_glyphs, used, shaper_item.num_glyphs);
+//         qDebug("    . num_glyphs=%d, used=%d, item.num_glyphs=%d", num_glyphs, used, shaper_item.num_glyphs);
             ensureSpace(shaper_item.num_glyphs);
             shaper_item.num_glyphs = num_glyphs - used;
-//          tqDebug("    .. num_glyphs=%d, used=%d, item.num_glyphs=%d", num_glyphs, used, shaper_item.num_glyphs);
+//          qDebug("    .. num_glyphs=%d, used=%d, item.num_glyphs=%d", num_glyphs, used, shaper_item.num_glyphs);
             shaper_item.glyphs = glyphs(&si);
             shaper_item.advances = advances(&si);
             shaper_item.offsets = offsets(&si);
@@ -118,7 +118,7 @@ void QTextEngine::shape( int item ) const
     advance_t *advances = this->advances( &si );
     advance_t *end = advances + si.num_glyphs;
     while ( advances < end ) {
-//         tqDebug("advances[%d] = %d", advances - this->advances(&si), *advances);
+//         qDebug("advances[%d] = %d", advances - this->advances(&si), *advances);
 	si.width += *(advances++);
     }
 
diff --git a/src/kernel/qtextlayout.cpp b/src/kernel/qtextlayout.cpp
index 3bda5d2..5f677a0 100644
--- a/src/kernel/qtextlayout.cpp
+++ b/src/kernel/qtextlayout.cpp
@@ -134,7 +134,7 @@ int QTextItem::cursorToX( int *cPos, Edge edge ) const
 	for ( int i = 0; i < glyph_pos; i++ )
 	    x += advances[i];
     }
-//     tqDebug("cursorToX: pos=%d, gpos=%d x=%d", pos, glyph_pos, x );
+//     qDebug("cursorToX: pos=%d, gpos=%d x=%d", pos, glyph_pos, x );
     *cPos = pos;
     return x;
 }
@@ -174,7 +174,7 @@ int QTextItem::xToCursor( int x, CursorPosition cpos ) const
 	    cp_after = i;
 	    for ( int j = lastCluster; j < newCluster; j++ )
 		x_after += advances[j];
-	    // 		tqDebug("cluster boundary: lastCluster=%d, newCluster=%d, x_before=%d, x_after=%d",
+	    // 		qDebug("cluster boundary: lastCluster=%d, newCluster=%d, x_before=%d, x_after=%d",
 	    // 		       lastCluster, newCluster, x_before, x_after );
 	    if ( x_after > x )
 		break;
@@ -184,7 +184,7 @@ int QTextItem::xToCursor( int x, CursorPosition cpos ) const
 
     bool before = ( cpos == OnCharacters || (x - x_before) < (x_after - x) );
 
-//     tqDebug("got cursor position for %d: %d/%d, x_ba=%d/%d using %d",
+//     qDebug("got cursor position for %d: %d/%d, x_ba=%d/%d using %d",
 // 	   x, cp_before,cp_after,  x_before, x_after,  before ? cp_before : cp_after );
 
     return before ? cp_before : cp_after;
@@ -355,7 +355,7 @@ QTextLayout::Result QTextLayout::addCurrentItem()
     QScriptItem &current = d->items[d->currentItem];
     d->shape( d->currentItem );
     d->widthUsed += current.width;
-//     tqDebug("trying to add item %d with width %d, remaining %d", d->currentItem, current.width, d->lineWidth-d->widthUsed );
+//     qDebug("trying to add item %d with width %d, remaining %d", d->currentItem, current.width, d->lineWidth-d->widthUsed );
 
     d->currentItem++;
 
@@ -376,7 +376,7 @@ QTextLayout::Result QTextLayout::endLine( int x, int y, int alignment,
     int i;
     QTextLayout::Result result = LineEmpty;
 
-//    tqDebug("endLine x=%d, y=%d, first=%d, current=%d lw=%d wu=%d", x,  y, d->firstItemInLine, d->currentItem, d->lineWidth, d->widthUsed );
+//    qDebug("endLine x=%d, y=%d, first=%d, current=%d lw=%d wu=%d", x,  y, d->firstItemInLine, d->currentItem, d->lineWidth, d->widthUsed );
     int width_nobreak_found = d->widthUsed;
     if ( d->firstItemInLine == -1 )
 	goto end;
@@ -428,21 +428,21 @@ QTextLayout::Result QTextLayout::endLine( int x, int y, int alignment,
 		int lastGlyph = 0;
 		int tmpItemWidth = 0;
 
-//     		tqDebug("looking for break in item %d, isSpace=%d", i, si->isSpace );
+//     		qDebug("looking for break in item %d, isSpace=%d", i, si->isSpace );
 		if(si->isSpace && !(alignment & (Qt::SingleLine|Qt::IncludeTrailingSpaces))) {
 		    swidth += si->width;
 		} else {
 		    tmpWidth += swidth;
 		    swidth = 0;
 		    for ( int pos = 0; pos < length; pos++ ) {
-//  			tqDebug("advance=%d, w=%d, tmpWidth=%d, softbreak=%d, whitespace=%d",
+//  			qDebug("advance=%d, w=%d, tmpWidth=%d, softbreak=%d, whitespace=%d",
 //                                *advances, w, tmpWidth, itemAttrs->softBreak, itemAttrs->whiteSpace );
 			int glyph = logClusters[pos];
 			if ( lastGlyph != glyph ) {
 			    while ( lastGlyph < glyph )
 				tmpItemWidth += advances[lastGlyph++];
 			    if ( breakPosition != -1 && w + tmpWidth + tmpItemWidth > d->lineWidth ) {
-// 				tqDebug("found break at w=%d, tmpWidth=%d, tmpItemWidth=%d", w, tmpWidth, tmpItemWidth);
+// 				qDebug("found break at w=%d, tmpWidth=%d, tmpItemWidth=%d", w, tmpWidth, tmpItemWidth);
 				d->widthUsed = w;
 				goto found;
 			    }
@@ -456,7 +456,7 @@ QTextLayout::Result QTextLayout::endLine( int x, int y, int alignment,
 				breakany = FALSE;
 			    breakItem = i;
 			    breakPosition = pos;
-//     			    tqDebug("found possible break at item %d, position %d (absolute=%d), w=%d, tmpWidth=%d, tmpItemWidth=%d", breakItem, breakPosition, d->items[breakItem].position+breakPosition, w, tmpWidth, tmpItemWidth);
+//     			    qDebug("found possible break at item %d, position %d (absolute=%d), w=%d, tmpWidth=%d, tmpItemWidth=%d", breakItem, breakPosition, d->items[breakItem].position+breakPosition, w, tmpWidth, tmpItemWidth);
 			    w += tmpWidth + tmpItemWidth;
 			    itemWidth += tmpItemWidth;
 			    tmpWidth = 0;
@@ -482,12 +482,12 @@ QTextLayout::Result QTextLayout::endLine( int x, int y, int alignment,
 	    goto nobreak;
         }
 
-//   	tqDebug("linebreak at item %d, position %d, wu=%d", breakItem, breakPosition, d->widthUsed );
+//   	qDebug("linebreak at item %d, position %d, wu=%d", breakItem, breakPosition, d->widthUsed );
 	// split the line
 	if ( breakPosition > 0 ) {
 // 	    int length = d->length( breakItem );
 
-//   	    tqDebug("splitting item, itemWidth=%d", itemWidth);
+//   	    qDebug("splitting item, itemWidth=%d", itemWidth);
 	    // not a full item, need to break
 	    d->splitItem( breakItem, breakPosition );
 	    d->currentItem = breakItem+1;
@@ -508,10 +508,10 @@ QTextLayout::Result QTextLayout::endLine( int x, int y, int alignment,
 	visual = new int[numRuns];
     }
 
-//     tqDebug("reordering %d runs, numSpaceItems=%d", numRuns, numSpaceItems );
+//     qDebug("reordering %d runs, numSpaceItems=%d", numRuns, numSpaceItems );
     for ( i = 0; i < numRuns; i++ ) {
 	levels[i] = d->items[i+d->firstItemInLine].analysis.bidiLevel;
-// 	tqDebug("    level = %d", d->items[i+d->firstItemInLine].analysis.bidiLevel );
+// 	qDebug("    level = %d", d->items[i+d->firstItemInLine].analysis.bidiLevel );
     }
     d->bidiReorder( numRuns, levels, visual );
 
@@ -541,7 +541,7 @@ QTextLayout::Result QTextLayout::endLine( int x, int y, int alignment,
     int left = x;
     for ( i = 0; i < numRuns; i++ ) {
 	QScriptItem &si = d->items[d->firstItemInLine+visual[i]];
-//  	tqDebug("positioning item %d with width %d (from=%d/length=%d) at %d", d->firstItemInLine+visual[i], si.width, si.position,
+//  	qDebug("positioning item %d with width %d (from=%d/length=%d) at %d", d->firstItemInLine+visual[i], si.width, si.position,
 // 	       d->length(d->firstItemInLine+visual[i]), x );
 	si.x = x;
 	si.y = y + asc;
@@ -593,7 +593,7 @@ void QTextLayout::endLayout()
 
 int QTextLayout::nextCursorPosition( int oldPos, CursorMode mode ) const
 {
-//     tqDebug("looking for next cursor pos for %d", oldPos );
+//     qDebug("looking for next cursor pos for %d", oldPos );
     const QCharAttributes *attributes = d->attributes();
     int len = d->string.length();
     if ( oldPos >= len )
@@ -606,13 +606,13 @@ int QTextLayout::nextCursorPosition( int oldPos, CursorMode mode ) const
 	while ( oldPos < len && !attributes[oldPos].wordStop && !attributes[oldPos-1].whiteSpace )
 	    oldPos++;
     }
-//     tqDebug("  -> %d",  oldPos );
+//     qDebug("  -> %d",  oldPos );
     return oldPos;
 }
 
 int QTextLayout::previousCursorPosition( int oldPos, CursorMode mode ) const
 {
-//     tqDebug("looking for previous cursor pos for %d", oldPos );
+//     qDebug("looking for previous cursor pos for %d", oldPos );
     const QCharAttributes *attributes = d->attributes();
     if ( oldPos <= 0 )
 	return 0;
@@ -624,7 +624,7 @@ int QTextLayout::previousCursorPosition( int oldPos, CursorMode mode ) const
 	while ( oldPos && !attributes[oldPos].wordStop && !attributes[oldPos-1].whiteSpace )
 	    oldPos--;
     }
-//     tqDebug("  -> %d",  oldPos );
+//     qDebug("  -> %d",  oldPos );
     return oldPos;
 }
 
diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp
index 0cb8840..1653a51 100644
--- a/src/kernel/qthread.cpp
+++ b/src/kernel/qthread.cpp
@@ -80,7 +80,7 @@
     {
 	for( int count = 0; count < 20; count++ ) {
 	    sleep( 1 );
-	    tqDebug( "Ping!" );
+	    qDebug( "Ping!" );
 	}
     }
 
@@ -166,7 +166,7 @@ QThread::~QThread()
     QMutexLocker locker( d->mutex() );
     if ( d->running && !d->finished ) {
 #ifdef QT_CHECK_STATE
-	tqWarning("QThread object destroyed while thread is still running.");
+	qWarning("QThread object destroyed while thread is still running.");
 #endif
 
 	d->orphan = TRUE;
diff --git a/src/kernel/qthread_unix.cpp b/src/kernel/qthread_unix.cpp
index b8c3f0d..e4d6625 100644
--- a/src/kernel/qthread_unix.cpp
+++ b/src/kernel/qthread_unix.cpp
@@ -131,7 +131,7 @@ void QThreadInstance::finish( void * )
 
     if ( ! d ) {
 #ifdef QT_CHECK_STATE
-	tqWarning( "QThread: internal error: zero data for running thread." );
+	qWarning( "QThread: internal error: zero data for running thread." );
 #endif // QT_CHECK_STATE
 	return;
     }
@@ -328,7 +328,7 @@ void QThread::start(Priority priority)
 	    if (pthread_attr_getschedpolicy(&attr, &sched_policy) != 0) {
                 // failed to get the scheduling policy, don't bother
                 // setting the priority
-                tqWarning("QThread: cannot determine default scheduler policy");
+                qWarning("QThread: cannot determine default scheduler policy");
                 break;
 	    }
 
@@ -337,7 +337,7 @@ void QThread::start(Priority priority)
             if (prio_min == -1 || prio_max == -1) {
                 // failed to get the scheduling parameters, don't
                 // bother setting the priority
-                tqWarning("QThread: cannot determine scheduler priority range");
+                qWarning("QThread: cannot determine scheduler priority range");
                 break;
             }
 
@@ -378,7 +378,7 @@ void QThread::start(Priority priority)
 
 	if ( ret ) {
 #ifdef QT_CHECK_STATE
-	    tqWarning( "QThread::start: thread stack size error: %s", strerror( ret ) ) ;
+	    qWarning( "QThread::start: thread stack size error: %s", strerror( ret ) ) ;
 #endif // QT_CHECK_STATE
 
 	    // we failed to set the stacksize, and as the documentation states,
@@ -402,7 +402,7 @@ void QThread::start(Priority priority)
 
     if ( ret ) {
 #ifdef QT_CHECK_STATE
-	tqWarning( "QThread::start: thread creation error: %s", strerror( ret ) );
+	qWarning( "QThread::start: thread creation error: %s", strerror( ret ) );
 #endif // QT_CHECK_STATE
 
 	d->running = FALSE;
@@ -439,7 +439,7 @@ bool QThread::wait( unsigned long time )
 
     if ( d->thread_id == pthread_self() ) {
 #ifdef QT_CHECK_STATE
-	tqWarning( "QThread::wait: thread tried to wait on itself" );
+	qWarning( "QThread::wait: thread tried to wait on itself" );
 #endif // QT_CHECK_STATE
 
 	return FALSE;
@@ -464,7 +464,7 @@ bool QThread::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
 
     return (ret == 0);
diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp
index ffa7e54..c748425 100644
--- a/src/kernel/qtimer.cpp
+++ b/src/kernel/qtimer.cpp
@@ -246,7 +246,7 @@ static void sst_init()
     if ( !sst_list ) {
 	sst_list = new QObjectList;
 	Q_CHECK_PTR( sst_list );
-	tqAddPostRoutine( sst_cleanup );
+	qAddPostRoutine( sst_cleanup );
     }
 }
 
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index 55749e2..ca160f9 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -492,13 +492,13 @@ bool QTranslator::load( const QString & filename, const QString & directory,
 
     f = qt_open( QFile::encodeName(realname), O_RDONLY, 0666 );
     if ( f < 0 ) {
-	// tqDebug( "can't open %s: %s", realname.ascii(), strerror( errno ) );
+	// qDebug( "can't open %s: %s", realname.ascii(), strerror( errno ) );
 	return FALSE;
     }
 
     struct stat st;
     if ( fstat( f, &st ) ) {
-	// tqDebug( "can't stat %s: %s", realname.ascii(), strerror( errno ) );
+	// qDebug( "can't stat %s: %s", realname.ascii(), strerror( errno ) );
 	return FALSE;
     }
     char * tmp;
@@ -507,7 +507,7 @@ bool QTranslator::load( const QString & filename, const QString & directory,
 		       MAP_FILE | MAP_PRIVATE, // swap-backed map from file
 		       f, 0 ); // from offset 0 of f
     if ( !tmp || tmp == (char*)MAP_FAILED ) {
-	// tqDebug( "can't mmap %s: %s", filename.ascii(), strerror( errno ) );
+	// qDebug( "can't mmap %s: %s", filename.ascii(), strerror( errno ) );
 	return FALSE;
     }
 
@@ -845,7 +845,7 @@ void QTranslator::squeeze( SaveMode mode )
 	delete [] hTable;
 
 	if ( upto > 131072 ) {
-	    tqWarning( "QTranslator::squeeze: Too many contexts" );
+	    qWarning( "QTranslator::squeeze: Too many contexts" );
 	    delete d->contextArray;
 	    d->contextArray = 0;
 	}
@@ -1029,7 +1029,7 @@ QTranslatorMessage QTranslator::findMessage( const char* context,
 	return QTranslatorMessage();
 
     if ( systemWordSize == 0 )
-	tqSysInfo( &systemWordSize, &systemBigEndian );
+	qSysInfo( &systemWordSize, &systemBigEndian );
 
     for ( ;; ) {
 	Q_UINT32 h = elfHash( QCString(sourceText) + comment );
diff --git a/src/kernel/qurl.cpp b/src/kernel/qurl.cpp
index b717f2a..fd377ad 100644
--- a/src/kernel/qurl.cpp
+++ b/src/kernel/qurl.cpp
@@ -849,15 +849,15 @@ bool QUrl::parse( const QString& url )
     d->cleanPathDirty = TRUE;
 
 #if 0
-    tqDebug( "URL: %s", url.latin1() );
-    tqDebug( "protocol: %s", d->protocol.latin1() );
-    tqDebug( "user: %s", d->user.latin1() );
-    tqDebug( "pass: %s", d->pass.latin1() );
-    tqDebug( "host: %s", d->host.latin1() );
-    tqDebug( "path: %s", path().latin1() );
-    tqDebug( "ref: %s", d->refEncoded.latin1() );
-    tqDebug( "query: %s", d->queryEncoded.latin1() );
-    tqDebug( "port: %d\n\n----------------------------\n\n", d->port );
+    qDebug( "URL: %s", url.latin1() );
+    qDebug( "protocol: %s", d->protocol.latin1() );
+    qDebug( "user: %s", d->user.latin1() );
+    qDebug( "pass: %s", d->pass.latin1() );
+    qDebug( "host: %s", d->host.latin1() );
+    qDebug( "path: %s", path().latin1() );
+    qDebug( "ref: %s", d->refEncoded.latin1() );
+    qDebug( "query: %s", d->queryEncoded.latin1() );
+    qDebug( "port: %d\n\n----------------------------\n\n", d->port );
 #endif
 
     return TRUE;
diff --git a/src/kernel/qurloperator.cpp b/src/kernel/qurloperator.cpp
index 902f915..1e1b666 100644
--- a/src/kernel/qurloperator.cpp
+++ b/src/kernel/qurloperator.cpp
@@ -122,7 +122,7 @@ public:
 
     A QUrlOperator can be used like this, for example to download a
     file (and assuming that the FTP protocol is \link
-    tqInitNetworkProtocols() registered\endlink):
+    qInitNetworkProtocols() registered\endlink):
     \code
     QUrlOperator *op = new QUrlOperator();
     op->copy( QString("ftp://ftp.trolltech.com/qt/source/qt-2.1.0.tar.gz"),
@@ -148,7 +148,7 @@ public:
     handling deals with this problem.
 
     To register the available network protocols, use the
-    tqInitNetworkProtocols() function. The protocols currently
+    qInitNetworkProtocols() function. The protocols currently
     supported are:
     \list
     \i \link QFtp FTP\endlink,
@@ -293,7 +293,7 @@ QUrlOperator::QUrlOperator()
     : QUrl()
 {
 #ifdef QURLOPERATOR_DEBUG
-    tqDebug( "QUrlOperator: cstr 1" );
+    qDebug( "QUrlOperator: cstr 1" );
 #endif
     d = new QUrlOperatorPrivate;
 }
@@ -309,7 +309,7 @@ QUrlOperator::QUrlOperator( const QString &url )
     : QUrl( url )
 {
 #ifdef QURLOPERATOR_DEBUG
-    tqDebug( "QUrlOperator: cstr 2" );
+    qDebug( "QUrlOperator: cstr 2" );
 #endif
     d = new QUrlOperatorPrivate;
     getNetworkProtocol();
@@ -323,7 +323,7 @@ QUrlOperator::QUrlOperator( const QUrlOperator& url )
     : QObject(), QUrl( url )
 {
 #ifdef QURLOPERATOR_DEBUG
-    tqDebug( "QUrlOperator: cstr 3" );
+    qDebug( "QUrlOperator: cstr 3" );
 #endif
     d = new QUrlOperatorPrivate;
     *d = *url.d;
@@ -345,7 +345,7 @@ QUrlOperator::QUrlOperator( const QUrlOperator& url, const QString& relUrl, bool
     : QUrl( url, relUrl, checkSlash )
 {
 #ifdef QURLOPERATOR_DEBUG
-    tqDebug( "QUrlOperator: cstr 4" );
+    qDebug( "QUrlOperator: cstr 4" );
 #endif
     d = new QUrlOperatorPrivate;
     if ( relUrl == "." )
@@ -363,7 +363,7 @@ QUrlOperator::QUrlOperator( const QUrlOperator& url, const QString& relUrl, bool
 QUrlOperator::~QUrlOperator()
 {
 #ifdef QURLOPERATOR_DEBUG
-    tqDebug( "QUrlOperator: dstr" );
+    qDebug( "QUrlOperator: dstr" );
 #endif
     delete d;
 }
@@ -570,7 +570,7 @@ const QNetworkOperation *QUrlOperator::rename( const QString &oldname, const QSt
 QPtrList<QNetworkOperation> QUrlOperator::copy( const QString &from, const QString &to, bool move, bool toPath )
 {
 #ifdef QURLOPERATOR_DEBUG
-    tqDebug( "QUrlOperator: copy %s %s %d", from.latin1(), to.latin1(), move );
+    qDebug( "QUrlOperator: copy %s %s %d", from.latin1(), to.latin1(), move );
 #endif
 
     QPtrList<QNetworkOperation> ops;
@@ -644,7 +644,7 @@ QPtrList<QNetworkOperation> QUrlOperator::copy( const QString &from, const QStri
 	    gProt->setAutoDelete( TRUE );
 	}
 #ifdef QURLOPERATOR_DEBUG
-	tqDebug( "QUrlOperator: copy operation should start now..." );
+	qDebug( "QUrlOperator: copy operation should start now..." );
 #endif
 	return ops;
     } else {
@@ -1063,7 +1063,7 @@ bool QUrlOperator::checkValid()
 void QUrlOperator::copyGotData( const QByteArray &data_, QNetworkOperation *op )
 {
 #ifdef QURLOPERATOR_DEBUG
-    tqDebug( "QUrlOperator: copyGotData: %d new bytes", data_.size() );
+    qDebug( "QUrlOperator: copyGotData: %d new bytes", data_.size() );
 #endif
     QNetworkOperation *put = d->getOpPutOpMap[ (void*)op ];
     if ( put ) {
@@ -1089,7 +1089,7 @@ void QUrlOperator::continueCopy( QNetworkOperation *op )
 
 #ifdef QURLOPERATOR_DEBUG
     if ( op->state() != QNetworkProtocol::StFailed ) {
-	tqDebug( "QUrlOperator: continue copy (get finished, put will start)" );
+	qDebug( "QUrlOperator: continue copy (get finished, put will start)" );
     }
 #endif
 
@@ -1134,7 +1134,7 @@ void QUrlOperator::continueCopy( QNetworkOperation *op )
 void QUrlOperator::finishedCopy()
 {
 #ifdef QURLOPERATOR_DEBUG
-    tqDebug( "QUrlOperator: finished copy (finished putting)" );
+    qDebug( "QUrlOperator: finished copy (finished putting)" );
 #endif
 
     if ( d->waitingCopies.isEmpty() )
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 2125585..c9ea5b1 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -408,7 +408,7 @@ void QVariant::Private::clear()
     QDataStream in(...);      // (opening the previously written stream)
     in >> v;                  // Reads an Int variant
     int z = v.toInt();        // z = 123
-    tqDebug("Type is %s",      // prints "Type is int"
+    qDebug("Type is %s",      // prints "Type is int"
 	    v.typeName());
     v.asInt() += 100;	      // The variant now hold the value 223.
     v = QVariant( QStringList() );
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index d0243bb..28328b8 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -882,7 +882,7 @@ QWidget::QWidget( QWidget *parent, const char *name, WFlags f, NFlags n )
 {
 #if defined(QT_CHECK_STATE) && !defined(Q_WS_WIN)
     if ( qApp->type() == QApplication::Tty ) {
-	tqWarning( "QWidget: Cannot create a QWidget when no GUI "
+	qWarning( "QWidget: Cannot create a QWidget when no GUI "
 		  "is being used" );
     }
 #endif
@@ -954,7 +954,7 @@ QWidget::~QWidget()
 {
 #if defined (QT_CHECK_STATE)
     if ( paintingActive() )
-	tqWarning( "%s (%s): deleted while being painted", className(), name() );
+	qWarning( "%s (%s): deleted while being painted", className(), name() );
 #endif
 
     // Remove myself and all children from the can-take-focus list
@@ -2671,7 +2671,7 @@ void QWidget::setBackgroundMode( BackgroundMode m, BackgroundMode visual )
 	setBackgroundEmpty();
     } else if ( m == FixedColor || m == FixedPixmap ) {
 #if defined(QT_DEBUG)
-	tqWarning( "QWidget::setBackgroundMode: FixedColor or FixedPixmap makes"
+	qWarning( "QWidget::setBackgroundMode: FixedColor or FixedPixmap makes"
 		  " no sense" );
 #endif
 	return;
@@ -3181,7 +3181,7 @@ void QWidget::setFocusProxy( QWidget * w )
     for ( QWidget* fp  = w; fp; fp = fp->focusProxy() ) {
 	if ( fp == this ) {
 #if defined (QT_CHECK_STATE)
-	    tqWarning( "%s (%s): already in focus proxy chain", className(), name() );
+	    qWarning( "%s (%s): already in focus proxy chain", className(), name() );
 #endif
 	    return;
 	}
diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
index 754ee9e..775829c 100644
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
@@ -1250,7 +1250,7 @@ qstring_to_xtp( const QString& s )
 					     tl, 1, XStdICCTextStyle, &tp );
 #if defined(QT_DEBUG)
 	if ( errCode < 0 )
-	    tqDebug( "qstring_to_xtp result code %d", errCode );
+	    qDebug( "qstring_to_xtp result code %d", errCode );
 #endif
     }
     if ( !mapper || errCode < 0 ) {
@@ -1422,7 +1422,7 @@ void QWidget::grabMouse()
 		status == GrabFrozen      ? "\"GrabFrozen\"" :
 		status == GrabInvalidTime ? "\"GrabInvalidTime\"" :
 		"<?>";
-	    tqWarning( "Grabbing the mouse failed with %s", s );
+	    qWarning( "Grabbing the mouse failed with %s", s );
 	}
 #endif
 	mouseGrb = this;
@@ -1464,7 +1464,7 @@ void QWidget::grabMouse( const QCursor &cursor )
 		status == GrabFrozen      ? "\"GrabFrozen\"" :
 		status == GrabInvalidTime ? "\"GrabInvalidTime\"" :
 					    "<?>";
-	    tqWarning( "Grabbing the mouse failed with %s", s );
+	    qWarning( "Grabbing the mouse failed with %s", s );
 	}
 #endif
 	mouseGrb = this;
@@ -2215,7 +2215,7 @@ void QWidget::setMinimumSize( int minw, int minh )
 {
 #if defined(QT_CHECK_RANGE)
     if ( minw < 0 || minh < 0 )
-	tqWarning("QWidget::setMinimumSize: The smallest allowed size is (0,0)");
+	qWarning("QWidget::setMinimumSize: The smallest allowed size is (0,0)");
 #endif
     createExtra();
     if ( extra->minw == minw && extra->minh == minh )
@@ -2244,7 +2244,7 @@ void QWidget::setMaximumSize( int maxw, int maxh )
 {
 #if defined(QT_CHECK_RANGE)
     if ( maxw > QWIDGETSIZE_MAX || maxh > QWIDGETSIZE_MAX ) {
-	tqWarning("QWidget::setMaximumSize: (%s/%s) "
+	qWarning("QWidget::setMaximumSize: (%s/%s) "
 		"The largest allowed size is (%d,%d)",
 		 name( "unnamed" ), className(), QWIDGETSIZE_MAX,
 		QWIDGETSIZE_MAX );
@@ -2252,7 +2252,7 @@ void QWidget::setMaximumSize( int maxw, int maxh )
 	maxh = QMIN( maxh, QWIDGETSIZE_MAX );
     }
     if ( maxw < 0 || maxh < 0 ) {
-	tqWarning("QWidget::setMaximumSize: (%s/%s) Negative sizes (%d,%d) "
+	qWarning("QWidget::setMaximumSize: (%s/%s) Negative sizes (%d,%d) "
 		"are not possible",
 		name( "unnamed" ), className(), maxw, maxh );
 	maxw = QMAX( maxw, 0 );
@@ -2546,7 +2546,7 @@ int QWidget::metric( int m ) const
 	    default:
 		val = 0;
 #if defined(QT_CHECK_RANGE)
-		tqWarning( "QWidget::metric: Invalid metric command" );
+		qWarning( "QWidget::metric: Invalid metric command" );
 #endif
 	}
     }
@@ -2800,7 +2800,7 @@ void QWidget::updateFrameStrut() const
 	    XFree(c);
 
 	if (! p) {
-	    tqWarning("QWidget::updateFrameStrut(): ERROR - no parent");
+	    qWarning("QWidget::updateFrameStrut(): ERROR - no parent");
 	    return;
 	}
 
diff --git a/src/kernel/qwindowdefs.h b/src/kernel/qwindowdefs.h
index f54e68a..05a3a33 100644
--- a/src/kernel/qwindowdefs.h
+++ b/src/kernel/qwindowdefs.h
@@ -185,8 +185,8 @@ Q_EXPORT const char *qAppName();		// get application name
 // Misc functions
 
 typedef void (*QtCleanUpFunction)();
-Q_EXPORT void tqAddPostRoutine( QtCleanUpFunction );
-Q_EXPORT void tqRemovePostRoutine( QtCleanUpFunction );
+Q_EXPORT void qAddPostRoutine( QtCleanUpFunction );
+Q_EXPORT void qRemovePostRoutine( QtCleanUpFunction );
 
 #if !defined(QT_CLEAN_NAMESPACE)
 // source compatibility with Qt 2.x
diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp
index c01c118..aaefddd 100644
--- a/src/kernel/qwmatrix.cpp
+++ b/src/kernel/qwmatrix.cpp
@@ -702,8 +702,8 @@ QPointArray QWMatrix::mapToPolygon( const QRect &rect ) const
 #if 0
     int i;
     for( i = 0; i< 4; i++ )
-	tqDebug("coords(%d) = (%f/%f) (%d/%d)", i, x[i], y[i], qRound(x[i]), qRound(y[i]) );
-    tqDebug( "width=%f, height=%f", sqrt( (x[1]-x[0])*(x[1]-x[0]) + (y[1]-y[0])*(y[1]-y[0]) ),
+	qDebug("coords(%d) = (%f/%f) (%d/%d)", i, x[i], y[i], qRound(x[i]), qRound(y[i]) );
+    qDebug( "width=%f, height=%f", sqrt( (x[1]-x[0])*(x[1]-x[0]) + (y[1]-y[0])*(y[1]-y[0]) ),
 	    sqrt( (x[0]-x[3])*(x[0]-x[3]) + (y[0]-y[3])*(y[0]-y[3]) ) );
 #endif
     // all coordinates are correctly, tranform to a pointarray
diff --git a/src/moc/moc.l b/src/moc/moc.l
index f49af5e..f032fd0 100644
--- a/src/moc/moc.l
+++ b/src/moc/moc.l
@@ -264,13 +264,13 @@ STRING		{ALMOSTSTRING}\"
 
 <QT_DEF>[_a-zA-Z][_a-zA-Z0-9]* {
 			  X;
-			  yylval.string = tqstrdup(yytext);
+			  yylval.string = qstrdup(yytext);
 			  return IDENTIFIER;
 			}
 
 <IN_PROPERTY>[_a-zA-Z][_a-zA-Z0-9]* {
 			  X;
-			  yylval.string = tqstrdup(yytext);
+			  yylval.string = qstrdup(yytext);
 			  return IDENTIFIER;
 			}
 
@@ -280,7 +280,7 @@ STRING		{ALMOSTSTRING}\"
 
 <IN_CLASSINFO>{ALMOSTSTRING} {
 			  X;
-			  yylval.string = tqstrdup( yytext + 1 );
+			  yylval.string = qstrdup( yytext + 1 );
 			  input();		/* discard the '"' */
 			  return STRING;
 			}
@@ -317,7 +317,7 @@ STRING		{ALMOSTSTRING}\"
 
 <QT_DEF>{ALMOSTSTRING} {
 			  X;
-			  yylval.string = tqstrdup( yytext + 1 );
+			  yylval.string = qstrdup( yytext + 1 );
 			  input();		/* discard the '"' */
 			  return STRING;
 			}
diff --git a/src/moc/moc_lex.cpp b/src/moc/moc_lex.cpp
index 1786cbb..bef27ad 100644
--- a/src/moc/moc_lex.cpp
+++ b/src/moc/moc_lex.cpp
@@ -1827,7 +1827,7 @@ YY_RULE_SETUP
 #line 262 "moc.l"
 {
 			  X;
-			  yylval.string = tqstrdup(yytext);
+			  yylval.string = qstrdup(yytext);
 			  return IDENTIFIER;
 			}
 	YY_BREAK
@@ -1836,7 +1836,7 @@ YY_RULE_SETUP
 #line 268 "moc.l"
 {
 			  X;
-			  yylval.string = tqstrdup(yytext);
+			  yylval.string = qstrdup(yytext);
 			  return IDENTIFIER;
 			}
 	YY_BREAK
@@ -1861,7 +1861,7 @@ YY_RULE_SETUP
 #line 278 "moc.l"
 {
 			  X;
-			  yylval.string = tqstrdup( yytext + 1 );
+			  yylval.string = qstrdup( yytext + 1 );
 			  input();		/* discard the '"' */
 			  return STRING;
 			}
@@ -1932,7 +1932,7 @@ YY_RULE_SETUP
 #line 315 "moc.l"
 {
 			  X;
-			  yylval.string = tqstrdup( yytext + 1 );
+			  yylval.string = qstrdup( yytext + 1 );
 			  input();		/* discard the '"' */
 			  return STRING;
 			}
diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp
index 45937fe..3cc4d76 100644
--- a/src/network/qdns.cpp
+++ b/src/network/qdns.cpp
@@ -411,7 +411,7 @@ void QDnsAnswer::parseA()
 {
     if ( next != pp + 4 ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "QDns: saw %d bytes long IN A for %s",
+	qDebug( "QDns: saw %d bytes long IN A for %s",
 		next - pp, label.ascii() );
 #endif
 	return;
@@ -424,7 +424,7 @@ void QDnsAnswer::parseA()
 				( answer[pp+2] <<  8 ) +
 				( answer[pp+3] ) );
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns: saw %s IN A %s (ttl %d)", label.ascii(),
+    qDebug( "QDns: saw %s IN A %s (ttl %d)", label.ascii(),
 	    rr->address.toString().ascii(), ttl );
 #endif
 }
@@ -434,7 +434,7 @@ void QDnsAnswer::parseAaaa()
 {
     if ( next != pp + 16 ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "QDns: saw %d bytes long IN Aaaa for %s",
+	qDebug( "QDns: saw %d bytes long IN Aaaa for %s",
 		next - pp, label.ascii() );
 #endif
 	return;
@@ -444,7 +444,7 @@ void QDnsAnswer::parseAaaa()
     rr->t = QDns::Aaaa;
     rr->address = QHostAddress( answer+pp );
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns: saw %s IN Aaaa %s (ttl %d)", label.ascii(),
+    qDebug( "QDns: saw %s IN Aaaa %s (ttl %d)", label.ascii(),
 	    rr->address.toString().ascii(), ttl );
 #endif
 }
@@ -455,7 +455,7 @@ void QDnsAnswer::parseMx()
 {
     if ( next < pp + 2 ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "QDns: saw %d bytes long IN MX for %s",
+	qDebug( "QDns: saw %d bytes long IN MX for %s",
 		next - pp, label.ascii() );
 #endif
 	return;
@@ -467,13 +467,13 @@ void QDnsAnswer::parseMx()
     rr->target = readString().lower();
     if ( !ok ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "QDns: saw bad string in MX for %s", label.ascii() );
+	qDebug( "QDns: saw bad string in MX for %s", label.ascii() );
 #endif
 	return;
     }
     rr->t = QDns::Mx;
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns: saw %s IN MX %d %s (ttl %d)", label.ascii(),
+    qDebug( "QDns: saw %s IN MX %d %s (ttl %d)", label.ascii(),
 	    rr->priority, rr->target.ascii(), ttl );
 #endif
 }
@@ -483,7 +483,7 @@ void QDnsAnswer::parseSrv()
 {
     if ( next < pp + 6 ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "QDns: saw %d bytes long IN SRV for %s",
+	qDebug( "QDns: saw %d bytes long IN SRV for %s",
 		next - pp, label.ascii() );
 #endif
 	return;
@@ -497,13 +497,13 @@ void QDnsAnswer::parseSrv()
     rr->target = readString().lower();
     if ( !ok ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "QDns: saw bad string in SRV for %s", label.ascii() );
+	qDebug( "QDns: saw bad string in SRV for %s", label.ascii() );
 #endif
 	return;
     }
     rr->t = QDns::Srv;
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns: saw %s IN SRV %d %d %d %s (ttl %d)", label.ascii(),
+    qDebug( "QDns: saw %s IN SRV %d %d %d %s (ttl %d)", label.ascii(),
 	    rr->priority, rr->weight, rr->port, rr->target.ascii(), ttl );
 #endif
 }
@@ -514,7 +514,7 @@ void QDnsAnswer::parseCname()
     QString target = readString().lower();
     if ( !ok ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "QDns: saw bad cname for for %s", label.ascii() );
+	qDebug( "QDns: saw bad cname for for %s", label.ascii() );
 #endif
 	return;
     }
@@ -523,7 +523,7 @@ void QDnsAnswer::parseCname()
     rr->t = QDns::Cname;
     rr->target = target;
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns: saw %s IN CNAME %s (ttl %d)", label.ascii(),
+    qDebug( "QDns: saw %s IN CNAME %s (ttl %d)", label.ascii(),
 	    rr->target.ascii(), ttl );
 #endif
 }
@@ -534,7 +534,7 @@ void QDnsAnswer::parseNs()
     QString target = readString().lower();
     if ( !ok ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "QDns: saw bad cname for for %s", label.ascii() );
+	qDebug( "QDns: saw bad cname for for %s", label.ascii() );
 #endif
 	return;
     }
@@ -542,7 +542,7 @@ void QDnsAnswer::parseNs()
     // parse, but ignore
 
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns: saw %s IN NS %s (ttl %d)", label.ascii(),
+    qDebug( "QDns: saw %s IN NS %s (ttl %d)", label.ascii(),
 	    target.ascii(), ttl );
 #endif
 }
@@ -553,7 +553,7 @@ void QDnsAnswer::parsePtr()
     QString target = readString().lower();
     if ( !ok ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "QDns: saw bad PTR for for %s", label.ascii() );
+	qDebug( "QDns: saw bad PTR for for %s", label.ascii() );
 #endif
 	return;
     }
@@ -562,7 +562,7 @@ void QDnsAnswer::parsePtr()
     rr->t = QDns::Ptr;
     rr->target = target;
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns: saw %s IN PTR %s (ttl %d)", label.ascii(),
+    qDebug( "QDns: saw %s IN PTR %s (ttl %d)", label.ascii(),
 	    rr->target.ascii(), ttl );
 #endif
 }
@@ -573,7 +573,7 @@ void QDnsAnswer::parseTxt()
     QString text = readString(FALSE);
     if ( !ok ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "QDns: saw bad TXT for for %s", label.ascii() );
+	qDebug( "QDns: saw bad TXT for for %s", label.ascii() );
 #endif
 	return;
     }
@@ -582,7 +582,7 @@ void QDnsAnswer::parseTxt()
     rr->t = QDns::Txt;
     rr->text = text;
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns: saw %s IN TXT \"%s\" (ttl %d)", label.ascii(),
+    qDebug( "QDns: saw %s IN TXT \"%s\" (ttl %d)", label.ascii(),
 	    rr->text.ascii(), ttl );
 #endif
 }
@@ -593,7 +593,7 @@ void QDnsAnswer::parse()
     // okay, do the work...
     if ( (answer[2] & 0x78) != 0 ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "DNS Manager: answer to wrong query type (%d)", answer[1] );
+	qDebug( "DNS Manager: answer to wrong query type (%d)", answer[1] );
 #endif
 	ok = FALSE;
 	return;
@@ -605,7 +605,7 @@ void QDnsAnswer::parse()
     // TC
     if ( (answer[2] & 2) != 0 ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "DNS Manager: truncated answer; pressing on" );
+	qDebug( "DNS Manager: truncated answer; pressing on" );
 #endif
     }
 
@@ -617,7 +617,7 @@ void QDnsAnswer::parse()
 
     if ( (answer[3] & 0x0f) == 3 ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "DNS Manager: saw NXDomain for %s", query->l.ascii() );
+	qDebug( "DNS Manager: saw NXDomain for %s", query->l.ascii() );
 #endif
 	// NXDomain.  cache that for one minute.
 	rr = new QDnsRR( query->l );
@@ -632,7 +632,7 @@ void QDnsAnswer::parse()
 
     if ( (answer[3] & 0x0f) != 0 ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "DNS Manager: error code %d", answer[3] & 0x0f );
+	qDebug( "DNS Manager: error code %d", answer[3] & 0x0f );
 #endif
 	ok = FALSE;
 	return;
@@ -671,7 +671,7 @@ void QDnsAnswer::parse()
 	    rdlength = ( answer[pp+8] << 8 ) + answer[pp+9];
 	if ( pp + 10 + rdlength > size ) {
 #if defined(QDNS_DEBUG)
-	    tqDebug( "DNS Manager: ran out of stuff to parse (%d+%d>%d (%d)",
+	    qDebug( "DNS Manager: ran out of stuff to parse (%d+%d>%d (%d)",
 		    pp, rdlength, size, rrno < ancount );
 #endif
 	    // if we're still in the AN section, we should go back and
@@ -689,7 +689,7 @@ void QDnsAnswer::parse()
 	pp = pp + 10;
 	if ( clas != 1 ) {
 #if defined(QDNS_DEBUG)
-	    tqDebug( "DNS Manager: class %d (not internet) for %s",
+	    qDebug( "DNS Manager: class %d (not internet) for %s",
 		    clas, label.isNull() ? "." : label.ascii() );
 #endif
 	} else {
@@ -723,7 +723,7 @@ void QDnsAnswer::parse()
 	    default:
 		// something we don't know
 #if defined(QDNS_DEBUG)
-		tqDebug( "DNS Manager: type %d for %s", type,
+		qDebug( "DNS Manager: type %d for %s", type,
 			label.isNull() ? "." : label.ascii() );
 #endif
 		break;
@@ -750,7 +750,7 @@ void QDnsAnswer::parse()
     }
     if ( answers == 0 ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "DNS Manager: answer contained no answers" );
+	qDebug( "DNS Manager: answer contained no answers" );
 #endif
 	ok = ( aa && rd );
     }
@@ -790,7 +790,7 @@ void QDnsAnswer::parse()
 		    // well, it's equal, but it's not the same. so we kill it,
 		    // but use its expiry time.
 #if defined(QDNS_DEBUG)
-		    tqDebug( "killing off old %d for %s, expire was %d",
+		    qDebug( "killing off old %d for %s, expire was %d",
                             older->t, older->domain->name().latin1(),
                             rr->expireTime );
 #endif
@@ -799,7 +799,7 @@ void QDnsAnswer::parse()
 		    rr->deleteTime = QMAX( older->deleteTime, rr->deleteTime );
 		    older->deleteTime = 0;
 #if defined(QDNS_DEBUG)
-		    tqDebug( "    adjusted expire is %d", rr->expireTime );
+		    qDebug( "    adjusted expire is %d", rr->expireTime );
 #endif
 		}
 		drrs->next();
@@ -808,7 +808,7 @@ void QDnsAnswer::parse()
     }
 
 #if defined(QDNS_DEBUG)
-    //tqDebug( "DNS Manager: ()" );
+    //qDebug( "DNS Manager: ()" );
 #endif
 }
 
@@ -836,7 +836,7 @@ void QDnsAnswer::notify()
 	    notified.insert( (void*)dns, (void*)42 );
 	    if ( rrs->count() == 0 ) {
 #if defined(QDNS_DEBUG)
-		tqDebug( "DNS Manager: found no answers!" );
+		qDebug( "DNS Manager: found no answers!" );
 #endif
 		dns->d->noNames = TRUE;
 		((QDnsUgleHack*)dns)->ugle( TRUE );
@@ -846,7 +846,7 @@ void QDnsAnswer::notify()
 		    ((QDnsUgleHack*)dns)->ugle();
 #if defined(QDNS_DEBUG)
 		else
-		    tqDebug( "DNS Manager: DNS thing %s not notified for %s",
+		    qDebug( "DNS Manager: DNS thing %s not notified for %s",
 			    dns->label().ascii(), query->l.ascii() );
 #endif
 	    }
@@ -902,7 +902,7 @@ static void cleanupDns()
 QDnsManager * QDnsManager::manager()
 {
     if ( !globalManager ) {
-        tqAddPostRoutine(cleanupDns);
+        qAddPostRoutine(cleanupDns);
 	new QDnsManager();
     }
     return globalManager;
@@ -913,7 +913,7 @@ void QDnsUgleHack::ugle( bool emitAnyway)
 {
     if ( emitAnyway || !isWorking() ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "DNS Manager: status change for %s (type %d)",
+	qDebug( "DNS Manager: status change for %s (type %d)",
 		label().ascii(), recordType() );
 #endif
 	emit resultsReady();
@@ -977,9 +977,9 @@ QDnsManager::QDnsManager()
 	if ( !ns->current() ) {
 	    ns->append( new QHostAddress(*h) );
 #if defined(QDNS_DEBUG)
-	    tqDebug( "using name server %s", h->toString().latin1() );
+	    qDebug( "using name server %s", h->toString().latin1() );
 	} else {
-	    tqDebug( "skipping address %s", h->toString().latin1() );
+	    qDebug( "skipping address %s", h->toString().latin1() );
 #endif
 	}
 	::ns->next();
@@ -1000,9 +1000,9 @@ QDnsManager::QDnsManager()
 	if ( !domains->current() ) {
 	    domains->append( s );
 #if defined(QDNS_DEBUG)
-	    tqDebug( "searching domain %s", s );
+	    qDebug( "searching domain %s", s );
 	} else {
-	    tqDebug( "skipping domain %s", s );
+	    qDebug( "skipping domain %s", s );
 #endif
 	}
 	::domains->next();
@@ -1035,7 +1035,7 @@ void QDnsManager::cleanCache()
     QDnsDomain * d;
     Q_UINT32 thisSweep = now();
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDnsManager::cleanCache(: Called, time is %u, last was %u",
+    qDebug( "QDnsManager::cleanCache(: Called, time is %u, last was %u",
 	   thisSweep, lastSweep );
 #endif
 
@@ -1079,12 +1079,12 @@ void QDnsManager::answer()
 #endif
 #if defined(QDNS_DEBUG)
 #if !defined (QT_NO_IPV6)
-    tqDebug("DNS Manager: answer arrived: %d bytes from %s:%d", r,
+    qDebug("DNS Manager: answer arrived: %d bytes from %s:%d", r,
 	   useIpv4Socket ? ipv4Socket->peerAddress().toString().ascii()
 	   : ipv6Socket->peerAddress().toString().ascii(),
 	   useIpv4Socket ? ipv4Socket->peerPort() : ipv6Socket->peerPort() );
 #else
-    tqDebug("DNS Manager: answer arrived: %d bytes from %s:%d", r,
+    qDebug("DNS Manager: answer arrived: %d bytes from %s:%d", r,
            ipv4Socket->peerAddress().toString().ascii(), ipv4Socket->peerPort());;
 #endif
 #endif
@@ -1101,7 +1101,7 @@ void QDnsManager::answer()
 	i++;
     if ( i == queries.size() ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "DNS Manager: bad id (0x%04x) %d", aid, i );
+	qDebug( "DNS Manager: bad id (0x%04x) %d", aid, i );
 #endif
 	return;
     }
@@ -1110,7 +1110,7 @@ void QDnsManager::answer()
 
     if ( ( (Q_UINT8)(a[2]) & 0x80 ) == 0 ) {
 #if defined(QDNS_DEBUG)
-	tqDebug( "DNS Manager: received a query" );
+	qDebug( "DNS Manager: received a query" );
 #endif
 	return;
     }
@@ -1159,7 +1159,7 @@ void QDnsManager::transmitQuery( int i )
 	// and then get rid of the query
 	queries.take( i );
 #if defined(QDNS_DEBUG)
-	tqDebug( "DNS Manager: giving up on query 0x%04x", q->id );
+	qDebug( "DNS Manager: giving up on query 0x%04x", q->id );
 #endif
 	delete q;
 	QTimer::singleShot( 0, QDnsManager::manager(), SLOT(cleanCache()) );
@@ -1255,7 +1255,7 @@ void QDnsManager::transmitQuery( int i )
 	// and then get rid of the query
 	queries.take( i );
 #if defined(QDNS_DEBUG)
-	tqDebug( "DNS Manager: no DNS server found on query 0x%04x", q->id );
+	qDebug( "DNS Manager: no DNS server found on query 0x%04x", q->id );
 #endif
 	delete q;
 	QTimer::singleShot( 1000*10, QDnsManager::manager(), SLOT(cleanCache()) );
@@ -1271,7 +1271,7 @@ void QDnsManager::transmitQuery( int i )
 	ipv6Socket->writeBlock( p.data(), pp, receiver, 53 );
 #endif
 #if defined(QDNS_DEBUG)
-    tqDebug( "issuing query 0x%04x (%d) about %s type %d to %s",
+    qDebug( "issuing query 0x%04x (%d) about %s type %d to %s",
 	    q->id, q->step, q->l.ascii(), q->t,
 	    ns->at( q->step % ns->count() )->toString().ascii() );
 #endif
@@ -1289,7 +1289,7 @@ void QDnsManager::transmitQuery( int i )
 		ipv6Socket->writeBlock( p.data(), pp, *server, 53 );
 #endif
 #if defined(QDNS_DEBUG)
-	    tqDebug( "copying query to %s", server->toString().ascii() );
+	    qDebug( "copying query to %s", server->toString().ascii() );
 #endif
 	}
     }
@@ -1408,12 +1408,12 @@ QPtrList<QDnsRR> * QDnsDomain::cached( const QDns * r )
 	QString s = *it++;
 	nxdomain = FALSE;
 #if defined(QDNS_DEBUG)
-	tqDebug( "looking at cache for %s (%s %d)",
+	qDebug( "looking at cache for %s (%s %d)",
 		s.ascii(), r->label().ascii(), r->recordType() );
 #endif
 	QDnsDomain * d = m->domain( s );
 #if defined(QDNS_DEBUG)
-	tqDebug( " - found %d RRs", d && d->rrs ? d->rrs->count() : 0 );
+	qDebug( " - found %d RRs", d && d->rrs ? d->rrs->count() : 0 );
 #endif
 	if ( d->rrs )
 	    d->rrs->first();
@@ -1425,7 +1425,7 @@ QPtrList<QDnsRR> * QDnsDomain::cached( const QDns * r )
 		// cname.  if the code is ugly, that may just
 		// possibly be because the concept is.
 #if defined(QDNS_DEBUG)
-		tqDebug( "found cname from %s to %s",
+		qDebug( "found cname from %s to %s",
 			r->label().ascii(), rr->target.ascii() );
 #endif
 		s = rr->target;
@@ -1472,11 +1472,11 @@ QPtrList<QDnsRR> * QDnsDomain::cached( const QDns * r )
 	// if we found a positive result, return quickly
 	if ( answer && l->count() ) {
 #if defined(QDNS_DEBUG)
-	    tqDebug( "found %d records for %s",
+	    qDebug( "found %d records for %s",
 		    l->count(), r->label().ascii() );
 	    l->first();
 	    while( l->current() ) {
-		tqDebug( "  type %d target %s address %s",
+		qDebug( "  type %d target %s address %s",
 		       l->current()->t,
 		       l->current()->target.latin1(),
 		       l->current()->address.toString().latin1() );
@@ -1489,7 +1489,7 @@ QPtrList<QDnsRR> * QDnsDomain::cached( const QDns * r )
 
 #if defined(QDNS_DEBUG)
 	if ( nxdomain )
-	    tqDebug( "found NXDomain %s", s.ascii() );
+	    qDebug( "found NXDomain %s", s.ascii() );
 #endif
 
 	if ( !nxdomain ) {
@@ -1539,7 +1539,7 @@ void QDnsDomain::sweep( Q_UINT32 thisSweep )
 	    rr->deleteTime = thisSweep; // will hit next time around
 
 #if defined(QDNS_DEBUG)
-	tqDebug( "QDns::sweep: %s type %d expires %u %u - %s / %s",
+	qDebug( "QDns::sweep: %s type %d expires %u %u - %s / %s",
 	       rr->domain->name().latin1(), rr->t,
 	       rr->expireTime, rr->deleteTime,
 	       rr->target.latin1(), rr->address.toString().latin1());
@@ -1775,10 +1775,10 @@ void QDns::setLabel( const QString & label )
     setStartQueryTimer(); // start query the next time we enter event loop
 #endif
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns::setLabel: %d address(es) for %s", n.count(), l.ascii() );
+    qDebug( "QDns::setLabel: %d address(es) for %s", n.count(), l.ascii() );
     int i = 0;
     for( i = 0; i < (int)n.count(); i++ )
-	tqDebug( "QDns::setLabel: %d: %s", i, n[i].ascii() );
+	qDebug( "QDns::setLabel: %d: %s", i, n[i].ascii() );
 #endif
 }
 
@@ -1965,7 +1965,7 @@ QString QDns::toInAddrArpaDomain( const QHostAddress &address )
 bool QDns::isWorking() const
 {
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns::isWorking (%s, %d)", l.ascii(), t );
+    qDebug( "QDns::isWorking (%s, %d)", l.ascii(), t );
 #endif
     if ( t == None )
 	return FALSE;
@@ -2020,7 +2020,7 @@ bool QDns::isWorking() const
 QValueList<QHostAddress> QDns::addresses() const
 {
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns::addresses (%s)", l.ascii() );
+    qDebug( "QDns::addresses (%s)", l.ascii() );
 #endif
     QValueList<QHostAddress> result;
     if ( t != A && t != Aaaa )
@@ -2074,7 +2074,7 @@ QValueList<QHostAddress> QDns::addresses() const
 QValueList<QDns::MailServer> QDns::mailServers() const
 {
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns::mailServers (%s)", l.ascii() );
+    qDebug( "QDns::mailServers (%s)", l.ascii() );
 #endif
     QValueList<QDns::MailServer> result;
     if ( t != Mx )
@@ -2131,7 +2131,7 @@ QValueList<QDns::MailServer> QDns::mailServers() const
 QValueList<QDns::Server> QDns::servers() const
 {
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns::servers (%s)", l.ascii() );
+    qDebug( "QDns::servers (%s)", l.ascii() );
 #endif
     QValueList<QDns::Server> result;
     if ( t != Srv )
@@ -2170,7 +2170,7 @@ QValueList<QDns::Server> QDns::servers() const
 QStringList QDns::hostNames() const
 {
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns::hostNames (%s)", l.ascii() );
+    qDebug( "QDns::hostNames (%s)", l.ascii() );
 #endif
     QStringList result;
     if ( t != Ptr )
@@ -2208,7 +2208,7 @@ QStringList QDns::hostNames() const
 QStringList QDns::texts() const
 {
 #if defined(QDNS_DEBUG)
-    tqDebug( "QDns::texts (%s)", l.ascii() );
+    qDebug( "QDns::texts (%s)", l.ascii() );
 #endif
     QStringList result;
     if ( t != Txt )
@@ -2475,7 +2475,7 @@ void QDns::doResInit()
 	last = searchList.find( separator, first );
 	if ( last < 0 )
 	    last = searchList.length();
-	domains->append( tqstrdup( searchList.mid( first, last-first ) ) );
+	domains->append( qstrdup( searchList.mid( first, last-first ) ) );
 	first = last+1;
     } while( first < (int)searchList.length() );
 }
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp
index 55db3bd..0183a7a 100644
--- a/src/network/qftp.cpp
+++ b/src/network/qftp.cpp
@@ -325,7 +325,7 @@ void QFtpDTP::writeData()
 {
     if ( is_ba ) {
 #if defined(QFTPDTP_DEBUG)
-	tqDebug( "QFtpDTP::writeData: write %d bytes", data.ba->size() );
+	qDebug( "QFtpDTP::writeData: write %d bytes", data.ba->size() );
 #endif
 	if ( data.ba->size() == 0 )
 	    emit dataTransferProgress( 0, bytesTotal );
@@ -340,7 +340,7 @@ void QFtpDTP::writeData()
 	while ( !data.dev->atEnd() && socket.bytesToWrite()==0 ) {
 	    Q_LONG read = data.dev->readBlock( buf, blockSize );
 #if defined(QFTPDTP_DEBUG)
-	    tqDebug( "QFtpDTP::writeData: writeBlock() of size %d bytes", (int)read );
+	    qDebug( "QFtpDTP::writeData: writeBlock() of size %d bytes", (int)read );
 #endif
 	    socket.writeBlock( buf, read );
 	    if ( !data.dev )
@@ -375,7 +375,7 @@ inline void QFtpDTP::clearError()
 void QFtpDTP::abortConnection()
 {
 #if defined(QFTPDTP_DEBUG)
-    tqDebug( "QFtpDTP::abortConnection" );
+    qDebug( "QFtpDTP::abortConnection" );
 #endif
     callWriteData = FALSE;
     clearData();
@@ -526,7 +526,7 @@ void QFtpDTP::socketConnected()
 
     bytesDone = 0;
 #if defined(QFTPDTP_DEBUG)
-    tqDebug( "QFtpDTP::connectState( CsConnected )" );
+    qDebug( "QFtpDTP::connectState( CsConnected )" );
 #endif
     emit connectState( QFtpDTP::CsConnected );
 }
@@ -536,7 +536,7 @@ void QFtpDTP::socketReadyRead()
     if ( pi->currentCommand().isEmpty() ) {
 	socket.close();
 #if defined(QFTPDTP_DEBUG)
-	tqDebug( "QFtpDTP::connectState( CsClosed )" );
+	qDebug( "QFtpDTP::connectState( CsClosed )" );
 #endif
 	emit connectState( QFtpDTP::CsClosed );
 	return;
@@ -547,7 +547,7 @@ void QFtpDTP::socketReadyRead()
 	    QUrlInfo i;
 	    QString line = socket.readLine();
 #if defined(QFTPDTP_DEBUG)
-	    tqDebug( "QFtpDTP read (list): '%s'", line.latin1() );
+	    qDebug( "QFtpDTP read (list): '%s'", line.latin1() );
 #endif
 	    if ( parseDir( line, "", &i ) ) {
 		emit listInfo( i );
@@ -570,14 +570,14 @@ void QFtpDTP::socketReadyRead()
 	    ba.resize( bytesRead );
 	    bytesDone += bytesRead;
 #if defined(QFTPDTP_DEBUG)
-	    tqDebug( "QFtpDTP read: %d bytes (total %d bytes)", (int)bytesRead, bytesDone );
+	    qDebug( "QFtpDTP read: %d bytes (total %d bytes)", (int)bytesRead, bytesDone );
 #endif
 	    emit dataTransferProgress( bytesDone, bytesTotal );
             if (data.dev)       // make sure it wasn't deleted in the slot
                 data.dev->writeBlock( ba );
 	} else {
 #if defined(QFTPDTP_DEBUG)
-	    tqDebug( "QFtpDTP readyRead: %d bytes available (total %d bytes read)", (int)bytesAvailable(), bytesDone );
+	    qDebug( "QFtpDTP readyRead: %d bytes available (total %d bytes read)", (int)bytesAvailable(), bytesDone );
 #endif
 	    emit dataTransferProgress( bytesDone+socket.bytesAvailable(), bytesTotal );
 	    emit readyRead();
@@ -589,12 +589,12 @@ void QFtpDTP::socketError( int e )
 {
     if ( e == QSocket::ErrHostNotFound ) {
 #if defined(QFTPDTP_DEBUG)
-	tqDebug( "QFtpDTP::connectState( CsHostNotFound )" );
+	qDebug( "QFtpDTP::connectState( CsHostNotFound )" );
 #endif
 	emit connectState( QFtpDTP::CsHostNotFound );
     } else if ( e == QSocket::ErrConnectionRefused ) {
 #if defined(QFTPDTP_DEBUG)
-	tqDebug( "QFtpDTP::connectState( CsConnectionRefused )" );
+	qDebug( "QFtpDTP::connectState( CsConnectionRefused )" );
 #endif
 	emit connectState( QFtpDTP::CsConnectionRefused );
     }
@@ -606,7 +606,7 @@ void QFtpDTP::socketConnectionClosed()
 	clearData();
     }
 #if defined(QFTPDTP_DEBUG)
-    tqDebug( "QFtpDTP::connectState( CsClosed )" );
+    qDebug( "QFtpDTP::connectState( CsClosed )" );
 #endif
     emit connectState( QFtpDTP::CsClosed );
 }
@@ -615,7 +615,7 @@ void QFtpDTP::socketBytesWritten( int bytes )
 {
     bytesDone += bytes;
 #if defined(QFTPDTP_DEBUG)
-    tqDebug( "QFtpDTP::bytesWritten( %d )", bytesDone );
+    qDebug( "QFtpDTP::bytesWritten( %d )", bytesDone );
 #endif
     emit dataTransferProgress( bytesDone, bytesTotal );
     if ( callWriteData )
@@ -701,7 +701,7 @@ void QFtpPI::abort()
 
     abortState = AbortStarted;
 #if defined(QFTPPI_DEBUG)
-    tqDebug( "QFtpPI send: ABOR" );
+    qDebug( "QFtpPI send: ABOR" );
 #endif
     commandSocket.writeBlock( "ABOR\r\n", 6 );
 
@@ -718,7 +718,7 @@ void QFtpPI::connected()
 {
     state = Begin;
 #if defined(QFTPPI_DEBUG)
-//    tqDebug( "QFtpPI state: %d [connected()]", state );
+//    qDebug( "QFtpPI state: %d [connected()]", state );
 #endif
     emit connectState( QFtp::Connected );
 }
@@ -807,11 +807,11 @@ void QFtpPI::readyRead()
 bool QFtpPI::processReply()
 {
 #if defined(QFTPPI_DEBUG)
-//    tqDebug( "QFtpPI state: %d [processReply() begin]", state );
+//    qDebug( "QFtpPI state: %d [processReply() begin]", state );
     if ( replyText.length() < 400 )
-	tqDebug( "QFtpPI recv: %d %s", 100*replyCode[0]+10*replyCode[1]+replyCode[2], replyText.latin1() );
+	qDebug( "QFtpPI recv: %d %s", 100*replyCode[0]+10*replyCode[1]+replyCode[2], replyText.latin1() );
     else
-	tqDebug( "QFtpPI recv: %d (text skipped)", 100*replyCode[0]+10*replyCode[1]+replyCode[2] );
+	qDebug( "QFtpPI recv: %d (text skipped)", 100*replyCode[0]+10*replyCode[1]+replyCode[2] );
 #endif
 
     // process 226 replies ("Closing Data Connection") only when the data
@@ -861,7 +861,7 @@ bool QFtpPI::processReply()
 	    return TRUE;
     }
 #if defined(QFTPPI_DEBUG)
-//    tqDebug( "QFtpPI state: %d [processReply() intermediate]", state );
+//    qDebug( "QFtpPI state: %d [processReply() intermediate]", state );
 #endif
 
     // special actions on certain replies
@@ -878,7 +878,7 @@ bool QFtpPI::processReply()
 	QRegExp addrPortPattern("(\\d+),(\\d+),(\\d+),(\\d+),(\\d+),(\\d+)");
 	if (addrPortPattern.search(replyText) == -1) {
 #if defined(QFTPPI_DEBUG)
-	    tqDebug( "QFtp: bad 227 response -- address and port information missing" );
+	    qDebug( "QFtp: bad 227 response -- address and port information missing" );
 #endif
 	    // ### error handling
 	} else {
@@ -930,7 +930,7 @@ bool QFtpPI::processReply()
 	    break;
     }
 #if defined(QFTPPI_DEBUG)
-//    tqDebug( "QFtpPI state: %d [processReply() end]", state );
+//    qDebug( "QFtpPI state: %d [processReply() end]", state );
 #endif
     return TRUE;
 }
@@ -951,7 +951,7 @@ bool QFtpPI::startNextCmd()
 
 #if defined(QFTPPI_DEBUG)
     if ( state != Idle )
-	tqDebug( "QFtpPI startNextCmd: Internal error! QFtpPI called in non-Idle state %d", state );
+	qDebug( "QFtpPI startNextCmd: Internal error! QFtpPI called in non-Idle state %d", state );
 #endif
     if ( pendingCommands.isEmpty() ) {
 	currentCmd = QString::null;
@@ -961,7 +961,7 @@ bool QFtpPI::startNextCmd()
     currentCmd = pendingCommands.first();
     pendingCommands.pop_front();
 #if defined(QFTPPI_DEBUG)
-    tqDebug( "QFtpPI send: %s", currentCmd.left( currentCmd.length()-2 ).latin1() );
+    qDebug( "QFtpPI send: %s", currentCmd.left( currentCmd.length()-2 ).latin1() );
 #endif
     state = Waiting;
 #ifndef QT_NO_TEXTCODEC
@@ -1042,7 +1042,7 @@ static QFtpPrivate* d( const QFtp* foo )
     if ( !d_ptr ) {
 	d_ptr = new QPtrDict<QFtpPrivate>;
 	d_ptr->setAutoDelete( TRUE );
-	tqAddPostRoutine( cleanup_d_ptr );
+	qAddPostRoutine( cleanup_d_ptr );
     }
     QFtpPrivate* ret = d_ptr->find( (void*)foo );
     if ( ! ret ) {
@@ -1093,7 +1093,7 @@ static void delete_d( const QFtp* foo )
     \endcode
 
     This code will only work if the QFtp class is registered; to
-    register the class, you must call tqInitNetworkProtocols() before
+    register the class, you must call qInitNetworkProtocols() before
     using a QUrlOperator with QFtp.
 
     The rest of this descrption describes the direct interface to FTP.
diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp
index f5a77d7..b0a7ff5 100644
--- a/src/network/qhttp.cpp
+++ b/src/network/qhttp.cpp
@@ -1039,7 +1039,7 @@ QString QHttpRequestHeader::toString() const
     \endcode
 
     This code will only work if the QHttp class is registered; to
-    register the class, you must call tqInitNetworkProtocols() before
+    register the class, you must call qInitNetworkProtocols() before
     using a QUrlOperator with HTTP.
 
     The QNetworkProtocol interface for HTTP only supports the
@@ -1435,7 +1435,7 @@ void QHttp::abort()
 Q_ULONG QHttp::bytesAvailable() const
 {
 #if defined(QHTTP_DEBUG)
-    tqDebug( "QHttp::bytesAvailable(): %d bytes", (int)d->rba.size() );
+    qDebug( "QHttp::bytesAvailable(): %d bytes", (int)d->rba.size() );
 #endif
     return d->rba.size();
 }
@@ -1450,7 +1450,7 @@ Q_LONG QHttp::readBlock( char *data, Q_ULONG maxlen )
 {
     if ( data == 0 && maxlen != 0 ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QHttp::readBlock: Null pointer error" );
+	qWarning( "QHttp::readBlock: Null pointer error" );
 #endif
 	return -1;
     }
@@ -1460,7 +1460,7 @@ Q_LONG QHttp::readBlock( char *data, Q_ULONG maxlen )
 
     d->bytesDone += maxlen;
 #if defined(QHTTP_DEBUG)
-    tqDebug( "QHttp::readBlock(): read %d bytes (%d bytes done)", (int)maxlen, d->bytesDone );
+    qDebug( "QHttp::readBlock(): read %d bytes (%d bytes done)", (int)maxlen, d->bytesDone );
 #endif
     return maxlen;
 }
@@ -1880,7 +1880,7 @@ void QHttp::slotConnected()
     d->bytesTotal = str.length();
     d->socket.writeBlock( str.latin1(), d->bytesTotal );
 #if defined(QHTTP_DEBUG)
-    tqDebug( "QHttp: write request header:\n---{\n%s}---", str.latin1() );
+    qDebug( "QHttp: write request header:\n---{\n%s}---", str.latin1() );
 #endif
 
     if ( d->postDevice ) {
@@ -1927,7 +1927,7 @@ void QHttp::slotBytesWritten( int written )
 
 	int n = d->postDevice->readBlock( arr.data(), max );
 	if ( n != max ) {
-	    tqWarning("Could not read enough bytes from the device");
+	    qWarning("Could not read enough bytes from the device");
 	    close();
 	    return;
 	}
@@ -1965,12 +1965,12 @@ void QHttp::slotReadyRead()
 	    return;
 
 #if defined(QHTTP_DEBUG)
-	tqDebug( "QHttp: read response header:\n---{\n%s}---", d->headerStr.latin1() );
+	qDebug( "QHttp: read response header:\n---{\n%s}---", d->headerStr.latin1() );
 #endif
 	d->response = QHttpResponseHeader( d->headerStr );
 	d->headerStr = "";
 #if defined(QHTTP_DEBUG)
-	tqDebug( "QHttp: read response header:\n---{\n%s}---", d->response.toString().latin1() );
+	qDebug( "QHttp: read response header:\n---{\n%s}---", d->response.toString().latin1() );
 #endif
 	// Check header
 	if ( !d->response.isValid() ) {
@@ -2089,7 +2089,7 @@ void QHttp::slotReadyRead()
 		    delete arr;
 		    d->bytesDone += n;
 #if defined(QHTTP_DEBUG)
-		    tqDebug( "QHttp::slotReadyRead(): read %ld bytes (%d bytes done)", n, d->bytesDone );
+		    qDebug( "QHttp::slotReadyRead(): read %ld bytes (%d bytes done)", n, d->bytesDone );
 #endif
 		    if ( d->response.hasContentLength() )
 			emit dataReadProgress( d->bytesDone, d->response.contentLength() );
@@ -2098,7 +2098,7 @@ void QHttp::slotReadyRead()
 		} else {
 		    d->rba.append( arr );
 #if defined(QHTTP_DEBUG)
-		    tqDebug( "QHttp::slotReadyRead(): read %ld bytes (%ld bytes done)", n, d->bytesDone + bytesAvailable() );
+		    qDebug( "QHttp::slotReadyRead(): read %ld bytes (%ld bytes done)", n, d->bytesDone + bytesAvailable() );
 #endif
 		    if ( d->response.hasContentLength() )
 			emit dataReadProgress( d->bytesDone + bytesAvailable(), d->response.contentLength() );
@@ -2185,7 +2185,7 @@ void QHttp::killIdleTimer()
 void QHttp::setState( int s )
 {
 #if defined(QHTTP_DEBUG)
-    tqDebug( "QHttp state changed %d -> %d", d->state, s );
+    qDebug( "QHttp state changed %d -> %d", d->state, s );
 #endif
     d->state = (State)s;
     emit stateChanged( s );
diff --git a/src/network/qnetwork.cpp b/src/network/qnetwork.cpp
index 0c4275b..2d5ce00 100644
--- a/src/network/qnetwork.cpp
+++ b/src/network/qnetwork.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Implementation of tqInitNetworkProtocols function.
+** Implementation of qInitNetworkProtocols function.
 **
 ** Created : 970521
 **
@@ -58,7 +58,7 @@
 
     This function is declared in \l qnetwork.h.
 */
-void tqInitNetworkProtocols()
+void qInitNetworkProtocols()
 {
 #ifndef QT_NO_NETWORKPROTOCOL_FTP
     QNetworkProtocol::registerNetworkProtocol( "ftp", new QNetworkProtocolFactory< QFtp > );
diff --git a/src/network/qnetwork.h b/src/network/qnetwork.h
index 0fdc5b5..649c01e 100644
--- a/src/network/qnetwork.h
+++ b/src/network/qnetwork.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Definition of tqInitNetworkProtocols function.
+** Definition of qInitNetworkProtocols function.
 **
 ** Created : 970521
 **
@@ -53,7 +53,7 @@
 
 #ifndef QT_NO_NETWORK
 
-QM_EXPORT_NETWORK void tqInitNetworkProtocols();
+QM_EXPORT_NETWORK void qInitNetworkProtocols();
 
 #endif
 
diff --git a/src/network/qserversocket.cpp b/src/network/qserversocket.cpp
index e307c9b..3b3add9 100644
--- a/src/network/qserversocket.cpp
+++ b/src/network/qserversocket.cpp
@@ -176,7 +176,7 @@ void QServerSocket::init( const QHostAddress & address, Q_UINT16 port, int backl
 	connect( d->n, SIGNAL(activated(int)),
 		 this, SLOT(incomingConnection(int)) );
     } else {
-	tqWarning( "QServerSocket: failed to bind or listen to the socket" );
+	qWarning( "QServerSocket: failed to bind or listen to the socket" );
 	delete d->s;
 	d->s = 0;
     }
diff --git a/src/network/qsocket.cpp b/src/network/qsocket.cpp
index 9414d0e..492bc72 100644
--- a/src/network/qsocket.cpp
+++ b/src/network/qsocket.cpp
@@ -321,7 +321,7 @@ QSocket::QSocket( QObject *parent, const char *name )
 QSocket::~QSocket()
 {
 #if defined(QSOCKET_DEBUG)
-    tqDebug( "QSocket (%s): Destroy", name() );
+    qDebug( "QSocket (%s): Destroy", name() );
 #endif
     if ( state() != Idle )
 	close();
@@ -411,7 +411,7 @@ QSocket::State QSocket::state() const
 void QSocket::connectToHost( const QString &host, Q_UINT16 port )
 {
 #if defined(QSOCKET_DEBUG)
-    tqDebug( "QSocket (%s)::connectToHost: host %s, port %d",
+    qDebug( "QSocket (%s)::connectToHost: host %s, port %d",
 	    name(), host.ascii(), port );
 #endif
     setSocketIntern( -1 );
@@ -442,7 +442,7 @@ void QSocket::connectToHost( const QString &host, Q_UINT16 port )
 void QSocket::tryConnecting()
 {
 #if defined(QSOCKET_DEBUG)
-    tqDebug( "QSocket (%s)::tryConnecting()", name() );
+    qDebug( "QSocket (%s)::tryConnecting()", name() );
 #endif
     // ### this ifdef isn't correct - addresses() also does /etc/hosts and
     // numeric-address-as-string handling.
@@ -452,7 +452,7 @@ void QSocket::tryConnecting()
 	d->l4 = d->dns4->addresses();
 	if ( !d->l4.isEmpty() || !d->dns4->isWorking() ) {
 #if defined(QSOCKET_DEBUG)
-	    tqDebug( "QSocket (%s)::tryConnecting: host %s, port %d: "
+	    qDebug( "QSocket (%s)::tryConnecting: host %s, port %d: "
 		    "%d IPv4 addresses",
 		    name(), d->host.ascii(), d->port, d->l4.count() );
 #endif
@@ -465,7 +465,7 @@ void QSocket::tryConnecting()
 	d->l6 = d->dns6->addresses();
 	if ( !d->l6.isEmpty() || !d->dns6->isWorking() ) {
 #if defined(QSOCKET_DEBUG)
-	    tqDebug( "QSocket (%s)::tryConnecting: host %s, port %d: "
+	    qDebug( "QSocket (%s)::tryConnecting: host %s, port %d: "
 		    "%d IPv6 addresses",
 		    name(), d->host.ascii(), d->port, d->l6.count() );
 #endif
@@ -516,7 +516,7 @@ void QSocket::tryConnecting()
 		}
 
 #if defined(QSOCKET_DEBUG)
-		tqDebug( "QSocket (%s)::tryConnecting: "
+		qDebug( "QSocket (%s)::tryConnecting: "
 			"Gave up on IP address %s",
 			name(), d->socket->peerAddress().toString().ascii() );
 #endif
@@ -539,7 +539,7 @@ void QSocket::tryConnecting()
 		d->setSocketDevice( this, 0 );
 		stuck = TRUE;
 #if defined(QSOCKET_DEBUG)
-		tqDebug( "QSocket (%s)::tryConnecting: Trying IP address %s",
+		qDebug( "QSocket (%s)::tryConnecting: Trying IP address %s",
 			name(), d->addr.toString().ascii() );
 #endif
 	    }
@@ -654,7 +654,7 @@ bool QSocket::open( int m )
 {
     if ( isOpen() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSocket::open: Already open" );
+	qWarning( "QSocket::open: Already open" );
 #endif
 	return FALSE;
     }
@@ -692,7 +692,7 @@ void QSocket::close()
     if ( !d->rsn || !d->wsn )
 	return;
 #if defined(QSOCKET_DEBUG)
-    tqDebug( "QSocket (%s): close socket", name() );
+    qDebug( "QSocket (%s): close socket", name() );
 #endif
     if ( d->socket && d->wsize ) {		// there's data to be written
 	d->state = Closing;
@@ -721,7 +721,7 @@ bool QSocket::consumeWriteBuf( Q_ULONG nbytes )
     if ( nbytes <= 0 || nbytes > d->wsize )
 	return FALSE;
 #if defined(QSOCKET_DEBUG)
-    tqDebug( "QSocket (%s): skipWriteBuf %d bytes", name(), (int)nbytes );
+    qDebug( "QSocket (%s): skipWriteBuf %d bytes", name(), (int)nbytes );
 #endif
     d->wsize -= nbytes;
     for ( ;; ) {
@@ -754,7 +754,7 @@ void QSocket::flush()
     int consumed = 0;
     while ( !osBufferFull && d->state >= Connecting && d->wsize > 0 ) {
 #if defined(QSOCKET_DEBUG)
-	tqDebug( "QSocket (%s): flush: Write data to the socket", name() );
+	qDebug( "QSocket (%s): flush: Write data to the socket", name() );
 #endif
 	QByteArray *a = d->wba.first();
 	int nwritten;
@@ -798,14 +798,14 @@ void QSocket::flush()
     }
     if ( consumed > 0 ) {
 #if defined(QSOCKET_DEBUG)
-	tqDebug( "QSocket (%s): flush: wrote %d bytes, %d left",
+	qDebug( "QSocket (%s): flush: wrote %d bytes, %d left",
 		name(), consumed, (int)d->wsize );
 #endif
 	emit bytesWritten( consumed );
     }
     if ( d->state == Closing && d->wsize == 0 ) {
 #if defined(QSOCKET_DEBUG)
-	tqDebug( "QSocket (%s): flush: Delayed close done. Terminating.",
+	qDebug( "QSocket (%s): flush: Delayed close done. Terminating.",
 		name() );
 #endif
 	setFlags( IO_Sequential );
@@ -981,20 +981,20 @@ Q_LONG QSocket::readBlock( char *data, Q_ULONG maxlen )
 {
     if ( data == 0 && maxlen != 0 ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QSocket::readBlock: Null pointer error" );
+	qWarning( "QSocket::readBlock: Null pointer error" );
 #endif
 	return -1;
     }
     if ( !isOpen() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QSocket::readBlock: Socket is not open" );
+	qWarning( "QSocket::readBlock: Socket is not open" );
 #endif
 	return -1;
     }
     if ( maxlen >= d->rba.size() )
 	maxlen = d->rba.size();
 #if defined(QSOCKET_DEBUG)
-    tqDebug( "QSocket (%s): readBlock %d bytes", name(), (int)maxlen );
+    qDebug( "QSocket (%s): readBlock %d bytes", name(), (int)maxlen );
 #endif
     d->rba.consumeBytes( maxlen, data );
     // After we read data from our internal buffer, if we use the
@@ -1019,18 +1019,18 @@ Q_LONG QSocket::writeBlock( const char *data, Q_ULONG len )
 {
 #if defined(QT_CHECK_NULL)
     if ( data == 0 && len != 0 ) {
-	tqWarning( "QSocket::writeBlock: Null pointer error" );
+	qWarning( "QSocket::writeBlock: Null pointer error" );
     }
 #endif
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {
-	tqWarning( "QSocket::writeBlock: Socket is not open" );
+	qWarning( "QSocket::writeBlock: Socket is not open" );
 	return -1;
     }
 #endif
 #if defined(QT_CHECK_STATE)
     if ( d->state == Closing ) {
-	tqWarning( "QSocket::writeBlock: Cannot write, socket is closing" );
+	qWarning( "QSocket::writeBlock: Cannot write, socket is closing" );
     }
 #endif
     if ( len == 0 || d->state == Closing || d->state == Idle )
@@ -1061,7 +1061,7 @@ Q_LONG QSocket::writeBlock( const char *data, Q_ULONG len )
     else if ( d->wsn )
 	d->wsn->setEnabled( TRUE );
 #if defined(QSOCKET_DEBUG)
-    tqDebug( "QSocket (%s): writeBlock %d bytes", name(), (int)len );
+    qDebug( "QSocket (%s): writeBlock %d bytes", name(), (int)len );
 #endif
     return len;
 }
@@ -1121,7 +1121,7 @@ int QSocket::ungetch( int ch )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isOpen() ) {
-	tqWarning( "QSocket::ungetch: Socket not open" );
+	qWarning( "QSocket::ungetch: Socket not open" );
 	return -1;
     }
 #endif
@@ -1243,7 +1243,7 @@ void QSocket::sn_read( bool force )
 	if ( nread == 0 ) {			// really closed
 	    if ( !d->socket->isOpen() ) {
 #if defined(QSOCKET_DEBUG)
-		tqDebug( "QSocket (%s): sn_read: Connection closed", name() );
+		qDebug( "QSocket (%s): sn_read: Connection closed", name() );
 #endif
 		d->connectionClosed();
 		emit connectionClosed();
@@ -1258,7 +1258,7 @@ void QSocket::sn_read( bool force )
 		    return;
 		}
 #if defined(QSOCKET_DEBUG)
-		tqWarning( "QSocket::sn_read (%s): Close error", name() );
+		qWarning( "QSocket::sn_read (%s): Close error", name() );
 #endif
 		if ( d->rsn )
 		    d->rsn->setEnabled( FALSE );
@@ -1272,7 +1272,7 @@ void QSocket::sn_read( bool force )
 
     } else {					// data to be read
 #if defined(QSOCKET_DEBUG)
-	tqDebug( "QSocket (%s): sn_read: %ld incoming bytes", name(), nbytes );
+	qDebug( "QSocket (%s): sn_read: %ld incoming bytes", name(), nbytes );
 #endif
 	if ( nbytes > (int)sizeof(buf) ) {
 	    // big
@@ -1289,7 +1289,7 @@ void QSocket::sn_read( bool force )
 	}
 	if ( nread == 0 ) {
 #if defined(QSOCKET_DEBUG)
-	    tqDebug( "QSocket (%s): sn_read: Connection closed", name() );
+	    qDebug( "QSocket (%s): sn_read: Connection closed", name() );
 #endif
 	    // ### we should rather ask the socket device if it is closed
 	    d->connectionClosed();
@@ -1306,7 +1306,7 @@ void QSocket::sn_read( bool force )
 		return;
 	    }
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QSocket::sn_read: Read error" );
+	    qWarning( "QSocket::sn_read: Read error" );
 #endif
 	    if ( d->rsn )
 		d->rsn->setEnabled( FALSE );
@@ -1316,7 +1316,7 @@ void QSocket::sn_read( bool force )
 	}
 	if ( nread != (int)a->size() ) {		// unexpected
 #if defined(CHECK_RANGE) && !defined(Q_OS_WIN32)
-	    tqWarning( "QSocket::sn_read: Unexpected short read" );
+	    qWarning( "QSocket::sn_read: Unexpected short read" );
 #endif
 	    a->resize( nread );
 	}
@@ -1356,7 +1356,7 @@ void QSocket::tryConnection()
     if ( d->socket->connect( d->addr, d->port ) ) {
 	d->state = Connected;
 #if defined(QSOCKET_DEBUG)
-	tqDebug( "QSocket (%s): sn_write: Got connection to %s",
+	qDebug( "QSocket (%s): sn_write: Got connection to %s",
 		name(), peerName().ascii() );
 #endif
 	if ( d->rsn )
diff --git a/src/network/qsocketdevice.cpp b/src/network/qsocketdevice.cpp
index 5a5bfab..f298cff 100644
--- a/src/network/qsocketdevice.cpp
+++ b/src/network/qsocketdevice.cpp
@@ -163,7 +163,7 @@ QSocketDevice::QSocketDevice( int socket, Type type )
       d(new QSocketDevicePrivate(Unknown))
 {
 #if defined(QSOCKETDEVICE_DEBUG)
-    tqDebug( "QSocketDevice: Created QSocketDevice %p (socket %x, type %d)",
+    qDebug( "QSocketDevice: Created QSocketDevice %p (socket %x, type %d)",
 	   this, socket, type );
 #endif
     init();
@@ -186,7 +186,7 @@ QSocketDevice::QSocketDevice( Type type )
       d(new QSocketDevicePrivate(IPv4))
 {
 #if defined(QSOCKETDEVICE_DEBUG)
-    tqDebug( "QSocketDevice: Created QSocketDevice object %p, type %d",
+    qDebug( "QSocketDevice: Created QSocketDevice object %p, type %d",
 	    this, type );
 #endif
     init();
@@ -215,7 +215,7 @@ QSocketDevice::QSocketDevice( Type type, Protocol protocol, int )
       d(new QSocketDevicePrivate(protocol))
 {
 #if defined(QSOCKETDEVICE_DEBUG)
-    tqDebug( "QSocketDevice: Created QSocketDevice object %p, type %d",
+    qDebug( "QSocketDevice: Created QSocketDevice object %p, type %d",
 	    this, type );
 #endif
     init();
@@ -231,7 +231,7 @@ QSocketDevice::~QSocketDevice()
     delete d;
     d = 0;
 #if defined(QSOCKETDEVICE_DEBUG)
-    tqDebug( "QSocketDevice: Destroyed QSocketDevice %p", this );
+    qDebug( "QSocketDevice: Destroyed QSocketDevice %p", this );
 #endif
 }
 
@@ -308,7 +308,7 @@ void QSocketDevice::setSocket( int socket, Type type )
     if ( fd != -1 )			// close any open socket
 	close();
 #if defined(QSOCKETDEVICE_DEBUG)
-    tqDebug( "QSocketDevice::setSocket: socket %x, type %d", socket, type );
+    qDebug( "QSocketDevice::setSocket: socket %x, type %d", socket, type );
 #endif
     t = type;
     fd = socket;
@@ -335,7 +335,7 @@ bool QSocketDevice::open( int mode )
     if ( isOpen() || !isValid() )
 	return FALSE;
 #if defined(QSOCKETDEVICE_DEBUG)
-    tqDebug( "QSocketDevice::open: mode %x", mode );
+    qDebug( "QSocketDevice::open: mode %x", mode );
 #endif
     setMode( mode & IO_ReadWrite );
     setState( IO_Open );
diff --git a/src/network/qsocketdevice_unix.cpp b/src/network/qsocketdevice_unix.cpp
index 81f21c8..d773a0d 100644
--- a/src/network/qsocketdevice_unix.cpp
+++ b/src/network/qsocketdevice_unix.cpp
@@ -224,7 +224,7 @@ void QSocketDevice::close()
     setState( 0 );
     ::close( fd );
 #if defined(QSOCKETDEVICE_DEBUG)
-    tqDebug( "QSocketDevice::close: Closed socket %x", fd );
+    qDebug( "QSocketDevice::close: Closed socket %x", fd );
 #endif
     fd = -1;
     fetchConnectionParameters();
@@ -268,7 +268,7 @@ bool QSocketDevice::blocking() const
 void QSocketDevice::setBlocking( bool enable )
 {
 #if defined(QSOCKETDEVICE_DEBUG)
-    tqDebug( "QSocketDevice::setBlocking( %d )", enable );
+    qDebug( "QSocketDevice::setBlocking( %d )", enable );
 #endif
     if ( !isValid() )
 	return;
@@ -760,20 +760,20 @@ Q_LONG QSocketDevice::readBlock( char *data, Q_ULONG maxlen )
 {
 #if defined(QT_CHECK_NULL)
     if ( data == 0 && maxlen != 0 ) {
-	tqWarning( "QSocketDevice::readBlock: Null pointer error" );
+	qWarning( "QSocketDevice::readBlock: Null pointer error" );
     }
 #endif
 #if defined(QT_CHECK_STATE)
     if ( !isValid() ) {
-	tqWarning( "QSocketDevice::readBlock: Invalid socket" );
+	qWarning( "QSocketDevice::readBlock: Invalid socket" );
 	return -1;
     }
     if ( !isOpen() ) {
-	tqWarning( "QSocketDevice::readBlock: Device is not open" );
+	qWarning( "QSocketDevice::readBlock: Device is not open" );
 	return -1;
     }
     if ( !isReadable() ) {
-	tqWarning( "QSocketDevice::readBlock: Read operation not permitted" );
+	qWarning( "QSocketDevice::readBlock: Read operation not permitted" );
 	return -1;
     }
 #endif
@@ -851,25 +851,25 @@ Q_LONG QSocketDevice::writeBlock( const char *data, Q_ULONG len )
 {
     if ( data == 0 && len != 0 ) {
 #if defined(QT_CHECK_NULL) || defined(QSOCKETDEVICE_DEBUG)
-	tqWarning( "QSocketDevice::writeBlock: Null pointer error" );
+	qWarning( "QSocketDevice::writeBlock: Null pointer error" );
 #endif
 	return -1;
     }
     if ( !isValid() ) {
 #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG)
-	tqWarning( "QSocketDevice::writeBlock: Invalid socket" );
+	qWarning( "QSocketDevice::writeBlock: Invalid socket" );
 #endif
 	return -1;
     }
     if ( !isOpen() ) {
 #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG)
-	tqWarning( "QSocketDevice::writeBlock: Device is not open" );
+	qWarning( "QSocketDevice::writeBlock: Device is not open" );
 #endif
 	return -1;
     }
     if ( !isWritable() ) {
 #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG)
-	tqWarning( "QSocketDevice::writeBlock: Write operation not permitted" );
+	qWarning( "QSocketDevice::writeBlock: Write operation not permitted" );
 #endif
 	return -1;
     }
@@ -939,32 +939,32 @@ Q_LONG QSocketDevice::writeBlock( const char * data, Q_ULONG len,
 {
     if ( t != Datagram ) {
 #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG)
-	tqWarning( "QSocketDevice::sendBlock: Not datagram" );
+	qWarning( "QSocketDevice::sendBlock: Not datagram" );
 #endif
 	return -1; // for now - later we can do t/tcp
     }
 
     if ( data == 0 && len != 0 ) {
 #if defined(QT_CHECK_NULL) || defined(QSOCKETDEVICE_DEBUG)
-	tqWarning( "QSocketDevice::sendBlock: Null pointer error" );
+	qWarning( "QSocketDevice::sendBlock: Null pointer error" );
 #endif
 	return -1;
     }
     if ( !isValid() ) {
 #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG)
-	tqWarning( "QSocketDevice::sendBlock: Invalid socket" );
+	qWarning( "QSocketDevice::sendBlock: Invalid socket" );
 #endif
 	return -1;
     }
     if ( !isOpen() ) {
 #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG)
-	tqWarning( "QSocketDevice::sendBlock: Device is not open" );
+	qWarning( "QSocketDevice::sendBlock: Device is not open" );
 #endif
 	return -1;
     }
     if ( !isWritable() ) {
 #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG)
-	tqWarning( "QSocketDevice::sendBlock: Write operation not permitted" );
+	qWarning( "QSocketDevice::sendBlock: Write operation not permitted" );
 #endif
 	return -1;
     }
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 51cb0b3..c2a35ea 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -159,7 +159,7 @@ static QCleanupHandler<QGLFormat> qgl_cleanup_format;
     if ( !w->format().stereo() ) {
 	// ok, goggles off
 	if ( !w->format().hasOverlay() ) {
-	    tqFatal( "Cool hardware required" );
+	    qFatal( "Cool hardware required" );
 	}
     }
     \endcode
@@ -211,9 +211,9 @@ QGLFormat::QGLFormat()
 	: QGLWidget( QGLFormat( StencilBuffer | AlphaChannel ), parent, name )
     {
 	if ( !format().stencil() )
-	    tqWarning( "Could not get stencil buffer; results will be suboptimal" );
+	    qWarning( "Could not get stencil buffer; results will be suboptimal" );
 	if ( !format().alphaChannel() )
-	    tqWarning( "Could not get alpha channel; results will be suboptimal" );
+	    qWarning( "Could not get alpha channel; results will be suboptimal" );
 	...
     }
     \endcode
@@ -877,7 +877,7 @@ void QGLContext::setDevice( QPaintDevice *pDev )
     if ( d->paintDevice && (d->paintDevice->devType() != QInternal::Widget
 			&& d->paintDevice->devType() != QInternal::Pixmap) ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QGLContext: Unsupported paint device type" );
+	qWarning( "QGLContext: Unsupported paint device type" );
 #endif
     }
 }
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 9a0343c..55fa07e 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -56,7 +56,7 @@
 #define QGL_VERSION	450
 #define QGL_VERSION_STR	"4.5"
 QM_EXPORT_OPENGL inline const char *qGLVersion() {
-    tqObsolete( 0, "qGLVersion", "qVersion" );
+    qObsolete( 0, "qGLVersion", "qVersion" );
     return QGL_VERSION_STR;
 }
 #endif
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 1787134..a8abef8 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -135,7 +135,7 @@ bool qt_resolve_gl_symbols(bool fatal)
 
     if (!qt_glCallLists) { // if this fails the rest will surely fail
 	if (fatal)
-	    tqFatal("Unable to resolve GL/GLX symbols - please check your GL library installation.");
+	    qFatal("Unable to resolve GL/GLX symbols - please check your GL library installation.");
 	return FALSE;
     }
 
@@ -241,7 +241,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
 	const char *v = glXQueryServerString( dpy, vi->screen, GLX_VERSION );
 	if ( v )
 	    mesa_gl = strstr(v,"Mesa") != 0;
-	tqAddPostRoutine( cleanup_cmaps );
+	qAddPostRoutine( cleanup_cmaps );
     }
 
     CMapEntry *x = cmap_dict->find( (long) vi->visualid + ( vi->screen * 256 ) );
@@ -253,11 +253,11 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
     XStandardColormap *c;
     int n, i;
 
-    // tqDebug( "Choosing cmap for vID %0x", vi->visualid );
+    // qDebug( "Choosing cmap for vID %0x", vi->visualid );
 
     if ( vi->visualid ==
 	 XVisualIDFromVisual( (Visual*)QPaintDevice::x11AppVisual( vi->screen ) ) ) {
-	// tqDebug( "Using x11AppColormap" );
+	// qDebug( "Using x11AppColormap" );
 	return QPaintDevice::x11AppColormap( vi->screen );
     }
 
@@ -271,7 +271,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
 		    if ( c[i].visualid == vi->visual->visualid ) {
 			x->cmap = c[i].colormap;
 			x->scmap = c[i];
-			//tqDebug( "Using HP_RGB scmap" );
+			//qDebug( "Using HP_RGB scmap" );
 
 		    }
 		    i++;
@@ -288,7 +288,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
 	_XmuLookupStandardColormap qt_XmuLookupStandardColormap;
 	qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) QLibrary::resolve("Xmu.so.6", "XmuLookupStandardColormap");
 	if (!qt_XmuLookupStandardColormap)
-	    tqFatal("Unable to resolve Xmu symbols - please check your Xmu library installation.");
+	    qFatal("Unable to resolve Xmu symbols - please check your Xmu library installation.");
 #define XmuLookupStandardColormap qt_XmuLookupStandardColormap
 
 #endif
@@ -302,7 +302,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
 		    if ( c[i].visualid == vi->visualid ) {
 			x->cmap = c[i].colormap;
 			x->scmap = c[i];
-			//tqDebug( "Using RGB_DEFAULT scmap" );
+			//qDebug( "Using RGB_DEFAULT scmap" );
 		    }
 		    i++;
 		}
@@ -315,7 +315,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
 	x->cmap = XCreateColormap( dpy, RootWindow(dpy,vi->screen), vi->visual,
 				   AllocNone );
 	x->alloc = TRUE;
-	// tqDebug( "Allocating cmap" );
+	// qDebug( "Allocating cmap" );
     }
 
     // associate cmap with visualid
@@ -466,7 +466,7 @@ bool QGLContext::chooseContext( const QGLContext* shareContext )
     if ( shareContext &&
 	 ( !shareContext->isValid() || !shareContext->cx ) ) {
 #if defined(QT_CHECK_NULL)
-	    tqWarning("QGLContext::chooseContext(): Cannot share with invalid context");
+	    qWarning("QGLContext::chooseContext(): Cannot share with invalid context");
 #endif
 	    shareContext = 0;
     }
@@ -703,7 +703,7 @@ void QGLContext::makeCurrent()
 {
     if ( !d->valid ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning("QGLContext::makeCurrent(): Cannot make invalid context current.");
+	qWarning("QGLContext::makeCurrent(): Cannot make invalid context current.");
 #endif
 	return;
     }
@@ -718,9 +718,9 @@ void QGLContext::makeCurrent()
 			     ((QWidget *)d->paintDevice)->winId(),
 			     (GLXContext)cx );
 #if defined(QT_CHECK_NULL)
-    //    tqDebug("makeCurrent: %i, vi=%i, vi->vi=%i, vi->id=%i", (int)this, (int)vi, (int)((XVisualInfo*)vi)->visual, (int)((XVisualInfo*)vi)->visualid );
+    //    qDebug("makeCurrent: %i, vi=%i, vi->vi=%i, vi->id=%i", (int)this, (int)vi, (int)((XVisualInfo*)vi)->visual, (int)((XVisualInfo*)vi)->visualid );
     if ( !ok )
-	tqWarning("QGLContext::makeCurrent(): Failed.");
+	qWarning("QGLContext::makeCurrent(): Failed.");
 #endif
     if ( ok )
 	currentCtx = this;
@@ -881,13 +881,13 @@ void qgl_use_font(QFontEngineXft *engine, int first, int count, int listBase)
 
 	err = FT_Load_Glyph(face, FT_Get_Char_Index(face, i), FT_LOAD_DEFAULT);
 	if (err) {
-	    tqDebug("failed loading glyph %d from font", i);
+	    qDebug("failed loading glyph %d from font", i);
 	    Q_ASSERT(!err);
 	}
 	err = FT_Render_Glyph(face->glyph, (antialiased ? ft_render_mode_normal
 					    : ft_render_mode_mono));
 	if (err) {
-	    tqDebug("failed rendering glyph %d from font", i);
+	    qDebug("failed rendering glyph %d from font", i);
 	    Q_ASSERT(!err);
 	}
 
@@ -1011,7 +1011,7 @@ void QGLOverlayWidget::initializeGL()
     if ( transparentColor.isValid() )
 	qglClearColor( transparentColor );
     else
-	tqWarning( "QGLOverlayWidget::initializeGL(): Could not get transparent color" );
+	qWarning( "QGLOverlayWidget::initializeGL(): Could not get transparent color" );
     realWidget->initializeOverlayGL();
 }
 
@@ -1128,13 +1128,13 @@ void QGLWidget::setContext( QGLContext *context,
 {
     if ( context == 0 ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QGLWidget::setContext: Cannot set null context" );
+	qWarning( "QGLWidget::setContext: Cannot set null context" );
 #endif
 	return;
     }
     if ( !context->deviceIsPixmap() && context->device() != this ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QGLWidget::setContext: Context must refer to this widget" );
+	qWarning( "QGLWidget::setContext: Context must refer to this widget" );
 #endif
 	return;
     }
@@ -1333,7 +1333,7 @@ void QGLWidget::setColormap( const QGLColormap & c )
 	return;
 
     if ( !cmap.d->cmapHandle && !qCanAllocColors( this ) ) {
-	tqWarning( "QGLWidget::setColormap: Cannot create a read/write "
+	qWarning( "QGLWidget::setColormap: Cannot create a read/write "
 		  "colormap for this visual" );
 	return;
     }
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp
index 71d3937..2deb46b 100644
--- a/src/opengl/qglcolormap.cpp
+++ b/src/opengl/qglcolormap.cpp
@@ -173,7 +173,7 @@ void QGLColormap::setEntry( int idx, QRgb color )
 
 #if defined(QT_CHECK_RANGE)
     if ( idx < 0 || idx > (int) d->cells.size() ) {
-	tqWarning( "QGLColormap::setRgb: Index out of range." );
+	qWarning( "QGLColormap::setRgb: Index out of range." );
 	return;
     }
 #endif
diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp
index 793a157..6954ef8 100644
--- a/src/sql/drivers/ibase/qsql_ibase.cpp
+++ b/src/sql/drivers/ibase/qsql_ibase.cpp
@@ -411,7 +411,7 @@ QIBaseResult::~QIBaseResult()
 
 bool QIBaseResult::prepare(const QString& query)
 {
-    //tqDebug("prepare: %s", query.ascii());
+    //qDebug("prepare: %s", query.ascii());
     if (!driver() || !driver()->isOpen() || driver()->isOpenError())
 	return FALSE;
     d->cleanup();
@@ -471,7 +471,7 @@ bool QIBaseResult::exec()
     if (d->inda && extension()->index.count() > 0) {
 	QMap<int, QString>::ConstIterator it;
 	if ((int)extension()->index.count() > d->inda->sqld) {
-	    tqWarning("QIBaseResult::exec: Parameter mismatch, expected %d, got %d parameters", d->inda->sqld, extension()->index.count());
+	    qWarning("QIBaseResult::exec: Parameter mismatch, expected %d, got %d parameters", d->inda->sqld, extension()->index.count());
 	    return FALSE;
 	}
 	int para = 0;
@@ -560,7 +560,7 @@ bool QIBaseResult::exec()
 
 bool QIBaseResult::reset (const QString& query)
 {
-//    tqDebug("reset: %s", query.ascii());
+//    qDebug("reset: %s", query.ascii());
     if (!driver() || !driver()->isOpen() || driver()->isOpenError())
 	return FALSE;
     d->cleanup();
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 67d3684..7cfe0a7 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -53,7 +53,7 @@
 # define Q_NO_MYSQL_EMBEDDED
 #endif
 
-QPtrDict<QSqlOpenExtension> *tqSqlOpenExtDict();
+QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict();
 
 static int qMySqlConnectionCount = 0;
 static bool qMySqlInitHandledByUser = FALSE;
@@ -237,7 +237,7 @@ bool QMYSQLResult::fetchFirst()
 QVariant QMYSQLResult::data( int field )
 {
     if ( !isSelect() || field >= (int) d->fieldTypes.count() ) {
-	tqWarning( "QMYSQLResult::data: column %d out of range", field );
+	qWarning( "QMYSQLResult::data: column %d out of range", field );
 	return QVariant();
     }
     
@@ -284,7 +284,7 @@ QVariant QMYSQLResult::data( int field )
 	return QVariant( val );
     }
 #ifdef QT_CHECK_RANGE
-    tqWarning("QMYSQLResult::data: unknown data type");
+    qWarning("QMYSQLResult::data: unknown data type");
 #endif
     return QVariant();
 }
@@ -368,7 +368,7 @@ static void qServerInit()
     // but is vital for the embedded lib
     if ( mysql_server_init( 0, 0, 0 ) ) {
 #  ifdef QT_CHECK_RANGE
-	tqWarning( "QMYSQLDriver::qServerInit: unable to start server." );
+	qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
 #  endif
     }
     
@@ -404,7 +404,7 @@ QMYSQLDriver::QMYSQLDriver( MYSQL * con, QObject * parent, const char * name )
 
 void QMYSQLDriver::init()
 {
-    tqSqlOpenExtDict()->insert( this, new QMYSQLOpenExtension(this) );
+    qSqlOpenExtDict()->insert( this, new QMYSQLOpenExtension(this) );
     d = new QMYSQLDriverPrivate();
     d->mysql = 0;
     qMySqlConnectionCount++;
@@ -417,8 +417,8 @@ QMYSQLDriver::~QMYSQLDriver()
         qServerEnd();
 
     delete d;
-    if ( !tqSqlOpenExtDict()->isEmpty() ) {
-	QSqlOpenExtension *ext = tqSqlOpenExtDict()->take( this );
+    if ( !qSqlOpenExtDict()->isEmpty() ) {
+	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
 	delete ext;
     }
 }
@@ -452,7 +452,7 @@ bool QMYSQLDriver::open( const QString&,
 			 const QString&,
 			 int )
 {
-    tqWarning("QMYSQLDriver::open(): This version of open() is no longer supported." );
+    qWarning("QMYSQLDriver::open(): This version of open() is no longer supported." );
     return FALSE;
 }
 
@@ -482,7 +482,7 @@ bool QMYSQLDriver::open( const QString& db,
 	    if ( val == "TRUE" || val == "1" )
 		opts << tmp.left( idx );
 	    else
-		tqWarning( "QMYSQLDriver::open: Illegal connect option value '%s'", tmp.latin1() );
+		qWarning( "QMYSQLDriver::open: Illegal connect option value '%s'", tmp.latin1() );
 	} else {
 	    opts << tmp;
 	}
@@ -505,7 +505,7 @@ bool QMYSQLDriver::open( const QString& db,
 	else if ( opt == "CLIENT_SSL" )
 	    optionFlags |= CLIENT_SSL;
 	else 
-	    tqWarning( "QMYSQLDriver::open: Unknown connect option '%s'", (*it).latin1() );
+	    qWarning( "QMYSQLDriver::open: Unknown connect option '%s'", (*it).latin1() );
     }
 
     if ( (d->mysql = mysql_init((MYSQL*) 0)) &&
@@ -696,7 +696,7 @@ bool QMYSQLDriver::beginTransaction()
 #endif
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QMYSQLDriver::beginTransaction: Database not open" );
+	qWarning( "QMYSQLDriver::beginTransaction: Database not open" );
 #endif
 	return FALSE;
     }
@@ -714,7 +714,7 @@ bool QMYSQLDriver::commitTransaction()
 #endif
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QMYSQLDriver::commitTransaction: Database not open" );
+	qWarning( "QMYSQLDriver::commitTransaction: Database not open" );
 #endif
 	return FALSE;
     }
@@ -732,7 +732,7 @@ bool QMYSQLDriver::rollbackTransaction()
 #endif
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QMYSQLDriver::rollbackTransaction: Database not open" );
+	qWarning( "QMYSQLDriver::rollbackTransaction: Database not open" );
 #endif
 	return FALSE;
     }
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 416e722..b09afd2 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -127,7 +127,7 @@ public:
     QODBCResult * result;
 };
 
-QPtrDict<QSqlOpenExtension> *tqSqlOpenExtDict();
+QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict();
 
 class QODBCOpenExtension : public QSqlOpenExtension
 {
@@ -190,7 +190,7 @@ static QString qODBCWarn( const QODBCPrivate* odbc)
 static void qSqlWarning( const QString& message, const QODBCPrivate* odbc )
 {
 #ifdef QT_CHECK_RANGE
-    tqWarning( "%s\tError: %s", message.local8Bit().data(), qODBCWarn( odbc ).local8Bit().data() );
+    qWarning( "%s\tError: %s", message.local8Bit().data(), qODBCWarn( odbc ).local8Bit().data() );
 #endif
 }
 
@@ -309,7 +309,7 @@ static QString qGetStringData( SQLHANDLE hStmt, int column, int colSize, bool& i
 	    break;
 	} else {
 #ifdef QT_CHECK_RANGE
-	    tqWarning( "qGetStringData: Error while fetching data (%d)", r );
+	    qWarning( "qGetStringData: Error while fetching data (%d)", r );
 #endif
 	    fieldVal = QString::null;
 	    break;
@@ -341,7 +341,7 @@ static QByteArray qGetBinaryData( SQLHANDLE hStmt, int column, QSQLLEN& lengthIn
 			&nullable );
 #ifdef QT_CHECK_RANGE
     if ( r != SQL_SUCCESS )
-	tqWarning( "qGetBinaryData: Unable to describe column %d", column );
+	qWarning( "qGetBinaryData: Unable to describe column %d", column );
 #endif
     // SQLDescribeCol may return 0 if size cannot be determined
     if (!colSize) {
@@ -524,7 +524,7 @@ bool QODBCPrivate::setConnectionOptions( const QString& connOpts )
 	if ( (idx = tmp.find( '=' )) != -1 )
 	    connMap[ tmp.left( idx ) ] = tmp.mid( idx + 1 ).simplifyWhiteSpace();
 	else
-	    tqWarning( "QODBCDriver::open: Illegal connect option value '%s'", tmp.latin1() );
+	    qWarning( "QODBCDriver::open: Illegal connect option value '%s'", tmp.latin1() );
     }
     if ( connMap.count() ) {
 	QMap<QString, QString>::ConstIterator it;
@@ -540,7 +540,7 @@ bool QODBCPrivate::setConnectionOptions( const QString& connOpts )
 		} else if ( val == "SQL_MODE_READ_WRITE" ) {
 		    v = SQL_MODE_READ_WRITE;
 		} else {
-		    tqWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) );
+		    qWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) );
 		    break;
 		}
 		r = SQLSetConnectAttr( hDbc, SQL_ATTR_ACCESS_MODE, (SQLPOINTER) v, 0 );
@@ -565,7 +565,7 @@ bool QODBCPrivate::setConnectionOptions( const QString& connOpts )
 		} else if ( val == "SQL_FALSE" ) {
 		    v = SQL_FALSE;
 		} else {
-		    tqWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) );
+		    qWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) );
 		    break;
 		}
 		r = SQLSetConnectAttr( hDbc, SQL_ATTR_METADATA_ID, (SQLPOINTER) v, 0 );
@@ -587,14 +587,14 @@ bool QODBCPrivate::setConnectionOptions( const QString& connOpts )
 		} else if ( val == "SQL_OPT_TRACE_ON" ) {
 		    v = SQL_OPT_TRACE_ON;
 		} else {
-		    tqWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) );
+		    qWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) );
 		    break;
 		}
 		r = SQLSetConnectAttr( hDbc, SQL_ATTR_TRACE, (SQLPOINTER) v, 0 );
 	    }
 #ifdef QT_CHECK_RANGE
               else {
-		  tqWarning( QString("QODBCDriver::open: Unknown connection attribute '%1'").arg( opt ) );
+		  qWarning( QString("QODBCDriver::open: Unknown connection attribute '%1'").arg( opt ) );
 	    }
 #endif
 	    if ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) {
@@ -860,7 +860,7 @@ bool QODBCResult::fetchLast()
 QVariant QODBCResult::data( int field )
 {
     if ( field >= (int) d->rInf.count() ) {
-	tqWarning( "QODBCResult::data: column %d out of range", field );
+	qWarning( "QODBCResult::data: column %d out of range", field );
 	return QVariant();
     }
     if ( fieldCache.contains( field ) )
@@ -1230,7 +1230,7 @@ bool QODBCResult::exec()
 	    para++;
 	    if ( r != SQL_SUCCESS ) {
 #ifdef QT_CHECK_RANGE
-		tqWarning( "QODBCResult::exec: unable to bind variable: %s", qODBCWarn( d ).local8Bit().data() );
+		qWarning( "QODBCResult::exec: unable to bind variable: %s", qODBCWarn( d ).local8Bit().data() );
 #endif
 		setLastError( qMakeError( "Unable to bind variable", QSqlError::Statement, d ) );
 		return FALSE;
@@ -1240,7 +1240,7 @@ bool QODBCResult::exec()
     r = SQLExecute( d->hStmt );
     if ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QODBCResult::exec: Unable to execute statement: %s", qODBCWarn( d ).local8Bit().data() );
+	qWarning( "QODBCResult::exec: Unable to execute statement: %s", qODBCWarn( d ).local8Bit().data() );
 #endif
 	setLastError( qMakeError( "Unable to execute statement", QSqlError::Statement, d ) );
 	return FALSE;
@@ -1345,7 +1345,7 @@ QODBCDriver::QODBCDriver( SQLHANDLE env, SQLHANDLE con, QObject * parent, const
 
 void QODBCDriver::init()
 {
-    tqSqlOpenExtDict()->insert( this, new QODBCOpenExtension(this) );
+    qSqlOpenExtDict()->insert( this, new QODBCOpenExtension(this) );
     d = new QODBCPrivate();
 }
 
@@ -1353,8 +1353,8 @@ QODBCDriver::~QODBCDriver()
 {
     cleanup();
     delete d;
-    if ( !tqSqlOpenExtDict()->isEmpty() ) {
-	QSqlOpenExtension *ext = tqSqlOpenExtDict()->take( this );
+    if ( !qSqlOpenExtDict()->isEmpty() ) {
+	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
 	delete ext;
     }
 }
@@ -1398,7 +1398,7 @@ bool QODBCDriver::open( const QString&,
 			const QString&,
 			int )
 {
-    tqWarning("QODBCDriver::open(): This version of open() is no longer supported." );
+    qWarning("QODBCDriver::open(): This version of open() is no longer supported." );
     return FALSE;
 }
 
@@ -1603,7 +1603,7 @@ bool QODBCPrivate::checkDriver() const
 #endif
 	if ( sup == SQL_FALSE ) {
 #ifdef QT_CHECK_RANGE
-	    tqWarning ( "QODBCDriver::open: Warning - Driver doesn't support all needed functionality (%d). "
+	    qWarning ( "QODBCDriver::open: Warning - Driver doesn't support all needed functionality (%d). "
 		       "Please look at the Qt SQL Module Driver documentation for more information.", reqFunc[ i ] );
 #endif
 	    return FALSE;
@@ -1623,7 +1623,7 @@ bool QODBCPrivate::checkDriver() const
 #endif
 	if ( sup == SQL_FALSE ) {
 #ifdef QT_CHECK_RANGE
-	    tqWarning( "QODBCDriver::checkDriver: Warning - Driver doesn't support some non-critical functions (%d)", optFunc[ i ] );
+	    qWarning( "QODBCDriver::checkDriver: Warning - Driver doesn't support some non-critical functions (%d)", optFunc[ i ] );
 #endif
 	    return TRUE;
 	}
@@ -1656,7 +1656,7 @@ bool QODBCDriver::beginTransaction()
 {
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning(" QODBCDriver::beginTransaction: Database not open" );
+	qWarning(" QODBCDriver::beginTransaction: Database not open" );
 #endif
 	return FALSE;
     }
@@ -1676,7 +1676,7 @@ bool QODBCDriver::commitTransaction()
 {
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning(" QODBCDriver::commitTransaction: Database not open" );
+	qWarning(" QODBCDriver::commitTransaction: Database not open" );
 #endif
 	return FALSE;
     }
@@ -1694,7 +1694,7 @@ bool QODBCDriver::rollbackTransaction()
 {
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning(" QODBCDriver::rollbackTransaction: Database not open" );
+	qWarning(" QODBCDriver::rollbackTransaction: Database not open" );
 #endif
 	return FALSE;
     }
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index 84c3ff2..7fe1a91 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -64,8 +64,8 @@
 # undef open
 #endif
 
-QPtrDict<QSqlDriverExtension> *tqSqlDriverExtDict();
-QPtrDict<QSqlOpenExtension> *tqSqlOpenExtDict();
+QPtrDict<QSqlDriverExtension> *qSqlDriverExtDict();
+QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict();
 
 class QPSQLPrivate
 {
@@ -272,7 +272,7 @@ static QPoint pointFromString( const QString& s)
 QVariant QPSQLResult::data( int i )
 {
     if ( i >= PQnfields( d->result ) ) {
-	tqWarning( "QPSQLResult::data: column %d out of range", i );
+	qWarning( "QPSQLResult::data: column %d out of range", i );
 	return QVariant();
     }
     int ptype = PQftype( d->result, i );
@@ -395,7 +395,7 @@ QVariant QPSQLResult::data( int i )
 	int fd = lo_open( d->connection, oid, INV_READ );
 #ifdef QT_CHECK_RANGE
 	if ( fd < 0) {
-	    tqWarning( "QPSQLResult::data: unable to open large object for read" );
+	    qWarning( "QPSQLResult::data: unable to open large object for read" );
 	    ((QSqlDriver*)driver())->commitTransaction();
 	    return QVariant( ba );
 	}
@@ -429,7 +429,7 @@ QVariant QPSQLResult::data( int i )
 #endif
 
 	if (retval < 0) {
-	    tqWarning( "QPSQLResult::data: unable to read large object" );
+	    qWarning( "QPSQLResult::data: unable to read large object" );
 	} else {
 	    ba.duplicate( buf, size );
 	}
@@ -441,7 +441,7 @@ QVariant QPSQLResult::data( int i )
     default:
     case QVariant::Invalid:
 #ifdef QT_CHECK_RANGE
-	tqWarning("QPSQLResult::data: unknown data type");
+	qWarning("QPSQLResult::data: unknown data type");
 #endif
 	;
     }
@@ -512,7 +512,7 @@ static void setDatestyle( PGconn* connection )
 #ifdef QT_CHECK_RANGE
     int status =  PQresultStatus( result );
     if ( status != PGRES_COMMAND_OK )
-        tqWarning( "%s", PQerrorMessage( connection ) );
+        qWarning( "%s", PQerrorMessage( connection ) );
 #endif
     PQclear( result );
 }
@@ -531,7 +531,7 @@ static QPSQLDriver::Protocol getPSQLVersion( PGconn* connection )
 	    int vMin = rx.cap( 2 ).toInt();
 	    if ( vMaj < 6 ) {
 #ifdef QT_CHECK_RANGE
-		tqWarning( "This version of PostgreSQL is not supported and may not work." );
+		qWarning( "This version of PostgreSQL is not supported and may not work." );
 #endif
 		return QPSQLDriver::Version6;
 	    }
@@ -547,7 +547,7 @@ static QPSQLDriver::Protocol getPSQLVersion( PGconn* connection )
 	}
     } else {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "This version of PostgreSQL is not supported and may not work." );
+	qWarning( "This version of PostgreSQL is not supported and may not work." );
 #endif
     }
 
@@ -574,8 +574,8 @@ QPSQLDriver::QPSQLDriver( PGconn * conn, QObject * parent, const char * name )
 
 void QPSQLDriver::init()
 {
-    tqSqlDriverExtDict()->insert( this, new QPSQLDriverExtension(this) );
-    tqSqlOpenExtDict()->insert( this, new QPSQLOpenExtension(this) );
+    qSqlDriverExtDict()->insert( this, new QPSQLDriverExtension(this) );
+    qSqlOpenExtDict()->insert( this, new QPSQLOpenExtension(this) );
 
     d = new QPSQLPrivate();
 }
@@ -585,12 +585,12 @@ QPSQLDriver::~QPSQLDriver()
     if ( d->connection )
 	PQfinish( d->connection );
     delete d;
-    if ( !tqSqlDriverExtDict()->isEmpty() ) {
-	QSqlDriverExtension *ext = tqSqlDriverExtDict()->take( this );
+    if ( !qSqlDriverExtDict()->isEmpty() ) {
+	QSqlDriverExtension *ext = qSqlDriverExtDict()->take( this );
 	delete ext;
     }
-    if ( !tqSqlOpenExtDict()->isEmpty() ) {
-	QSqlOpenExtension *ext = tqSqlOpenExtDict()->take( this );
+    if ( !qSqlOpenExtDict()->isEmpty() ) {
+	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
 	delete ext;
     }
 }
@@ -623,7 +623,7 @@ bool QPSQLDriver::open( const QString&,
 			const QString&,
 			int )
 {
-    tqWarning("QPSQLDriver::open(): This version of open() is no longer supported." );
+    qWarning("QPSQLDriver::open(): This version of open() is no longer supported." );
     return FALSE;
 }
 
@@ -688,7 +688,7 @@ bool QPSQLDriver::beginTransaction()
 {
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QPSQLDriver::beginTransaction: Database not open" );
+	qWarning( "QPSQLDriver::beginTransaction: Database not open" );
 #endif
 	return FALSE;
     }
@@ -706,7 +706,7 @@ bool QPSQLDriver::commitTransaction()
 {
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QPSQLDriver::commitTransaction: Database not open" );
+	qWarning( "QPSQLDriver::commitTransaction: Database not open" );
 #endif
 	return FALSE;
     }
@@ -724,7 +724,7 @@ bool QPSQLDriver::rollbackTransaction()
 {
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QPSQLDriver::rollbackTransaction: Database not open" );
+	qWarning( "QPSQLDriver::rollbackTransaction: Database not open" );
 #endif
 	return FALSE;
     }
diff --git a/src/sql/qdatatable.cpp b/src/sql/qdatatable.cpp
index 69656a0..d1404d9 100644
--- a/src/sql/qdatatable.cpp
+++ b/src/sql/qdatatable.cpp
@@ -112,10 +112,10 @@ public:
 #ifdef QT_DEBUG_DATATABLE
 void qt_debug_buffer( const QString& msg, QSqlRecord* cursor )
 {
-    tqDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
-    tqDebug(msg);
+    qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+    qDebug(msg);
     for ( uint j = 0; j < cursor->count(); ++j ) {
-	tqDebug(cursor->field(j)->name() + " type:" + QString(cursor->field(j)->value().typeName()) + " value:" + cursor->field(j)->value().toString() );
+	qDebug(cursor->field(j)->name() + " type:" + QString(cursor->field(j)->value().typeName()) + " value:" + cursor->field(j)->value().toString() );
     }
 }
 #endif
@@ -1047,7 +1047,7 @@ bool QDataTable::insertCurrent()
 	return FALSE;
     if ( !sqlCursor()->canInsert() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QDataTable::insertCurrent: insert not allowed for %s",
+	qWarning("QDataTable::insertCurrent: insert not allowed for %s",
 		 sqlCursor()->name().latin1() );
 #endif
 	endInsert();
@@ -1121,7 +1121,7 @@ bool QDataTable::updateCurrent()
 	return FALSE;
     if ( sqlCursor()->primaryIndex().count() == 0 ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QDataTable::updateCurrent: no primary index for %s",
+	qWarning("QDataTable::updateCurrent: no primary index for %s",
 		 sqlCursor()->name().latin1() );
 #endif
 	endUpdate();
@@ -1129,7 +1129,7 @@ bool QDataTable::updateCurrent()
     }
     if ( !sqlCursor()->canUpdate() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QDataTable::updateCurrent: updates not allowed for %s",
+	qWarning("QDataTable::updateCurrent: updates not allowed for %s",
 		 sqlCursor()->name().latin1() );
 #endif
 	endUpdate();
@@ -1195,7 +1195,7 @@ bool QDataTable::deleteCurrent()
 	return FALSE;
     if ( sqlCursor()->primaryIndex().count() == 0 ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QDataTable::deleteCurrent: no primary index %s",
+	qWarning("QDataTable::deleteCurrent: no primary index %s",
 		 sqlCursor()->name().latin1() );
 #endif
 	return FALSE;
diff --git a/src/sql/qsqlcursor.cpp b/src/sql/qsqlcursor.cpp
index eed30f5..a1be1f8 100644
--- a/src/sql/qsqlcursor.cpp
+++ b/src/sql/qsqlcursor.cpp
@@ -400,7 +400,7 @@ void QSqlCursor::setName( const QString& name, bool autopopulate )
 	}
 #ifdef QT_CHECK_RANGE
 	if ( isEmpty() )
-	    tqWarning("QSqlCursor::setName: unable to build record, does '%s' exist?", name.latin1() );
+	    qWarning("QSqlCursor::setName: unable to build record, does '%s' exist?", name.latin1() );
 #endif
     }
 }
@@ -1533,7 +1533,7 @@ bool QSqlCursor::isNull( const QString& name ) const
 void QSqlCursor::setValue( int i, const QVariant& val )
 {
 #ifdef QT_DEBUG
-    tqDebug("QSqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete().");
+    qDebug("QSqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete().");
 #endif
     QSqlRecord::setValue( i, val );
 }
@@ -1542,7 +1542,7 @@ void QSqlCursor::setValue( int i, const QVariant& val )
 void QSqlCursor::setValue( const QString& name, const QVariant& val )
 {
 #ifdef QT_DEBUG
-    tqDebug("QSqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete().");
+    qDebug("QSqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete().");
 #endif
     QSqlRecord::setValue( name, val );
 }
diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp
index ec2aa0f..eaa7a70 100644
--- a/src/sql/qsqldatabase.cpp
+++ b/src/sql/qsqldatabase.cpp
@@ -92,7 +92,7 @@ QPtrDict<QSqlOpenExtension> *qt_open_extension_dict = 0;
 static QSingleCleanupHandler< QPtrDict<QSqlDriverExtension> > qt_driver_ext_cleanup;
 static QSingleCleanupHandler< QPtrDict<QSqlOpenExtension> > qt_open_ext_cleanup;
 
-Q_EXPORT QPtrDict<QSqlDriverExtension> *tqSqlDriverExtDict()
+Q_EXPORT QPtrDict<QSqlDriverExtension> *qSqlDriverExtDict()
 {
     if ( !qt_driver_extension_dict ) {
 	qt_driver_extension_dict = new QPtrDict<QSqlDriverExtension>;
@@ -101,7 +101,7 @@ Q_EXPORT QPtrDict<QSqlDriverExtension> *tqSqlDriverExtDict()
     return qt_driver_extension_dict;
 }
 
-Q_EXPORT QPtrDict<QSqlOpenExtension> *tqSqlOpenExtDict()
+Q_EXPORT QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict()
 {
     if ( !qt_open_extension_dict ) {
 	qt_open_extension_dict = new QPtrDict<QSqlOpenExtension>;
@@ -212,7 +212,7 @@ QSqlDatabaseManager* QSqlDatabaseManager::instance()
     static QGuardedPtr<QSqlDatabaseManager> sqlConnection = 0;
     if ( !sqlConnection ) {
 	if( qApp == 0 ){
-	    tqFatal( "QSqlDatabaseManager: A QApplication object has to be "
+	    qFatal( "QSqlDatabaseManager: A QApplication object has to be "
 		    "instantiated in order to use the SQL module." );
 	    return 0;
 	}
@@ -238,7 +238,7 @@ QSqlDatabase* QSqlDatabaseManager::database( const QString& name, bool open )
 	db->open();
 #ifdef QT_CHECK_RANGE
 	if ( !db->isOpen() )
-	    tqWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
+	    qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
                     db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() );
 #endif
     }
@@ -690,8 +690,8 @@ void QSqlDatabase::init( const QString& type, const QString& )
 
     if ( !d->driver ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
-	tqWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
+	qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
+	qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
 #endif
 	d->driver = new QNullDriver();
 	d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
diff --git a/src/sql/qsqldriver.cpp b/src/sql/qsqldriver.cpp
index 47963c5..78db42c 100644
--- a/src/sql/qsqldriver.cpp
+++ b/src/sql/qsqldriver.cpp
@@ -50,8 +50,8 @@
 #define DBState_OpenError	0x0002
 
 // ### This needs to go in 4.0!
-QPtrDict<QSqlDriverExtension> *tqSqlDriverExtDict();
-QPtrDict<QSqlOpenExtension> *tqSqlOpenExtDict();
+QPtrDict<QSqlDriverExtension> *qSqlDriverExtDict();
+QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict();
 
 /*!
     \class QSqlDriver qsqldriver.h
@@ -132,8 +132,8 @@ QSqlDriver::~QSqlDriver()
 
 bool QSqlDriver::isOpen() const
 {
-    if ( !tqSqlDriverExtDict()->isEmpty() ) {
-	QSqlDriverExtension *ext = tqSqlDriverExtDict()->find( (QSqlDriver *) this );
+    if ( !qSqlDriverExtDict()->isEmpty() ) {
+	QSqlDriverExtension *ext = qSqlDriverExtDict()->find( (QSqlDriver *) this );
 	if ( ext )
 	    return ext->isOpen();
     }
@@ -498,8 +498,8 @@ bool QSqlDriver::open( const QString& db,
 		       int port,
 		       const QString& connOpts )
 {
-    if ( !tqSqlOpenExtDict()->isEmpty() ) {
-	QSqlOpenExtension *ext = tqSqlOpenExtDict()->find( (QSqlDriver *) this );
+    if ( !qSqlOpenExtDict()->isEmpty() ) {
+	QSqlOpenExtension *ext = qSqlOpenExtDict()->find( (QSqlDriver *) this );
 	if ( ext )
 	    return ext->open( db, user, password, host, port, connOpts );
     }
diff --git a/src/sql/qsqlfield.cpp b/src/sql/qsqlfield.cpp
index 408b300..bf66011 100644
--- a/src/sql/qsqlfield.cpp
+++ b/src/sql/qsqlfield.cpp
@@ -193,7 +193,7 @@ void QSqlField::setValue( const QVariant& value )
 	return;
     if ( value.type() != d->type ) {
 	if ( !val.canCast( d->type ) )
-	     tqWarning("QSqlField::setValue: %s cannot cast from %s to %s",
+	     qWarning("QSqlField::setValue: %s cannot cast from %s to %s",
 		      nm.local8Bit().data(), value.typeName(), QVariant::typeToName( d->type ) );
     }
     val = value;
diff --git a/src/sql/qsqlindex.cpp b/src/sql/qsqlindex.cpp
index 3a4eb8a..f5bdace 100644
--- a/src/sql/qsqlindex.cpp
+++ b/src/sql/qsqlindex.cpp
@@ -277,7 +277,7 @@ QSqlIndex QSqlIndex::fromStringList( const QStringList& l, const QSqlCursor* cur
 	if ( field )
 	    newSort.append( *field, desc );
 	else
-	    tqWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
+	    qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
     }
     return newSort;
 }
diff --git a/src/sql/qsqlmanager_p.cpp b/src/sql/qsqlmanager_p.cpp
index 0d80286..68360dc 100644
--- a/src/sql/qsqlmanager_p.cpp
+++ b/src/sql/qsqlmanager_p.cpp
@@ -307,10 +307,10 @@ static int compare_recs( const QSqlRecord* buf1, const QSqlRecord* buf2,
 #ifdef QT_DEBUG_DATAMANAGER
 static void debug_datamanager_buffer( const QString& msg, QSqlRecord* cursor )
 {
-    tqDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
-    tqDebug( "%s", msg.latin1() );
+    qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+    qDebug( "%s", msg.latin1() );
     for ( uint j = 0; j < cursor->count(); ++j ) {
-	tqDebug( "%s", (cursor->field(j)->name() + " type:"
+	qDebug( "%s", (cursor->field(j)->name() + " type:"
 		       + QString(cursor->field(j)->value().typeName())
 		       + " value:" + cursor->field(j)->value().toString())
 		       .latin1() );
@@ -348,7 +348,7 @@ update.  For example:
 bool QSqlCursorManager::findBuffer( const QSqlIndex& idx, int atHint )
 {
 #ifdef QT_DEBUG_DATAMANAGER
-    tqDebug("QSqlCursorManager::findBuffer:");
+    qDebug("QSqlCursorManager::findBuffer:");
 #endif
     QSqlCursor* cur = cursor();
     if ( !cur )
@@ -363,7 +363,7 @@ bool QSqlCursorManager::findBuffer( const QSqlIndex& idx, int atHint )
     QSqlRecord* buf = cur->editBuffer();
     bool indexEquals = FALSE;
 #ifdef QT_DEBUG_DATAMANAGER
-    tqDebug(" Checking hint...");
+    qDebug(" Checking hint...");
 #endif
     /* check the hint */
     if ( cur->seek( atHint ) )
@@ -371,7 +371,7 @@ bool QSqlCursorManager::findBuffer( const QSqlIndex& idx, int atHint )
 
     if ( !indexEquals ) {
 #ifdef QT_DEBUG_DATAMANAGER
-	tqDebug(" Checking current page...");
+	qDebug(" Checking current page...");
 #endif
 	/* check current page */
 	int pageSize = 20;
@@ -389,7 +389,7 @@ bool QSqlCursorManager::findBuffer( const QSqlIndex& idx, int atHint )
     if ( !indexEquals && cur->driver()->hasFeature( QSqlDriver::QuerySize )
 	 && cur->sort().count() ) {
 #ifdef QT_DEBUG_DATAMANAGER
-	tqDebug(" Using binary search...");
+	qDebug(" Using binary search...");
 #endif
 	// binary search based on record buffer and current sort fields
 	int lo = 0;
@@ -442,7 +442,7 @@ bool QSqlCursorManager::findBuffer( const QSqlIndex& idx, int atHint )
 
     if ( !indexEquals ) {
 #ifdef QT_DEBUG_DATAMANAGER
-	tqDebug(" Using brute search...");
+	qDebug(" Using brute search...");
 #endif
 #ifndef QT_NO_CURSOR
 	QApplication::setOverrideCursor( Qt::waitCursor );
@@ -465,7 +465,7 @@ bool QSqlCursorManager::findBuffer( const QSqlIndex& idx, int atHint )
 #endif
     }
 #ifdef QT_DEBUG_DATAMANAGER
-	tqDebug(" Done, result:" + QString::number( indexEquals ) );
+	qDebug(" Done, result:" + QString::number( indexEquals ) );
 #endif
     return indexEquals;
 }
diff --git a/src/sql/qsqlpropertymap.cpp b/src/sql/qsqlpropertymap.cpp
index 7222ce0..3c99a1c 100644
--- a/src/sql/qsqlpropertymap.cpp
+++ b/src/sql/qsqlpropertymap.cpp
@@ -221,7 +221,7 @@ QVariant QSqlPropertyMap::property( QWidget * widget )
 
     if ( !mo ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlPropertyMap::property: %s does not exist", widget->metaObject()->className() );
+	qWarning("QSqlPropertyMap::property: %s does not exist", widget->metaObject()->className() );
 #endif
 	return QVariant();
     }
@@ -240,7 +240,7 @@ void QSqlPropertyMap::setProperty( QWidget * widget, const QVariant & value )
 	mo = mo->superClass();
     if ( !mo ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlPropertyMap::setProperty: %s not handled by QSqlPropertyMap", widget->metaObject()->className() );
+	qWarning("QSqlPropertyMap::setProperty: %s not handled by QSqlPropertyMap", widget->metaObject()->className() );
 #endif
 	return;
     }
diff --git a/src/sql/qsqlquery.cpp b/src/sql/qsqlquery.cpp
index 44e3b67..fec2343 100644
--- a/src/sql/qsqlquery.cpp
+++ b/src/sql/qsqlquery.cpp
@@ -353,7 +353,7 @@ bool QSqlQuery::exec ( const QString& query )
     d->sqlResult->setAt( QSql::BeforeFirst );
     if ( !driver() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::exec: no driver" );
+	qWarning("QSqlQuery::exec: no driver" );
 #endif
 	return FALSE;
     }
@@ -363,18 +363,18 @@ bool QSqlQuery::exec ( const QString& query )
     d->executedQuery = d->sqlResult->lastQuery();
     if ( !driver()->isOpen() || driver()->isOpenError() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::exec: database not open" );
+	qWarning("QSqlQuery::exec: database not open" );
 #endif
 	return FALSE;
     }
     if ( query.isNull() || query.length() == 0 ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::exec: empty query" );
+	qWarning("QSqlQuery::exec: empty query" );
 #endif
 	return FALSE;
     }
 #ifdef QT_DEBUG_SQL
-    tqDebug( "\n QSqlQuery: " + query );
+    qDebug( "\n QSqlQuery: " + query );
 #endif
     return d->sqlResult->reset( query );
 }
@@ -403,7 +403,7 @@ QVariant QSqlQuery::value( int i ) const
 	return d->sqlResult->data( i );
     } else {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QSqlQuery::value: not positioned on a valid record" );
+	qWarning( "QSqlQuery::value: not positioned on a valid record" );
 #endif
     }
     return QVariant();
@@ -544,7 +544,7 @@ bool QSqlQuery::seek( int i, bool relative )
     // let drivers optimize
     if ( isForwardOnly() && actualIdx < at() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
+	qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
 #endif
 	afterSeek();
 	return FALSE;
@@ -661,7 +661,7 @@ bool QSqlQuery::prev()
 	return FALSE;
     if ( isForwardOnly() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
+	qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
 #endif
 	return FALSE;
     }
@@ -705,7 +705,7 @@ bool QSqlQuery::first()
 	return FALSE;
     if ( isForwardOnly() && at() > QSql::BeforeFirst ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
+	qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
 #endif
 	return FALSE;
     }
@@ -937,7 +937,7 @@ bool QSqlQuery::prepare( const QString& query )
     d->sqlResult->extension()->clear();
     if ( !driver() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::prepare: no driver" );
+	qWarning("QSqlQuery::prepare: no driver" );
 #endif
 	return FALSE;
     }
@@ -946,18 +946,18 @@ bool QSqlQuery::prepare( const QString& query )
     d->sqlResult->setQuery( query.stripWhiteSpace() );
     if ( !driver()->isOpen() || driver()->isOpenError() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::prepare: database not open" );
+	qWarning("QSqlQuery::prepare: database not open" );
 #endif
 	return FALSE;
     }
     if ( query.isNull() || query.length() == 0 ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::prepare: empty query" );
+	qWarning("QSqlQuery::prepare: empty query" );
 #endif
 	return FALSE;
     }
 #ifdef QT_DEBUG_SQL
-    tqDebug( "\n QSqlQuery: " + query );
+    qDebug( "\n QSqlQuery: " + query );
 #endif
     QString q = query;
     QRegExp rx(QString::fromLatin1("'[^']*'|:([a-zA-Z0-9_]+)"));
@@ -1176,7 +1176,7 @@ QVariant QSqlQuery::boundValue( int pos ) const
     QMap<QString, QVariant>::ConstIterator it;
     QMap<QString, QVariant> vals = query.boundValues();
     for ( it = vals.begin(); it != vals.end(); ++it )
-        tqWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() );
+        qWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() );
     ...
 
     // Examine the bound values - bound using positional binding
@@ -1184,7 +1184,7 @@ QVariant QSqlQuery::boundValue( int pos ) const
     QValueList<QVariant> list = query.boundValues().values();
     int i = 0;
     for ( it = list.begin(); it != list.end(); ++it )
-        tqWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ );
+        qWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ );
     ...
 
     \endcode
diff --git a/src/sql/qsqlrecord.cpp b/src/sql/qsqlrecord.cpp
index 10e66ed..bc6a25f 100644
--- a/src/sql/qsqlrecord.cpp
+++ b/src/sql/qsqlrecord.cpp
@@ -302,7 +302,7 @@ int QSqlRecord::position( const QString& name ) const
 	    return i;
     }
 #ifdef QT_CHECK_RANGE
-    tqWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
+    qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
 #endif
     return -1;
 }
@@ -317,7 +317,7 @@ QSqlField* QSqlRecord::field( int i )
     checkDetach();
     if ( !sh->d->contains( i ) ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QSqlRecord::field: index out of range: %d", i );
+	qWarning( "QSqlRecord::field: index out of range: %d", i );
 #endif
 	return 0;
     }
@@ -348,7 +348,7 @@ const QSqlField* QSqlRecord::field( int i ) const
 {
     if ( !sh->d->contains( i ) ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QSqlRecord::field: index out of range: %d", i  );
+	qWarning( "QSqlRecord::field: index out of range: %d", i  );
 #endif // QT_CHECK_RANGE
 	return 0;
     }
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 076b259..faf3649 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -611,7 +611,7 @@ void QCommonStyle::drawControl( ControlElement element,
 {
 #if defined(QT_CHECK_STATE)
     if (! widget) {
-	tqWarning("QCommonStyle::drawControl: widget parameter cannot be zero!");
+	qWarning("QCommonStyle::drawControl: widget parameter cannot be zero!");
 	return;
     }
 #endif
@@ -1139,7 +1139,7 @@ QRect QCommonStyle::subRect(SubRect r, const QWidget *widget) const
 {
 #if defined(QT_CHECK_STATE)
     if (! widget) {
-	tqWarning("QCommonStyle::subRect: widget parameter cannot be zero!");
+	qWarning("QCommonStyle::subRect: widget parameter cannot be zero!");
 	return QRect();
     }
 #endif
@@ -1491,7 +1491,7 @@ void QCommonStyle::drawComplexControl( ComplexControl control,
 {
 #if defined(QT_CHECK_STATE)
     if (! widget) {
-	tqWarning("QCommonStyle::drawComplexControl: widget parameter cannot be zero!");
+	qWarning("QCommonStyle::drawComplexControl: widget parameter cannot be zero!");
 	return;
     }
 #endif
@@ -1917,7 +1917,7 @@ QRect QCommonStyle::querySubControlMetrics( ComplexControl control,
 {
 #if defined(QT_CHECK_STATE)
     if (! widget) {
-	tqWarning("QCommonStyle::querySubControlMetrics: widget parameter cannot be zero!");
+	qWarning("QCommonStyle::querySubControlMetrics: widget parameter cannot be zero!");
 	return QRect();
     }
 #endif
@@ -2468,7 +2468,7 @@ QSize QCommonStyle::sizeFromContents(ContentsType contents,
 
 #if defined(QT_CHECK_STATE)
     if (! widget) {
-	tqWarning("QCommonStyle::sizeFromContents: widget parameter cannot be zero!");
+	qWarning("QCommonStyle::sizeFromContents: widget parameter cannot be zero!");
 	return sz;
     }
 #endif
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);
diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp
index 7db8c1e..1e68de0 100644
--- a/src/widgets/qaction.cpp
+++ b/src/widgets/qaction.cpp
@@ -785,7 +785,7 @@ void QAction::setAccel( const QKeySequence& key )
     }
 #if defined(QT_CHECK_STATE)
     else
-	tqWarning( "QAction::setAccel() (%s) requires widget in parent chain", name() );
+	qWarning( "QAction::setAccel() (%s) requires widget in parent chain", name() );
 #endif
     d->update();
 }
@@ -841,7 +841,7 @@ void QAction::activate()
 {
     if ( isToggleAction() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QAction::%s() (%s) Toggle actions "
+	qWarning( "QAction::%s() (%s) Toggle actions "
 		  "can not be activated", "activate", name() );
 #endif
 	return;
@@ -858,7 +858,7 @@ void QAction::toggle()
 {
     if ( !isToggleAction() ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QAction::%s() (%s) Only toggle actions "
+	qWarning( "QAction::%s() (%s) Only toggle actions "
 		  "can be switched", "toggle", name() );
 #endif
 	return;
@@ -882,7 +882,7 @@ void QAction::setOn( bool enable )
     if ( !isToggleAction() ) {
 #if defined(QT_CHECK_STATE)
 	if ( enable )
-	    tqWarning( "QAction::%s() (%s) Only toggle actions "
+	    qWarning( "QAction::%s() (%s) Only toggle actions "
 		      "can be switched", "setOn", name() );
 #endif
 	return;
@@ -1066,7 +1066,7 @@ bool QAction::addTo( QWidget* w )
 
 	d->update( QActionPrivate::State | QActionPrivate::EverythingElse );
     } else {
-	tqWarning( "QAction::addTo(), unknown object" );
+	qWarning( "QAction::addTo(), unknown object" );
 	return FALSE;
     }
     return TRUE;
@@ -1226,7 +1226,7 @@ bool QAction::removeFrom( QWidget* w )
 	    }
 	}
     } else {
-	tqWarning( "QAction::removeFrom(), unknown object" );
+	qWarning( "QAction::removeFrom(), unknown object" );
 	return FALSE;
     }
     return TRUE;
diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp
index 1395169..57178fb 100644
--- a/src/widgets/qbutton.cpp
+++ b/src/widgets/qbutton.cpp
@@ -631,7 +631,7 @@ void QButton::setState( ToggleState s )
 {
     if ( !toggleTyp ) {
 #if defined(QT_CHECK_STATE)
-	tqWarning( "QButton::setState() / setOn: (%s) Only toggle buttons "
+	qWarning( "QButton::setState() / setOn: (%s) Only toggle buttons "
 		 "may be switched", name( "unnamed" ) );
 #endif
 	return;
diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp
index 39788b1..1da559c 100644
--- a/src/widgets/qcombobox.cpp
+++ b/src/widgets/qcombobox.cpp
@@ -469,7 +469,7 @@ static inline bool checkInsertIndex( const char *method, const char * name,
     bool range_err = (*index > count);
 #if defined(QT_CHECK_RANGE)
     if ( range_err )
-	tqWarning( "QComboBox::%s: (%s) Index %d out of range",
+	qWarning( "QComboBox::%s: (%s) Index %d out of range",
 		 method, name ? name : "<no name>", *index );
 #else
     Q_UNUSED( method )
@@ -487,7 +487,7 @@ static inline bool checkIndex( const char *method, const char * name,
     bool range_err = (index >= count);
 #if defined(QT_CHECK_RANGE)
     if ( range_err )
-	tqWarning( "QComboBox::%s: (%s) Index %i out of range",
+	qWarning( "QComboBox::%s: (%s) Index %i out of range",
 		 method, name ? name : "<no name>", index );
 #else
     Q_UNUSED( method )
diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp
index 9ac3afb..6f6ca71 100644
--- a/src/widgets/qdatetimeedit.cpp
+++ b/src/widgets/qdatetimeedit.cpp
@@ -2118,7 +2118,7 @@ void QTimeEdit::stepUp()
     default:
 	accepted = FALSE;
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QTimeEdit::stepUp: Focus section out of range!" );
+	qWarning( "QTimeEdit::stepUp: Focus section out of range!" );
 #endif
 	break;
     }
@@ -2170,7 +2170,7 @@ void QTimeEdit::stepDown()
     default:
 	accepted = FALSE;
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QTimeEdit::stepDown: Focus section out of range!" );
+	qWarning( "QTimeEdit::stepDown: Focus section out of range!" );
 #endif
 	break;
     }
diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp
index b6dcbae..787a406 100644
--- a/src/widgets/qdialogbuttons.cpp
+++ b/src/widgets/qdialogbuttons.cpp
@@ -84,7 +84,7 @@ void
 QDialogButtons::init(Q_UINT32 buttons, Orientation orient)
 {
     if(buttons == All) {
-	tqWarning("QDialogButtons: cannot specify All by itself!");
+	qWarning("QDialogButtons: cannot specify All by itself!");
 	buttons = None;
     }
     d = new QDialogButtonsPrivate;
@@ -173,7 +173,7 @@ void
 QDialogButtons::setDefaultButton(Button button)
 {
     if(!((int)(d->visible & button) == button)) {
-	tqWarning("QDialogButtons: Button '%d' is not visible (so cannot be default)", button);
+	qWarning("QDialogButtons: Button '%d' is not visible (so cannot be default)", button);
 	return;
     }
     if(d->def != button) {
diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp
index 375730f..2d4d957 100644
--- a/src/widgets/qdockarea.cpp
+++ b/src/widgets/qdockarea.cpp
@@ -766,21 +766,21 @@ void QDockArea::moveDockWindow( QDockWindow *w, const QPoint &p, const QRect &r,
 	    insertLine = TRUE;
 
 #if defined(QDOCKAREA_DEBUG)
-	tqDebug( "insert in line %d, and insert that line: %d", dockLine, insertLine );
-	tqDebug( "     (btw, we have %d lines)", lines.count() );
+	qDebug( "insert in line %d, and insert that line: %d", dockLine, insertLine );
+	qDebug( "     (btw, we have %d lines)", lines.count() );
 #endif
 	QDockWindow *dw = 0;
 	if ( dockLine >= (int)lines.count() ) { // insert after last line
 	    dockWindows->append( dockWindow );
 	    dockWindow->setNewLine( TRUE );
 #if defined(QDOCKAREA_DEBUG)
-	    tqDebug( "insert at the end" );
+	    qDebug( "insert at the end" );
 #endif
 	} else if ( dockLine == 0 && insertLine ) { // insert before first line
 	    dockWindows->insert( 0, dockWindow );
 	    dockWindows->at( 1 )->setNewLine( TRUE );
 #if defined(QDOCKAREA_DEBUG)
-	    tqDebug( "insert at the begin" );
+	    qDebug( "insert at the begin" );
 #endif
 	} else { // insert somewhere in between
 	    // make sure each line start has a new line
@@ -790,7 +790,7 @@ void QDockArea::moveDockWindow( QDockWindow *w, const QPoint &p, const QRect &r,
 	    // find the index of the first widget in the search line
 	    int searchLine = dockLine;
 #if defined(QDOCKAREA_DEBUG)
-	    tqDebug( "search line start of %d", searchLine );
+	    qDebug( "search line start of %d", searchLine );
 #endif
 	    QDockWindow *lsw = lineStarts.at( searchLine );
 	    int index = dockWindows->find( lsw );
@@ -803,7 +803,7 @@ void QDockArea::moveDockWindow( QDockWindow *w, const QPoint &p, const QRect &r,
 		    (void)dockWindows->at( index ); // move current to index
 	    }
 #if defined(QDOCKAREA_DEBUG)
-	    tqDebug( "     which starts at %d", index );
+	    qDebug( "     which starts at %d", index );
 #endif
 	    if ( !insertLine ) { // if we insert the docking widget in the existing line
 		// find the index for the widget
@@ -825,7 +825,7 @@ void QDockArea::moveDockWindow( QDockWindow *w, const QPoint &p, const QRect &r,
 		    firstTime = FALSE;
 		}
 #if defined(QDOCKAREA_DEBUG)
-		tqDebug( "insert at index: %d", index );
+		qDebug( "insert at index: %d", index );
 #endif
 		// if we insert it just before a widget which has a new line, transfer the newline to the docking widget
 		// but not if we didn't only mave a widget in its line which was alone in the line before
@@ -833,7 +833,7 @@ void QDockArea::moveDockWindow( QDockWindow *w, const QPoint &p, const QRect &r,
 		     && index >= 0 && index < (int)dockWindows->count() &&
 		     dockWindows->at( index )->newLine() && lineOf( index ) == dockLine ) {
 #if defined(QDOCKAREA_DEBUG)
-		    tqDebug( "get rid of the old newline and get me one" );
+		    qDebug( "get rid of the old newline and get me one" );
 #endif
 		    dockWindows->at( index )->setNewLine( FALSE );
 		    dockWindow->setNewLine( TRUE );
@@ -844,18 +844,18 @@ void QDockArea::moveDockWindow( QDockWindow *w, const QPoint &p, const QRect &r,
 		}
 	    } else { // insert in a new line, so make sure the dock widget and the widget which will be after it have a newline
 #if defined(QDOCKAREA_DEBUG)
-		tqDebug( "insert a new line" );
+		qDebug( "insert a new line" );
 #endif
 		if ( index < (int)dockWindows->count() ) {
 #if defined(QDOCKAREA_DEBUG)
-		    tqDebug( "give the widget at %d a newline", index );
+		    qDebug( "give the widget at %d a newline", index );
 #endif
 		    QDockWindow* nldw = dockWindows->at( index );
 		    if ( nldw )
 			nldw->setNewLine( TRUE );
 		}
 #if defined(QDOCKAREA_DEBUG)
-		tqDebug( "give me a newline" );
+		qDebug( "give me a newline" );
 #endif
 		dockWindow->setNewLine( TRUE );
 	    }
diff --git a/src/widgets/qheader.cpp b/src/widgets/qheader.cpp
index e12f25d..82fd012 100644
--- a/src/widgets/qheader.cpp
+++ b/src/widgets/qheader.cpp
@@ -826,7 +826,7 @@ void QHeader::mouseMoveEvent( QMouseEvent *e )
 	break;
     }
     default:
-	tqWarning( "QHeader::mouseMoveEvent: (%s) unknown state", name() );
+	qWarning( "QHeader::mouseMoveEvent: (%s) unknown state", name() );
 	break;
     }
 }
diff --git a/src/widgets/qlcdnumber.cpp b/src/widgets/qlcdnumber.cpp
index 2358dbe..4398907 100644
--- a/src/widgets/qlcdnumber.cpp
+++ b/src/widgets/qlcdnumber.cpp
@@ -375,14 +375,14 @@ void QLCDNumber::setNumDigits( int numDigits )
 {
     if ( numDigits > 99 ) {
 #if defined(QT_CHECK_RANGE)
-        tqWarning( "QLCDNumber::setNumDigits: (%s) Max 99 digits allowed",
+        qWarning( "QLCDNumber::setNumDigits: (%s) Max 99 digits allowed",
                  name( "unnamed" ) );
 #endif
         numDigits = 99;
     }
     if (numDigits < 0 ) {
 #if defined(QT_CHECK_RANGE)
-        tqWarning( "QLCDNumber::setNumDigits: (%s) Min 0 digits allowed",
+        qWarning( "QLCDNumber::setNumDigits: (%s) Min 0 digits allowed",
                  name( "unnamed" ) );
 #endif
         numDigits = 0;
@@ -976,7 +976,7 @@ void QLCDNumber::drawSegment( const QPoint &pos, char segmentNo, QPainter &p,
             break;
 #if defined(QT_CHECK_RANGE)
         default :
-            tqWarning( "QLCDNumber::drawSegment: (%s) Internal error."
+            qWarning( "QLCDNumber::drawSegment: (%s) Internal error."
                      "  Illegal segment id: %d\n",
                      name( "unnamed" ), segmentNo );
 #endif
@@ -1111,7 +1111,7 @@ void QLCDNumber::drawSegment( const QPoint &pos, char segmentNo, QPainter &p,
             break;
 #if defined(QT_CHECK_RANGE)
         default :
-            tqWarning( "QLCDNumber::drawSegment: (%s) Internal error."
+            qWarning( "QLCDNumber::drawSegment: (%s) Internal error."
                      "  Illegal segment id: %d\n",
                      name( "unnamed" ), segmentNo );
 #endif
diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp
index 18968e9..f5e0057 100644
--- a/src/widgets/qlistbox.cpp
+++ b/src/widgets/qlistbox.cpp
@@ -3789,14 +3789,14 @@ void QListBox::viewportPaintEvent( QPaintEvent * e )
 	// this stuff has been useful enough times that from now I'm
 	//  leaving it in the source.
 	uint i = 0;
-	tqDebug( "%s/%s: %i rects", className(), name(), r.rects().size() );
+	qDebug( "%s/%s: %i rects", className(), name(), r.rects().size() );
 	while( i < r.rects().size() ) {
-	    tqDebug( "rect %d: %d, %d, %d, %d", i,
+	    qDebug( "rect %d: %d, %d, %d, %d", i,
 		   r.rects()[i].left(), r.rects()[i].top(),
 		   r.rects()[i].width(), r.rects()[i].height() );
 	    i++;
 	}
-	tqDebug( "" );
+	qDebug( "" );
     }
 #endif
 
@@ -3977,7 +3977,7 @@ QRect QListBox::itemRect( QListBoxItem *item ) const
 */
 int QListBox::inSort( const QListBoxItem * lbi )
 {
-    tqObsolete( "QListBox", "inSort", "insertItem" );
+    qObsolete( "QListBox", "inSort", "insertItem" );
     if ( !lbi )
 	return -1;
 
@@ -4009,7 +4009,7 @@ int QListBox::inSort( const QListBoxItem * lbi )
 */
 int QListBox::inSort( const QString& text )
 {
-    tqObsolete( "QListBox", "inSort", "insertItem" );
+    qObsolete( "QListBox", "inSort", "insertItem" );
     return inSort( new QListBoxText(text) );
 }
 
@@ -4160,7 +4160,7 @@ void QListBox::showEvent( QShowEvent * )
 */
 bool QListBox::itemYPos( int index, int *yPos ) const
 {
-    tqObsolete( "QListBox", "itemYPos" );
+    qObsolete( "QListBox", "itemYPos" );
     QListBoxItem* i = item(index);
     if ( !i )
 	return FALSE;
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 0fe6818..d441a59 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -6048,7 +6048,7 @@ QCheckListItem::QCheckListItem( QCheckListItem *parent, const QString &text,
     init();
     if ( myType == RadioButton ) {
 	if ( parent->type() != RadioButtonController )
-	    tqWarning( "QCheckListItem::QCheckListItem(), radio button must be "
+	    qWarning( "QCheckListItem::QCheckListItem(), radio button must be "
 		      "child of a controller" );
 	else
 	    d->exclusive = parent;
@@ -6069,7 +6069,7 @@ QCheckListItem::QCheckListItem( QCheckListItem *parent, QListViewItem *after,
     init();
     if ( myType == RadioButton ) {
  	if ( parent->type() != RadioButtonController )
- 	    tqWarning( "QCheckListItem::QCheckListItem(), radio button must be "
+ 	    qWarning( "QCheckListItem::QCheckListItem(), radio button must be "
 		      "child of a controller" );
  	else
  	    d->exclusive = parent;
@@ -6088,7 +6088,7 @@ QCheckListItem::QCheckListItem( QListViewItem *parent, const QString &text,
 {
     myType = tt;
     if ( myType == RadioButton ) {
-      tqWarning( "QCheckListItem::QCheckListItem(), radio button must be "
+      qWarning( "QCheckListItem::QCheckListItem(), radio button must be "
 	       "child of a QCheckListItem" );
     }
     init();
@@ -6107,7 +6107,7 @@ QCheckListItem::QCheckListItem( QListViewItem *parent, QListViewItem *after,
 {
     myType = tt;
     if ( myType == RadioButton ) {
- 	tqWarning( "QCheckListItem::QCheckListItem(), radio button must be "
+ 	qWarning( "QCheckListItem::QCheckListItem(), radio button must be "
  		  "child of a QCheckListItem" );
     }
     init();
@@ -6125,7 +6125,7 @@ QCheckListItem::QCheckListItem( QListView *parent, const QString &text,
 {
     myType = tt;
     if ( tt == RadioButton )
-	tqWarning( "QCheckListItem::QCheckListItem(), radio button must be "
+	qWarning( "QCheckListItem::QCheckListItem(), radio button must be "
 		 "child of a QCheckListItem" );
     init();
 }
@@ -6142,7 +6142,7 @@ QCheckListItem::QCheckListItem( QListView *parent, QListViewItem *after,
 {
     myType = tt;
     if ( tt == RadioButton )
- 	tqWarning( "QCheckListItem::QCheckListItem(), radio button must be "
+ 	qWarning( "QCheckListItem::QCheckListItem(), radio button must be "
  		  "child of a QCheckListItem" );
     init();
 }
@@ -6236,7 +6236,7 @@ QCheckListItem::~QCheckListItem()
 void QCheckListItem::setTristate( bool b )
 {
     if ( ( myType != CheckBoxController ) && ( myType != CheckBox ) ) {
-	tqWarning( "QCheckListItem::setTristate(), has no effect on RadioButton "
+	qWarning( "QCheckListItem::setTristate(), has no effect on RadioButton "
 		  "or RadioButtonController." );
     	return;
     }
@@ -7733,7 +7733,7 @@ QListViewItemIterator &QListViewItemIterator::operator-=( int j )
 QListViewItem* QListViewItemIterator::operator*()
 {
     if ( curr != 0 && !matchesFlags( curr ) )
-	tqWarning( "QListViewItemIterator::operator*() curr out of sync" );
+	qWarning( "QListViewItemIterator::operator*() curr out of sync" );
     return curr;
 }
 
@@ -7744,7 +7744,7 @@ QListViewItem* QListViewItemIterator::operator*()
 QListViewItem *QListViewItemIterator::current() const
 {
     if ( curr != 0 && !matchesFlags( curr ) )
-	tqWarning( "QListViewItemIterator::current() curr out of sync" );
+	qWarning( "QListViewItemIterator::current() curr out of sync" );
     return curr;
 }
 
diff --git a/src/widgets/qmenudata.cpp b/src/widgets/qmenudata.cpp
index a5ade29..518ea6b 100644
--- a/src/widgets/qmenudata.cpp
+++ b/src/widgets/qmenudata.cpp
@@ -813,7 +813,7 @@ void QMenuData::removeItemAt( int index )
 {
     if ( index < 0 || index >= (int)mitems->count() ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QMenuData::removeItem: Index %d out of range", index );
+	qWarning( "QMenuData::removeItem: Index %d out of range", index );
 #endif
 	return;
     }
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index a2d7446..9e1e01c 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -112,7 +112,7 @@ static void cleanup()
 static void popupSubMenuLater( int msec, QPopupMenu * receiver ) {
     if ( !singleSingleShot ) {
 	singleSingleShot = new QTimer( qApp, "popup submenu timer" );
-	tqAddPostRoutine( cleanup );
+	qAddPostRoutine( cleanup );
     }
 
     singleSingleShot->disconnect( SIGNAL(timeout()) );
@@ -1163,7 +1163,7 @@ QSize QPopupMenu::updateSize(bool force_update, bool do_resize)
 #if defined(QT_CHECK_NULL)
 		if ( mi->text().isNull() && !mi->pixmap() && !mi->iconSet() &&
 		     !mi->isSeparator() && !mi->widget() && !mi->custom() )
-		    tqWarning( "QPopupMenu: (%s) Popup has invalid menu item",
+		    qWarning( "QPopupMenu: (%s) Popup has invalid menu item",
 			      name( "unnamed" ) );
 #endif
 	    }
diff --git a/src/widgets/qrangecontrol.cpp b/src/widgets/qrangecontrol.cpp
index e9b325f..c329831 100644
--- a/src/widgets/qrangecontrol.cpp
+++ b/src/widgets/qrangecontrol.cpp
@@ -348,7 +348,7 @@ void QRangeControl::setRange( int minValue, int maxValue )
 {
     if ( minValue > maxValue ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QRangeControl::setRange: minValue %d > maxValue %d",
+	qWarning( "QRangeControl::setRange: minValue %d > maxValue %d",
 		  minValue, maxValue );
 #endif
 	maxValue = minValue;
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index aa9651e..6af8f12 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -1388,7 +1388,7 @@ void QScrollView::addChild(QWidget* child, int x, int y)
 {
     if ( !child ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QScrollView::addChild(): Cannot add null child" );
+	qWarning( "QScrollView::addChild(): Cannot add null child" );
 #endif
 	return;
     }
@@ -2589,7 +2589,7 @@ void QScrollView::enableClipper(bool y)
     if ( !d->clipped_viewport == !y )
 	return;
     if ( d->children.count() )
-	tqFatal("May only call QScrollView::enableClipper() before adding widgets");
+	qFatal("May only call QScrollView::enableClipper() before adding widgets");
     if ( y ) {
 	d->clipped_viewport = new QClipperWidget(clipper(), "qt_clipped_viewport", d->flags);
 	d->clipped_viewport->setGeometry(-coord_limit/2,-coord_limit/2,
diff --git a/src/widgets/qslider.cpp b/src/widgets/qslider.cpp
index d10a444..1573294 100644
--- a/src/widgets/qslider.cpp
+++ b/src/widgets/qslider.cpp
@@ -601,7 +601,7 @@ void QSlider::resetState()
     case Idle:
 	break;
     default:
-	tqWarning("QSlider: (%s) in wrong state", name( "unnamed" ) );
+	qWarning("QSlider: (%s) in wrong state", name( "unnamed" ) );
     }
     state = Idle;
 }
diff --git a/src/widgets/qstatusbar.cpp b/src/widgets/qstatusbar.cpp
index 1a66fba..9a57704 100644
--- a/src/widgets/qstatusbar.cpp
+++ b/src/widgets/qstatusbar.cpp
@@ -194,7 +194,7 @@ void QStatusBar::addWidget( QWidget * widget, int stretch, bool permanent )
 {
     if ( !widget ) {
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QStatusBar::addWidget(): Cannot add null widget" );
+	qWarning( "QStatusBar::addWidget(): Cannot add null widget" );
 #endif
 	return;
     }
@@ -246,7 +246,7 @@ void QStatusBar::removeWidget( QWidget* widget )
 	reformat();
 #if defined(QT_DEBUG)
     else
-	tqDebug( "QStatusBar::removeWidget(): Widget not found." );
+	qDebug( "QStatusBar::removeWidget(): Widget not found." );
 #endif
 }
 
diff --git a/src/widgets/qtextbrowser.cpp b/src/widgets/qtextbrowser.cpp
index 7824de6..38e280b 100644
--- a/src/widgets/qtextbrowser.cpp
+++ b/src/widgets/qtextbrowser.cpp
@@ -251,11 +251,11 @@ void QTextBrowser::setSource(const QString& name)
 	const QMimeSource* m =
 		    mimeSourceFactory()->data( source, context() );
 	if ( !m ){
-	    tqWarning("QTextBrowser: no mimesource for %s", source.latin1() );
+	    qWarning("QTextBrowser: no mimesource for %s", source.latin1() );
 	}
 	else {
 	    if ( !QTextDrag::decode( m, txt ) ) {
-		tqWarning("QTextBrowser: cannot decode %s", source.latin1() );
+		qWarning("QTextBrowser: cannot decode %s", source.latin1() );
 	    }
 	}
 	if ( isVisible() ) {
diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp
index e305d14..0908e84 100644
--- a/src/widgets/qtextedit.cpp
+++ b/src/widgets/qtextedit.cpp
@@ -5069,7 +5069,7 @@ void QTextEdit::updateStyles()
 void QTextEdit::setDocument( QTextDocument *dc )
 {
     if ( dc == 0 ) {
-        tqWarning( "Q3TextEdit::setDocument() called with null Q3TextDocument pointer" );
+        qWarning( "Q3TextEdit::setDocument() called with null Q3TextDocument pointer" );
         return;
     }
     if ( dc == doc )
@@ -6452,7 +6452,7 @@ void QTextEdit::optimParseTags( QString * line, int lineNo, int indexOffset )
 		    cur = tag->prev;
 		    if ( !cur ) {
 #ifdef QT_CHECK_RANGE
-			tqWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 );
+			qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 );
 #endif
 			return; // something is wrong - give up
 		    }
@@ -6475,7 +6475,7 @@ void QTextEdit::optimParseTags( QString * line, int lineNo, int indexOffset )
 				    break;
 				} else if ( !cur->leftTag ) {
 #ifdef QT_CHECK_RANGE
-				    tqWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 );
+				    qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 );
 #endif
 				    return; // something is amiss - give up
 				}
@@ -6956,9 +6956,9 @@ void QTextEdit::optimDrawContents( QPainter * p, int clipx, int clipy,
         // useful debug info
 	//
 //	tag = d->od->tags;
-//	tqWarning("###");
+//	qWarning("###");
 //	while ( tag ) {
-//	    tqWarning( "Tag: %p, parent: %09p, leftTag: %09p, Name: %-15s, ParentName: %s, %d%d%d", tag,
+//	    qWarning( "Tag: %p, parent: %09p, leftTag: %09p, Name: %-15s, ParentName: %s, %d%d%d", tag,
 //		       tag->parent, tag->leftTag, tag->tag.latin1(), tag->parent ? tag->parent->tag.latin1():"<none>",
 //		      tag->bold, tag->italic, tag->underline );
 //	    tag = tag->next;
diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp
index 2f1b59b..f11b613 100644
--- a/src/widgets/qtoolbutton.cpp
+++ b/src/widgets/qtoolbutton.cpp
@@ -716,10 +716,10 @@ void QToolButton::setOnIconSet( const QIconSet& set )
 {
     setIconSet( set );
     /*
-      ### Get rid of all tqWarning in this file in 4.0.
+      ### Get rid of all qWarning in this file in 4.0.
       Also consider inlining the obsolete functions then.
     */
-    tqWarning( "QToolButton::setOnIconSet(): This function is not supported"
+    qWarning( "QToolButton::setOnIconSet(): This function is not supported"
 	      " anymore" );
 }
 
@@ -790,7 +790,7 @@ void QToolButton::setIconSet( const QIconSet & set )
 void QToolButton::setIconSet( const QIconSet & set, bool /* on */ )
 {
     setIconSet( set );
-    tqWarning( "QToolButton::setIconSet(): 'on' parameter ignored" );
+    qWarning( "QToolButton::setIconSet(): 'on' parameter ignored" );
 }
 
 #endif
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index 9a57c44..c6e8f04 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -417,7 +417,7 @@ void QWhatsThat::paintEvent( QPaintEvent* )
 QWhatsThisPrivate::WhatsThisItem::~WhatsThisItem()
 {
     if ( count )
-	tqFatal( "QWhatsThis: Internal error (%d)", count );
+	qFatal( "QWhatsThis: Internal error (%d)", count );
     delete whatsthis;
 }
 
@@ -617,7 +617,7 @@ void QWhatsThisPrivate::setUpWhatsThis()
 	// It is necessary to use a post routine, because
 	// the destructor deletes pixmaps and other stuff that
 	// needs a working X connection under X11.
-	tqAddPostRoutine( qWhatsThisPrivateCleanup );
+	qAddPostRoutine( qWhatsThisPrivateCleanup );
     }
 }
 
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp
index c1bf214..b6699e8 100644
--- a/src/workspace/qworkspace.cpp
+++ b/src/workspace/qworkspace.cpp
@@ -976,7 +976,7 @@ void QWorkspace::showEvent( QShowEvent *e )
 			    dw->move(dw->mapToGlobal(QPoint(0, 0)));
 			    d->newdocks.append(dw);
 			} else {
-			    tqDebug("not sure what to do with %s %s", (*dock_it)->className(),
+			    qDebug("not sure what to do with %s %s", (*dock_it)->className(),
 				   (*dock_it)->name());
 			}
 		    }
@@ -1316,7 +1316,7 @@ bool QWorkspace::eventFilter( QObject *o, QEvent * e)
 	    ::qt_cast<QDockArea*>(o) && !((QWidget*)o)->isVisible()) {
 	    QChildEvent *ce = (QChildEvent*)e;
 	    if(!::qt_cast<QDockWindow*>(ce->child())) {
-		tqDebug("No idea what to do..");
+		qDebug("No idea what to do..");
 		return FALSE;
 	    }
 	    QDockWindow *w = (QDockWindow*)ce->child();
diff --git a/src/xml/qdom.cpp b/src/xml/qdom.cpp
index c83f27e..524c638 100644
--- a/src/xml/qdom.cpp
+++ b/src/xml/qdom.cpp
@@ -3686,7 +3686,7 @@ static QString encodeAttr( const QString& str )
 	    i += 4;
         } else if (!isXmlChar(tmp[(int)i])) {
             QString repl = "&#x" + QString::number(tmp[(int)i].unicode(), 16) + ';';
-            tqWarning("QDom: saving invalid character %s, the document will not be well-formed", repl.latin1());
+            qWarning("QDom: saving invalid character %s, the document will not be well-formed", repl.latin1());
             tmp.replace(i, 1, repl);
             len += repl.length() - 1;
             i += repl.length();
@@ -4651,7 +4651,7 @@ QDomNodePrivate* QDomTextPrivate::cloneNode( bool deep)
 QDomTextPrivate* QDomTextPrivate::splitText( int offset )
 {
     if ( !parent() ) {
-	tqWarning( "QDomText::splitText  The node has no parent. So I can not split" );
+	qWarning( "QDomText::splitText  The node has no parent. So I can not split" );
 	return 0;
     }
 
diff --git a/src/xml/qsvgdevice.cpp b/src/xml/qsvgdevice.cpp
index 9f8cd79..1f184f1 100644
--- a/src/xml/qsvgdevice.cpp
+++ b/src/xml/qsvgdevice.cpp
@@ -187,13 +187,13 @@ bool QSvgDevice::play( QPainter *painter )
     pt->setPen( Qt::NoPen ); // SVG default pen and brush
     pt->setBrush( Qt::black );
     if ( doc.isNull() ) {
-	tqWarning( "QSvgDevice::play: No SVG data set." );
+	qWarning( "QSvgDevice::play: No SVG data set." );
 	return FALSE;
     }
 
     QDomNode svg = doc.namedItem( "svg" );
     if ( svg.isNull() || !svg.isElement() ) {
-	tqWarning( "QSvgDevice::play: Couldn't find any svg element." );
+	qWarning( "QSvgDevice::play: Couldn't find any svg element." );
 	return FALSE;
     }
 
@@ -221,7 +221,7 @@ bool QSvgDevice::play( QPainter *painter )
 	QRegExp re( QString::fromLatin1("\\s*(\\S+)\\s*,?\\s*(\\S+)\\s*,?"
 					"\\s*(\\S+)\\s*,?\\s*(\\S+)\\s*") );
 	if ( re.search( attr.namedItem( "viewBox" ).nodeValue() ) < 0 ) {
-	    tqWarning( "QSvgDevice::play: Invalid viewBox attribute.");
+	    qWarning( "QSvgDevice::play: Invalid viewBox attribute.");
 	    return FALSE;
 	} else {
 	    double x = re.cap( 1 ).toDouble();
@@ -229,7 +229,7 @@ bool QSvgDevice::play( QPainter *painter )
 	    double w = re.cap( 3 ).toDouble();
 	    double h = re.cap( 4 ).toDouble();
 	    if ( w < 0 || h < 0 ) {
-		tqWarning( "QSvgDevice::play: Invalid viewBox dimension.");
+		qWarning( "QSvgDevice::play: Invalid viewBox dimension.");
 		return FALSE;
 	    } else if ( w == 0 || h == 0 ) {
 		return TRUE;
@@ -353,7 +353,7 @@ bool QSvgDevice::save( QIODevice *dev )
 {
 #if defined(CHECK_RANGE)
     if ( !d->images.isEmpty() || !d->pixmaps.isEmpty() )
-	tqWarning( "QSvgDevice::save: skipping external images" );
+	qWarning( "QSvgDevice::save: skipping external images" );
 #endif
 
     QTextStream s( dev );
@@ -419,7 +419,7 @@ int QSvgDevice::metric( int m ) const
     default:
 	val = 0;
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "QSvgDevice::metric: Invalid metric command" );
+	qWarning( "QSvgDevice::metric: Invalid metric command" );
 #endif
     }
     return val;
@@ -714,7 +714,7 @@ bool QSvgDevice::cmd ( int c, QPainter *painter, QPDevCmdParam *p )
 	}
     default:
 #if defined(CHECK_RANGE)
-	tqWarning( "QSVGDevice::cmd: Invalid command %d", c );
+	qWarning( "QSVGDevice::cmd: Invalid command %d", c );
 #endif
 	break;
     }
@@ -981,7 +981,7 @@ bool QSvgDevice::play( const QDomNode &node )
 		// ### catch references to embedded .svg files
 		QPixmap pix;
 		if ( !pix.load( href ) ) {
-		    tqWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() );
+		    qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() );
 		    break;
 		}
 		pt->drawPixmap( QRect( x1, y1, w, h ), pix );
@@ -1027,7 +1027,7 @@ bool QSvgDevice::play( const QDomNode &node )
                 break;
 	    }
 	case InvalidElement:
-	    tqWarning( "QSvgDevice::play: unknown element type %s",
+	    qWarning( "QSvgDevice::play: unknown element type %s",
 		      node.nodeName().latin1() );
 	    break;
 	};
@@ -1114,7 +1114,7 @@ double QSvgDevice::parseLen( const QString &str, bool *ok, bool horiz ) const
 {
     QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") );
     if ( reg.search( str ) == -1 ) {
-	tqWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() );
+	qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() );
 	if ( ok )
 	    *ok = FALSE;
 	return 0.0;
@@ -1143,7 +1143,7 @@ double QSvgDevice::parseLen( const QString &str, bool *ok, bool horiz ) const
 	else if ( u == "pc" )
 	    dbl *= m.logicalDpiX() / 6.0;
 	else
-	    tqWarning( "QSvgDevice::parseLen: Unknown unit %s",  u.latin1() );
+	    qWarning( "QSvgDevice::parseLen: Unknown unit %s",  u.latin1() );
     }
     if ( ok )
 	*ok = TRUE;
@@ -1241,7 +1241,7 @@ void QSvgDevice::setStyleProperty( const QString &prop, const QString &val,
 	else if ( val == "italic" )
 	    font->setItalic( TRUE );
 	else
-	    tqWarning( "QSvgDevice::setStyleProperty: unhandled "
+	    qWarning( "QSvgDevice::setStyleProperty: unhandled "
 		      "font-style: %s", val.latin1() );
     } else if ( prop == "font-weight" ) {
 	int w = font->weight();
@@ -1373,7 +1373,7 @@ void QSvgDevice::drawPath( const QString &data )
 		cmd = mode;			// continue in previous mode
 		idx--;
 	    } else {
-		tqWarning( "QSvgDevice::drawPath: Unknown command" );
+		qWarning( "QSvgDevice::drawPath: Unknown command" );
 		return;
 	    }
 	}
@@ -1385,7 +1385,7 @@ void QSvgDevice::drawPath( const QString &data )
 	for ( int i = 0; i < numArgs; i++ ) {
 	    int pos = reg.search( data, idx );
 	    if ( pos == -1 ) {
-		tqWarning( "QSvgDevice::drawPath: Error parsing arguments" );
+		qWarning( "QSvgDevice::drawPath: Error parsing arguments" );
 		return;
 	    }
 	    arg[ i ] = reg.cap( 1 ).toDouble();
diff --git a/src/xml/qxml.cpp b/src/xml/qxml.cpp
index 97759a5..010389b 100644
--- a/src/xml/qxml.cpp
+++ b/src/xml/qxml.cpp
@@ -2725,7 +2725,7 @@ bool QXmlSimpleReader::feature( const QString& name, bool *ok ) const
     } else if ( name == "http://trolltech.com/xml/features/report-start-end-entity" ) {
 	return d->reportEntities;
     } else {
-	tqWarning( "Unknown feature %s", name.latin1() );
+	qWarning( "Unknown feature %s", name.latin1() );
 	if ( ok != 0 )
 	    *ok = FALSE;
     }
@@ -2783,7 +2783,7 @@ void QXmlSimpleReader::setFeature( const QString& name, bool value )
     } else if ( name == "http://trolltech.com/xml/features/report-start-end-entity" ) {
 	d->reportEntities = value;
     } else {
-	tqWarning( "Unknown feature %s", name.latin1() );
+	qWarning( "Unknown feature %s", name.latin1() );
     }
 }
 
@@ -3182,14 +3182,14 @@ bool QXmlSimpleReader::parseProlog()
     } else {
         state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseProlog (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseProlog (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
             ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -3370,14 +3370,14 @@ bool QXmlSimpleReader::parseElement()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseElement (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseElement (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -3734,14 +3734,14 @@ bool QXmlSimpleReader::parseContent()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseContent (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseContent (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -4035,14 +4035,14 @@ bool QXmlSimpleReader::parseMisc()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseMisc (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseMisc (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -4189,14 +4189,14 @@ bool QXmlSimpleReader::parsePI()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parsePI (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parsePI (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -4418,14 +4418,14 @@ bool QXmlSimpleReader::parseDoctype()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseDoctype (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseDoctype (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -4620,14 +4620,14 @@ bool QXmlSimpleReader::parseExternalID()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseExternalID (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseExternalID (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -4781,14 +4781,14 @@ bool QXmlSimpleReader::parseMarkupdecl()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseMarkupdecl (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseMarkupdecl (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -4938,14 +4938,14 @@ bool QXmlSimpleReader::parsePEReference()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parsePEReference (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parsePEReference (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -5110,14 +5110,14 @@ bool QXmlSimpleReader::parseAttlistDecl()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseAttlistDecl (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseAttlistDecl (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -5325,14 +5325,14 @@ bool QXmlSimpleReader::parseAttType()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseAttType (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseAttType (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -5545,14 +5545,14 @@ bool QXmlSimpleReader::parseAttValue()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseAttValue (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseAttValue (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -5686,14 +5686,14 @@ bool QXmlSimpleReader::parseElementDecl()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseElementDecl (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseElementDecl (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -5894,14 +5894,14 @@ bool QXmlSimpleReader::parseNotationDecl()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseNotationDecl (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseNotationDecl (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -6037,14 +6037,14 @@ bool QXmlSimpleReader::parseChoiceSeq()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseChoiceSeq (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseChoiceSeq (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -6201,14 +6201,14 @@ bool QXmlSimpleReader::parseEntityDecl()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseEntityDecl (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseEntityDecl (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -6469,14 +6469,14 @@ bool QXmlSimpleReader::parseEntityValue()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseEntityValue (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseEntityValue (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -6587,14 +6587,14 @@ bool QXmlSimpleReader::parseComment()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseComment (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseComment (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -6698,14 +6698,14 @@ bool QXmlSimpleReader::parseAttribute()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseAttribute (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseAttribute (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -6804,14 +6804,14 @@ bool QXmlSimpleReader::parseName()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseName (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseName (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -6889,14 +6889,14 @@ bool QXmlSimpleReader::parseNmtoken()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseNmtoken (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseNmtoken (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -6997,14 +6997,14 @@ bool QXmlSimpleReader::parseReference()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseReference (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseReference (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
@@ -7324,14 +7324,14 @@ bool QXmlSimpleReader::parseString()
     } else {
 	state = d->parseStack->pop().state;
 #if defined(QT_QXML_DEBUG)
-	tqDebug( "QXmlSimpleReader: parseString (cont) in state %d", state );
+	qDebug( "QXmlSimpleReader: parseString (cont) in state %d", state );
 #endif
 	if ( !d->parseStack->isEmpty() ) {
 	    ParseFunction function = d->parseStack->top().function;
 	    if ( function == &QXmlSimpleReader::eat_ws ) {
 		d->parseStack->pop();
 #if defined(QT_QXML_DEBUG)
-		tqDebug( "QXmlSimpleReader: eat_ws (cont)" );
+		qDebug( "QXmlSimpleReader: eat_ws (cont)" );
 #endif
 	    }
 	    if ( !(this->*function)() ) {
diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp
index dbc823f..83d0bdc 100644
--- a/tools/assistant/config.cpp
+++ b/tools/assistant/config.cpp
@@ -57,7 +57,7 @@ Config::Config()
     if( !static_configuration ) {
 	static_configuration = this;
     } else {
-	tqWarning( "Multiple configurations not allowed!" );
+	qWarning( "Multiple configurations not allowed!" );
     }
 }
 
@@ -74,23 +74,23 @@ Config *Config::loadConfig(const QString &profileFileName)
 
     QFile file(profileFileName);
     if (!file.exists()) {
-	tqWarning( "File does not exist: " + profileFileName );
+	qWarning( "File does not exist: " + profileFileName );
 	return 0;
     }
     DocuParser *parser = DocuParser::createParser( profileFileName );
     if (!parser) {
-	tqWarning( "Failed to create parser for file: " + profileFileName );
+	qWarning( "Failed to create parser for file: " + profileFileName );
 	return 0;
     }
     if (parser->parserVersion() < DocuParser::Qt320) {
-	tqWarning( "File does not contain profile information" );
+	qWarning( "File does not contain profile information" );
 	return 0;
     }
     DocuParser320 *profileParser = static_cast<DocuParser320*>(parser);
     parser->parse(&file);
     config->profil = profileParser->profile();
     if (!config->profil) {
-	tqWarning( "Config::loadConfig(), no profile in: " + profileFileName );
+	qWarning( "Config::loadConfig(), no profile in: " + profileFileName );
 	return 0;
     }
     config->profil->setProfileType(Profile::UserProfile);
@@ -180,10 +180,10 @@ void Config::saveSettings()
 #ifdef ASSISTANT_DEBUG
 static void dumpmap( const QMap<QString,QString> &m, const QString &header )
 {
-    tqDebug( header );
+    qDebug( header );
     QMap<QString,QString>::ConstIterator it = m.begin();
     while (it != m.end()) {
-	tqDebug( "  " + it.key() + ":\t\t" + *it );
+	qDebug( "  " + it.key() + ":\t\t" + *it );
 	++it;
     }
 }
@@ -231,7 +231,7 @@ void Config::loadDefaultProfile()
     dumpmap( profil->indexPages, "IndexPages" );
     dumpmap( profil->imageDirs, "ImageDirs" );
     dumpmap( profil->dcfTitles, "dcfTitles" );
-    tqDebug( "Docfiles: \n  " + profil->docs.join( "\n  " ) );
+    qDebug( "Docfiles: \n  " + profil->docs.join( "\n  " ) );
 #endif
 }
 
@@ -264,11 +264,11 @@ void Config::saveProfile( Profile *profile )
     settings.writeEntry( profKey + "ImageDirs", imgDirs );
 
 #if ASSISTANT_DEBUG
-    tqDebug( "Titles:\n  - " + ( (QStringList*) &titles )->join( "\n  - " ) );
-    tqDebug( "Docfiles:\n  - " + dcfs.join( "\n  - " ) );
-    tqDebug( "IndexPages:\n  - " + indexes.join( "\n  - " ) );
-    tqDebug( "DocIcons:\n  - " + icons.join( "\n  - " ) );
-    tqDebug( "ImageDirs:\n  - " + imgDirs.join( "\n  - " ) );
+    qDebug( "Titles:\n  - " + ( (QStringList*) &titles )->join( "\n  - " ) );
+    qDebug( "Docfiles:\n  - " + dcfs.join( "\n  - " ) );
+    qDebug( "IndexPages:\n  - " + indexes.join( "\n  - " ) );
+    qDebug( "DocIcons:\n  - " + icons.join( "\n  - " ) );
+    qDebug( "ImageDirs:\n  - " + imgDirs.join( "\n  - " ) );
 #endif
 }
 
@@ -374,6 +374,6 @@ bool Config::sideBarHidden() const
 QString Config::assistantDocPath() const
 {
     return profil->props["assistantdocs"].isEmpty()
-	? QString( tqInstallPathDocs() ) + "/html"
+	? QString( qInstallPathDocs() ) + "/html"
 	: profil->props["assistantdocs"];
 }
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index 45de1d8..ceee175 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -81,7 +81,7 @@ static bool verifyDirectory(const QString &str)
     if (!dirInfo.exists())
 	return QDir().mkdir(str);
     if (!dirInfo.isDir()) {
-	tqWarning("'%s' exists but is not a directory", str.latin1());
+	qWarning("'%s' exists but is not a directory", str.latin1());
 	return FALSE;
     }
     return TRUE;
@@ -268,7 +268,7 @@ void HelpDialog::removeOldCacheFiles()
 {
     QString dir = cacheFilesPath; // ### remove the last '/' ?
     if (!verifyDirectory(cacheFilesPath)) {
-	tqWarning( "Failed to created assistant directory" );
+	qWarning( "Failed to created assistant directory" );
 	return;
     }
     QString pname = "." + Config::configuration()->profileName();
diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp
index c2190e6..9e73ceb 100644
--- a/tools/assistant/index.cpp
+++ b/tools/assistant/index.cpp
@@ -158,7 +158,7 @@ void Index::parseDocument( const QString &filename, int docNum )
 {
     QFile file( filename );
     if ( !file.open( IO_ReadOnly ) ) {
-	tqWarning( "can not open file " + filename );
+	qWarning( "can not open file " + filename );
 	return;
     }
 
@@ -327,7 +327,7 @@ QString Index::getDocumentTitle( const QString &fileName )
 {
     QFile file( fileName );
     if ( !file.open( IO_ReadOnly ) ) {
-	tqWarning( "cannot open file " + fileName );
+	qWarning( "cannot open file " + fileName );
 	return fileName;
     }
     QTextStream s( &file );
@@ -450,7 +450,7 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo
 {
     QFile file( fileName );
     if ( !file.open( IO_ReadOnly ) ) {
-	tqWarning( "cannot open file " + fileName );
+	qWarning( "cannot open file " + fileName );
 	return FALSE;
     }
 
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index aa5f3be..0619909 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -286,7 +286,7 @@ int main( int argc, char ** argv )
     }
 
     if( resourceDir.isNull() )
-	resourceDir = tqInstallPathTranslations();
+	resourceDir = qInstallPathTranslations();
 
     QTranslator translator( 0 );
     translator.load( QString("assistant_") + QTextCodec::locale(), resourceDir );
diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h
index e5df018..75acd89 100644
--- a/tools/assistant/mainwindow.ui.h
+++ b/tools/assistant/mainwindow.ui.h
@@ -412,7 +412,7 @@ void MainWindow::showLinkFromClient( const QString &link )
 void MainWindow::showLink( const QString &link )
 {
     if( link.isEmpty() ) {
-	tqWarning( "The link is empty!" );
+	qWarning( "The link is empty!" );
     }
 
     int find = link.find( '#' );
@@ -441,7 +441,7 @@ void MainWindow::showLink( const QString &link )
 void MainWindow::showLinks( const QStringList &links )
 {
     if ( links.size() == 0 ) {
-	tqWarning( "MainWindow::showLinks() - Empty link" );
+	qWarning( "MainWindow::showLinks() - Empty link" );
 	return;
     }
 
@@ -482,7 +482,7 @@ void MainWindow::timerEvent(QTimerEvent *e)
 
 void MainWindow::showQtHelp()
 {
-    showLink( QString( tqInstallPathDocs() ) + "/html/index.html" );
+    showLink( QString( qInstallPathDocs() ) + "/html/index.html" );
 }
 
 void MainWindow::showSettingsDialog()
diff --git a/tools/assistant/profile.cpp b/tools/assistant/profile.cpp
index 8d65754..be83f2a 100644
--- a/tools/assistant/profile.cpp
+++ b/tools/assistant/profile.cpp
@@ -45,7 +45,7 @@
 
 Profile *Profile::createDefaultProfile( const QString &docPath )
 {
-    QString path = tqInstallPathDocs();
+    QString path = qInstallPathDocs();
     if ( !docPath.isEmpty() )
         path = docPath;        
     path = path + "/html/";
@@ -116,9 +116,9 @@ void Profile::removeDocFileEntry( const QString &docfile )
     }
 
 #ifdef ASSISTANT_DEBUG   
-    tqDebug( "docs:\n  - " + docs.join( "\n  - " ) );
-    tqDebug( "titles:\n  - " + titles.join( "\n  - " ) );    
-    tqDebug( "keys:\n  - " + ( (QStringList*) &(dcfTitles.keys()) )->join( "\n  - " ) );
-    tqDebug( "values:\n  - " + ( (QStringList*) &(dcfTitles.values()) )->join( "\n  - " ) );
+    qDebug( "docs:\n  - " + docs.join( "\n  - " ) );
+    qDebug( "titles:\n  - " + titles.join( "\n  - " ) );    
+    qDebug( "keys:\n  - " + ( (QStringList*) &(dcfTitles.keys()) )->join( "\n  - " ) );
+    qDebug( "values:\n  - " + ( (QStringList*) &(dcfTitles.values()) )->join( "\n  - " ) );
 #endif
 }
diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp
index b12a598..74a6b19 100644
--- a/tools/designer/designer/command.cpp
+++ b/tools/designer/designer/command.cpp
@@ -2220,7 +2220,7 @@ void AddMenuCommand::execute()
 void AddMenuCommand::unexecute()
 {
     if ( !item ) {
-	tqWarning( "The AddMenuCommand was created without a menu item." );
+	qWarning( "The AddMenuCommand was created without a menu item." );
 	return;
     }
     item->menu()->hide();
diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp
index 6991fab..412f50f 100644
--- a/tools/designer/designer/customwidgeteditorimpl.cpp
+++ b/tools/designer/designer/customwidgeteditorimpl.cpp
@@ -764,7 +764,7 @@ void CustomWidgetEditor::loadDescription()
     QString errMsg;
     int errLine;
     if ( !doc.setContent( &f, &errMsg, &errLine ) ) {
-	tqDebug( QString("Parse error: ") + errMsg + QString(" in line %d"), errLine );
+	qDebug( QString("Parse error: ") + errMsg + QString(" in line %d"), errLine );
 	return;
     }
 
diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp
index 7e78580..b4c68cc 100644
--- a/tools/designer/designer/hierarchyview.cpp
+++ b/tools/designer/designer/hierarchyview.cpp
@@ -911,7 +911,7 @@ static HierarchyItem::Type getChildType( int type )
 {
     switch ( (HierarchyItem::Type)type ) {
     case HierarchyItem::Widget:
-	tqWarning( "getChildType: Inserting childs dynamically to Widget or SlotParent is not allowed!" );
+	qWarning( "getChildType: Inserting childs dynamically to Widget or SlotParent is not allowed!" );
 	break;
     case HierarchyItem::SlotParent:
     case HierarchyItem::SlotPublic:
diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp
index 3efe107..2701023 100644
--- a/tools/designer/designer/layout.cpp
+++ b/tools/designer/designer/layout.cpp
@@ -774,7 +774,7 @@ void GridLayout::doLayout()
 		( (QLayoutWidget*)w )->updateSizePolicy();
 	    w->show();
 	} else {
-	    tqWarning("ooops, widget '%s' does not fit in layout", w->name() );
+	    qWarning("ooops, widget '%s' does not fit in layout", w->name() );
 	}
     }
     finishLayout( needMove, layout );
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 3bdf654..0474b2f 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -133,7 +133,7 @@ MainWindow *MainWindow::self = 0;
 
 QString assistantPath()
 {
-    QString path = QDir::cleanDirPath( QString( tqInstallPathBins() ) +
+    QString path = QDir::cleanDirPath( QString( qInstallPathBins() ) +
 				       QDir::separator() );
     return path;
 }
@@ -2794,7 +2794,7 @@ void MainWindow::setSnapGrid( bool b )
 
 QString MainWindow::documentationPath() const
 {
-    return QString( tqInstallPathDocs() ) + "/html/";
+    return QString( qInstallPathDocs() ) + "/html/";
 }
 
 void MainWindow::windowsMenuActivated( int id )
@@ -3421,7 +3421,7 @@ void MainWindow::showSourceLine( QObject *o, int line, LineMode lm )
 	fw = ff->formWindow();
 
     if ( !fw && !qwf_forms ) {
-	tqWarning( "MainWindow::showSourceLine: qwf_forms is NULL!" );
+	qWarning( "MainWindow::showSourceLine: qwf_forms is NULL!" );
 	return;
     }
 
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index c847f92..d8d99aa 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -1450,7 +1450,7 @@ void MainWindow::createNewTemplate()
     const char *qtdir = getenv( "QTDIR" );
     if(qtdir)
 	templRoots << qtdir;
-    templRoots << tqInstallPathData();
+    templRoots << qInstallPathData();
     if(qtdir) //try the tools/designer directory last!
 	templRoots << (QString(qtdir) + "/tools/designer");
     QFile f;
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index 4da93cc..cd36cc0 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -152,7 +152,7 @@ void MetaDataBase::setPropertyChanged( QObject *o, const QString &property, bool
     }
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -191,7 +191,7 @@ bool MetaDataBase::isPropertyChanged( QObject *o, const QString &property )
 	return ( (PropertyObject*)o )->mdIsPropertyChanged( property );
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return FALSE;
     }
@@ -204,7 +204,7 @@ QStringList MetaDataBase::changedProperties( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QStringList();
     }
@@ -222,7 +222,7 @@ void MetaDataBase::setPropertyComment( QObject *o, const QString &property, cons
     }
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -237,7 +237,7 @@ QString MetaDataBase::propertyComment( QObject *o, const QString &property )
 	return ( (PropertyObject*)o )->mdPropertyComment( property );
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QString::null;
     }
@@ -254,7 +254,7 @@ void MetaDataBase::setFakeProperty( QObject *o, const QString &property, const Q
     }
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -268,7 +268,7 @@ QVariant MetaDataBase::fakeProperty( QObject * o, const QString &property)
 	return ( (PropertyObject*)o )->mdFakeProperty( property );
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QVariant();
     }
@@ -284,7 +284,7 @@ QMap<QString,QVariant>* MetaDataBase::fakeProperties( QObject* o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return 0;
     }
@@ -298,7 +298,7 @@ void MetaDataBase::setSpacing( QObject *o, int spacing )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r || !o->isWidgetType() ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -326,7 +326,7 @@ int MetaDataBase::spacing( QObject *o )
 	o = ( (QMainWindow*)o )->centralWidget();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r || !o->isWidgetType() ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return -1;
     }
@@ -341,7 +341,7 @@ void MetaDataBase::setMargin( QObject *o, int margin )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r || !o->isWidgetType() ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -383,7 +383,7 @@ int MetaDataBase::margin( QObject *o )
 	o = ( (QMainWindow*)o )->centralWidget();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r || !o->isWidgetType() ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return -1;
     }
@@ -397,7 +397,7 @@ void MetaDataBase::setResizeMode( QObject *o, const QString &mode )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r || !o->isWidgetType() ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -414,7 +414,7 @@ QString MetaDataBase::resizeMode( QObject *o )
 	o = ( (QMainWindow*)o )->centralWidget();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r || !o->isWidgetType() ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QString::null;
     }
@@ -427,7 +427,7 @@ void MetaDataBase::addConnection( QObject *o, QObject *sender, const QCString &s
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -461,7 +461,7 @@ void MetaDataBase::removeConnection( QObject *o, QObject *sender, const QCString
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -490,7 +490,7 @@ void MetaDataBase::setupConnections( QObject *o, const QValueList<LanguageInterf
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -538,7 +538,7 @@ bool MetaDataBase::hasConnection( QObject *o, QObject *sender, const QCString &s
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return FALSE;
     }
@@ -560,7 +560,7 @@ QValueList<MetaDataBase::Connection> MetaDataBase::connections( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QValueList<Connection>();
     }
@@ -573,7 +573,7 @@ QValueList<MetaDataBase::Connection> MetaDataBase::connections( QObject *o, QObj
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QValueList<Connection>();
     }
@@ -595,7 +595,7 @@ QValueList<MetaDataBase::Connection> MetaDataBase::connections( QObject *o, QObj
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QValueList<Connection>();
     }
@@ -616,7 +616,7 @@ void MetaDataBase::doConnections( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -670,7 +670,7 @@ bool MetaDataBase::hasSlot( QObject *o, const QCString &slot, bool onlyCustom )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return FALSE;
     }
@@ -714,7 +714,7 @@ bool MetaDataBase::isSlotUsed( QObject *o, const QCString &slot )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 	          o, o->name(), o->className() );
 	return FALSE;
     }
@@ -735,7 +735,7 @@ void MetaDataBase::addFunction( QObject *o, const QCString &function, const QStr
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -759,7 +759,7 @@ void MetaDataBase::setFunctionList( QObject *o, const QValueList<Function> &func
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -773,7 +773,7 @@ void MetaDataBase::removeFunction( QObject *o, const QCString &function, const Q
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -797,7 +797,7 @@ void MetaDataBase::removeFunction( QObject *o, const QString &function )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -815,7 +815,7 @@ QValueList<MetaDataBase::Function> MetaDataBase::functionList( QObject *o, bool
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QValueList<Function>();
     }
@@ -834,7 +834,7 @@ QValueList<MetaDataBase::Function> MetaDataBase::slotList( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QValueList<Function>();
     }
@@ -852,7 +852,7 @@ void MetaDataBase::changeFunction( QObject *o, const QString &function, const QS
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -876,7 +876,7 @@ void MetaDataBase::changeFunctionAttributes( QObject *o, const QString &oldName,
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -900,7 +900,7 @@ bool MetaDataBase::hasFunction( QObject *o, const QCString &function, bool onlyC
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return FALSE;
     }
@@ -944,7 +944,7 @@ QString MetaDataBase::languageOfFunction( QObject *o, const QCString &function )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QString::null;
     }
@@ -1038,7 +1038,7 @@ void MetaDataBase::setTabOrder( QWidget *w, const QWidgetList &order )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*) w );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  w, w->name(), w->className() );
 	return;
     }
@@ -1051,7 +1051,7 @@ QWidgetList MetaDataBase::tabOrder( QWidget *w )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*) w );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  w, w->name(), w->className() );
 	return QWidgetList();
     }
@@ -1064,7 +1064,7 @@ void MetaDataBase::setIncludes( QObject *o, const QValueList<Include> &incs )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1077,7 +1077,7 @@ QValueList<MetaDataBase::Include> MetaDataBase::includes( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QValueList<Include>();
     }
@@ -1090,7 +1090,7 @@ void MetaDataBase::setForwards( QObject *o, const QStringList &fwds )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1103,7 +1103,7 @@ QStringList MetaDataBase::forwards( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QStringList();
     }
@@ -1116,7 +1116,7 @@ void MetaDataBase::setVariables( QObject *o, const QValueList<Variable> &vars )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1129,7 +1129,7 @@ void MetaDataBase::addVariable( QObject *o, const QString &name, const QString &
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1144,7 +1144,7 @@ void MetaDataBase::removeVariable( QObject *o, const QString &name )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1162,7 +1162,7 @@ QValueList<MetaDataBase::Variable> MetaDataBase::variables( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QValueList<MetaDataBase::Variable>();
     }
@@ -1175,7 +1175,7 @@ bool MetaDataBase::hasVariable( QObject *o, const QString &name )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return FALSE;
     }
@@ -1203,7 +1203,7 @@ void MetaDataBase::setSignalList( QObject *o, const QStringList &sigs )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1236,7 +1236,7 @@ QStringList MetaDataBase::signalList( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QStringList();
     }
@@ -1249,7 +1249,7 @@ void MetaDataBase::setMetaInfo( QObject *o, MetaInfo mi )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1262,7 +1262,7 @@ MetaDataBase::MetaInfo MetaDataBase::metaInfo( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return MetaInfo();
     }
@@ -1308,7 +1308,7 @@ void MetaDataBase::setCursor( QWidget *w, const QCursor &c )
     }
     MetaDataBaseRecord *r = db->find( (void*)w );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  w, w->name(), w->className() );
 	return;
     }
@@ -1399,7 +1399,7 @@ void MetaDataBase::setPixmapArgument( QObject *o, int pixmap, const QString &arg
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1415,7 +1415,7 @@ QString MetaDataBase::pixmapArgument( QObject *o, int pixmap )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QString::null;
     }
@@ -1430,7 +1430,7 @@ void MetaDataBase::clearPixmapArguments( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1450,7 +1450,7 @@ void MetaDataBase::setPixmapKey( QObject *o, int pixmap, const QString &arg )
     }
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1468,7 +1468,7 @@ QString MetaDataBase::pixmapKey( QObject *o, int pixmap )
 	return ( (PropertyObject*)o )->mdPixmapKey( pixmap );
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QString::null;
     }
@@ -1491,7 +1491,7 @@ void MetaDataBase::clearPixmapKeys( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1508,7 +1508,7 @@ void MetaDataBase::setColumnFields( QObject *o, const QMap<QString, QString> &co
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1523,7 +1523,7 @@ QMap<QString, QString> MetaDataBase::columnFields( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QMap<QString, QString>();
     }
@@ -1589,7 +1589,7 @@ void MetaDataBase::setBreakPoints( QObject *o, const QValueList<uint> &l )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1612,7 +1612,7 @@ QValueList<uint> MetaDataBase::breakPoints( QObject *o )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QValueList<uint>();
     }
@@ -1627,7 +1627,7 @@ void MetaDataBase::setBreakPointCondition( QObject *o, int line, const QString &
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1641,7 +1641,7 @@ QString MetaDataBase::breakPointCondition( QObject *o, int line )
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return QString::null;
     }
@@ -1662,7 +1662,7 @@ void MetaDataBase::setExportMacro( QObject *o, const QString &macro )
     }
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
@@ -1679,7 +1679,7 @@ QString MetaDataBase::exportMacro( QObject *o )
 	return ( (PropertyObject*)o )->mdExportMacro();
     MetaDataBaseRecord *r = db->find( (void*)o );
     if ( !r ) {
-	tqWarning( "No entry for %p (%s, %s) found in MetaDataBase",
+	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return "";
     }
diff --git a/tools/designer/designer/newformimpl.cpp b/tools/designer/designer/newformimpl.cpp
index 8ef429c..a4a6ce0 100644
--- a/tools/designer/designer/newformimpl.cpp
+++ b/tools/designer/designer/newformimpl.cpp
@@ -289,7 +289,7 @@ void NewForm::insertTemplates( QIconView *tView,
 	const char *qtdir = getenv( "QTDIR" );
 	if(qtdir)
 	    templRoots << qtdir;
-	templRoots << tqInstallPathData();
+	templRoots << qInstallPathData();
 	if(qtdir) //try the tools/designer directory last!
 	    templRoots << (QString(qtdir) + "/tools/designer");
 	for ( QStringList::Iterator it = templRoots.begin(); it != templRoots.end(); ++it ) {
diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp
index 9e64053..8c8b0a7 100644
--- a/tools/designer/designer/pixmapchooser.cpp
+++ b/tools/designer/designer/pixmapchooser.cpp
@@ -83,7 +83,7 @@ void PixmapView::previewUrl( const QUrl &u )
 	if ( !pix.isNull() )
 	    setPixmap( pix );
     } else {
-	tqWarning( "Previewing remote files not supported." );
+	qWarning( "Previewing remote files not supported." );
     }
 }
 
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index 6f97dd8..3eae1c4 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -1048,7 +1048,7 @@ void Project::loadConnections()
 		dbConnections.append( conn );
 	    }
 	} else {
-	    tqDebug( QString("Parse error: ") + errMsg + QString(" in line %d"), errLine );
+	    qDebug( QString("Parse error: ") + errMsg + QString(" in line %d"), errLine );
 	}
 	f.close();
     }
@@ -1583,7 +1583,7 @@ QString Project::locationOfObject( QObject *o )
 
     extern QMap<QWidget*, QString> *qwf_forms;
     if ( !qwf_forms ) {
-	tqWarning( "Project::locationOfObject: qwf_forms is NULL!" );
+	qWarning( "Project::locationOfObject: qwf_forms is NULL!" );
 	return QString::null;
     }
 
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index c0c89ae..708f779 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -118,7 +118,7 @@ static QStringList getFontList()
 {
     if ( !fontDataBase ) {
 	fontDataBase = new QFontDatabase;
-	tqAddPostRoutine( cleanupFontDatabase );
+	qAddPostRoutine( cleanupFontDatabase );
     }
     return fontDataBase->families();
 }
@@ -150,7 +150,7 @@ bool PropertyWhatsThis::clicked( const QString& href )
 {
     if ( !href.isEmpty() ) {
 	QAssistantClient *ac = MainWindow::self->assistantClient();
-	ac->showPage( QString( tqInstallPathDocs() ) + "/html/" + href );
+	ac->showPage( QString( qInstallPathDocs() ) + "/html/" + href );
     }
     return FALSE; // do not hide window
 }
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index cb1c39a..257f4e6 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -1756,7 +1756,7 @@ void Resource::saveProperty( QObject *w, const QString &name, const QVariant &va
 	break;
     }
     default:
-	tqWarning( "saving the property %s of type %d not supported yet", name.latin1(), (int)t );
+	qWarning( "saving the property %s of type %d not supported yet", name.latin1(), (int)t );
     }
 }
 
@@ -1803,7 +1803,7 @@ QObject *Resource::createObject( const QDomElement &e, QWidget *parent, QLayout*
     bool isPlugin =
 	WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( parentClassName ) );
     if ( isPlugin )
-	tqWarning( "####### loading custom container widgets without page support not implemented!" );
+	qWarning( "####### loading custom container widgets without page support not implemented!" );
     // ### TODO loading for custom container widgets without pages
 #endif
     if ( !className.isNull() ) {
@@ -2367,9 +2367,9 @@ void Resource::saveImageData( const QImage &img, QTextStream &ts, int indent )
     QByteArray bazip = ba;
     int i = 0;
     if (compress) {
-	bazip = tqCompress( ba );
+	bazip = qCompress( ba );
 	format += ".GZ";
-	// The first 4 bytes in tqCompress() are the length of the unzipped
+	// The first 4 bytes in qCompress() are the length of the unzipped
 	// format. The XPM.GZ format does not use these.
 	i = 4;
     }
diff --git a/tools/designer/designer/wizardeditorimpl.cpp b/tools/designer/designer/wizardeditorimpl.cpp
index 7e3cff1..8754953 100644
--- a/tools/designer/designer/wizardeditorimpl.cpp
+++ b/tools/designer/designer/wizardeditorimpl.cpp
@@ -252,7 +252,7 @@ void WizardEditor::itemDropped( QListBoxItem * i )
     // Assumes that only one item has been moved.
     int droppedItem = listBox->index( i );
 
-    //tqDebug( "Moving page %d -> %d", draggedItem, droppedItem );
+    //qDebug( "Moving page %d -> %d", draggedItem, droppedItem );
     MoveWizardPageCommand *cmd = new MoveWizardPageCommand( tr( "Move page %1 to %2 in %3" ).arg( draggedItem ).arg( droppedItem ).arg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem );
     commands.append( cmd );
 }
diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp
index 3493dac..df9a78f 100644
--- a/tools/designer/editor/yyindent.cpp
+++ b/tools/designer/editor/yyindent.cpp
@@ -1115,7 +1115,7 @@ static QString fileContents( const QString& fileName )
 {
     QFile f( fileName );
     if ( !f.open(IO_ReadOnly) ) {
-	tqWarning( "yyindent error: Cannot open file '%s' for reading: %s",
+	qWarning( "yyindent error: Cannot open file '%s' for reading: %s",
 		  fileName.latin1(), strerror(errno) );
 	return QString::null;
     }
@@ -1124,14 +1124,14 @@ static QString fileContents( const QString& fileName )
     QString contents = t.read();
     f.close();
     if ( contents.isEmpty() )
-	tqWarning( "yyindent error: File '%s' is empty", fileName.latin1() );
+	qWarning( "yyindent error: File '%s' is empty", fileName.latin1() );
     return contents;
 }
 
 int main( int argc, char **argv )
 {
     if ( argc != 2 ) {
-	tqWarning( "usage: yyindent file.cpp" );
+	qWarning( "usage: yyindent file.cpp" );
 	return 1;
     }
 
diff --git a/tools/designer/examples/book/connection.cpp b/tools/designer/examples/book/connection.cpp
index 9bd0a45..710f50c 100644
--- a/tools/designer/examples/book/connection.cpp
+++ b/tools/designer/examples/book/connection.cpp
@@ -18,9 +18,9 @@ bool createConnections()
     defaultDB->setPassword( DB_BOOKS_PASSWD );
     defaultDB->setHostName( DB_BOOKS_HOST );
     if ( ! defaultDB->open() ) { 
-	tqWarning( "Failed to open books database: " + 
+	qWarning( "Failed to open books database: " + 
 		  defaultDB->lastError().driverText() );
-	tqWarning( defaultDB->lastError().databaseText() );
+	qWarning( defaultDB->lastError().databaseText() );
 	return FALSE;
     }
 
diff --git a/tools/designer/plugins/cppeditor/yyreg.cpp b/tools/designer/plugins/cppeditor/yyreg.cpp
index 0648e36..144c99f 100644
--- a/tools/designer/plugins/cppeditor/yyreg.cpp
+++ b/tools/designer/plugins/cppeditor/yyreg.cpp
@@ -71,7 +71,7 @@ enum { Tok_Boi, Tok_Ampersand, Tok_Aster, Tok_LeftParen, Tok_RightParen,
 /*
   The following variables store the lexical analyzer state. The best way
   to understand them is to implement a function myGetToken() that calls
-  getToken(), to add some tqDebug() statements in there and then to
+  getToken(), to add some qDebug() statements in there and then to
   #define getToken() myGetToken().
 */
 static QString *yyIn; // the input stream
@@ -143,7 +143,7 @@ static void stopTokenizer()
 */
 static int getToken()
 {
-    // why "+ 2"? try putting some tqDebug()'s and see
+    // why "+ 2"? try putting some qDebug()'s and see
     yyPos = yyCurPos + 2;
 
     for ( ;; ) {
@@ -177,7 +177,7 @@ static int getToken()
 		  around with the tokenizer state to effectively
 		  ignore the comment. Beware of off-by-one and
 		  off-by-two bugs when you modify this code by adding
-		  tqDebug()'s here and there.
+		  qDebug()'s here and there.
 		*/
 		if ( yyCurPos >= 0 ) {
 		    int lineStart = yyIn->findRev( QChar('\n'), yyCurPos ) + 1;
diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp
index 66a485a..c309eb2 100644
--- a/tools/designer/plugins/dlg/dlg2ui.cpp
+++ b/tools/designer/plugins/dlg/dlg2ui.cpp
@@ -1617,7 +1617,7 @@ QStringList Dlg2Ui::convertQtArchitectDlgFile( const QString& fileName )
 
     outf.setName( outFileName );
     if ( !outf.open(IO_WriteOnly) ) {
-	tqWarning( "dlg2ui: Could not open output file '%s'",
+	qWarning( "dlg2ui: Could not open output file '%s'",
 		  outFileName.latin1() );
 	return QStringList();
     }
diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp
index 07efef2..39ff5e8 100644
--- a/tools/designer/plugins/glade/glade2ui.cpp
+++ b/tools/designer/plugins/glade/glade2ui.cpp
@@ -2181,7 +2181,7 @@ QStringList Glade2Ui::convertGladeFile( const QString& fileName )
 	    outFileName += QString( ".ui" );
 	    FILE *out = fopen( outFileName.latin1(), "w" );
 	    if ( out == 0 ) {
-		tqWarning( "glade2ui: Could not open file '%s'",
+		qWarning( "glade2ui: Could not open file '%s'",
 			 outFileName.latin1() );
 	    } else {
 		if ( !yyOut.isEmpty() )
diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
index 2934612..bce7fb2 100644
--- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
+++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
@@ -251,7 +251,7 @@ bool KDEVDLG2UI::parse()
 	QString outputFile = QString( className ) + ".ui";
 	fileOut.setName( outputFile );
 	if (!fileOut.open( IO_WriteOnly ) )
-	    tqFatal( "kdevdlg2ui: Could not open output file '%s'", outputFile.latin1() );
+	    qFatal( "kdevdlg2ui: Could not open output file '%s'", outputFile.latin1() );
 	out = new QTextStream( &fileOut );
 	targetFiles.append( outputFile );
     } else {
@@ -515,7 +515,7 @@ bool KDEVDLG2UI::writeDialog( const QString& name )
 	   writeColor( "paletteBackgroundColor", color );
 	} //else {
 	    //if ( line.length() )
-	    //tqDebug( "IGNORED: %s", line.latin1() );
+	    //qDebug( "IGNORED: %s", line.latin1() );
 	//}
     }
     *out << "</UI>" << endl;
diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp
index 6011ca0..1247f3d 100644
--- a/tools/designer/plugins/kdevdlg/main.cpp
+++ b/tools/designer/plugins/kdevdlg/main.cpp
@@ -89,7 +89,7 @@ QStringList KDevDlgFilter::import( const QString &, const QString& filename )
 {
     QFile file( filename );
     if ( !file.open( IO_ReadOnly ) )
-	tqWarning( "uic: Could not open file '%s' ", filename.latin1() );
+	qWarning( "uic: Could not open file '%s' ", filename.latin1() );
     QTextStream in;
     in.setDevice( &file );
 
diff --git a/tools/designer/plugins/rc/main.cpp b/tools/designer/plugins/rc/main.cpp
index b3900a9..f2e9abb 100644
--- a/tools/designer/plugins/rc/main.cpp
+++ b/tools/designer/plugins/rc/main.cpp
@@ -87,7 +87,7 @@ QStringList RCFilter::import( const QString &, const QString& filename )
 {
     QFile file( filename );
     if ( !file.open( IO_ReadOnly ) )
-	tqWarning( "uic: Could not open file '%s' ", filename.latin1() );
+	qWarning( "uic: Could not open file '%s' ", filename.latin1() );
     QTextStream in;
     in.setDevice( &file );
 
diff --git a/tools/designer/plugins/rc/rc2ui.cpp b/tools/designer/plugins/rc/rc2ui.cpp
index 0f27730..b3e48dd 100644
--- a/tools/designer/plugins/rc/rc2ui.cpp
+++ b/tools/designer/plugins/rc/rc2ui.cpp
@@ -380,7 +380,7 @@ bool RC2UI::makeDialog()
 	    QString outputFile = QString(className) + ".ui";
 	    fileOut.setName( outputFile );
 	    if (!fileOut.open( IO_WriteOnly ) )
-		tqFatal( "rc2ui: Could not open output file '%s'", outputFile.latin1() );
+		qFatal( "rc2ui: Could not open output file '%s'", outputFile.latin1() );
 	    out = new QTextStream( &fileOut );
 	    targetFiles.append( outputFile );
 	} else {
@@ -838,7 +838,7 @@ bool RC2UI::makeStringTable()
 	if (outputFile ) {
 	    fileOut.setName( outputFile );
 	    if (!fileOut.open( IO_WriteOnly ) )
-		tqFatal( "rc2ui: Could not open output file '%s'", outputFile.latin1() );
+		qFatal( "rc2ui: Could not open output file '%s'", outputFile.latin1() );
 	    out = new QTextStream( &fileOut );
 	}
 
diff --git a/tools/designer/tools/conv2ui/main.cpp b/tools/designer/tools/conv2ui/main.cpp
index f0c32c5..7ede6c7 100644
--- a/tools/designer/tools/conv2ui/main.cpp
+++ b/tools/designer/tools/conv2ui/main.cpp
@@ -76,12 +76,12 @@ bool Conv2ui::reinit()
 bool Conv2ui::convert( const QString & filename, const QDir & dest )
 {
     if ( !importFiltersManager ) {
-	tqWarning( "Conv2ui: no QPluginManager was found" );
+	qWarning( "Conv2ui: no QPluginManager was found" );
 	return FALSE;
     }
 
     if ( !QFile::exists( absName( filename ) ) ) {
-	tqWarning( "Conv2ui: can not find file %s", filename.latin1() );
+	qWarning( "Conv2ui: can not find file %s", filename.latin1() );
 	return FALSE;
     }
 
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index 6ac2885..f6f09c4 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -78,7 +78,7 @@ static QString convertToCIdentifier( const char *s )
 static ulong embedData( QTextStream& out, const uchar* input, int nbytes )
 {
 #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
-    QByteArray bazip( tqCompress( input, nbytes ) );
+    QByteArray bazip( qCompress( input, nbytes ) );
     ulong len = bazip.size();
 #else
     ulong len = nbytes;
diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp
index 6a8db05..ace2033 100644
--- a/tools/designer/uic/main.cpp
+++ b/tools/designer/uic/main.cpp
@@ -265,7 +265,7 @@ int main( int argc, char * argv[] )
     if ( !outputFile.isEmpty() ) {
 	fileOut.setName( outputFile );
 	if (!fileOut.open( IO_WriteOnly ) ) {
-	    tqWarning( "uic: Could not open output file '%s'", outputFile.data() );
+	    qWarning( "uic: Could not open output file '%s'", outputFile.data() );
 	    return 1;
 	}
     } else {
@@ -283,7 +283,7 @@ int main( int argc, char * argv[] )
 
     QFile file( fileName );
     if ( !file.open( IO_ReadOnly ) ) {
-	tqWarning( "uic: Could not open file '%s'", fileName );
+	qWarning( "uic: Could not open file '%s'", fileName );
 	return 1;
     }
 
@@ -291,13 +291,13 @@ int main( int argc, char * argv[] )
     QString errMsg;
     int errLine;
     if ( !doc.setContent( &file, &errMsg, &errLine ) ) {
-	tqWarning( QString("uic: Failed to parse %s: ") + errMsg + QString (" in line %d"), fileName, errLine );
+	qWarning( QString("uic: Failed to parse %s: ") + errMsg + QString (" in line %d"), fileName, errLine );
 	return 1;
     }
 
     QDomElement e = doc.firstChild().toElement();
     if ( e.hasAttribute("version") && e.attribute("version").toDouble() > 3.3 ) {
-	tqWarning( QString("uic: File generated with too recent version of Qt Designer (%s vs. %s)"),
+	qWarning( QString("uic: File generated with too recent version of Qt Designer (%s vs. %s)"),
 		  e.attribute("version").latin1(), QT_VERSION_STR );
 	return 1;
     }
@@ -350,7 +350,7 @@ int main( int argc, char * argv[] )
 	out << "#endif // " << protector << endl;
     }
     if ( fileOut.status() != IO_Ok ) {
-	tqWarning( "uic: Error writing to file" );
+	qWarning( "uic: Error writing to file" );
 	if ( !outputFile.isEmpty() )
 	    remove( outputFile );
     }
diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp
index 4b0b16c..a7be6df 100644
--- a/tools/designer/uic/subclassing.cpp
+++ b/tools/designer/uic/subclassing.cpp
@@ -345,7 +345,7 @@ void Uic::writeFunctionsSubImpl( const QStringList &fuLst, const QStringList &ty
 	out << " */" << endl;
 	out << type << " " << subClass << "::" << (*it) << endl;
 	out << "{" << endl;
-	out << "    tqWarning( \"" << subClass << "::" << (*it) << " not yet implemented!\" );" << endl;
+	out << "    qWarning( \"" << subClass << "::" << (*it) << " not yet implemented!\" );" << endl;
 	out << "}" << endl << endl;
     }
     out << endl;
diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp
index 0340bc8..b7fc6e9 100644
--- a/tools/designer/uilib/qwidgetfactory.cpp
+++ b/tools/designer/uilib/qwidgetfactory.cpp
@@ -344,7 +344,7 @@ QWidget *QWidgetFactory::create( QIODevice *dev, QObject *connector, QWidget *pa
 	    if ( doc.setContent( dev, &errMsg, &errLine ) ) {
 		w = widgetFactory->createFromUiFile( doc, connector, parent, name );
 	    } else {
-		// tqDebug( QString("Parse error: ") + errMsg + QString(" in line %d"), errLine );
+		// qDebug( QString("Parse error: ") + errMsg + QString(" in line %d"), errLine );
 	    }
 	}
 	if ( !w ) {
@@ -701,7 +701,7 @@ void QWidgetFactory::inputSpacer( const UibStrTable& strings, QDataStream& in,
 	    }
 	    break;
 	default:
-	    tqFatal( "Corrupt" );
+	    qFatal( "Corrupt" );
 	}
 	in >> objectTag;
     }
@@ -768,7 +768,7 @@ void QWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
 	    }
 	    break;
 	default:
-	    tqFatal( "Corrupt" );
+	    qFatal( "Corrupt" );
 	}
 	in >> objectTag;
     }
@@ -833,7 +833,7 @@ void QWidgetFactory::inputItem( const UibStrTable& strings, QDataStream& in,
 		pixmaps << value.asPixmap();
 	    break;
 	default:
-	    tqFatal( "Corrupt" );
+	    qFatal( "Corrupt" );
 	}
 	in >> objectTag;
     }
@@ -904,7 +904,7 @@ void QWidgetFactory::inputMenuItem( QObject **objects,
 	    popupMenu->insertSeparator();
 	    break;
 	default:
-	    tqFatal( "Corrupt" );
+	    qFatal( "Corrupt" );
 	}
 	in >> objectTag;
     }
@@ -1091,7 +1091,7 @@ QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects,
 					     QBrush(color, value.asPixmap()) );
 			break;
 		    default:
-			tqFatal( "Corrupt" );
+			qFatal( "Corrupt" );
 		    }
 		    in >> paletteTag;
 		}
@@ -1156,7 +1156,7 @@ QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects,
 	    }
 	    break;
 	default:
-	    tqFatal( "Corrupt" );
+	    qFatal( "Corrupt" );
 	}
 	in >> objectTag;
 	metAttribute--;
@@ -1193,14 +1193,14 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in,
     in >> lf;
     in >> cr;
     if ( lf != '\n' || cr != '\r' ) {
-	tqWarning( "File corrupted" );
+	qWarning( "File corrupted" );
 	return 0;
     }
 
     Q_UINT8 qdatastreamVersion;
     in >> qdatastreamVersion;
     if ( (int) qdatastreamVersion > in.version() ) {
-	tqWarning( "Incompatible version of Qt" );
+	qWarning( "Incompatible version of Qt" );
 	return 0;
     }
     in.setVersion( qdatastreamVersion );
@@ -1259,7 +1259,7 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in,
 			unpackStringSplit( strings, in, slot );
 		    // ###
 #if 0
-		    tqWarning( "connect( %p, %s, %p, %s )", objects[senderNo],
+		    qWarning( "connect( %p, %s, %p, %s )", objects[senderNo],
 			      signal.latin1(), objects[receiverNo],
 			      slot.latin1() );
 #endif
@@ -1268,7 +1268,7 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in,
 	    break;
 	case Block_Functions:
 	    // ###
-	    tqWarning( "Block_Functions not supported" );
+	    qWarning( "Block_Functions not supported" );
 	    in.device()->at( nextBlock );
 	    break;
 	case Block_Images:
@@ -1350,7 +1350,7 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in,
 	    break;
 	case Block_Variables:
 	    // ###
-	    tqWarning( "Block_Variables not supported" );
+	    qWarning( "Block_Variables not supported" );
 	    in.device()->at( nextBlock );
 	    break;
 	case Block_Widget:
@@ -1361,7 +1361,7 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in,
 		toplevel->setName( name );
 	    break;
 	default:
-	    tqWarning( "Version error" );
+	    qWarning( "Version error" );
 	    return 0;
 	}
 	in >> blockType;
@@ -1640,7 +1640,7 @@ QWidget *QWidgetFactory::createWidgetInternal( const QDomElement &e, QWidget *pa
     QString parentClassName = parent ? parent->className() : 0;
     bool isPlugin = parent ? !!d->customWidgets.find( parent->className() ) : FALSE;
     if ( isPlugin )
-	tqWarning( "####### loading custom container widgets without page support not implemented!" );
+	qWarning( "####### loading custom container widgets without page support not implemented!" );
     // ### TODO loading for custom container widgets without pages
 #endif
     
diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp
index 40d71a6..e8725e5 100644
--- a/tools/linguist/linguist/trwindow.cpp
+++ b/tools/linguist/linguist/trwindow.cpp
@@ -769,7 +769,7 @@ void TrWindow::newPhraseBook()
 
 void TrWindow::openPhraseBook()
 {
-    QString phrasebooks( tqInstallPathData() );
+    QString phrasebooks( qInstallPathData() );
     QString name = QFileDialog::getOpenFileName( phrasebooks + "/phrasebooks",
 	tr("Qt phrase books (*.qph)\n"
 	   "All files (*)"),
@@ -852,8 +852,8 @@ void TrWindow::revertSorting()
 
 void TrWindow::manual()
 {
-    QAssistantClient *ac = new QAssistantClient( tqInstallPathBins(), this );
-    ac->showPage( QString( tqInstallPathDocs() ) + "/html/linguist-manual.html" );
+    QAssistantClient *ac = new QAssistantClient( qInstallPathBins(), this );
+    ac->showPage( QString( qInstallPathDocs() ) + "/html/linguist-manual.html" );
 }
 
 void TrWindow::about()
diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp
index 41314c0..ce8fb98 100644
--- a/tools/linguist/lupdate/fetchtr.cpp
+++ b/tools/linguist/lupdate/fetchtr.cpp
@@ -176,7 +176,7 @@ static int getToken()
 		break;
 	    case 'T':
 		// TR() for when all else fails
-		if ( tqstricmp(yyIdent + 1, "R") == 0 )
+		if ( qstricmp(yyIdent + 1, "R") == 0 )
 		    return Tok_tr;
 		break;
 	    case 'c':
@@ -350,7 +350,7 @@ static int getToken()
 		yyString[yyStringLen] = '\0';
 
 		if ( yyCh != '"' )
-		    tqWarning( "%s:%d: Unterminated C++ string",
+		    qWarning( "%s:%d: Unterminated C++ string",
 			      (const char *) yyFileName, yyLineNo );
 
 		if ( yyCh == EOF ) {
@@ -551,7 +551,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 						       QString::null, utf8) );
 
 		    if ( lacks_Q_OBJECT.contains(context) ) {
-			tqWarning( "%s:%d: Class '%s' lacks Q_OBJECT macro",
+			qWarning( "%s:%d: Class '%s' lacks Q_OBJECT macro",
 				  (const char *) yyFileName, yyLineNo,
 				  (const char *) context );
 			lacks_Q_OBJECT.remove( context );
@@ -622,7 +622,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 	case Tok_Arrow:
 	    yyTok = getToken();
 	    if ( yyTok == Tok_tr || yyTok == Tok_trUtf8 )
-		tqWarning( "%s:%d: Cannot invoke tr() like this",
+		qWarning( "%s:%d: Cannot invoke tr() like this",
 			  (const char *) yyFileName, yyLineNo );
 	    break;
 	case Tok_Gulbrandsen:
@@ -639,7 +639,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 	    if ( yyBraceDepth == (int) namespaces.count() ) {
 		if ( missing_Q_OBJECT ) {
 		    if ( needs_Q_OBJECT.contains(functionContext) ) {
-			tqWarning( "%s:%d: Class '%s' lacks Q_OBJECT macro",
+			qWarning( "%s:%d: Class '%s' lacks Q_OBJECT macro",
 				  (const char *) yyFileName, yyLineNo,
 				  (const char *) functionContext );
 		    } else {
diff --git a/tools/makeqpf/main.cpp b/tools/makeqpf/main.cpp
index 56b89e2..0dceee3 100644
--- a/tools/makeqpf/main.cpp
+++ b/tools/makeqpf/main.cpp
@@ -242,16 +242,16 @@ private slots:
 
 static void usage()
 {
-    tqWarning("Usage: makeqpf [-A] [-f spec-file] [font ...]");
-    tqWarning("");
-    tqWarning("   Saves QPF font files by rendering and saving fonts.");
-    tqWarning("");
-    tqWarning("         -A = Render and save all fonts in fontdir");
-    tqWarning("         -f = File of lines:");
-    tqWarning("                fontname character-ranges");
-    tqWarning("              eg.");
-    tqWarning("                smoothtimes 0-ff,20a0-20af");
-    tqWarning("       font = Font to render and save");
+    qWarning("Usage: makeqpf [-A] [-f spec-file] [font ...]");
+    qWarning("");
+    qWarning("   Saves QPF font files by rendering and saving fonts.");
+    qWarning("");
+    qWarning("         -A = Render and save all fonts in fontdir");
+    qWarning("         -f = File of lines:");
+    qWarning("                fontname character-ranges");
+    qWarning("              eg.");
+    qWarning("                smoothtimes 0-ff,20a0-20af");
+    qWarning("       font = Font to render and save");
 }
 
 int main(int argc, char** argv)
@@ -303,7 +303,7 @@ int main(int argc, char** argv)
 		    m.save(family);
 		}
 	    } else {
-		tqWarning("Cannot open %s",specfile.latin1());
+		qWarning("Cannot open %s",specfile.latin1());
 	    }
 	} else {
 	    while (*argv)
diff --git a/tools/mergetr/mergetr.cpp b/tools/mergetr/mergetr.cpp
index 9096081..c286a84 100644
--- a/tools/mergetr/mergetr.cpp
+++ b/tools/mergetr/mergetr.cpp
@@ -186,7 +186,7 @@ void writecomment( QTextStream &str, const QString &s )
     while ( idx < len ) {
 	int nl = s.find( '\n', idx );
 	if ( nl < 0 ) {
-	    tqWarning( "writecomment: string lacks newline" );
+	    qWarning( "writecomment: string lacks newline" );
 	    str << "# " << s.mid( idx ) << '\n';
 	    return;
 	}
diff --git a/tools/msg2qm/msg2qm.cpp b/tools/msg2qm/msg2qm.cpp
index 8a1a0de..6ac8c36 100644
--- a/tools/msg2qm/msg2qm.cpp
+++ b/tools/msg2qm/msg2qm.cpp
@@ -110,7 +110,7 @@ void addTranslation( QTranslator* translator, const QString& msgid, const QStrin
 	    scope = *defaultScope;
 
 	if (translator->contains( scope.ascii(), id.ascii() ) ) {
-	    tqWarning("Error: \"%s\" already in use", msgid.ascii() );
+	    qWarning("Error: \"%s\" already in use", msgid.ascii() );
 	}
 	else {
 	    translator->insert( scope.latin1(), id.latin1(), msgstr );
diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp
index fbcfb0b..f906fea 100644
--- a/tools/qconfig/main.cpp
+++ b/tools/qconfig/main.cpp
@@ -422,7 +422,7 @@ void Main::loadFeatures(const QString& filename)
 		sectioncontents[sec].append(feature);
 		choices.append(feature);
 	    } else {
-		tqDebug("Unparsed text");
+		qDebug("Unparsed text");
 	    }
 
 	    feature = lab = sec = QString::null;
@@ -439,7 +439,7 @@ void Main::loadFeatures(const QString& filename)
 
 	int colon = line.find(':');
 	if ( colon < 0 ) {
-	    tqDebug("Cannot parse: %s",line.ascii());
+	    qDebug("Cannot parse: %s",line.ascii());
 	} else {
 	    QString tag = line.left(colon);
 	    QString value = line.mid(colon+1).stripWhiteSpace();
@@ -513,7 +513,7 @@ void Main::loadFeatures(const QString& filename)
 		deps.clear();
 	    } else if ( token[0].isEmpty() ) {
 	    } else {
-		tqDebug("Cannot parse: %s",token.join(" ").ascii());
+		qDebug("Cannot parse: %s",token.join(" ").ascii());
 	    }
 	} else if ( token[0] == "#include" ) {
 	    on = TRUE;
@@ -545,7 +545,7 @@ void Main::createItem(const QString& ch)
 	for (QStringList::Iterator dp = deps.begin(); dp != deps.end(); ++dp) {
 	    QString dsec = section[*dp];
 	    if ( dsec.isEmpty() )
-		tqDebug("No section for %s",(*dp).latin1());
+		qDebug("No section for %s",(*dp).latin1());
 	    if ( !parent && dsec == sec ) {
 		createItem(*dp);
 		parent = item[*dp];
@@ -582,7 +582,7 @@ void Main::loadConfig(const QString& filename)
 	    if ( i )
 		i->setDefined(TRUE);
 	    else
-		tqDebug("The item %s is not used by qfeatures.h", token[1].latin1());
+		qDebug("The item %s is not used by qfeatures.h", token[1].latin1());
 	}
     } while (!s.atEnd());
 }
@@ -608,14 +608,14 @@ void Main::updateAvailability(QListViewItem* i)
 		    if ( dd->isDefined() || !dd->isAvailable() )
 			av = FALSE;
 		} else
-		    tqDebug("%s ???",(*dit).latin1());
+		    qDebug("%s ???",(*dit).latin1());
 	    }
 	    if ( d->isAvailable() != av ) {
 		d->setAvailable(av);
 		updateAvailability(d);
 	    }
 	}
-tqDebug("%s: %d",choice->id.latin1(),choice->isAvailable());
+qDebug("%s: %d",choice->id.latin1(),choice->isAvailable());
     }
 }
 
diff --git a/tools/qembed/qembed.cpp b/tools/qembed/qembed.cpp
index 8bcff7c..db0a87d 100644
--- a/tools/qembed/qembed.cpp
+++ b/tools/qembed/qembed.cpp
@@ -55,7 +55,7 @@ struct EmbedImage {
 int main( int argc, char **argv )
 {
     if ( argc < 2 ) {
-	tqWarning( "Usage:\n\t%s [--images] files", argv[0] );
+	qWarning( "Usage:\n\t%s [--images] files", argv[0] );
 	return 1;
     }
 
@@ -103,19 +103,19 @@ int main( int argc, char **argv )
 	} else {
 	    QFile f( *it );
 	    if ( !f.open(IO_ReadOnly) ) {
-		tqWarning( "Cannot open file %s, ignoring it", (*it).latin1() );
+		qWarning( "Cannot open file %s, ignoring it", (*it).latin1() );
 		continue;
 	    }
 	    QByteArray a( f.size() );
 	    if ( f.size() == 0
 		 || f.readBlock(a.data(), f.size()) != (int)f.size() ) {
-		tqWarning( "Cannot read file %s, ignoring it", (*it).latin1() );
+		qWarning( "Cannot read file %s, ignoring it", (*it).latin1() );
 		continue;
 	    }
 	    if ( images ) {
 		QImage img;
 		if ( !img.loadFromData(a) ) {
-		    tqWarning( "Cannot read image from file %s, ignoring it", (*it).latin1() );
+		    qWarning( "Cannot read image from file %s, ignoring it", (*it).latin1() );
 		    continue;
 		}
 		EmbedImage *e = new EmbedImage;
diff --git a/tools/qvfb/main.cpp b/tools/qvfb/main.cpp
index 0fea3b3..50e11ec 100644
--- a/tools/qvfb/main.cpp
+++ b/tools/qvfb/main.cpp
@@ -86,7 +86,7 @@ int main( int argc, char *argv[] )
 	displayId = displaySpec.mid( m+1, rx.matchedLength()-1 ).toInt();
     }
 
-    tqDebug( "Using display %d", displayId );
+    qDebug( "Using display %d", displayId );
 
     QVFb mw( displayId, width, height, depth, skin );
     app.setMainWidget( &mw );
diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp
index 400d9da..35d6131 100644
--- a/tools/qvfb/qanimationwriter.cpp
+++ b/tools/qvfb/qanimationwriter.cpp
@@ -251,7 +251,7 @@ public:
 QAnimationWriter::QAnimationWriter( const QString& filename, const char* format )
 {
     if ( QCString(format) != "MNG" ) {
-	tqWarning("Format \"%s\" not supported, only MNG", format);
+	qWarning("Format \"%s\" not supported, only MNG", format);
 	dev = 0;
 	d = 0;
     } else {
@@ -389,7 +389,7 @@ void QAnimationWriter::appendFrame(const QImage& frm, const QPoint& offset)
 		    }
 		}
 	    }
-tqDebug("%d,%d  %d,%d",minx,miny,offset.x(),offset.y());
+qDebug("%d,%d  %d,%d",minx,miny,offset.x(),offset.y());
 	    d->composeImage(diff,QPoint(minx,miny)+offset);
 	}
 	if ( prev.isNull() || prev.size() == frame.size() && offset == QPoint(0,0) ) {
diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp
index 2c1422d..781cf78 100644
--- a/tools/qvfb/qvfbview.cpp
+++ b/tools/qvfb/qvfbview.cpp
@@ -88,7 +88,7 @@ QVFbView::QVFbView( int display_id, int w, int h, int d, QWidget *parent,
 	    break;
 
 	default:
-	    tqFatal( "Unsupported bit depth %d\n", d );
+	    qFatal( "Unsupported bit depth %d\n", d );
     }
 
     mousePipe = QString(QT_VFB_MOUSE_PIPE).arg(display_id);
@@ -99,14 +99,14 @@ QVFbView::QVFbView( int display_id, int w, int h, int d, QWidget *parent,
 
     mouseFd = open( mousePipe.latin1(), O_RDWR | O_NDELAY );
     if ( mouseFd == -1 ) {
-	tqFatal( "Cannot open mouse pipe" );
+	qFatal( "Cannot open mouse pipe" );
     }
 
     unlink( keyboardPipe );
     mkfifo( keyboardPipe, 0666 );
     keyboardFd = open( keyboardPipe, O_RDWR | O_NDELAY );
     if ( keyboardFd == -1 ) {
-	tqFatal( "Cannot open keyboard pipe" );
+	qFatal( "Cannot open keyboard pipe" );
     }
 
     key_t key = ftok( mousePipe.latin1(), 'b' );
@@ -129,7 +129,7 @@ QVFbView::QVFbView( int display_id, int w, int h, int d, QWidget *parent,
     }
 
     if ( (long)data == -1 )
-	tqFatal( "Cannot attach to shared memory" );
+	qFatal( "Cannot attach to shared memory" );
 
     hdr = (QVFbHeader *)data;
     hdr->width = w;
@@ -215,7 +215,7 @@ void QVFbView::setGamma(double gr, double gg, double gb)
 	if ( g > 255 ) g = 255;
 	if ( b > 255 ) b = 255;
 	gammatable[i] = qRgb(r,g,b);
-//tqDebug("%d: %d,%d,%d",i,r,g,b);
+//qDebug("%d: %d,%d,%d",i,r,g,b);
     }
 
     setDirty(rect());
@@ -282,25 +282,25 @@ static QString qws_dataDir()
     QString dataDir = "/tmp/qtembedded-" + username;
     if ( mkdir( dataDir.latin1(), 0700 ) ) {
 	if ( errno != EEXIST ) {
-	    tqFatal( QString("Cannot create Qt/Embedded data directory: %1")
+	    qFatal( QString("Cannot create Qt/Embedded data directory: %1")
 		    .arg( dataDir ) );
 	}
     }
 
     struct stat buf;
     if ( lstat( dataDir.latin1(), &buf ) )
-	tqFatal( QString( "stat failed for Qt/Embedded data directory: %1" )
+	qFatal( QString( "stat failed for Qt/Embedded data directory: %1" )
 		.arg( dataDir ) );
 
     if ( !S_ISDIR( buf.st_mode ) )
-	tqFatal( QString( "%1 is not a directory" ).arg( dataDir ) );
+	qFatal( QString( "%1 is not a directory" ).arg( dataDir ) );
 
     if ( buf.st_uid != getuid() )
-	tqFatal( QString( "Qt/Embedded data directory is not owned by user %1" )
+	qFatal( QString( "Qt/Embedded data directory is not owned by user %1" )
 		.arg( getuid() ) );
 
     if ( (buf.st_mode & 0677) != 0600 )
-	tqFatal( QString( "Qt/Embedded data directory has incorrect permissions: %1" )
+	qFatal( QString( "Qt/Embedded data directory has incorrect permissions: %1" )
 		.arg( dataDir ) );
 
     dataDir += "/";
@@ -485,7 +485,7 @@ void QVFbView::drawScreen()
     QRect r( hdr->update );
     hdr->dirty = FALSE;
     hdr->update = QRect();
-    // tqDebug( "update %d, %d, %dx%d", r.y(), r.x(), r.width(), r.height() );
+    // qDebug( "update %d, %d, %dx%d", r.y(), r.x(), r.width(), r.height() );
     r = r.intersect( QRect(0, 0, hdr->width, hdr->height ) );
     if ( !r.isEmpty() )  {
 	if ( int(zm) != zm ) {
diff --git a/tutorial/t10/lcdrange.cpp b/tutorial/t10/lcdrange.cpp
index 14fd007..b62cfbb 100644
--- a/tutorial/t10/lcdrange.cpp
+++ b/tutorial/t10/lcdrange.cpp
@@ -37,7 +37,7 @@ void LCDRange::setValue( int value )
 void LCDRange::setRange( int minVal, int maxVal )
 {
     if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) {
-      tqWarning( "LCDRange::setRange(%d,%d)\n"
+      qWarning( "LCDRange::setRange(%d,%d)\n"
 	       "\tRange must be 0..99\n"
 	       "\tand minVal must not be greater than maxVal",
 	       minVal, maxVal );
diff --git a/tutorial/t11/lcdrange.cpp b/tutorial/t11/lcdrange.cpp
index 14fd007..b62cfbb 100644
--- a/tutorial/t11/lcdrange.cpp
+++ b/tutorial/t11/lcdrange.cpp
@@ -37,7 +37,7 @@ void LCDRange::setValue( int value )
 void LCDRange::setRange( int minVal, int maxVal )
 {
     if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) {
-      tqWarning( "LCDRange::setRange(%d,%d)\n"
+      qWarning( "LCDRange::setRange(%d,%d)\n"
 	       "\tRange must be 0..99\n"
 	       "\tand minVal must not be greater than maxVal",
 	       minVal, maxVal );
diff --git a/tutorial/t12/lcdrange.cpp b/tutorial/t12/lcdrange.cpp
index c808bf1..bdd722d 100644
--- a/tutorial/t12/lcdrange.cpp
+++ b/tutorial/t12/lcdrange.cpp
@@ -67,7 +67,7 @@ void LCDRange::setValue( int value )
 void LCDRange::setRange( int minVal, int maxVal )
 {
     if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) {
-	tqWarning( "LCDRange::setRange(%d,%d)\n"
+	qWarning( "LCDRange::setRange(%d,%d)\n"
 		  "\tRange must be 0..99\n"
 		  "\tand minVal must not be greater than maxVal",
 		  minVal, maxVal );
diff --git a/tutorial/t13/lcdrange.cpp b/tutorial/t13/lcdrange.cpp
index 5755c7d..3c91b27 100644
--- a/tutorial/t13/lcdrange.cpp
+++ b/tutorial/t13/lcdrange.cpp
@@ -72,7 +72,7 @@ void LCDRange::setValue( int value )
 void LCDRange::setRange( int minVal, int maxVal )
 {
     if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) {
-	tqWarning( "LCDRange::setRange(%d,%d)\n"
+	qWarning( "LCDRange::setRange(%d,%d)\n"
 		  "\tRange must be 0..99\n"
 		  "\tand minVal must not be greater than maxVal",
 		  minVal, maxVal );
diff --git a/tutorial/t14/lcdrange.cpp b/tutorial/t14/lcdrange.cpp
index 5755c7d..3c91b27 100644
--- a/tutorial/t14/lcdrange.cpp
+++ b/tutorial/t14/lcdrange.cpp
@@ -72,7 +72,7 @@ void LCDRange::setValue( int value )
 void LCDRange::setRange( int minVal, int maxVal )
 {
     if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) {
-	tqWarning( "LCDRange::setRange(%d,%d)\n"
+	qWarning( "LCDRange::setRange(%d,%d)\n"
 		  "\tRange must be 0..99\n"
 		  "\tand minVal must not be greater than maxVal",
 		  minVal, maxVal );
diff --git a/tutorial/t8/lcdrange.cpp b/tutorial/t8/lcdrange.cpp
index 14fd007..b62cfbb 100644
--- a/tutorial/t8/lcdrange.cpp
+++ b/tutorial/t8/lcdrange.cpp
@@ -37,7 +37,7 @@ void LCDRange::setValue( int value )
 void LCDRange::setRange( int minVal, int maxVal )
 {
     if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) {
-      tqWarning( "LCDRange::setRange(%d,%d)\n"
+      qWarning( "LCDRange::setRange(%d,%d)\n"
 	       "\tRange must be 0..99\n"
 	       "\tand minVal must not be greater than maxVal",
 	       minVal, maxVal );
diff --git a/tutorial/t9/lcdrange.cpp b/tutorial/t9/lcdrange.cpp
index 14fd007..b62cfbb 100644
--- a/tutorial/t9/lcdrange.cpp
+++ b/tutorial/t9/lcdrange.cpp
@@ -37,7 +37,7 @@ void LCDRange::setValue( int value )
 void LCDRange::setRange( int minVal, int maxVal )
 {
     if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) {
-      tqWarning( "LCDRange::setRange(%d,%d)\n"
+      qWarning( "LCDRange::setRange(%d,%d)\n"
 	       "\tRange must be 0..99\n"
 	       "\tand minVal must not be greater than maxVal",
 	       minVal, maxVal );