summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/ntqglist.h2
-rw-r--r--src/tools/ntqmutex.h2
-rw-r--r--src/tools/ntqsemaphore.h2
-rw-r--r--src/tools/ntqthreadstorage.h4
-rw-r--r--src/tools/ntqwaitcondition.h2
-rw-r--r--src/tools/qcom_p.h2
-rw-r--r--src/tools/qcomlibrary.cpp10
-rw-r--r--src/tools/qcriticalsection_p.cpp2
-rw-r--r--src/tools/qcriticalsection_p.h2
-rw-r--r--src/tools/qcstring.cpp8
-rw-r--r--src/tools/qdatetime.cpp10
-rw-r--r--src/tools/qdir_unix.cpp12
-rw-r--r--src/tools/qgarray.cpp12
-rw-r--r--src/tools/qglist.cpp182
-rw-r--r--src/tools/qgvector.cpp8
-rw-r--r--src/tools/qlocale.cpp2
-rw-r--r--src/tools/qmutex_unix.cpp4
-rw-r--r--src/tools/qmutexpool.cpp2
-rw-r--r--src/tools/qmutexpool_p.h4
-rw-r--r--src/tools/qregexp.cpp20
-rw-r--r--src/tools/qsemaphore.cpp4
-rw-r--r--src/tools/qstring.cpp128
-rw-r--r--src/tools/qthreadinstance_p.h4
-rw-r--r--src/tools/qthreadstorage_unix.cpp4
-rw-r--r--src/tools/qwaitcondition_unix.cpp4
25 files changed, 218 insertions, 218 deletions
diff --git a/src/tools/ntqglist.h b/src/tools/ntqglist.h
index babc9f493..aaa0a4a3f 100644
--- a/src/tools/ntqglist.h
+++ b/src/tools/ntqglist.h
@@ -150,7 +150,7 @@ private:
TQLNode *locate( uint ); // get node at i'th pos
TQLNode *unlink(); // unlink node
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
// TQMutex* mutex;
#endif
diff --git a/src/tools/ntqmutex.h b/src/tools/ntqmutex.h
index 7b73514da..e23f66fe8 100644
--- a/src/tools/ntqmutex.h
+++ b/src/tools/ntqmutex.h
@@ -45,7 +45,7 @@
#include "ntqglobal.h"
#endif // QT_H
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
class TQMutexPrivate;
diff --git a/src/tools/ntqsemaphore.h b/src/tools/ntqsemaphore.h
index dc6309d58..3d418e074 100644
--- a/src/tools/ntqsemaphore.h
+++ b/src/tools/ntqsemaphore.h
@@ -45,7 +45,7 @@
#include "ntqglobal.h"
#endif // QT_H
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
class TQSemaphorePrivate;
diff --git a/src/tools/ntqthreadstorage.h b/src/tools/ntqthreadstorage.h
index 06edbec3e..9d9f20cf8 100644
--- a/src/tools/ntqthreadstorage.h
+++ b/src/tools/ntqthreadstorage.h
@@ -39,7 +39,7 @@
#ifndef TQTHREADSTORAGE_H
#define TQTHREADSTORAGE_H
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
#ifndef QT_H
#include "ntqglobal.h"
@@ -90,6 +90,6 @@ public:
{ (void) d.set( t ); }
};
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
#endif // TQTHREADSTORAGE_H
diff --git a/src/tools/ntqwaitcondition.h b/src/tools/ntqwaitcondition.h
index 7b8475f23..b85baf920 100644
--- a/src/tools/ntqwaitcondition.h
+++ b/src/tools/ntqwaitcondition.h
@@ -45,7 +45,7 @@
#include "ntqglobal.h"
#endif // QT_H
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
#include <limits.h>
diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
index f3338ca07..afb122855 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 7097b287a..60899a6ab 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 TQString& library, uint version, uint flags,
const TQCString &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 TQComLibrary::createInstanceInternal()
bool query_done = FALSE;
bool warn_mismatch = TRUE;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &cache ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
if ( ! cache ) {
cache = new TQSettings;
diff --git a/src/tools/qcriticalsection_p.cpp b/src/tools/qcriticalsection_p.cpp
index 70fcd84e9..20c2127b0 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 8fa383375..6fda0f3a4 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 a3bea8ff4..6bfaa9c36 100644
--- a/src/tools/qcstring.cpp
+++ b/src/tools/qcstring.cpp
@@ -43,9 +43,9 @@
#include "ntqregexp.h"
#include "ntqdatastream.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 @@ TQ_UINT16 tqChecksum( const char *data, uint len )
{
if ( !crc_tbl_init ) { // create lookup table
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ?
tqt_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 9ab03b6bf..235ba7457 100644
--- a/src/tools/qdatetime.cpp
+++ b/src/tools/qdatetime.cpp
@@ -1039,7 +1039,7 @@ TQDate TQDate::currentDate( TQt::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 == TQt::LocalTime )
@@ -1051,7 +1051,7 @@ TQDate TQDate::currentDate( TQt::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 TQTime::currentTime( TQTime *ct, TQt::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 == TQt::LocalTime )
@@ -1741,7 +1741,7 @@ bool TQTime::currentTime( TQTime *ct, TQt::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 TQDateTime::setTime_t( time_t secsSince1Jan1970UTC, TQt::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 7f316ad71..5c421a3e3 100644
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/qdir_unix.cpp
@@ -48,9 +48,9 @@
#include "ntqregexp.h"
#include "ntqstringlist.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 TQDir::readDirEntries( const TQString &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 TQDir::readDirEntries( const TQString &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
{
TQString fn = TQFile::decodeName(file->d_name);
fi.setFile( *this, fn );
@@ -311,10 +311,10 @@ const TQFileInfoList * TQDir::drives()
if ( !knownMemoryLeak ) {
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &knownMemoryLeak ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
if ( !knownMemoryLeak ) {
knownMemoryLeak = new TQFileInfoList;
diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp
index f2b41e506..1d4971c20 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 TQGArray::sort( uint sz )
if ( numItems < 2 )
return;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ?
tqt_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 TQGArray::bsearch( const char *d, uint sz ) const
if ( !numItems )
return -1;
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ?
tqt_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 6c0455c9c..3ed8bd93b 100644
--- a/src/tools/qglist.cpp
+++ b/src/tools/qglist.cpp
@@ -43,9 +43,9 @@
#include "ntqdatastream.h"
#include "ntqvaluelist.h"
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
#include "ntqmutex.h"
-#endif // defined(QT_THREAD_SUPPORT)
+#endif // defined(TQT_THREAD_SUPPORT)
/*!
\class TQLNode ntqglist.h
@@ -225,7 +225,7 @@ TQDataStream &TQGList::write( TQDataStream &s, TQPtrCollection::Item ) const
TQGList::TQGList()
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex = new TQMutex(true);
#endif
firstNode = lastNode = curNode = 0; // initialize list
@@ -241,7 +241,7 @@ TQGList::TQGList()
TQGList::TQGList( const TQGList & list )
: TQPtrCollection( list )
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex = new TQMutex(true);
#endif
firstNode = lastNode = curNode = 0; // initialize list
@@ -268,7 +268,7 @@ TQGList::~TQGList()
// 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 TQGList::operator==( const TQGList &list ) const
TQLNode *TQGList::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 @@ TQLNode *TQGList::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 @@ TQLNode *TQGList::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 @@ TQLNode *TQGList::locate( uint index )
void TQGList::inSort( TQPtrCollection::Item d )
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
int index = 0;
@@ -411,7 +411,7 @@ void TQGList::inSort( TQPtrCollection::Item d )
index++;
}
insertAt( index, d );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->unlock();
#endif
}
@@ -423,7 +423,7 @@ void TQGList::inSort( TQPtrCollection::Item d )
void TQGList::prepend( TQPtrCollection::Item d )
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
register TQLNode *n = new TQLNode( newItem(d) );
@@ -436,7 +436,7 @@ void TQGList::prepend( TQPtrCollection::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 TQGList::prepend( TQPtrCollection::Item d )
void TQGList::append( TQPtrCollection::Item d )
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
register TQLNode *n = new TQLNode( newItem(d) );
@@ -463,7 +463,7 @@ void TQGList::append( TQPtrCollection::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 TQGList::append( TQPtrCollection::Item d )
bool TQGList::insertAt( uint index, TQPtrCollection::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;
}
TQLNode *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 TQGList::insertAt( uint index, TQPtrCollection::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 TQGList::insertAt( uint index, TQPtrCollection::Item d )
void TQGList::relinkNode( TQLNode *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 TQGList::relinkNode( TQLNode *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 TQGList::relinkNode( TQLNode *n )
TQLNode *TQGList::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 @@ TQLNode *TQGList::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 @@ TQLNode *TQGList::unlink()
bool TQGList::removeNode( TQLNode *n )
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
#if defined(QT_CHECK_NULL)
@@ -622,7 +622,7 @@ bool TQGList::removeNode( TQLNode *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 TQGList::removeNode( TQLNode *n )
bool TQGList::remove( TQPtrCollection::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;
}
TQLNode *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 TQGList::remove( TQPtrCollection::Item d )
bool TQGList::removeRef( TQPtrCollection::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;
}
TQLNode *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 TQGList::removeRef( TQPtrCollection::Item d )
bool TQGList::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;
}
TQLNode *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 TQGList::removeAt( uint index )
*/
bool TQGList::replaceAt( uint index, TQPtrCollection::Item d )
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
TQLNode *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 TQGList::replaceAt( uint index, TQPtrCollection::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 TQGList::replaceAt( uint index, TQPtrCollection::Item d )
TQPtrCollection::Item TQGList::takeNode( TQLNode *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) ) {
tqWarning( "TQGList::takeNode: Corrupted node" );
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->unlock();
#endif
return 0;
@@ -785,7 +785,7 @@ TQPtrCollection::Item TQGList::takeNode( TQLNode *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 @@ TQPtrCollection::Item TQGList::takeNode( TQLNode *n )
TQPtrCollection::Item TQGList::take()
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
TQLNode *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 @@ TQPtrCollection::Item TQGList::take()
TQPtrCollection::Item TQGList::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 @@ TQPtrCollection::Item TQGList::takeAt( uint index )
TQLNode *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 @@ TQPtrCollection::Item TQGList::takeAt( uint index )
TQPtrCollection::Item TQGList::takeFirst()
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
first();
TQLNode *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 @@ TQPtrCollection::Item TQGList::takeFirst()
TQPtrCollection::Item TQGList::takeLast()
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
last();
TQLNode *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 @@ TQPtrCollection::Item TQGList::takeLast()
void TQGList::clear()
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
register TQLNode *n = firstNode;
@@ -898,7 +898,7 @@ void TQGList::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 TQGList::clear()
int TQGList::findRef( TQPtrCollection::Item d, bool fromStart )
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
register TQLNode *n;
@@ -929,7 +929,7 @@ int TQGList::findRef( TQPtrCollection::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 TQGList::findRef( TQPtrCollection::Item d, bool fromStart )
int TQGList::find( TQPtrCollection::Item d, bool fromStart )
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
register TQLNode *n;
@@ -961,7 +961,7 @@ int TQGList::find( TQPtrCollection::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 TQGList::find( TQPtrCollection::Item d, bool fromStart )
uint TQGList::containsRef( TQPtrCollection::Item d ) const
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
register TQLNode *n = firstNode;
@@ -984,7 +984,7 @@ uint TQGList::containsRef( TQPtrCollection::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 TQGList::containsRef( TQPtrCollection::Item d ) const
uint TQGList::contains( TQPtrCollection::Item d ) const
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
register TQLNode *n = firstNode;
@@ -1008,7 +1008,7 @@ uint TQGList::contains( TQPtrCollection::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 TQGList::contains( TQPtrCollection::Item d ) const
TQPtrCollection::Item TQGList::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 @@ TQPtrCollection::Item TQGList::first()
TQPtrCollection::Item TQGList::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 @@ TQPtrCollection::Item TQGList::last()
TQPtrCollection::Item TQGList::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 @@ TQPtrCollection::Item TQGList::next()
curIndex = -1;
curNode = 0;
}
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->unlock();
#endif
return 0;
@@ -1129,14 +1129,14 @@ TQPtrCollection::Item TQGList::next()
TQPtrCollection::Item TQGList::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 @@ TQPtrCollection::Item TQGList::prev()
curIndex = -1;
curNode = 0;
}
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->unlock();
#endif
return 0;
@@ -1157,12 +1157,12 @@ TQPtrCollection::Item TQGList::prev()
void TQGList::toVector( TQGVector *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 TQGList::toVector( TQGVector *vector ) const
n = n->next;
i++;
}
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->unlock();
#endif
}
void TQGList::heapSortPushDown( TQPtrCollection::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 TQGList::heapSortPushDown( TQPtrCollection::Item* heap, int first, int last
}
}
}
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->unlock();
#endif
}
@@ -1233,12 +1233,12 @@ void TQGList::heapSortPushDown( TQPtrCollection::Item* heap, int first, int last
void TQGList::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 TQGList::sort()
}
delete [] realheap;
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->unlock();
#endif
}
@@ -1300,7 +1300,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQGList &list )
TQDataStream &TQGList::read( TQDataStream &s )
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
uint num;
@@ -1326,7 +1326,7 @@ TQDataStream &TQGList::read( TQDataStream &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 @@ TQDataStream &TQGList::read( TQDataStream &s )
TQDataStream &TQGList::write( TQDataStream &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 @@ TQDataStream &TQGList::write( TQDataStream &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 @@ TQDataStream &TQGList::write( TQDataStream &s ) const
*/
TQLNode* TQGList::erase( TQLNode* it )
{
-#if defined(QT_THREAD_SUPPORT)
+#if defined(TQT_THREAD_SUPPORT)
//mutex->lock();
#endif
TQLNode* 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/qgvector.cpp b/src/tools/qgvector.cpp
index af896ab72..2c8b13d68 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/qgvector.cpp
@@ -51,9 +51,9 @@
#include "ntqdatastream.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 TQGVector::sort() // sort vector
}
}
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &sort_vec ) : 0 );
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
sort_vec = (TQGVector*)this;
qsort( vec, count(), sizeof(Item), cmp_vec );
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index 22c20caee..39a430e26 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -3244,7 +3244,7 @@ TQString TQLocalePrivate::doubleToString(double d,
TQString digits;
#ifdef QT_QLOCALE_USES_FCVT
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
static bool dummy_for_mutex;
TQMutex *fcvt_mutex = tqt_global_mutexpool ? tqt_global_mutexpool->get( &dummy_for_mutex ) : 0;
# define FCVT_LOCK if (fcvt_mutex) fcvt_mutex->lock()
diff --git a/src/tools/qmutex_unix.cpp b/src/tools/qmutex_unix.cpp
index ac466fd88..6d1a1423d 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 TQMutex::level()
\sa TQMutexLocker::TQMutexLocker()
*/
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
diff --git a/src/tools/qmutexpool.cpp b/src/tools/qmutexpool.cpp
index 5bc6cce2f..18cd55606 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 <ntqthread.h>
diff --git a/src/tools/qmutexpool_p.h b/src/tools/qmutexpool_p.h
index e560c994c..cb2eef205 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 "ntqmutex.h"
@@ -75,6 +75,6 @@ private:
extern Q_EXPORT TQMutexPool *tqt_global_mutexpool;
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
#endif // TQMUTEXPOOL_P_H
diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp
index 7330f4f1a..d5598c4db 100644
--- a/src/tools/qregexp.cpp
+++ b/src/tools/qregexp.cpp
@@ -52,10 +52,10 @@
#include "ntqstring.h"
#include "ntqtl.h"
-#ifdef QT_THREAD_SUPPORT
+#ifdef TQT_THREAD_SUPPORT
#include "ntqthreadstorage.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 TQRegExpPrivate
#ifndef QT_NO_REGEXP_OPTIM
static TQSingleCleanupHandler<TQCache<TQRegExpEngine> > cleanup_cache;
-# ifndef QT_THREAD_SUPPORT
+# ifndef TQT_THREAD_SUPPORT
static TQCache<TQRegExpEngine> *engineCache = 0;
-# endif // QT_THREAD_SUPPORT
+# endif // TQT_THREAD_SUPPORT
#endif // QT_NO_REGEXP_OPTIM
static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern,
bool caseSensitive, bool deref )
{
-# ifdef QT_THREAD_SUPPORT
+# ifdef TQT_THREAD_SUPPORT
static TQThreadStorage<TQCache<TQRegExpEngine> *> engineCaches;
TQCache<TQRegExpEngine> *engineCache = 0;
TQThreadInstance *currentThread = TQThreadInstance::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( TQRegExpEngine *&eng, const TQString &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 TQCache<TQRegExpEngine>;
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 d4f240f70..810837b4c 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 "ntqsemaphore.h"
#include "ntqmutex.h"
@@ -252,4 +252,4 @@ bool TQSemaphore::tryAccess(int n)
return TRUE;
}
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index 10f0a6d26..755d26776 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -93,9 +93,9 @@
#define ULLONG_MAX TQ_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 "ntqmutex.h"
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
extern TQMutex *tqt_sharedStringMutex;
@@ -1053,9 +1053,9 @@ TQStringData::TQStringData() : TQShared(),
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 TQMutex(FALSE);
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
ref();
}
@@ -1067,9 +1067,9 @@ TQStringData::TQStringData(TQChar *u, uint l, uint m) : TQShared(),
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 TQMutex(FALSE);
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
}
TQStringData::~TQStringData() {
@@ -1084,12 +1084,12 @@ TQStringData::~TQStringData() {
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 TQStringData::setDirty() {
@@ -1457,14 +1457,14 @@ QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0);
TQStringData* TQString::makeSharedNull()
{
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
if (tqt_sharedStringMutex) tqt_sharedStringMutex->lock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
if (TQString::shared_null) {
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
if (tqt_sharedStringMutex) tqt_sharedStringMutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
return TQString::shared_null;
}
@@ -1474,9 +1474,9 @@ TQStringData* TQString::makeSharedNull()
that->d = TQString::shared_null;
#endif
-#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
+#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
if (tqt_sharedStringMutex) tqt_sharedStringMutex->unlock();
-#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
+#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
return TQString::shared_null;
}
@@ -1517,13 +1517,13 @@ TQString::TQString( const TQString &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 @@ TQString::~TQString()
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 TQString::real_detach()
void TQString::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 TQStringData::deleteSelf()
TQString &TQString::operator=( const TQString &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 TQString::truncate( uint newLen )
*/
void TQString::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 TQString::setLength( uint newLen )
uint len = TQMIN( d->len, newLen );
memcpy( nd, d->unicode, sizeof(TQChar) * 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 TQStringData( 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 TQString::squeeze()
*/
void TQString::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 @@ TQString TQString::fromUcs2( const unsigned short *str )
*/
TQChar& TQString::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 @@ TQString& TQString::setUnicode( const TQChar *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 @@ TQString& TQString::setUnicode( const TQChar *unicode, uint len )
if ( unicode ) {
memcpy( nd, unicode, sizeof(TQChar)*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 TQStringData( 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(TQChar)*len );
@@ -7254,9 +7254,9 @@ TQConstString::TQConstString( const TQChar* unicode, uint length ) :
*/
TQConstString::~TQConstString()
{
-#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 ) {
TQChar* cp = QT_ALLOC_QCHAR_VEC( d->len );
@@ -7268,9 +7268,9 @@ TQConstString::~TQConstString()
}
// 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 9fae260ed..14f0de591 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 "ntqmutex.h"
@@ -105,5 +105,5 @@ public:
bool disableThreadPostedEvents : 1;
};
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
#endif // TQTHREAD_P_H
diff --git a/src/tools/qthreadstorage_unix.cpp b/src/tools/qthreadstorage_unix.cpp
index df4c3866f..d53f6fb6e 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 TQThreadStorageData::finish( void **thread_storage )
\sa localData() hasLocalData()
*/
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
diff --git a/src/tools/qwaitcondition_unix.cpp b/src/tools/qwaitcondition_unix.cpp
index 2d985332b..62038bae5 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 TQWaitCondition::wait(TQMutex *mutex, unsigned long time)
return (ret == 0);
}
-#endif // QT_THREAD_SUPPORT
+#endif // TQT_THREAD_SUPPORT
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 12:55:06 +0000