QT_THREAD_SUPPORT -> TQT_THREAD_SUPPORT conversion to align to updated admin module

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

25 files changed, 218 insertions, 218 deletions

diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
index f563d4f..65a47c7 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/qcom_p.h
@@ -273,7 +273,7 @@ public:		   \
     ulong release() {if(!--qtrefcount){delete this;return 0;}return qtrefcount;}
 
 #ifndef Q_EXPORT_COMPONENT
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 #define QT_THREADED_BUILD 1
 #define Q_UCM_FLAGS_STRING "11"
 #else
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index 8d13549..2c7da71 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -48,9 +48,9 @@
 #include <errno.h>
 #endif // NO_ERROR_H
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include "qmutexpool_p.h"
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #ifndef QT_DEBUG_COMPONENT
 # if defined(QT_DEBUG)
@@ -94,7 +94,7 @@ static bool qt_verify( const QString& library, uint version, uint flags,
 		    const QCString &key, bool warn )
 {
     uint our_flags = 1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     our_flags |= 2;
 #endif
 
@@ -398,10 +398,10 @@ void QComLibrary::createInstanceInternal()
     bool query_done = FALSE;
     bool warn_mismatch = TRUE;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     QMutexLocker locker( qt_global_mutexpool ?
 			 qt_global_mutexpool->get( &cache ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if ( ! cache ) {
 	cache = new QSettings;
diff --git a/src/tools/qcriticalsection_p.cpp b/src/tools/qcriticalsection_p.cpp
index cc625d2..dd2ba70 100644
--- a/src/tools/qcriticalsection_p.cpp
+++ b/src/tools/qcriticalsection_p.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #include "qt_windows.h"
 
diff --git a/src/tools/qcriticalsection_p.h b/src/tools/qcriticalsection_p.h
index 9e2f555..cd0a047 100644
--- a/src/tools/qcriticalsection_p.h
+++ b/src/tools/qcriticalsection_p.h
@@ -54,7 +54,7 @@
 //
 //
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #if defined(Q_WS_WIN)
 
diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp
index 9abf9e7..002ea59 100644
--- a/src/tools/qcstring.cpp
+++ b/src/tools/qcstring.cpp
@@ -43,9 +43,9 @@
 #include "qregexp.h"
 #include "qdatastream.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -312,10 +312,10 @@ Q_UINT16 qChecksum( const char *data, uint len )
 {
     if ( !crc_tbl_init ) {			// create lookup table
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	QMutexLocker locker( qt_global_mutexpool ?
 			     qt_global_mutexpool->get( &crc_tbl_init ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 	if ( !crc_tbl_init ) {
 	    createCRC16Table();
diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp
index 6e96161..b4307f9 100644
--- a/src/tools/qdatetime.cpp
+++ b/src/tools/qdatetime.cpp
@@ -1039,7 +1039,7 @@ QDate QDate::currentDate( Qt::TimeSpec ts )
     time( &ltime );
     tm *t;
 
-#  if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+#  if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
     // use the reentrant versions of localtime() and gmtime() where available
     tm res;
     if ( ts == Qt::LocalTime )
@@ -1051,7 +1051,7 @@ QDate QDate::currentDate( Qt::TimeSpec ts )
 	t = localtime( &ltime );
     else
 	t = gmtime( &ltime );
-#  endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
+#  endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
 
     d.jd = gregorianToJulian( t->tm_year + 1900, t->tm_mon + 1, t->tm_mday );
 #endif
@@ -1729,7 +1729,7 @@ bool QTime::currentTime( QTime *ct, Qt::TimeSpec ts )
     time_t ltime = tv.tv_sec;
     tm *t;
 
-#  if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+#  if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
     // use the reentrant versions of localtime() and gmtime() where available
     tm res;
     if ( ts == Qt::LocalTime )
@@ -1741,7 +1741,7 @@ bool QTime::currentTime( QTime *ct, Qt::TimeSpec ts )
 	t = localtime( &ltime );
     else
 	t = gmtime( &ltime );
-#  endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
+#  endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
 
     ct->ds = (uint)( MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min +
 		     1000 * t->tm_sec + tv.tv_usec / 1000 );
@@ -2042,7 +2042,7 @@ void QDateTime::setTime_t( time_t secsSince1Jan1970UTC, Qt::TimeSpec ts )
     time_t tmp = secsSince1Jan1970UTC;
     tm *brokenDown = 0;
 
-#if defined(Q_OS_UNIX) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+#if defined(Q_OS_UNIX) && defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
     // posix compliant system
     // use the reentrant versions of localtime() and gmtime() where available
     tm res;
diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp
index 5c0c393..05b434c 100644
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/qdir_unix.cpp
@@ -48,9 +48,9 @@
 #include "qregexp.h"
 #include "qstringlist.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #include <stdlib.h>
 #include <limits.h>
@@ -237,7 +237,7 @@ bool QDir::readDirEntries( const QString &nameFilter,
     if ( !dir )
 	return FALSE; // cannot read the directory
 
-#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
     union {
 	struct dirent mt_file;
 	char b[sizeof(struct dirent) + MAXNAMLEN + 1];
@@ -245,7 +245,7 @@ bool QDir::readDirEntries( const QString &nameFilter,
     while ( readdir_r(dir, &u.mt_file, &file ) == 0 && file )
 #else
     while ( (file = readdir(dir)) )
-#endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
+#endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
     {
 	QString fn = QFile::decodeName(file->d_name);
 	fi.setFile( *this, fn );
@@ -311,10 +311,10 @@ const QFileInfoList * QDir::drives()
 
     if ( !knownMemoryLeak ) {
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 	QMutexLocker locker( qt_global_mutexpool ?
 			     qt_global_mutexpool->get( &knownMemoryLeak ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 	if ( !knownMemoryLeak ) {
 	    knownMemoryLeak = new QFileInfoList;
diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp
index 8a27510..298d1a2 100644
--- a/src/tools/qgarray.cpp
+++ b/src/tools/qgarray.cpp
@@ -52,9 +52,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 /*
   If USE_MALLOC isn't defined, we use new[] and delete[] to allocate
@@ -733,10 +733,10 @@ void QGArray::sort( uint sz )
     if ( numItems < 2 )
 	return;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     QMutexLocker locker( qt_global_mutexpool ?
 			 qt_global_mutexpool->get( &cmp_item_size ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     cmp_item_size = sz;
     qsort( shd->data, numItems, sz, cmp_arr );
@@ -752,10 +752,10 @@ int QGArray::bsearch( const char *d, uint sz ) const
     if ( !numItems )
 	return -1;
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     QMutexLocker locker( qt_global_mutexpool ?
 			 qt_global_mutexpool->get( &cmp_item_size ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     cmp_item_size = sz;
     char* r = (char*)::bsearch( d, shd->data, numItems, sz, cmp_arr );
diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp
index fb94427..c8ed5a6 100644
--- a/src/tools/qglist.cpp
+++ b/src/tools/qglist.cpp
@@ -43,9 +43,9 @@
 #include "qdatastream.h"
 #include "qvaluelist.h"
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
   #include "qmutex.h"
-#endif // defined(QT_THREAD_SUPPORT)
+#endif // defined(TQT_THREAD_SUPPORT)
 
 /*!
   \class QLNode qglist.h
@@ -225,7 +225,7 @@ QDataStream &QGList::write( QDataStream &s, QPtrCollection::Item ) const
 
 QGList::QGList()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex = new QMutex(true);
 #endif
     firstNode = lastNode = curNode = 0;		// initialize list
@@ -241,7 +241,7 @@ QGList::QGList()
 QGList::QGList( const QGList & list )
     : QPtrCollection( list )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex = new QMutex(true);
 #endif
     firstNode = lastNode = curNode = 0;		// initialize list
@@ -268,7 +268,7 @@ QGList::~QGList()
     // twice on the same address! This is insane but let's try not to crash
     // here.
     iterators = 0;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //delete mutex;
 #endif
 }
@@ -337,11 +337,11 @@ bool QGList::operator==( const QGList &list ) const
 
 QLNode *QGList::locate( uint index )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( index == (uint)curIndex ) {		// current node ?
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return curNode;
@@ -355,7 +355,7 @@ QLNode *QGList::locate( uint index )
     bool forward;				// direction to traverse
 
     if ( index >= numNodes ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return 0;
@@ -388,7 +388,7 @@ QLNode *QGList::locate( uint index )
 	}
     }
     curIndex = index;				// must update index
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return curNode = node;
@@ -401,7 +401,7 @@ QLNode *QGList::locate( uint index )
 
 void QGList::inSort( QPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     int index = 0;
@@ -411,7 +411,7 @@ void QGList::inSort( QPtrCollection::Item d )
 	index++;
     }
     insertAt( index, d );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -423,7 +423,7 @@ void QGList::inSort( QPtrCollection::Item d )
 
 void QGList::prepend( QPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register QLNode *n = new QLNode( newItem(d) );
@@ -436,7 +436,7 @@ void QGList::prepend( QPtrCollection::Item d )
     firstNode = curNode = n;			// curNode affected
     numNodes++;
     curIndex = 0;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -448,7 +448,7 @@ void QGList::prepend( QPtrCollection::Item d )
 
 void QGList::append( QPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register QLNode *n = new QLNode( newItem(d) );
@@ -463,7 +463,7 @@ void QGList::append( QPtrCollection::Item d )
     lastNode = curNode = n;			// curNode affected
     curIndex = numNodes;
     numNodes++;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -475,26 +475,26 @@ void QGList::append( QPtrCollection::Item d )
 
 bool QGList::insertAt( uint index, QPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( index == 0 ) {
 	prepend( d );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return TRUE;
     }
     else if ( index == numNodes ) {
 	append( d );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return TRUE;
     }
     QLNode *nextNode = locate( index );
     if ( !nextNode ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
@@ -509,7 +509,7 @@ bool QGList::insertAt( uint index, QPtrCollection::Item d )
     n->next = nextNode;
     curNode = n;				// curIndex set by locate()
     numNodes++;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return TRUE;
@@ -522,11 +522,11 @@ bool QGList::insertAt( uint index, QPtrCollection::Item d )
 
 void QGList::relinkNode( QLNode *n )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( n == firstNode ) {			// already first
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return;
@@ -543,7 +543,7 @@ void QGList::relinkNode( QLNode *n )
     firstNode = curNode = n;			// curNode affected
     numNodes++;
     curIndex = 0;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -555,11 +555,11 @@ void QGList::relinkNode( QLNode *n )
 
 QLNode *QGList::unlink()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( curNode == 0 ) {			// null current node
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return 0;
@@ -593,7 +593,7 @@ QLNode *QGList::unlink()
 	iterators->notifyRemove( n, curNode );
     }
     numNodes--;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return n;
@@ -606,7 +606,7 @@ QLNode *QGList::unlink()
 
 bool QGList::removeNode( QLNode *n )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
 #if defined(QT_CHECK_NULL)
@@ -622,7 +622,7 @@ bool QGList::removeNode( QLNode *n )
     delete n;
     curNode  = firstNode;
     curIndex = curNode ? 0 : -1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return TRUE;
@@ -636,25 +636,25 @@ bool QGList::removeNode( QLNode *n )
 
 bool QGList::remove( QPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( d && find(d) == -1 ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
     }
     QLNode *n = unlink();
     if ( !n ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
     }
     deleteItem( n->data );
     delete n;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return TRUE;
@@ -666,25 +666,25 @@ bool QGList::remove( QPtrCollection::Item d )
 
 bool QGList::removeRef( QPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( findRef(d) == -1 ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
     }
     QLNode *n = unlink();
     if ( !n ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
     }
     deleteItem( n->data );
     delete n;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return TRUE;
@@ -708,25 +708,25 @@ bool QGList::removeRef( QPtrCollection::Item d )
 
 bool QGList::removeAt( uint index )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( !locate(index) ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
     }
     QLNode *n = unlink();
     if ( !n ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
     }
     deleteItem( n->data );
     delete n;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return TRUE;
@@ -738,12 +738,12 @@ bool QGList::removeAt( uint index )
 */
 bool QGList::replaceAt( uint index, QPtrCollection::Item d )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     QLNode *n = locate( index );
     if ( !n ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return FALSE;
@@ -752,7 +752,7 @@ bool QGList::replaceAt( uint index, QPtrCollection::Item d )
 	deleteItem( n->data );
 	n->data = newItem( d );
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return TRUE;
@@ -766,14 +766,14 @@ bool QGList::replaceAt( uint index, QPtrCollection::Item d )
 
 QPtrCollection::Item QGList::takeNode( QLNode *n )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
 #if defined(QT_CHECK_NULL)
     if ( n == 0 || (n->prev && n->prev->next != n) ||
 	 (n->next && n->next->prev != n) ) {
 	qWarning( "QGList::takeNode: Corrupted node" );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return 0;
@@ -785,7 +785,7 @@ QPtrCollection::Item QGList::takeNode( QLNode *n )
     delete n;					// delete the node, not data
     curNode  = firstNode;
     curIndex = curNode ? 0 : -1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return d;
@@ -797,13 +797,13 @@ QPtrCollection::Item QGList::takeNode( QLNode *n )
 
 QPtrCollection::Item QGList::take()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     QLNode *n = unlink();			// unlink node
     Item d = n ? n->data : 0;
     delete n;					// delete node, keep contents
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return d;
@@ -815,11 +815,11 @@ QPtrCollection::Item QGList::take()
 
 QPtrCollection::Item QGList::takeAt( uint index )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( !locate(index) ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return 0;
@@ -827,7 +827,7 @@ QPtrCollection::Item QGList::takeAt( uint index )
     QLNode *n = unlink();			// unlink node
     Item d = n ? n->data : 0;
     delete n;					// delete node, keep contents
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return d;
@@ -839,14 +839,14 @@ QPtrCollection::Item QGList::takeAt( uint index )
 
 QPtrCollection::Item QGList::takeFirst()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     first();
     QLNode *n = unlink();			// unlink node
     Item d = n ? n->data : 0;
     delete n;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return d;
@@ -858,14 +858,14 @@ QPtrCollection::Item QGList::takeFirst()
 
 QPtrCollection::Item QGList::takeLast()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     last();
     QLNode *n = unlink();			// unlink node
     Item d = n ? n->data : 0;
     delete n;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return d;
@@ -878,7 +878,7 @@ QPtrCollection::Item QGList::takeLast()
 
 void QGList::clear()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register QLNode *n = firstNode;
@@ -898,7 +898,7 @@ void QGList::clear()
 	n = n->next;
 	delete prevNode;			// deallocate node
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -911,7 +911,7 @@ void QGList::clear()
 
 int QGList::findRef( QPtrCollection::Item d, bool fromStart )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register QLNode *n;
@@ -929,7 +929,7 @@ int QGList::findRef( QPtrCollection::Item d, bool fromStart )
     }
     curNode = n;
     curIndex = n ? index : -1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return curIndex;				// return position of item
@@ -943,7 +943,7 @@ int QGList::findRef( QPtrCollection::Item d, bool fromStart )
 
 int QGList::find( QPtrCollection::Item d, bool fromStart )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register QLNode *n;
@@ -961,7 +961,7 @@ int QGList::find( QPtrCollection::Item d, bool fromStart )
     }
     curNode = n;
     curIndex = n ? index : -1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return curIndex;				// return position of item
@@ -974,7 +974,7 @@ int QGList::find( QPtrCollection::Item d, bool fromStart )
 
 uint QGList::containsRef( QPtrCollection::Item d ) const
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register QLNode *n = firstNode;
@@ -984,7 +984,7 @@ uint QGList::containsRef( QPtrCollection::Item d ) const
 	    count++;
 	n = n->next;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return count;
@@ -997,7 +997,7 @@ uint QGList::containsRef( QPtrCollection::Item d ) const
 
 uint QGList::contains( QPtrCollection::Item d ) const
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     register QLNode *n = firstNode;
@@ -1008,7 +1008,7 @@ uint QGList::contains( QPtrCollection::Item d ) const
 	    count++;
 	n = n->next;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return count;
@@ -1058,17 +1058,17 @@ uint QGList::contains( QPtrCollection::Item d ) const
 
 QPtrCollection::Item QGList::first()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( firstNode ) {
 	curIndex = 0;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return (curNode=firstNode)->data;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return 0;
@@ -1080,17 +1080,17 @@ QPtrCollection::Item QGList::first()
 
 QPtrCollection::Item QGList::last()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( lastNode ) {
 	curIndex = numNodes-1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return (curNode=lastNode)->data;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return 0;
@@ -1102,14 +1102,14 @@ QPtrCollection::Item QGList::last()
 
 QPtrCollection::Item QGList::next()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( curNode ) {
 	if ( curNode->next ) {
 	    curIndex++;
 	    curNode = curNode->next;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	    //mutex->unlock();
 #endif
 	    return curNode->data;
@@ -1117,7 +1117,7 @@ QPtrCollection::Item QGList::next()
 	curIndex = -1;
 	curNode = 0;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return 0;
@@ -1129,14 +1129,14 @@ QPtrCollection::Item QGList::next()
 
 QPtrCollection::Item QGList::prev()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     if ( curNode ) {
 	if ( curNode->prev ) {
 	    curIndex--;
 	    curNode = curNode->prev;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	    //mutex->unlock();
 #endif
 	    return curNode->data;
@@ -1144,7 +1144,7 @@ QPtrCollection::Item QGList::prev()
 	curIndex = -1;
 	curNode = 0;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return 0;
@@ -1157,12 +1157,12 @@ QPtrCollection::Item QGList::prev()
 
 void QGList::toVector( QGVector *vector ) const
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     vector->clear();
     if ( !vector->resize( count() ) ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return;
@@ -1174,14 +1174,14 @@ void QGList::toVector( QGVector *vector ) const
 	n = n->next;
 	i++;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
 
 void QGList::heapSortPushDown( QPtrCollection::Item* heap, int first, int last )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     int r = first;
@@ -1218,7 +1218,7 @@ void QGList::heapSortPushDown( QPtrCollection::Item* heap, int first, int last )
 	    }
 	}
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -1233,12 +1233,12 @@ void QGList::heapSortPushDown( QPtrCollection::Item* heap, int first, int last )
 
 void QGList::sort()
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     uint n = count();
     if ( n < 2 ) {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 	//mutex->unlock();
 #endif
 	return;
@@ -1273,7 +1273,7 @@ void QGList::sort()
     }
 
     delete [] realheap;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
 }
@@ -1300,7 +1300,7 @@ QDataStream &operator<<( QDataStream &s, const QGList &list )
 
 QDataStream &QGList::read( QDataStream &s )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     uint num;
@@ -1326,7 +1326,7 @@ QDataStream &QGList::read( QDataStream &s )
     }
     curNode  = firstNode;
     curIndex = curNode ? 0 : -1;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return s;
@@ -1338,7 +1338,7 @@ QDataStream &QGList::read( QDataStream &s )
 
 QDataStream &QGList::write( QDataStream &s ) const
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     s << count();				// write number of items
@@ -1347,7 +1347,7 @@ QDataStream &QGList::write( QDataStream &s ) const
 	write( s, n->data );
 	n = n->next;
     }
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return s;
@@ -1361,13 +1361,13 @@ QDataStream &QGList::write( QDataStream &s ) const
  */
 QLNode* QGList::erase( QLNode* it )
 {
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->lock();
 #endif
     QLNode* n = it;
     it = it->next;
     removeNode( n );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
     //mutex->unlock();
 #endif
     return it;
diff --git a/src/tools/qglist.h b/src/tools/qglist.h
index dfacf47..14674c1 100644
--- a/src/tools/qglist.h
+++ b/src/tools/qglist.h
@@ -150,7 +150,7 @@ private:
     QLNode *locate( uint );			// get node at i'th pos
     QLNode *unlink();				// unlink node
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 //     QMutex* mutex;
 #endif
 
diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp
index 154d07d..44f5992 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/qgvector.cpp
@@ -51,9 +51,9 @@
 #include "qdatastream.h"
 #include <stdlib.h>
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #define USE_MALLOC				// comment to use new/delete
 
@@ -405,10 +405,10 @@ void QGVector::sort()				// sort vector
 	}
     }
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
     QMutexLocker locker( qt_global_mutexpool ?
 			 qt_global_mutexpool->get( &sort_vec ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     sort_vec = (QGVector*)this;
     qsort( vec, count(), sizeof(Item), cmp_vec );
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index a20ea83..72294a9 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -3244,7 +3244,7 @@ QString QLocalePrivate::doubleToString(double d,
         QString digits;
 
 #ifdef QT_QLOCALE_USES_FCVT
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
         static bool dummy_for_mutex;
         QMutex *fcvt_mutex =  qt_global_mutexpool ? qt_global_mutexpool->get( &dummy_for_mutex ) : 0;
 # define FCVT_LOCK if (fcvt_mutex) fcvt_mutex->lock()
diff --git a/src/tools/qmutex.h b/src/tools/qmutex.h
index 1dec4d2..e9dd8ea 100644
--- a/src/tools/qmutex.h
+++ b/src/tools/qmutex.h
@@ -45,7 +45,7 @@
 #include "qglobal.h"
 #endif // QT_H
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 class QMutexPrivate;
 
diff --git a/src/tools/qmutex_unix.cpp b/src/tools/qmutex_unix.cpp
index fde558f..d43fd03 100644
--- a/src/tools/qmutex_unix.cpp
+++ b/src/tools/qmutex_unix.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #include "qplatformdefs.h"
 
@@ -720,4 +720,4 @@ int QMutex::level()
     \sa QMutexLocker::QMutexLocker()
 */
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
diff --git a/src/tools/qmutexpool.cpp b/src/tools/qmutexpool.cpp
index 61b02d7..6d61316 100644
--- a/src/tools/qmutexpool.cpp
+++ b/src/tools/qmutexpool.cpp
@@ -38,7 +38,7 @@
 
 #include "qmutexpool_p.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 #include <qthread.h>
 
diff --git a/src/tools/qmutexpool_p.h b/src/tools/qmutexpool_p.h
index b7bcb33..9568882 100644
--- a/src/tools/qmutexpool_p.h
+++ b/src/tools/qmutexpool_p.h
@@ -51,7 +51,7 @@
 //
 //
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 #ifndef QT_H
 #include "qmutex.h"
@@ -75,6 +75,6 @@ private:
 
 extern Q_EXPORT QMutexPool *qt_global_mutexpool;
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #endif // QMUTEXPOOL_P_H
diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp
index 5b990f8..6d6790b 100644
--- a/src/tools/qregexp.cpp
+++ b/src/tools/qregexp.cpp
@@ -52,10 +52,10 @@
 #include "qstring.h"
 #include "qtl.h"
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 #include "qthreadstorage.h"
 #include <private/qthreadinstance_p.h>
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #undef QT_TRANSLATE_NOOP
 #define QT_TRANSLATE_NOOP( context, sourceText ) sourceText
@@ -3212,25 +3212,25 @@ struct QRegExpPrivate
 
 #ifndef QT_NO_REGEXP_OPTIM
 static QSingleCleanupHandler<QCache<QRegExpEngine> > cleanup_cache;
-#  ifndef QT_THREAD_SUPPORT
+#  ifndef TQT_THREAD_SUPPORT
 static QCache<QRegExpEngine> *engineCache = 0;
-#  endif // QT_THREAD_SUPPORT
+#  endif // TQT_THREAD_SUPPORT
 #endif // QT_NO_REGEXP_OPTIM
 
 static void regexpEngine( QRegExpEngine *&eng, const QString &pattern,
 			  bool caseSensitive, bool deref )
 {
-#  ifdef QT_THREAD_SUPPORT
+#  ifdef TQT_THREAD_SUPPORT
     static QThreadStorage<QCache<QRegExpEngine> *> engineCaches;
     QCache<QRegExpEngine> *engineCache = 0;
     QThreadInstance *currentThread = QThreadInstance::current();
     if (currentThread)
         engineCache = engineCaches.localData();
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
     if ( !deref ) {
 #ifndef QT_NO_REGEXP_OPTIM
-#  ifdef QT_THREAD_SUPPORT
+#  ifdef TQT_THREAD_SUPPORT
         if ( currentThread )
 #  endif
             {
@@ -3251,18 +3251,18 @@ static void regexpEngine( QRegExpEngine *&eng, const QString &pattern,
 
     if ( eng->deref() ) {
 #ifndef QT_NO_REGEXP_OPTIM
-#  ifdef QT_THREAD_SUPPORT
+#  ifdef TQT_THREAD_SUPPORT
         if ( currentThread )
 #  endif
             {
                 if ( engineCache == 0 ) {
                     engineCache = new QCache<QRegExpEngine>;
                     engineCache->setAutoDelete( TRUE );
-#  ifdef QT_THREAD_SUPPORT
+#  ifdef TQT_THREAD_SUPPORT
                     engineCaches.setLocalData(engineCache);
 #  else
                     cleanup_cache.set( &engineCache );
-#  endif // !QT_THREAD_SUPPORT
+#  endif // !TQT_THREAD_SUPPORT
                 }
                 if ( !pattern.isNull() &&
                      engineCache->insert(pattern, eng, 4 + pattern.length() / 4) )
diff --git a/src/tools/qsemaphore.cpp b/src/tools/qsemaphore.cpp
index 43ea17e..500a29b 100644
--- a/src/tools/qsemaphore.cpp
+++ b/src/tools/qsemaphore.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #include "qsemaphore.h"
 #include "qmutex.h"
@@ -252,4 +252,4 @@ bool QSemaphore::tryAccess(int n)
     return TRUE;
 }
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
diff --git a/src/tools/qsemaphore.h b/src/tools/qsemaphore.h
index 24572a6..2bd2d98 100644
--- a/src/tools/qsemaphore.h
+++ b/src/tools/qsemaphore.h
@@ -45,7 +45,7 @@
 #include "qglobal.h"
 #endif // QT_H
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 class QSemaphorePrivate;
 
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index 1288fd7..c7b0c95 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -93,9 +93,9 @@
 #define ULLONG_MAX Q_UINT64_C(18446744073709551615)
 #endif
 
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 #include "qmutex.h"
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 
 extern QMutex *qt_sharedStringMutex;
 
@@ -1053,9 +1053,9 @@ QStringData::QStringData() : QShared(),
 	maxl(0),
 	islatin1(FALSE),
 	security_unpaged(FALSE) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	mutex = new QMutex(FALSE);
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	ref();
 }
 
@@ -1067,9 +1067,9 @@ QStringData::QStringData(QChar *u, uint l, uint m) : QShared(),
 	maxl(m),
 	islatin1(FALSE),
 	security_unpaged(FALSE) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	mutex = new QMutex(FALSE);
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 }
 
 QStringData::~QStringData() {
@@ -1084,12 +1084,12 @@ QStringData::~QStringData() {
 	if ( ascii ) {
 		delete[] ascii;
 	}
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	if ( mutex ) {
 		delete mutex;
 		mutex = NULL;
 	}
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 }
 
 void QStringData::setDirty() {
@@ -1457,14 +1457,14 @@ QT_STATIC_CONST_IMPL QChar QChar::nbsp((ushort)0x00a0);
 
 QStringData* QString::makeSharedNull()
 {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
     if (qt_sharedStringMutex) qt_sharedStringMutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 
     if (QString::shared_null) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	if (qt_sharedStringMutex) qt_sharedStringMutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	return QString::shared_null;
     }
 
@@ -1474,9 +1474,9 @@ QStringData* QString::makeSharedNull()
     that->d = QString::shared_null;
 #endif
 
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
     if (qt_sharedStringMutex) qt_sharedStringMutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
     return QString::shared_null;
 }
 
@@ -1517,13 +1517,13 @@ QString::QString( const QString &s ) :
     d(s.d)
 {
     if ( d && (d != shared_null) ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
         d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
         d->ref();
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
         d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
     }
 }
 
@@ -1676,20 +1676,20 @@ QString::~QString()
 		return;
 	}
 
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	if ( d->deref() ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 		d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 		d->deleteSelf();
 		d = NULL;
 	}
 	else {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 		d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	}
 }
 
@@ -1711,22 +1711,22 @@ void QString::real_detach()
 void QString::deref()
 {
 	if ( d && (d != shared_null) ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 		d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 		if ( d->deref() ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 			d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 			if ( d != shared_null ) {
 				delete d;
 			}
 			d = 0;
 		}
 		else {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 			d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 		}
 	}
 }
@@ -1769,13 +1769,13 @@ void QStringData::deleteSelf()
 QString &QString::operator=( const QString &s )
 {
     if ( s.d && (s.d != shared_null) ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
         s.d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
         s.d->ref();
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
         s.d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
     }
     deref();
     d = s.d;
@@ -1883,9 +1883,9 @@ void QString::truncate( uint newLen )
 */
 void QString::setLength( uint newLen )
 {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
     d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 
     if ( d->count != 1 || newLen > d->maxl ||
 	 ( newLen * 4 < d->maxl && d->maxl > 4 ) ) {
@@ -1896,24 +1896,24 @@ void QString::setLength( uint newLen )
 	    uint len = QMIN( d->len, newLen );
 	    memcpy( nd, d->unicode, sizeof(QChar) * len );
 	    bool unpaged = d->security_unpaged;
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	    d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	    deref();
 	    d = new QStringData( nd, newLen, newMax );
 	    setSecurityUnPaged(unpaged);
 	}
 	else {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	    d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	}
     }
     else {
 	d->len = newLen;
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	d->setDirty();
     }
 }
@@ -1999,21 +1999,21 @@ void QString::squeeze()
 */
 void QString::grow( uint newLen )
 {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
     d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 
     if ( d->count != 1 || newLen > d->maxl ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	setLength( newLen );
     }
     else {
 	d->len = newLen;
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	d->setDirty();
     }
 }
@@ -6423,19 +6423,19 @@ QString QString::fromUcs2( const unsigned short *str )
 */
 
 QChar& QString::ref(uint i) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 	d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	if ( (d->count != 1) || (i >= d->len) ) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 		d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 		subat( i );
 	}
 	else {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 		d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 	}
 	d->setDirty();
 	return d->unicode[i];
@@ -6523,9 +6523,9 @@ QString& QString::setUnicode( const QChar *unicode, uint len )
 		}
 	}
 	else {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 		d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 		if ( d->count != 1 || len > d->maxl || ( len * 4 < d->maxl && d->maxl > 4 ) ) {
 			// detach, grown or shrink
 			uint newMax = computeNewMax( len );
@@ -6533,17 +6533,17 @@ QString& QString::setUnicode( const QChar *unicode, uint len )
 			if ( unicode ) {
 				memcpy( nd, unicode, sizeof(QChar)*len );
 			}
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 			d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 			deref();
 			d = new QStringData( nd, len, newMax );
 		}
 		else {
 			d->len = len;
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
 			d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 			d->setDirty();
 			if ( unicode ) {
 				memcpy( d->unicode, unicode, sizeof(QChar)*len );
@@ -7254,9 +7254,9 @@ QConstString::QConstString( const QChar* unicode, uint length ) :
 */
 QConstString::~QConstString()
 {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
     d->mutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 
     if ( d->count > 1 ) {
 	QChar* cp = QT_ALLOC_QCHAR_VEC( d->len );
@@ -7268,9 +7268,9 @@ QConstString::~QConstString()
     }
 
     // The original d->unicode is now unlinked.
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
     d->mutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 }
 
 /*!
diff --git a/src/tools/qthreadinstance_p.h b/src/tools/qthreadinstance_p.h
index 87dbe6c..865664e 100644
--- a/src/tools/qthreadinstance_p.h
+++ b/src/tools/qthreadinstance_p.h
@@ -51,7 +51,7 @@
 //
 //
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 #ifndef QT_H
 #include "qmutex.h"
@@ -105,5 +105,5 @@ public:
     bool disableThreadPostedEvents : 1;
 };
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 #endif // QTHREAD_P_H
diff --git a/src/tools/qthreadstorage.h b/src/tools/qthreadstorage.h
index b012ede..df3c515 100644
--- a/src/tools/qthreadstorage.h
+++ b/src/tools/qthreadstorage.h
@@ -39,7 +39,7 @@
 #ifndef QTHREADSTORAGE_H
 #define QTHREADSTORAGE_H
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 #ifndef QT_H
 #include "qglobal.h"
@@ -90,6 +90,6 @@ public:
     { (void) d.set( t ); }
 };
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
 
 #endif // QTHREADSTORAGE_H
diff --git a/src/tools/qthreadstorage_unix.cpp b/src/tools/qthreadstorage_unix.cpp
index 248a0ad..3dddd88 100644
--- a/src/tools/qthreadstorage_unix.cpp
+++ b/src/tools/qthreadstorage_unix.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
 
 #include "qplatformdefs.h"
 
@@ -346,4 +346,4 @@ void QThreadStorageData::finish( void **thread_storage )
     \sa localData() hasLocalData()
 */
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
diff --git a/src/tools/qwaitcondition.h b/src/tools/qwaitcondition.h
index ac263ed..aad455e 100644
--- a/src/tools/qwaitcondition.h
+++ b/src/tools/qwaitcondition.h
@@ -45,7 +45,7 @@
 #include "qglobal.h"
 #endif // QT_H
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #include <limits.h>
 
diff --git a/src/tools/qwaitcondition_unix.cpp b/src/tools/qwaitcondition_unix.cpp
index 5c3c23c..4807cb5 100644
--- a/src/tools/qwaitcondition_unix.cpp
+++ b/src/tools/qwaitcondition_unix.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
 
 #include "qplatformdefs.h"
 
@@ -313,4 +313,4 @@ bool QWaitCondition::wait(QMutex *mutex, unsigned long time)
     return (ret == 0);
 }
 
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT