TDE
/
tqt3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3
0
0
Fork 0
Code Issues Releases Wiki Activity

Conversion QT_THREAD_SUPPORT -> TQT_THREAD_SUPPORT. This is part of the

Browse Source 
qt->tqt conversion and is required to align to corresponding patch for
common/admin module.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 6 years ago
parent 1fb89fa154
commit 02964eb384
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
121 changed files with 545 additions and 545 deletions
Show Stats Download Patch File Download Diff File

10
doc/html/qapplication-h.html
Unescape View File

@ -94,9 +94,9 @@ class TQEventLoop;
class TQWSDecoration; class TQWSDecoration;
#endif #endif
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
class TQMutex; class TQMutex;
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
class TQApplication; class TQApplication;
@ -316,7 +316,7 @@ public:
static bool x11_apply_settings(); static bool x11_apply_settings();
#endif #endif
void wakeUpGuiThread(); void wakeUpGuiThread();
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
void lock(); void lock();
void unlock(bool wakeUpGui = TRUE); void unlock(bool wakeUpGui = TRUE);
bool locked(); bool locked();
@ -367,9 +367,9 @@ private:
friend void tqt_init(int *, char **, TQApplication::Type); friend void tqt_init(int *, char **, TQApplication::Type);
#endif #endif
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
static TQMutex *tqt_mutex; static TQMutex *tqt_mutex;
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
int app_argc; int app_argc;
char **app_argv; char **app_argv;

4
doc/html/qeventloop-h.html
Unescape View File

@ -88,9 +88,9 @@ struct timeval; //stdc struct
struct TimerInfo; //internal structure (qeventloop_mac.cpp) struct TimerInfo; //internal structure (qeventloop_mac.cpp)
#endif #endif
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
class TQMutex; class TQMutex;
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
class Q_EXPORT TQEventLoop : public TQObject class Q_EXPORT TQEventLoop : public TQObject

10
doc/html/qmake-manual-6.html
Unescape View File

@ -101,20 +101,20 @@ body { background: #ffffff; color: black; }
<pre> <pre>
win32 { win32 {
thread { thread {
DEFINES += QT_THREAD_SUPPORT DEFINES += TQT_THREAD_SUPPORT
} }
} }
</pre> </pre>
<p>To save writing many nested scopes, you can nest scopes using a colon like this:</p> <p>To save writing many nested scopes, you can nest scopes using a colon like this:</p>
<pre> <pre>
win32:thread { win32:thread {
DEFINES += QT_THREAD_SUPPORT DEFINES += TQT_THREAD_SUPPORT
} }
</pre> </pre>
<p>Once a test has been performed you may also do else/elseif operations. With this you may easily write complicated tests. This can be done with the special 'else' scope, it can be combined with other scopes (separated by colons as above) for example:</p> <p>Once a test has been performed you may also do else/elseif operations. With this you may easily write complicated tests. This can be done with the special 'else' scope, it can be combined with other scopes (separated by colons as above) for example:</p>
<pre> <pre>
win32:thread { win32:thread {
DEFINES += QT_THREAD_SUPPORT DEFINES += TQT_THREAD_SUPPORT
} else:debug { } else:debug {
DEFINES += QT_NOTHREAD_DEBUG DEFINES += QT_NOTHREAD_DEBUG
} else { } else {
@ -166,10 +166,10 @@ body { background: #ffffff; color: black; }
<p>If <em>value</em> is in the list of values stored in the variable called <em>variablename</em>, then the settings inside the scope will be processed. For example:</p> <p>If <em>value</em> is in the list of values stored in the variable called <em>variablename</em>, then the settings inside the scope will be processed. For example:</p>
<pre> <pre>
contains( CONFIG, thread ) { contains( CONFIG, thread ) {
DEFINES += QT_THREAD_SUPPORT DEFINES += TQT_THREAD_SUPPORT
} }
</pre> </pre>
<p>If <em>thread</em> is in the list of values for the <em>CONFIG</em> variable, then QT_THREAD_SUPPORT will be added to the list of values in the <em>DEFINES</em> variable.</p> <p>If <em>thread</em> is in the list of values for the <em>CONFIG</em> variable, then TQT_THREAD_SUPPORT will be added to the list of values in the <em>DEFINES</em> variable.</p>
<h4><a name="5-2"></a>count( variablename, number )</h4> <h4><a name="5-2"></a>count( variablename, number )</h4>
<p>If <em>number</em> matches the number of values stored in the variable called <em>variablename</em>, then the settings inside the scope will be processed. For example:</p> <p>If <em>number</em> matches the number of values stored in the variable called <em>variablename</em>, then the settings inside the scope will be processed. For example:</p>
<pre> <pre>

2
doc/html/qmutex-h.html
Unescape View File

@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
#include "ntqglobal.h" #include "ntqglobal.h"
#endif // QT_H #endif // QT_H
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
class TQMutexPrivate; class TQMutexPrivate;

2
doc/html/qsemaphore-h.html
Unescape View File

@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
#include "ntqglobal.h" #include "ntqglobal.h"
#endif // QT_H #endif // QT_H
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
class TQSemaphorePrivate; class TQSemaphorePrivate;

4
doc/html/qthread-h.html
Unescape View File

@ -77,7 +77,7 @@ body { background: #ffffff; color: black; }
#ifndef TQTHREAD_H #ifndef TQTHREAD_H
#define TQTHREAD_H #define TQTHREAD_H
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#ifndef QT_H #ifndef QT_H
#include "ntqwindowdefs.h" #include "ntqwindowdefs.h"
@ -161,7 +161,7 @@ private:
#endif // TQ_DISABLE_COPY #endif // TQ_DISABLE_COPY
}; };
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#endif // TQTHREAD_H #endif // TQTHREAD_H
</pre> </pre>

4
doc/html/qthreadstorage-h.html
Unescape View File

@ -75,7 +75,7 @@ body { background: #ffffff; color: black; }
#ifndef TQTHREADSTORAGE_H #ifndef TQTHREADSTORAGE_H
#define TQTHREADSTORAGE_H #define TQTHREADSTORAGE_H
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#ifndef QT_H #ifndef QT_H
#include "ntqglobal.h" #include "ntqglobal.h"
@ -126,7 +126,7 @@ public:
{ (void) d.set( t ); } { (void) d.set( t ); }
}; };
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#endif // TQTHREADSTORAGE_H #endif // TQTHREADSTORAGE_H
</pre> </pre>

2
doc/html/qwaitcondition-h.html
Unescape View File

@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
#include "ntqglobal.h" #include "ntqglobal.h"
#endif // QT_H #endif // QT_H
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include &lt;limits.h&gt; #include &lt;limits.h&gt;

4
doc/html/threads.html
Unescape View File

@ -81,8 +81,8 @@ such as with a special libc, installation will create a separate
library, <tt>libtqt-mt</tt> and hence threaded programs must be linked library, <tt>libtqt-mt</tt> and hence threaded programs must be linked
against this library (with <tt>-ltqt-mt</tt>) rather than the standard TQt against this library (with <tt>-ltqt-mt</tt>) rather than the standard TQt
library. library.
<p> On both platforms, you should compile with the macro <tt>QT_THREAD_SUPPORT</tt> defined (e.g. compile with <p> On both platforms, you should compile with the macro <tt>TQT_THREAD_SUPPORT</tt> defined (e.g. compile with
<tt>-DQT_THREAD_SUPPORT</tt>). On Windows, this is usually done by an <tt>-DTQT_THREAD_SUPPORT</tt>). On Windows, this is usually done by an
entry in <tt>ntqconfig.h</tt>. entry in <tt>ntqconfig.h</tt>.
<p> <h2> The Thread Classes <p> <h2> The Thread Classes
</h2> </h2>

4
doc/threads.doc
Unescape View File

@ -69,8 +69,8 @@ against this library (with \c{-ltqt-mt}) rather than the standard Qt
library. library.
On both platforms, you should compile with the macro \c On both platforms, you should compile with the macro \c
QT_THREAD_SUPPORT defined (e.g. compile with TQT_THREAD_SUPPORT defined (e.g. compile with
\c{-DQT_THREAD_SUPPORT}). On Windows, this is usually done by an \c{-DTQT_THREAD_SUPPORT}). On Windows, this is usually done by an
entry in \c{ntqconfig.h}. entry in \c{ntqconfig.h}.
\section1 The Thread Classes \section1 The Thread Classes

2
mkspecs/aix-g++-64/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
// uncomment if you have problems with <sys/proc.h> because your gcc // uncomment if you have problems with <sys/proc.h> because your gcc
// hasn't been built on exactly the same OS version your are using now. // hasn't been built on exactly the same OS version your are using now.
// typedef int crid_t; // typedef int crid_t;

2
mkspecs/aix-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
// uncomment if you have problems with <sys/proc.h> because your gcc // uncomment if you have problems with <sys/proc.h> because your gcc
// hasn't been built on exactly the same OS version your are using now. // hasn't been built on exactly the same OS version your are using now.
// typedef int crid_t; // typedef int crid_t;

2
mkspecs/aix-xlc-64/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/aix-xlc/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/bsdi-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/cygwin-g++/qplatformdefs.h
Unescape View File

@ -29,7 +29,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/darwin-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/dgux-g++/qplatformdefs.h
Unescape View File

@ -18,7 +18,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/freebsd-clang/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/freebsd-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/freebsd-icc/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/hpux-acc-64/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/hpux-acc-o64/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/hpux-acc/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/hpux-cc/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/hpux-g++-64/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/hpux-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/hpuxi-acc-32/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/hpuxi-acc-64/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/hurd-g++/qplatformdefs.h
Unescape View File

@ -30,7 +30,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/irix-cc-64/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/irix-cc-o32/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/irix-cc/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/irix-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/linux-clang/qplatformdefs.h
Unescape View File

@ -29,7 +29,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/linux-cxx/qplatformdefs.h
Unescape View File

@ -29,7 +29,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/linux-ecc-64/qplatformdefs.h
Unescape View File

@ -29,7 +29,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/linux-g++-32/qplatformdefs.h
Unescape View File

@ -29,7 +29,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/linux-g++-64/qplatformdefs.h
Unescape View File

@ -29,7 +29,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/linux-g++-sparc/qplatformdefs.h
Unescape View File

@ -29,7 +29,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/linux-g++/qplatformdefs.h
Unescape View File

@ -29,7 +29,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/linux-icc/qplatformdefs.h
Unescape View File

@ -29,7 +29,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/linux-kcc/qplatformdefs.h
Unescape View File

@ -29,7 +29,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/linux-kylix/qplatformdefs.h
Unescape View File

@ -29,7 +29,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/linux-pgcc/qplatformdefs.h
Unescape View File

@ -29,7 +29,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/lynxos-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/macx-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/macx-mwerks/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/macx-pbuilder/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/macx-xlc/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/netbsd-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/openbsd-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/qnx-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/reliant-cds-64/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/reliant-cds/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/sco-cc/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/sco-g++/qplatformdefs.h
Unescape View File

@ -18,7 +18,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/solaris-cc-64/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/solaris-cc/qplatformdefs.h
Unescape View File

@ -14,7 +14,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/solaris-g++-64/qplatformdefs.h
Unescape View File

@ -16,7 +16,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/solaris-g++/qplatformdefs.h
Unescape View File

@ -16,7 +16,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/tru64-cxx/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/tru64-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/unixware-cc/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

2
mkspecs/unixware-g++/qplatformdefs.h
Unescape View File

@ -13,7 +13,7 @@
// We are hot - unistd.h should have turned on the specific APIs we requested // We are hot - unistd.h should have turned on the specific APIs we requested
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <pthread.h> #include <pthread.h>
#endif #endif

10
qmake/book/qmake-advanced.leaf
Unescape View File

@ -141,7 +141,7 @@ this:
\code \code
win32 { win32 {
thread { thread {
DEFINES += QT_THREAD_SUPPORT DEFINES += TQT_THREAD_SUPPORT
} }
} }
\endcode \endcode
@ -151,7 +151,7 @@ like this:
\code \code
win32:thread { win32:thread {
DEFINES += QT_THREAD_SUPPORT DEFINES += TQT_THREAD_SUPPORT
} }
\endcode \endcode
@ -162,7 +162,7 @@ colons as above) for example:
\code \code
win32:thread { win32:thread {
DEFINES += QT_THREAD_SUPPORT DEFINES += TQT_THREAD_SUPPORT
} else:debug { } else:debug {
DEFINES += QT_NOTHREAD_DEBUG DEFINES += QT_NOTHREAD_DEBUG
} else { } else {
@ -276,12 +276,12 @@ For example:
\code \code
contains( CONFIG, thread ) { contains( CONFIG, thread ) {
DEFINES += QT_THREAD_SUPPORT DEFINES += TQT_THREAD_SUPPORT
} }
\endcode \endcode
If \e thread is in the list of values for the \e CONFIG variable, then If \e thread is in the list of values for the \e CONFIG variable, then
QT_THREAD_SUPPORT will be added to the list of values in the \e TQT_THREAD_SUPPORT will be added to the list of values in the \e
DEFINES variable. DEFINES variable.
\section2 count( variablename, number ) \section2 count( variablename, number )

2
qmake/generators/unix/unixmake.cpp
Unescape View File

@ -229,7 +229,7 @@ UnixMakefileGenerator::init()
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_DYNLOAD"]; project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_DYNLOAD"];
if ( project->isActiveConfig("thread") ) { if ( project->isActiveConfig("thread") ) {
if(project->isActiveConfig("qt")) if(project->isActiveConfig("qt"))
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT");
if ( !project->isEmpty("QMAKE_CFLAGS_THREAD")) { if ( !project->isEmpty("QMAKE_CFLAGS_THREAD")) {
project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"]; project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
project->variables()["PRL_EXPORT_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"]; project->variables()["PRL_EXPORT_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];

2
qmake/generators/win32/borland_bmake.cpp
Unescape View File

@ -427,7 +427,7 @@ BorlandMakefileGenerator::init()
} }
if(project->isActiveConfig("qt")) { if(project->isActiveConfig("qt")) {
if ( project->isActiveConfig("thread") ) if ( project->isActiveConfig("thread") )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT");
if ( project->isActiveConfig("accessibility" ) ) if ( project->isActiveConfig("accessibility" ) )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
if ( project->isActiveConfig("tablet") ) if ( project->isActiveConfig("tablet") )

2
qmake/generators/win32/mingw_make.cpp
Unescape View File

@ -428,7 +428,7 @@ MingwMakefileGenerator::init()
project->variables()["CONFIG"].append("dll"); project->variables()["CONFIG"].append("dll");
} }
if ( project->isActiveConfig("thread") ) { if ( project->isActiveConfig("thread") ) {
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT");
project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"]; project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"]; project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"];
project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"]; project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"];

2
qmake/generators/win32/msvc_dsp.cpp
Unescape View File

@ -747,7 +747,7 @@ DspMakefileGenerator::init()
} }
if ( thread ) { if ( thread ) {
if(project->isActiveConfig("qt")) if(project->isActiveConfig("qt"))
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" ); project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT" );
if ( project->isActiveConfig("dll") || project->first("TARGET") == "qtmain" if ( project->isActiveConfig("dll") || project->first("TARGET") == "qtmain"
|| !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { || !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
project->variables()["MSVCDSP_MTDEFD"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"]; project->variables()["MSVCDSP_MTDEFD"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"];

2
qmake/generators/win32/msvc_nmake.cpp
Unescape View File

@ -512,7 +512,7 @@ NmakeMakefileGenerator::init()
project->variables()["CONFIG"].append("dll"); project->variables()["CONFIG"].append("dll");
} }
if ( project->isActiveConfig("thread") ) if ( project->isActiveConfig("thread") )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT");
if ( project->isActiveConfig("accessibility" ) ) if ( project->isActiveConfig("accessibility" ) )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
if ( project->isActiveConfig("tablet") ) if ( project->isActiveConfig("tablet") )

4
qmake/generators/win32/msvc_vcproj.cpp
Unescape View File

@ -483,7 +483,7 @@ void VcprojGenerator::init()
} }
if( project->isActiveConfig("thread") ) { if( project->isActiveConfig("thread") ) {
project->variables()["DEFINES"] += "QT_THREAD_SUPPORT"; project->variables()["DEFINES"] += "TQT_THREAD_SUPPORT";
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
} else { } else {
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
@ -1209,7 +1209,7 @@ void VcprojGenerator::initOld()
// THREAD -------------------------------------------------------- // THREAD --------------------------------------------------------
if ( project->isActiveConfig("thread") ) { if ( project->isActiveConfig("thread") ) {
if(project->isActiveConfig("qt")) if(project->isActiveConfig("qt"))
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" ); project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT" );
if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt
&& project->first("TARGET") != "qtmain" ) && project->first("TARGET") != "qtmain" )
project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:libc"); project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:libc");

12
src/codecs/qtextcodec.cpp
Unescape View File

@ -75,9 +75,9 @@
# include "qfontcodecs_p.h" # include "qfontcodecs_p.h"
#endif #endif
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
# include <private/qmutexpool_p.h> # include <private/qmutexpool_p.h>
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
@ -121,12 +121,12 @@ void TQTextCodec::deleteAllCodecs()
if ( !all ) if ( !all )
return; return;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &all ) : 0 ); tqt_global_mutexpool->get( &all ) : 0 );
if ( !all ) if ( !all )
return; return;
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
destroying_is_ok = TRUE; destroying_is_ok = TRUE;
@ -151,11 +151,11 @@ static inline void setup()
{ {
if ( all ) return; if ( all ) return;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &all ) : 0 ); tqt_global_mutexpool->get( &all ) : 0 );
if ( all ) return; if ( all ) return;
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
realSetup(); realSetup();
} }

6
src/codecs/qtextcodecfactory.cpp
Unescape View File

@ -48,9 +48,9 @@
#include <private/qpluginmanager_p.h> #include <private/qpluginmanager_p.h>
#include "qtextcodecinterface_p.h" #include "qtextcodecinterface_p.h"
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
# include <private/qmutexpool_p.h> # include <private/qmutexpool_p.h>
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#include <stdlib.h> #include <stdlib.h>
@ -63,7 +63,7 @@ static void create_manager()
if ( manager ) // already created if ( manager ) // already created
return; return;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
// protect manager creation // protect manager creation
TQMutexLocker locker( tqt_global_mutexpool ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &manager ) : 0); tqt_global_mutexpool->get( &manager ) : 0);

10
src/dialogs/qfiledialog.cpp
Unescape View File

@ -100,9 +100,9 @@
#endif #endif
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
# include <private/qmutexpool_p.h> # include <private/qmutexpool_p.h>
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#endif // Q_WS_WIN #endif // Q_WS_WIN
#if !defined(Q_OS_TEMP) #if !defined(Q_OS_TEMP)
@ -527,7 +527,7 @@ static void resolveLibs()
static bool triedResolve = FALSE; static bool triedResolve = FALSE;
if ( !triedResolve ) { if ( !triedResolve ) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
// protect initialization // protect initialization
TQMutexLocker locker( tqt_global_mutexpool ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &triedResolve ) : 0 ); tqt_global_mutexpool->get( &triedResolve ) : 0 );
@ -3203,7 +3203,7 @@ void TQFileDialog::setDir( const TQString & pathstr )
i++; i++;
TQCString user; TQCString user;
if ( i == 1 ) { if ( i == 1 ) {
#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) #if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
# ifndef _POSIX_LOGIN_NAME_MAX # ifndef _POSIX_LOGIN_NAME_MAX
# define _POSIX_LOGIN_NAME_MAX 9 # define _POSIX_LOGIN_NAME_MAX 9
@ -3222,7 +3222,7 @@ void TQFileDialog::setDir( const TQString & pathstr )
user = dr.mid( 1, i-1 ).local8Bit(); user = dr.mid( 1, i-1 ).local8Bit();
dr = dr.mid( i, dr.length() ); dr = dr.mid( i, dr.length() );
struct passwd *pw; struct passwd *pw;
#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_FREEBSD) && !defined(Q_OS_OPENBSD) #if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_FREEBSD) && !defined(Q_OS_OPENBSD)
struct passwd mt_pw; struct passwd mt_pw;
char buffer[2048]; char buffer[2048];
if ( ::getpwnam_r( user, &mt_pw, buffer, 2048, &pw ) == 0 && pw == &mt_pw ) if ( ::getpwnam_r( user, &mt_pw, buffer, 2048, &pw ) == 0 && pw == &mt_pw )

6
src/inputmethod/qinputcontextfactory.cpp
Unescape View File

@ -43,9 +43,9 @@
#include "ntqapplication.h" #include "ntqapplication.h"
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <private/qmutexpool_p.h> #include <private/qmutexpool_p.h>
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#include <stdlib.h> #include <stdlib.h>
@ -62,7 +62,7 @@ static void create_manager()
if( manager ) // already created if( manager ) // already created
return; return;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
// protect manager creation // protect manager creation
TQMutexLocker locker( tqt_global_mutexpool ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &manager ) : 0); tqt_global_mutexpool->get( &manager ) : 0);

18
src/kernel/ntqapplication.h
Unescape View File

@ -61,10 +61,10 @@ class TQIMEvent;
class TQWSDecoration; class TQWSDecoration;
#endif #endif
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
class TQMutex; class TQMutex;
class TQThread; class TQThread;
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
class TQApplication; class TQApplication;
@ -297,7 +297,7 @@ public:
static bool x11_apply_settings(); static bool x11_apply_settings();
#endif #endif
void wakeUpGuiThread(); void wakeUpGuiThread();
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
void lock(); void lock();
void unlock(bool wakeUpGui = TRUE); void unlock(bool wakeUpGui = TRUE);
bool locked(); bool locked();
@ -354,9 +354,9 @@ private slots:
#endif #endif
public: public:
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
static TQMutex *tqt_mutex; static TQMutex *tqt_mutex;
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
private: private:
int app_argc; int app_argc;
@ -372,7 +372,7 @@ private:
#ifndef QT_NO_CURSOR #ifndef QT_NO_CURSOR
static TQCursor *app_cursor; static TQCursor *app_cursor;
#endif #endif
#ifndef QT_THREAD_SUPPORT #ifndef TQT_THREAD_SUPPORT
static TQEventLoop* eventloop; static TQEventLoop* eventloop;
#endif #endif
static int app_tracking; static int app_tracking;
@ -436,9 +436,9 @@ private:
friend class TQDialog; friend class TQDialog;
friend class TQAccelManager; friend class TQAccelManager;
friend class TQEvent; friend class TQEvent;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
friend class TQThread; friend class TQThread;
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
friend class TQTranslator; friend class TQTranslator;
friend class TQEventLoop; friend class TQEventLoop;
friend Q_EXPORT void tqt_ucm_initialize( TQApplication * ); friend Q_EXPORT void tqt_ucm_initialize( TQApplication * );
@ -458,7 +458,7 @@ private:
static TQEventLoop* currentEventLoop(); static TQEventLoop* currentEventLoop();
public: public:
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
static TQThread* guiThread(); static TQThread* guiThread();
static void threadTerminationHandler( TQThread * ); static void threadTerminationHandler( TQThread * );
#endif #endif

4
src/kernel/ntqeventloop.h
Unescape View File

@ -59,9 +59,9 @@ struct timeval; //stdc struct
struct TimerInfo; //internal structure (qeventloop_mac.cpp) struct TimerInfo; //internal structure (qeventloop_mac.cpp)
#endif #endif
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
class TQMutex; class TQMutex;
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
class Q_EXPORT TQEventLoop : public TQObject class Q_EXPORT TQEventLoop : public TQObject

2
src/kernel/ntqgplugin.h
Unescape View File

@ -66,7 +66,7 @@
#endif #endif
#ifndef Q_EXPORT_PLUGIN #ifndef Q_EXPORT_PLUGIN
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#define QT_THREADED_BUILD 1 #define QT_THREADED_BUILD 1
#define Q_PLUGIN_FLAGS_STRING "11" #define Q_PLUGIN_FLAGS_STRING "11"
#else #else

6
src/kernel/ntqobject.h
Unescape View File

@ -64,7 +64,7 @@ class TQObjectUserData;
#endif #endif
struct TQUObject; struct TQUObject;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
class TQThread; class TQThread;
#endif #endif
@ -230,14 +230,14 @@ private: // Disabled copy constructor and operator=
#endif #endif
public: public:
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQThread* contextThreadObject() const; TQThread* contextThreadObject() const;
void moveToThread(TQThread *targetThread); void moveToThread(TQThread *targetThread);
void disableThreadPostedEvents(bool disable); void disableThreadPostedEvents(bool disable);
#endif #endif
private: private:
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
void moveToThread_helper(TQThread *targetThread); void moveToThread_helper(TQThread *targetThread);
void setThreadObject_helper(TQThread *targetThread); void setThreadObject_helper(TQThread *targetThread);
#endif #endif

4
src/kernel/ntqthread.h
Unescape View File

@ -41,7 +41,7 @@
#ifndef TQTHREAD_H #ifndef TQTHREAD_H
#define TQTHREAD_H #define TQTHREAD_H
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#ifndef QT_H #ifndef QT_H
#include "ntqwindowdefs.h" #include "ntqwindowdefs.h"
@ -150,6 +150,6 @@ class Q_EXPORT TQEventLoopThread : public TQThread
virtual void run(); virtual void run();
}; };
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#endif // TQTHREAD_H #endif // TQTHREAD_H

74
src/kernel/qapplication.cpp
Unescape View File

@ -65,11 +65,11 @@
#endif #endif
#include "qfontdata_p.h" #include "qfontdata_p.h"
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
# include "ntqmutex.h" # include "ntqmutex.h"
# include "ntqthread.h" # include "ntqthread.h"
# include <private/qthreadinstance_p.h> # include <private/qthreadinstance_p.h>
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#include <stdlib.h> #include <stdlib.h>
@ -375,7 +375,7 @@ TQStringList *TQApplication::app_libpaths = 0;
bool TQApplication::metaComposeUnicode = FALSE; bool TQApplication::metaComposeUnicode = FALSE;
int TQApplication::composedUnicode = 0; int TQApplication::composedUnicode = 0;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutex *TQApplication::tqt_mutex = 0; TQMutex *TQApplication::tqt_mutex = 0;
TQMutex *tqt_sharedStringMutex = 0; TQMutex *tqt_sharedStringMutex = 0;
Q_EXPORT TQMutex * tqt_sharedMetaObjectMutex = 0; Q_EXPORT TQMutex * tqt_sharedMetaObjectMutex = 0;
@ -388,13 +388,13 @@ Q_EXPORT TQt::HANDLE tqt_get_application_thread_id()
{ {
return tqt_application_thread_id; return tqt_application_thread_id;
} }
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#ifndef QT_THREAD_SUPPORT #ifndef TQT_THREAD_SUPPORT
TQEventLoop *TQApplication::eventloop = 0; // application event loop TQEventLoop *TQApplication::eventloop = 0; // application event loop
#endif #endif
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQEventLoop* TQApplication::currentEventLoop() { TQEventLoop* TQApplication::currentEventLoop() {
TQThread* thread = TQThread::currentThreadObject(); TQThread* thread = TQThread::currentThreadObject();
if (thread) { if (thread) {
@ -541,7 +541,7 @@ TQClipboard *tqt_clipboard = 0; // global clipboard object
#endif #endif
TQWidgetList * tqt_modal_stack=0; // stack of modal widgets TQWidgetList * tqt_modal_stack=0; // stack of modal widgets
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
// thread wrapper for the main() thread // thread wrapper for the main() thread
class TQCoreApplicationThread : public TQThread class TQCoreApplicationThread : public TQThread
{ {
@ -605,9 +605,9 @@ static TQPostEventList *globalPostedEvents = 0; // list of posted events
uint qGlobalPostedEventsCount() uint qGlobalPostedEventsCount()
{ {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( postevent_mutex ); TQMutexLocker locker( postevent_mutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if (!globalPostedEvents) { if (!globalPostedEvents) {
return 0; return 0;
@ -1035,7 +1035,7 @@ TQApplication::TQApplication(Display *dpy, int argc, char **argv,
#endif // Q_WS_X11 #endif // Q_WS_X11
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQThread* TQApplication::guiThread() { TQThread* TQApplication::guiThread() {
return mainThread(); return mainThread();
} }
@ -1069,7 +1069,7 @@ void TQApplication::init_precmdline()
void TQApplication::initialize( int argc, char **argv, bool enable_sm ) void TQApplication::initialize( int argc, char **argv, bool enable_sm )
{ {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
tqt_mutex = new TQMutex( TRUE ); tqt_mutex = new TQMutex( TRUE );
tqt_sharedStringMutex = new TQMutex( TRUE ); tqt_sharedStringMutex = new TQMutex( TRUE );
tqt_sharedMetaObjectMutex = new TQMutex( TRUE ); tqt_sharedMetaObjectMutex = new TQMutex( TRUE );
@ -1078,7 +1078,7 @@ void TQApplication::initialize( int argc, char **argv, bool enable_sm )
#endif // QT_USE_GLIBMAINLOOP #endif // QT_USE_GLIBMAINLOOP
postevent_mutex = new TQMutex( TRUE ); postevent_mutex = new TQMutex( TRUE );
tqt_application_thread_id = TQThread::currentThread(); tqt_application_thread_id = TQThread::currentThread();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
app_argc = argc; app_argc = argc;
app_argv = argv; app_argv = argv;
@ -1226,12 +1226,12 @@ TQApplication::~TQApplication()
app_libpaths = 0; app_libpaths = 0;
#endif #endif
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
delete tqt_mutex; delete tqt_mutex;
tqt_mutex = 0; tqt_mutex = 0;
delete postevent_mutex; delete postevent_mutex;
postevent_mutex = 0; postevent_mutex = 0;
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if( tqApp == this ) { if( tqApp == this ) {
if ( postedEvents ) if ( postedEvents )
@ -1254,7 +1254,7 @@ TQApplication::~TQApplication()
session_key = 0; session_key = 0;
#endif //QT_NO_SESSIONMANAGER #endif //QT_NO_SESSIONMANAGER
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
delete tqt_sharedMetaObjectMutex; delete tqt_sharedMetaObjectMutex;
tqt_sharedMetaObjectMutex = 0; tqt_sharedMetaObjectMutex = 0;
delete tqt_sharedStringMutex; delete tqt_sharedStringMutex;
@ -1263,7 +1263,7 @@ TQApplication::~TQApplication()
delete tqt_timerListMutex; delete tqt_timerListMutex;
tqt_timerListMutex = 0; tqt_timerListMutex = 0;
#endif // QT_USE_GLIBMAINLOOP #endif // QT_USE_GLIBMAINLOOP
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
tqt_explicit_app_style = FALSE; tqt_explicit_app_style = FALSE;
tqt_app_has_font = FALSE; tqt_app_has_font = FALSE;
@ -2521,9 +2521,9 @@ bool TQApplication::notify( TQObject *receiver, TQEvent *e )
} }
if ( e->type() == TQEvent::ChildRemoved && receiver->postedEvents) { if ( e->type() == TQEvent::ChildRemoved && receiver->postedEvents) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( postevent_mutex ); TQMutexLocker locker( postevent_mutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if (globalPostedEvents) { if (globalPostedEvents) {
// the TQObject destructor calls TQObject::removeChild, which calls // the TQObject destructor calls TQObject::removeChild, which calls
@ -2868,7 +2868,7 @@ bool TQApplication::internalNotify( TQObject *receiver, TQEvent * e)
} }
if (!handled) { if (!handled) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
int locklevel = 0; int locklevel = 0;
int llcount; int llcount;
if (TQApplication::tqt_mutex) { if (TQApplication::tqt_mutex) {
@ -2881,7 +2881,7 @@ bool TQApplication::internalNotify( TQObject *receiver, TQEvent * e)
} }
#endif #endif
consumed = receiver->event( e ); consumed = receiver->event( e );
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (TQApplication::tqt_mutex) { if (TQApplication::tqt_mutex) {
for (llcount=0; llcount<locklevel; llcount++) { for (llcount=0; llcount<locklevel; llcount++) {
TQApplication::tqt_mutex->lock(); TQApplication::tqt_mutex->lock();
@ -3365,9 +3365,9 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event )
return; return;
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( postevent_mutex ); TQMutexLocker locker( postevent_mutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( !globalPostedEvents ) { // create list if ( !globalPostedEvents ) { // create list
globalPostedEvents = new TQPostEventList; globalPostedEvents = new TQPostEventList;
@ -3461,7 +3461,7 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event )
l->append( pe ); l->append( pe );
globalPostedEvents->append( pe ); globalPostedEvents->append( pe );
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
// Wake up the receiver thread event loop // Wake up the receiver thread event loop
TQThread* thread = receiver->contextThreadObject(); TQThread* thread = receiver->contextThreadObject();
if (thread) { if (thread) {
@ -3514,7 +3514,7 @@ void TQApplication::sendPostedEvents( TQObject *receiver, int event_type )
sendPostedEvents( 0, TQEvent::ChildInserted ); sendPostedEvents( 0, TQEvent::ChildInserted );
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( postevent_mutex ); TQMutexLocker locker( postevent_mutex );
#endif #endif
@ -3571,9 +3571,9 @@ void TQApplication::sendPostedEvents( TQObject *receiver, int event_type )
} }
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if ( locker.mutex() ) locker.mutex()->unlock(); if ( locker.mutex() ) locker.mutex()->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
// after all that work, it's time to deliver the event. // after all that work, it's time to deliver the event.
if ( e->type() == TQEvent::Paint && r->isWidgetType() ) { if ( e->type() == TQEvent::Paint && r->isWidgetType() ) {
TQWidget * w = (TQWidget*)r; TQWidget * w = (TQWidget*)r;
@ -3585,9 +3585,9 @@ void TQApplication::sendPostedEvents( TQObject *receiver, int event_type )
sent = TRUE; sent = TRUE;
TQApplication::sendEvent( r, e ); TQApplication::sendEvent( r, e );
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if ( locker.mutex() ) locker.mutex()->lock(); if ( locker.mutex() ) locker.mutex()->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
delete e; delete e;
// careful when adding anything below this point - the // careful when adding anything below this point - the
@ -3646,9 +3646,9 @@ void TQApplication::removePostedEvents( TQObject *receiver, int event_type )
return; return;
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( postevent_mutex ); TQMutexLocker locker( postevent_mutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
// the TQObject destructor calls this function directly. this can // the TQObject destructor calls this function directly. this can
// happen while the event loop is in the middle of posting events, // happen while the event loop is in the middle of posting events,
@ -3699,9 +3699,9 @@ void TQApplication::removePostedEvent( TQEvent * event )
return; return;
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( postevent_mutex ); TQMutexLocker locker( postevent_mutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( !globalPostedEvents ) { if ( !globalPostedEvents ) {
#if defined(QT_DEBUG) #if defined(QT_DEBUG)
@ -3797,7 +3797,7 @@ void TQApplication::removePostedEvent( TQEvent * event )
} }
void tqThreadTerminationHandlerRecursive( TQObject* object, TQThread* originThread, TQThread* destinationThread ) { void tqThreadTerminationHandlerRecursive( TQObject* object, TQThread* originThread, TQThread* destinationThread ) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQThread* objectThread = object->contextThreadObject(); TQThread* objectThread = object->contextThreadObject();
if (objectThread && (objectThread == originThread)) { if (objectThread && (objectThread == originThread)) {
TQThread::CleanupType cleanupType = objectThread->cleanupType(); TQThread::CleanupType cleanupType = objectThread->cleanupType();
@ -3822,7 +3822,7 @@ void tqThreadTerminationHandlerRecursive( TQObject* object, TQThread* originThre
for ( childObject = children.first(); childObject; childObject = children.next() ) { for ( childObject = children.first(); childObject; childObject = children.next() ) {
tqThreadTerminationHandlerRecursive(childObject, originThread, destinationThread); tqThreadTerminationHandlerRecursive(childObject, originThread, destinationThread);
} }
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
} }
/*!\internal /*!\internal
@ -3831,14 +3831,14 @@ void tqThreadTerminationHandlerRecursive( TQObject* object, TQThread* originThre
for thread destruction. for thread destruction.
*/ */
void TQApplication::threadTerminationHandler( TQThread *originThread ) { void TQApplication::threadTerminationHandler( TQThread *originThread ) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_mutex ); TQMutexLocker locker( tqt_mutex );
TQThread* destinationThread = guiThread(); TQThread* destinationThread = guiThread();
const TQObjectList* objects = TQObject::objectTrees(); const TQObjectList* objects = TQObject::objectTrees();
for ( TQObjectListIt objectit( *objects ) ; *objectit; ++objectit ) { for ( TQObjectListIt objectit( *objects ) ; *objectit; ++objectit ) {
tqThreadTerminationHandlerRecursive((*objectit), originThread, destinationThread); tqThreadTerminationHandlerRecursive((*objectit), originThread, destinationThread);
} }
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
} }
/*!\internal /*!\internal
@ -4190,7 +4190,7 @@ bool TQApplication::desktopSettingsAware()
\sa lock(), unlock() \link threads.html Thread Support in TQt\endlink \sa lock(), unlock() \link threads.html Thread Support in TQt\endlink
*/ */
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
void TQApplication::lock() void TQApplication::lock()
{ {
tqt_mutex->lock(); tqt_mutex->lock();

8
src/kernel/qapplication_x11.cpp
Unescape View File

@ -97,7 +97,7 @@
#endif // QT_NO_IM #endif // QT_NO_IM
#include "qinternal_p.h" // shared double buffer cleanup #include "qinternal_p.h" // shared double buffer cleanup
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
# include "ntqthread.h" # include "ntqthread.h"
#endif #endif
@ -1645,7 +1645,7 @@ void tqt_init_internal( int *argcptr, char **argv,
setlocale( LC_ALL, "" ); // use correct char set mapping setlocale( LC_ALL, "" ); // use correct char set mapping
setlocale( LC_NUMERIC, "C" ); // make sprintf()/scanf() work setlocale( LC_NUMERIC, "C" ); // make sprintf()/scanf() work
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (( tqt_is_gui_used ) && ( !display )) { if (( tqt_is_gui_used ) && ( !display )) {
// If TQt is running standalone with a GUI, initialize X11 threading // If TQt is running standalone with a GUI, initialize X11 threading
XInitThreads(); XInitThreads();
@ -2210,7 +2210,7 @@ void tqt_init_internal( int *argcptr, char **argv,
TQPainter::initialize(); TQPainter::initialize();
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
TQThread::initialize(); TQThread::initialize();
#endif #endif
@ -2498,7 +2498,7 @@ void tqt_cleanup()
TQColor::cleanup(); TQColor::cleanup();
TQSharedDoubleBuffer::cleanup(); TQSharedDoubleBuffer::cleanup();
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
TQThread::cleanup(); TQThread::cleanup();
#endif #endif

6
src/kernel/qeventloop.cpp
Unescape View File

@ -41,7 +41,7 @@
#include "ntqapplication.h" #include "ntqapplication.h"
#include "ntqdatetime.h" #include "ntqdatetime.h"
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
# include "ntqthread.h" # include "ntqthread.h"
# include "private/qthreadinstance_p.h" # include "private/qthreadinstance_p.h"
#endif #endif
@ -116,7 +116,7 @@ TQEventLoop::TQEventLoop( TQObject *parent, const char *name )
init(); init();
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQThread* thread = TQThread::currentThreadObject(); TQThread* thread = TQThread::currentThreadObject();
if (thread) { if (thread) {
if (thread->d) { if (thread->d) {
@ -135,7 +135,7 @@ TQEventLoop::~TQEventLoop()
{ {
cleanup(); cleanup();
delete d; delete d;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQThread* thread = TQThread::currentThreadObject(); TQThread* thread = TQThread::currentThreadObject();
if (thread) { if (thread) {
if (thread->d) { if (thread->d) {

68
src/kernel/qeventloop_unix_glib.cpp
Unescape View File

@ -46,7 +46,7 @@
#include "ntqbitarray.h" #include "ntqbitarray.h"
#include "ntqmutex.h" #include "ntqmutex.h"
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "ntqthread.h" #include "ntqthread.h"
#endif #endif
@ -55,11 +55,11 @@
#include <glib.h> #include <glib.h>
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#ifdef QT_USE_GLIBMAINLOOP #ifdef QT_USE_GLIBMAINLOOP
extern TQMutex *tqt_timerListMutex; extern TQMutex *tqt_timerListMutex;
#endif // QT_USE_GLIBMAINLOOP #endif // QT_USE_GLIBMAINLOOP
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
/***************************************************************************** /*****************************************************************************
Timer handling; UNIX has no application timer support so we'll have to Timer handling; UNIX has no application timer support so we'll have to
@ -186,7 +186,7 @@ static int allocTimerId() // find avail timer identifier
static void insertTimer( const TimerInfo *ti ) // insert timer info into list static void insertTimer( const TimerInfo *ti ) // insert timer info into list
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
tqt_timerListMutex->lock(); tqt_timerListMutex->lock();
#endif #endif
TimerInfo *t = timerList->first(); TimerInfo *t = timerList->first();
@ -209,7 +209,7 @@ static void insertTimer( const TimerInfo *ti ) // insert timer info into list
tqDebug( "TQObject: %d timers now exist for object %s::%s", dangerCount, ti->obj->className(), ti->obj->name() ); tqDebug( "TQObject: %d timers now exist for object %s::%s", dangerCount, ti->obj->className(), ti->obj->name() );
} }
#endif #endif
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
tqt_timerListMutex->unlock(); tqt_timerListMutex->unlock();
#endif #endif
} }
@ -235,7 +235,7 @@ static inline void getTime( timeval &t ) // get time of day
static void repairTimer( const timeval &time ) // repair broken timer static void repairTimer( const timeval &time ) // repair broken timer
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
tqt_timerListMutex->lock(); tqt_timerListMutex->lock();
#endif #endif
timeval diff = watchtime - time; timeval diff = watchtime - time;
@ -244,7 +244,7 @@ static void repairTimer( const timeval &time ) // repair broken timer
t->timeout = t->timeout - diff; t->timeout = t->timeout - diff;
t = timerList->next(); t = timerList->next();
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
tqt_timerListMutex->unlock(); tqt_timerListMutex->unlock();
#endif #endif
} }
@ -262,7 +262,7 @@ static void repairTimer( const timeval &time ) // repair broken timer
timeval *qt_wait_timer() timeval *qt_wait_timer()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
tqt_timerListMutex->lock(); tqt_timerListMutex->lock();
#endif #endif
static timeval tm; static timeval tm;
@ -288,19 +288,19 @@ timeval *qt_wait_timer()
if ( qt_wait_timer_max && *qt_wait_timer_max < tm ) { if ( qt_wait_timer_max && *qt_wait_timer_max < tm ) {
tm = *qt_wait_timer_max; tm = *qt_wait_timer_max;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
tqt_timerListMutex->unlock(); tqt_timerListMutex->unlock();
#endif #endif
return &tm; return &tm;
} }
if ( qt_wait_timer_max ) { if ( qt_wait_timer_max ) {
tm = *qt_wait_timer_max; tm = *qt_wait_timer_max;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
tqt_timerListMutex->unlock(); tqt_timerListMutex->unlock();
#endif #endif
return &tm; return &tm;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
tqt_timerListMutex->unlock(); tqt_timerListMutex->unlock();
#endif #endif
return 0; // no timers return 0; // no timers
@ -316,7 +316,7 @@ static void initTimers() // initialize timers
timerBitVec->clearBit( i ); timerBitVec->clearBit( i );
} }
timerList = new TimerList; timerList = new TimerList;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
tqt_timerListMutex = new TQMutex(true); tqt_timerListMutex = new TQMutex(true);
#endif #endif
TQ_CHECK_PTR( timerList ); TQ_CHECK_PTR( timerList );
@ -336,18 +336,18 @@ void cleanupTimers()
// Main timer functions for starting and killing timers // Main timer functions for starting and killing timers
int qStartTimer( int interval, TQObject *obj ) int qStartTimer( int interval, TQObject *obj )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->lock(); if (tqt_timerListMutex) tqt_timerListMutex->lock();
#endif #endif
if ( !timerList ) { // initialize timer data if ( !timerList ) { // initialize timer data
initTimers(); initTimers();
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->lock(); if (tqt_timerListMutex) tqt_timerListMutex->lock();
#endif #endif
} }
int id = allocTimerId(); // get free timer id int id = allocTimerId(); // get free timer id
if ( (id <= 0) || (id > (int)timerBitVec->size()) || (!obj) ) { // cannot create timer if ( (id <= 0) || (id > (int)timerBitVec->size()) || (!obj) ) { // cannot create timer
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return 0; return 0;
@ -363,7 +363,7 @@ int qStartTimer( int interval, TQObject *obj )
t->timeout = currentTime + t->interval; t->timeout = currentTime + t->interval;
t->obj = obj; t->obj = obj;
insertTimer( t ); // put timer in list insertTimer( t ); // put timer in list
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return id; return id;
@ -371,12 +371,12 @@ int qStartTimer( int interval, TQObject *obj )
bool qKillTimer( int id ) bool qKillTimer( int id )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->lock(); if (tqt_timerListMutex) tqt_timerListMutex->lock();
#endif #endif
register TimerInfo *t; register TimerInfo *t;
if ( (!timerList) || (id <= 0) || (id > (int)timerBitVec->size()) || (!timerBitVec->testBit( id-1 )) ) { if ( (!timerList) || (id <= 0) || (id > (int)timerBitVec->size()) || (!timerBitVec->testBit( id-1 )) ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return FALSE; // not init'd or invalid timer return FALSE; // not init'd or invalid timer
@ -389,13 +389,13 @@ bool qKillTimer( int id )
bool ret; bool ret;
timerBitVec->clearBit( id-1 ); // set timer inactive timerBitVec->clearBit( id-1 ); // set timer inactive
ret = timerList->remove(); ret = timerList->remove();
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return ret; return ret;
} }
else { // id not found else { // id not found
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return FALSE; return FALSE;
@ -404,12 +404,12 @@ bool qKillTimer( int id )
bool qKillTimer( TQObject *obj ) bool qKillTimer( TQObject *obj )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->lock(); if (tqt_timerListMutex) tqt_timerListMutex->lock();
#endif #endif
register TimerInfo *t; register TimerInfo *t;
if ( !timerList ) { // not initialized if ( !timerList ) { // not initialized
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return FALSE; return FALSE;
@ -425,7 +425,7 @@ bool qKillTimer( TQObject *obj )
t = timerList->next(); t = timerList->next();
} }
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return TRUE; return TRUE;
@ -632,11 +632,11 @@ int TQEventLoop::timeToWait() const
int TQEventLoop::activateTimers() int TQEventLoop::activateTimers()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->lock(); if (tqt_timerListMutex) tqt_timerListMutex->lock();
#endif #endif
if ( !timerList || !timerList->count() ) { // no timers if ( !timerList || !timerList->count() ) { // no timers
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return 0; return 0;
@ -682,11 +682,11 @@ int TQEventLoop::activateTimers()
if ( t->interval.tv_usec > 0 || t->interval.tv_sec > 0 ) { if ( t->interval.tv_usec > 0 || t->interval.tv_sec > 0 ) {
n_act++; n_act++;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
TQTimerEvent e( t->id ); TQTimerEvent e( t->id );
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
// Be careful...the current thread may not be the target object's thread! // Be careful...the current thread may not be the target object's thread!
if ((!t->obj) || if ((!t->obj) ||
(TQThread::currentThreadObject() && TQThread::currentThreadObject()->threadPostedEventsDisabled()) || (TQThread::currentThreadObject() && TQThread::currentThreadObject()->threadPostedEventsDisabled()) ||
@ -696,17 +696,17 @@ int TQEventLoop::activateTimers()
else { else {
TQApplication::postEvent( t->obj, new TQTimerEvent(e) ); // post event to correct thread TQApplication::postEvent( t->obj, new TQTimerEvent(e) ); // post event to correct thread
} }
#else // defined(QT_THREAD_SUPPORT) #else // defined(TQT_THREAD_SUPPORT)
TQApplication::sendEvent( t->obj, &e ); // send event TQApplication::sendEvent( t->obj, &e ); // send event
#endif // defined(QT_THREAD_SUPPORT) #endif // defined(TQT_THREAD_SUPPORT)
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->lock(); if (tqt_timerListMutex) tqt_timerListMutex->lock();
#endif #endif
if ( timerList->findRef( begin ) == -1 ) { if ( timerList->findRef( begin ) == -1 ) {
begin = 0; begin = 0;
} }
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return n_act; return n_act;
@ -731,7 +731,7 @@ int TQEventLoop::activateSocketNotifiers()
printf("activate sn : send event fd=%d\n", sn->gPollFD.fd ); printf("activate sn : send event fd=%d\n", sn->gPollFD.fd );
#endif #endif
sn->pending = FALSE; sn->pending = FALSE;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
// Be careful...the current thread may not be the target object's thread! // Be careful...the current thread may not be the target object's thread!
if ((!sn->obj) || if ((!sn->obj) ||
(TQThread::currentThreadObject() && TQThread::currentThreadObject()->threadPostedEventsDisabled()) || (TQThread::currentThreadObject() && TQThread::currentThreadObject()->threadPostedEventsDisabled()) ||
@ -741,9 +741,9 @@ int TQEventLoop::activateSocketNotifiers()
else { else {
TQApplication::postEvent( sn->obj, new TQEvent(event) ); // post event to correct thread TQApplication::postEvent( sn->obj, new TQEvent(event) ); // post event to correct thread
} }
#else // defined(QT_THREAD_SUPPORT) #else // defined(TQT_THREAD_SUPPORT)
TQApplication::sendEvent( sn->obj, &event ); // send event TQApplication::sendEvent( sn->obj, &event ); // send event
#endif // defined(QT_THREAD_SUPPORT) #endif // defined(TQT_THREAD_SUPPORT)
n_act++; n_act++;
} }
} }

10
src/kernel/qeventloop_x11.cpp
Unescape View File

@ -43,9 +43,9 @@
#include "qcolor_p.h" #include "qcolor_p.h"
#include "qt_x11_p.h" #include "qt_x11_p.h"
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
# include "ntqmutex.h" # include "ntqmutex.h"
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#include <errno.h> #include <errno.h>
@ -138,7 +138,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags )
XEvent event; XEvent event;
int nevents = 0; int nevents = 0;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
TQMutexLocker locker( TQApplication::tqt_mutex ); TQMutexLocker locker( TQApplication::tqt_mutex );
#endif #endif
@ -283,7 +283,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags )
// unlock the GUI mutex and select. when we return from this function, there is // unlock the GUI mutex and select. when we return from this function, there is
// something for us to do // something for us to do
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if ( locker.mutex() ) locker.mutex()->unlock(); if ( locker.mutex() ) locker.mutex()->unlock();
else return false; else return false;
#endif #endif
@ -298,7 +298,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags )
} while (nsel == -1 && (errno == EINTR || errno == EAGAIN)); } while (nsel == -1 && (errno == EINTR || errno == EAGAIN));
// relock the GUI mutex before processing any pending events // relock the GUI mutex before processing any pending events
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if ( locker.mutex() ) locker.mutex()->lock(); if ( locker.mutex() ) locker.mutex()->lock();
else return false; else return false;
#endif #endif

20
src/kernel/qeventloop_x11_glib.cpp
Unescape View File

@ -46,10 +46,10 @@
#include "qcolor_p.h" #include "qcolor_p.h"
#include "qt_x11_p.h" #include "qt_x11_p.h"
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
# include "ntqmutex.h" # include "ntqmutex.h"
# include "ntqthread.h" # include "ntqthread.h"
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#include <errno.h> #include <errno.h>
@ -295,7 +295,7 @@ bool TQEventLoop::processX11Events()
XEvent event; XEvent event;
int nevents = 0; int nevents = 0;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
TQMutexLocker locker( TQApplication::tqt_mutex ); TQMutexLocker locker( TQApplication::tqt_mutex );
#endif #endif
@ -383,7 +383,7 @@ bool TQEventLoop::gsourcePrepare(GSource *gs, int * timeout)
ProcessEventsFlags flags = d->pev_flags; ProcessEventsFlags flags = d->pev_flags;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
TQMutexLocker locker( TQApplication::tqt_mutex ); TQMutexLocker locker( TQApplication::tqt_mutex );
#endif #endif
@ -535,10 +535,10 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) {
Q_UNUSED(gs); Q_UNUSED(gs);
// relock the GUI mutex before processing any pending events // relock the GUI mutex before processing any pending events
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
TQMutexLocker locker( TQApplication::tqt_mutex ); TQMutexLocker locker( TQApplication::tqt_mutex );
#endif #endif
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (locker.mutex()) locker.mutex()->lock(); if (locker.mutex()) locker.mutex()->lock();
#endif #endif
@ -608,13 +608,13 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) {
// color approx. optimization - only on X11 // color approx. optimization - only on X11
qt_reset_color_avail(); qt_reset_color_avail();
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (locker.mutex()) locker.mutex()->unlock(); if (locker.mutex()) locker.mutex()->unlock();
#endif #endif
processX11Events(); processX11Events();
} }
else { else {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
if (locker.mutex()) locker.mutex()->unlock(); if (locker.mutex()) locker.mutex()->unlock();
#endif #endif
} }
@ -629,9 +629,9 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) {
bool TQEventLoop::hasPendingEvents() const bool TQEventLoop::hasPendingEvents() const
{ {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( TQApplication::tqt_mutex ); TQMutexLocker locker( TQApplication::tqt_mutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
extern uint qGlobalPostedEventsCount(); // from qapplication.cpp extern uint qGlobalPostedEventsCount(); // from qapplication.cpp
return ( qGlobalPostedEventsCount() || ( (tqt_is_gui_used && TQApplication::isGuiThread()) ? XPending( TQPaintDevice::x11AppDisplay() ) : 0)); return ( qGlobalPostedEventsCount() || ( (tqt_is_gui_used && TQApplication::isGuiThread()) ? XPending( TQPaintDevice::x11AppDisplay() ) : 0));

4
src/kernel/qfont_x11.cpp
Unescape View File

@ -269,13 +269,13 @@ void TQFont::initialize()
TQString sample; TQString sample;
if ( ttmp != -1 ) { if ( ttmp != -1 ) {
#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() where available // use the reentrant versions of localtime() where available
tm res; tm res;
tt = localtime_r( &ttmp, &res ); tt = localtime_r( &ttmp, &res );
#else #else
tt = localtime( &ttmp ); tt = localtime( &ttmp );
#endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS #endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
if ( tt != 0 && strftime( samp, 64, "%A%B", tt ) > 0 ) if ( tt != 0 && strftime( samp, 64, "%A%B", tt ) > 0 )
if ( codec ) if ( codec )

24
src/kernel/qmetaobject.cpp
Unescape View File

@ -41,9 +41,9 @@
#include "ntqmetaobject.h" #include "ntqmetaobject.h"
#include "ntqasciidict.h" #include "ntqasciidict.h"
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <private/qmutexpool_p.h> #include <private/qmutexpool_p.h>
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
/*! /*!
\class TQMetaData ntqmetaobject.h \class TQMetaData ntqmetaobject.h
@ -282,10 +282,10 @@ TQMetaObject::~TQMetaObject()
delete slotDict; // delete dicts delete slotDict; // delete dicts
delete signalDict; delete signalDict;
delete d; delete d;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker( tqt_global_mutexpool ? TQMutexLocker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); tqt_global_mutexpool->get( &qt_metaobjects ) : 0 );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( qt_metaobjects ) { if ( qt_metaobjects ) {
qt_metaobjects->remove( classname ); qt_metaobjects->remove( classname );
if ( qt_metaobjects->isEmpty() ) { if ( qt_metaobjects->isEmpty() ) {
@ -799,10 +799,10 @@ TQMetaObject *TQMetaObject::metaObject( const char *class_name )
{ {
if ( !qt_metaobjects ) if ( !qt_metaobjects )
return 0; return 0;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker( tqt_global_mutexpool ? TQMutexLocker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); tqt_global_mutexpool->get( &qt_metaobjects ) : 0 );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
TQtStaticMetaObjectFunction func = (TQtStaticMetaObjectFunction)qt_metaobjects->find( class_name ); TQtStaticMetaObjectFunction func = (TQtStaticMetaObjectFunction)qt_metaobjects->find( class_name );
if ( func ) if ( func )
return func(); return func();
@ -814,10 +814,10 @@ bool TQMetaObject::hasMetaObject( const char *class_name )
{ {
if ( !qt_metaobjects ) if ( !qt_metaobjects )
return FALSE; return FALSE;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker( tqt_global_mutexpool ? TQMutexLocker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); tqt_global_mutexpool->get( &qt_metaobjects ) : 0 );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
return !!qt_metaobjects->find( class_name ); return !!qt_metaobjects->find( class_name );
} }
@ -1204,10 +1204,10 @@ bool TQMetaProperty::reset( TQObject* o ) const
TQMetaObjectCleanUp::TQMetaObjectCleanUp( const char *mo_name, TQtStaticMetaObjectFunction func ) TQMetaObjectCleanUp::TQMetaObjectCleanUp( const char *mo_name, TQtStaticMetaObjectFunction func )
: metaObject( 0 ) : metaObject( 0 )
{ {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker( tqt_global_mutexpool ? TQMutexLocker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); tqt_global_mutexpool->get( &qt_metaobjects ) : 0 );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( !qt_metaobjects ) if ( !qt_metaobjects )
qt_metaobjects = new TQAsciiDict<void>( 257 ); qt_metaobjects = new TQAsciiDict<void>( 257 );
qt_metaobjects->insert( mo_name, (void*)func ); qt_metaobjects->insert( mo_name, (void*)func );
@ -1226,10 +1226,10 @@ TQMetaObjectCleanUp::TQMetaObjectCleanUp()
TQMetaObjectCleanUp::~TQMetaObjectCleanUp() TQMetaObjectCleanUp::~TQMetaObjectCleanUp()
{ {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker( tqt_global_mutexpool ? TQMutexLocker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); tqt_global_mutexpool->get( &qt_metaobjects ) : 0 );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( !--qt_metaobjects_count ) { if ( !--qt_metaobjects_count ) {
delete qt_metaobjects; delete qt_metaobjects;
qt_metaobjects = 0; qt_metaobjects = 0;

162
src/kernel/qobject.cpp
Unescape View File

@ -52,7 +52,7 @@
// TQStyleControlElementData // TQStyleControlElementData
#include "ntqstyle.h" #include "ntqstyle.h"
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include "ntqmutex.h" #include "ntqmutex.h"
#include <private/qmutexpool_p.h> #include <private/qmutexpool_p.h>
#include "ntqthread.h" #include "ntqthread.h"
@ -130,16 +130,16 @@ TQStyleControlElementDataPrivate* TQObject::controlElementDataPrivateObject() {
return d->controlElementDataPrivate; return d->controlElementDataPrivate;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
void TQObject::moveToThread_helper(TQThread *targetThread) void TQObject::moveToThread_helper(TQThread *targetThread)
{ {
TQEvent e(TQEvent::ThreadChange); TQEvent e(TQEvent::ThreadChange);
TQApplication::sendEvent(this, &e); TQApplication::sendEvent(this, &e);
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( d->childObjectListMutex ); TQMutexLocker locker( d->childObjectListMutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if (childObjects) { if (childObjects) {
TQObject *child; TQObject *child;
@ -155,9 +155,9 @@ void TQObject::setThreadObject_helper(TQThread *targetThread)
{ {
d->ownThread = targetThread; d->ownThread = targetThread;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( d->childObjectListMutex ); TQMutexLocker locker( d->childObjectListMutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if (childObjects) { if (childObjects) {
TQObject *child; TQObject *child;
@ -185,9 +185,9 @@ void TQObject::setThreadObject_helper(TQThread *targetThread)
*/ */
void TQObject::moveToThread(TQThread *targetThread) void TQObject::moveToThread(TQThread *targetThread)
{ {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( TQApplication::tqt_mutex ); TQMutexLocker locker( TQApplication::tqt_mutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if (parentObj) { if (parentObj) {
#if defined(QT_DEBUG) #if defined(QT_DEBUG)
@ -491,7 +491,7 @@ void *tqt_find_obj_child( TQObject *parent, const char *type, const char *name )
return 0; return 0;
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
/*! /*!
Returns a pointer to the TQThread* associated with Returns a pointer to the TQThread* associated with
@ -530,12 +530,12 @@ static void qt_spy_signal( TQObject* sender, int signal, TQUObject* o )
s.sprintf( "%s_%s", mo->className(), sigData->name ); s.sprintf( "%s_%s", mo->className(), sigData->name );
int slot = tqt_preliminary_signal_spy->metaObject()->findSlot( s, TRUE ); int slot = tqt_preliminary_signal_spy->metaObject()->findSlot( s, TRUE );
if ( slot >= 0 ) { if ( slot >= 0 ) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
// protect access to qt_spy_signal_sender // protect access to qt_spy_signal_sender
void * const address = &qt_spy_signal_sender; void * const address = &qt_spy_signal_sender;
TQMutexLocker locker( tqt_global_mutexpool ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( address ) : 0 ); tqt_global_mutexpool->get( address ) : 0 );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
TQObject* old_sender = qt_spy_signal_sender; TQObject* old_sender = qt_spy_signal_sender;
qt_spy_signal_sender = sender; qt_spy_signal_sender = sender;
@ -554,7 +554,7 @@ static void qt_spy_signal( TQObject* sender, int signal, TQUObject* o )
static TQObjectList* object_trees = 0; static TQObjectList* object_trees = 0;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
static TQMutex *obj_trees_mutex = 0; static TQMutex *obj_trees_mutex = 0;
#endif #endif
@ -562,7 +562,7 @@ static void cleanup_object_trees()
{ {
delete object_trees; delete object_trees;
object_trees = 0; object_trees = 0;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
delete obj_trees_mutex; delete obj_trees_mutex;
obj_trees_mutex = 0; obj_trees_mutex = 0;
#endif #endif
@ -576,7 +576,7 @@ static void ensure_object_trees()
static void insert_tree( TQObject* obj ) static void insert_tree( TQObject* obj )
{ {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if ( !obj_trees_mutex ) if ( !obj_trees_mutex )
obj_trees_mutex = new TQMutex(); obj_trees_mutex = new TQMutex();
TQMutexLocker locker( obj_trees_mutex ); TQMutexLocker locker( obj_trees_mutex );
@ -589,7 +589,7 @@ static void insert_tree( TQObject* obj )
static void remove_tree( TQObject* obj ) static void remove_tree( TQObject* obj )
{ {
if ( object_trees ) { if ( object_trees ) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( obj_trees_mutex ); TQMutexLocker locker( obj_trees_mutex );
#endif #endif
object_trees->removeRef( obj ); object_trees->removeRef( obj );
@ -780,10 +780,10 @@ TQObject::~TQObject()
delete childObjects; delete childObjects;
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
delete d->childObjectListMutex; delete d->childObjectListMutex;
delete d->senderObjectListMutex; delete d->senderObjectListMutex;
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
delete d; delete d;
} }
@ -1079,17 +1079,17 @@ bool TQObject::event( TQEvent *e )
TQSenderObjectList* sol; TQSenderObjectList* sol;
TQObject* oldSender = 0; TQObject* oldSender = 0;
sol = senderObjects; sol = senderObjects;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->lock(); sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( sol ) { if ( sol ) {
oldSender = sol->currentSender; oldSender = sol->currentSender;
sol->ref(); sol->ref();
sol->currentSender = metaEvent->sender(); sol->currentSender = metaEvent->sender();
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->unlock(); sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
TQUObject *o = metaEvent->data(); TQUObject *o = metaEvent->data();
if (metaEvent->type() == TQMetaCallEvent::MetaCallEmit) { if (metaEvent->type() == TQMetaCallEvent::MetaCallEmit) {
tqt_emit( metaEvent->id(), o ); tqt_emit( metaEvent->id(), o );
@ -1097,9 +1097,9 @@ bool TQObject::event( TQEvent *e )
if (metaEvent->type() == TQMetaCallEvent::MetaCallInvoke) { if (metaEvent->type() == TQMetaCallEvent::MetaCallInvoke) {
tqt_invoke( metaEvent->id(), o ); tqt_invoke( metaEvent->id(), o );
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->lock(); sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if (sol ) { if (sol ) {
sol->currentSender = oldSender; sol->currentSender = oldSender;
if ( sol->deref() ) { if ( sol->deref() ) {
@ -1108,9 +1108,9 @@ bool TQObject::event( TQEvent *e )
sol = NULL; sol = NULL;
} }
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if (sol) sol->listMutex->unlock(); if (sol) sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
} }
else { else {
tqWarning("TQObject: Ignoring metacall event from non-owning thread"); tqWarning("TQObject: Ignoring metacall event from non-owning thread");
@ -1617,9 +1617,9 @@ TQConnectionList *TQObject::receivers( int signal ) const
void TQObject::insertChild( TQObject *obj ) void TQObject::insertChild( TQObject *obj )
{ {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( d->childObjectListMutex ); TQMutexLocker locker( d->childObjectListMutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( obj->isTree ) { if ( obj->isTree ) {
remove_tree( obj ); remove_tree( obj );
@ -1663,9 +1663,9 @@ void TQObject::insertChild( TQObject *obj )
void TQObject::removeChild( TQObject *obj ) void TQObject::removeChild( TQObject *obj )
{ {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( d->childObjectListMutex ); TQMutexLocker locker( d->childObjectListMutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( childObjects && childObjects->removeRef(obj) ) { if ( childObjects && childObjects->removeRef(obj) ) {
obj->parentObj = 0; obj->parentObj = 0;
@ -1903,12 +1903,12 @@ const TQObject *TQObject::sender()
{ {
#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY #ifndef QT_NO_PRELIMINARY_SIGNAL_SPY
if ( this == tqt_preliminary_signal_spy ) { if ( this == tqt_preliminary_signal_spy ) {
# ifdef QT_THREAD_SUPPORT # ifdef TQT_THREAD_SUPPORT
// protect access to qt_spy_signal_sender // protect access to qt_spy_signal_sender
void * const address = &qt_spy_signal_sender; void * const address = &qt_spy_signal_sender;
TQMutexLocker locker( tqt_global_mutexpool ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( address ) : 0 ); tqt_global_mutexpool->get( address ) : 0 );
# endif // QT_THREAD_SUPPORT # endif // TQT_THREAD_SUPPORT
return qt_spy_signal_sender; return qt_spy_signal_sender;
} }
#endif #endif
@ -2252,24 +2252,24 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const
TQ_CHECK_PTR( c ); TQ_CHECK_PTR( c );
clist->append( c ); clist->append( c );
if ( !r->senderObjects ) { // create list of senders if ( !r->senderObjects ) { // create list of senders
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
r->d->senderObjectListMutex->lock(); r->d->senderObjectListMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
r->senderObjects = new TQSenderObjectList; r->senderObjects = new TQSenderObjectList;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
r->senderObjects->listMutex->lock(); r->senderObjects->listMutex->lock();
r->d->senderObjectListMutex->unlock(); r->d->senderObjectListMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
} }
else { else {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
r->senderObjects->listMutex->lock(); r->senderObjects->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
} }
r->senderObjects->append( s ); // add sender to list r->senderObjects->append( s ); // add sender to list
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
r->senderObjects->listMutex->unlock(); r->senderObjects->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
} }
@ -2475,25 +2475,25 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
c = clist->first(); c = clist->first();
while ( c ) { // for all receivers... while ( c ) { // for all receivers...
if ( r == 0 ) { // remove all receivers if ( r == 0 ) { // remove all receivers
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock(); if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
removeObjFromList( c->object()->senderObjects, s ); removeObjFromList( c->object()->senderObjects, s );
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock(); if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
success = TRUE; success = TRUE;
c = clist->next(); c = clist->next();
} else if ( r == c->object() && } else if ( r == c->object() &&
( (member_index == -1) || ( (member_index == -1) ||
((member_index == c->member()) && (c->memberType() == membcode)) ) ) { ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock(); if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
removeObjFromList( c->object()->senderObjects, s, TRUE ); removeObjFromList( c->object()->senderObjects, s, TRUE );
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock(); if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
success = TRUE; success = TRUE;
clist->remove(); clist->remove();
c = clist->current(); c = clist->current();
@ -2512,25 +2512,25 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
c = clist->first(); c = clist->first();
while ( c ) { // for all receivers... while ( c ) { // for all receivers...
if ( r == 0 ) { // remove all receivers if ( r == 0 ) { // remove all receivers
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock(); if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
removeObjFromList( c->object()->senderObjects, s, TRUE ); removeObjFromList( c->object()->senderObjects, s, TRUE );
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock(); if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
success = TRUE; success = TRUE;
c = clist->next(); c = clist->next();
} else if ( r == c->object() && } else if ( r == c->object() &&
( (member_index == -1) || ( (member_index == -1) ||
((member_index == c->member()) && (c->memberType() == membcode)) ) ) { ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock(); if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
removeObjFromList( c->object()->senderObjects, s, TRUE ); removeObjFromList( c->object()->senderObjects, s, TRUE );
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock(); if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
success = TRUE; success = TRUE;
clist->remove(); clist->remove();
c = clist->current(); c = clist->current();
@ -2772,9 +2772,9 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
c = clist->first(); c = clist->first();
object = c->object(); object = c->object();
sol = object->senderObjects; sol = object->senderObjects;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->lock(); sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( sol ) { if ( sol ) {
oldSender = sol->currentSender; oldSender = sol->currentSender;
sol->ref(); sol->ref();
@ -2785,13 +2785,13 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
(object->d->disableThreadPostedEvents) || (object->d->disableThreadPostedEvents) ||
(currentThread && currentThread->threadPostedEventsDisabled()) || (currentThread && currentThread->threadPostedEventsDisabled()) ||
(currentThread && object->d->ownThread == currentThread)) { (currentThread && object->d->ownThread == currentThread)) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->unlock(); sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
object->tqt_emit( c->member(), o ); object->tqt_emit( c->member(), o );
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->lock(); sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
} }
else { else {
if (object->d->ownThread && !object->d->ownThread->finished()) { if (object->d->ownThread && !object->d->ownThread->finished()) {
@ -2807,13 +2807,13 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
(object->d->disableThreadPostedEvents) || (object->d->disableThreadPostedEvents) ||
(currentThread && currentThread->threadPostedEventsDisabled()) || (currentThread && currentThread->threadPostedEventsDisabled()) ||
(currentThread && object->d->ownThread == currentThread)) { (currentThread && object->d->ownThread == currentThread)) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->unlock(); sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
object->tqt_invoke( c->member(), o ); object->tqt_invoke( c->member(), o );
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->lock(); sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
} }
else { else {
if (object->d->ownThread && !object->d->ownThread->finished()) { if (object->d->ownThread && !object->d->ownThread->finished()) {
@ -2832,9 +2832,9 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
sol = NULL; sol = NULL;
} }
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if (sol) sol->listMutex->unlock(); if (sol) sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
} else { } else {
TQConnection *cd = 0; TQConnection *cd = 0;
TQConnectionListIt it(*clist); TQConnectionListIt it(*clist);
@ -2845,9 +2845,9 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
cd = c; cd = c;
object = c->object(); object = c->object();
sol = object->senderObjects; sol = object->senderObjects;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->lock(); sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( sol ) { if ( sol ) {
oldSender = sol->currentSender; oldSender = sol->currentSender;
sol->ref(); sol->ref();
@ -2858,13 +2858,13 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
(object->d->disableThreadPostedEvents) || (object->d->disableThreadPostedEvents) ||
(currentThread && currentThread->threadPostedEventsDisabled()) || (currentThread && currentThread->threadPostedEventsDisabled()) ||
(currentThread && object->d->ownThread == currentThread)) { (currentThread && object->d->ownThread == currentThread)) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->unlock(); sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
object->tqt_emit( c->member(), o ); object->tqt_emit( c->member(), o );
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->lock(); sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
} }
else { else {
if (object->d->ownThread && !object->d->ownThread->finished()) { if (object->d->ownThread && !object->d->ownThread->finished()) {
@ -2880,13 +2880,13 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
(object->d->disableThreadPostedEvents) || (object->d->disableThreadPostedEvents) ||
(currentThread && currentThread->threadPostedEventsDisabled()) || (currentThread && currentThread->threadPostedEventsDisabled()) ||
(currentThread && object->d->ownThread == currentThread)) { (currentThread && object->d->ownThread == currentThread)) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->unlock(); sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
object->tqt_invoke( c->member(), o ); object->tqt_invoke( c->member(), o );
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->lock(); sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
} }
else { else {
if (object->d->ownThread && !object->d->ownThread->finished()) { if (object->d->ownThread && !object->d->ownThread->finished()) {
@ -2905,9 +2905,9 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
sol = NULL; sol = NULL;
} }
} }
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
if (sol) sol->listMutex->unlock(); if (sol) sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
} }
} }
} }
@ -3046,9 +3046,9 @@ void TQObject::dumpObjectTree()
void TQObject::dumpObjectInfo() void TQObject::dumpObjectInfo()
{ {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( d->senderObjectListMutex ); TQMutexLocker locker( d->senderObjectListMutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#if defined(QT_DEBUG) #if defined(QT_DEBUG)
tqDebug( "OBJECT %s::%s", className(), name( "unnamed" ) ); tqDebug( "OBJECT %s::%s", className(), name( "unnamed" ) );

8
src/kernel/qthread.cpp
Unescape View File

@ -36,7 +36,7 @@
** **
**********************************************************************/ **********************************************************************/
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include "qplatformdefs.h" #include "qplatformdefs.h"
@ -132,9 +132,9 @@
TQThread::TQThread() TQThread::TQThread()
{ {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( TQApplication::tqt_mutex ); TQMutexLocker locker( TQApplication::tqt_mutex );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
d = new TQThreadInstance; d = new TQThreadInstance;
d->init(0); d->init(0);
@ -282,4 +282,4 @@ void TQEventLoopThread::run()
if (eventLoop) eventLoop->exec(); if (eventLoop) eventLoop->exec();
} }
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT

4
src/kernel/qthread_unix.cpp
Unescape View File

@ -36,7 +36,7 @@
** **
**********************************************************************/ **********************************************************************/
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "qplatformdefs.h" #include "qplatformdefs.h"
@ -557,4 +557,4 @@ TQThread *TQThread::currentThreadObject()
} }
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT

4
src/kernel/qwidget.cpp
Unescape View File

@ -56,7 +56,7 @@
#include "ntqstyle.h" #include "ntqstyle.h"
#include "ntqmetaobject.h" #include "ntqmetaobject.h"
#include "ntqguardedptr.h" #include "ntqguardedptr.h"
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "ntqthread.h" #include "ntqthread.h"
#endif #endif
#if defined(QT_ACCESSIBILITY_SUPPORT) #if defined(QT_ACCESSIBILITY_SUPPORT)
@ -890,7 +890,7 @@ TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n )
} }
#endif #endif
#if defined(QT_THREAD_SUPPORT) && defined(QT_CHECK_STATE) #if defined(TQT_THREAD_SUPPORT) && defined(QT_CHECK_STATE)
if (TQThread::currentThreadObject() != TQApplication::guiThread()) { if (TQThread::currentThreadObject() != TQApplication::guiThread()) {
tqFatal( "TQWidget: Cannot create a TQWidget outside of the main GUI thread" ); tqFatal( "TQWidget: Cannot create a TQWidget outside of the main GUI thread" );
} }

6
src/moc/moc.y
Unescape View File

@ -2987,8 +2987,8 @@ void generateClass() // generate C++ source code for a class
// //
fprintf( out, "TQMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() ); fprintf( out, "TQMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() );
fprintf( out, " if ( metaObj ) {\n\treturn metaObj;\n}\n" ); fprintf( out, " if ( metaObj ) {\n\treturn metaObj;\n}\n" );
fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->lock();\n" ); fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->lock();\n" );
fprintf( out, " if ( metaObj ) {\n\tif (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n }\n#endif // QT_THREAD_SUPPORT\n" ); fprintf( out, " if ( metaObj ) {\n\tif (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n }\n#endif // TQT_THREAD_SUPPORT\n" );
if ( isTQObject ) if ( isTQObject )
fprintf( out, " TQMetaObject* parentObject = staticTQtMetaObject();\n" ); fprintf( out, " TQMetaObject* parentObject = staticTQtMetaObject();\n" );
else if ( !g->superClassName.isEmpty() ) else if ( !g->superClassName.isEmpty() )
@ -3058,7 +3058,7 @@ void generateClass() // generate C++ source code for a class
// Setup cleanup handler and return meta object // Setup cleanup handler and return meta object
// //
fprintf( out, " cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() ); fprintf( out, " cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() );
fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n#endif // QT_THREAD_SUPPORT\n" ); fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n#endif // TQT_THREAD_SUPPORT\n" );
fprintf( out, " return metaObj;\n}\n" ); fprintf( out, " return metaObj;\n}\n" );
// //

6
src/moc/moc_yacc.cpp
Unescape View File

@ -5862,8 +5862,8 @@ void generateClass() // generate C++ source code for a class
// //
fprintf( out, "TQMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() ); fprintf( out, "TQMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() );
fprintf( out, " if ( metaObj ) {\n\treturn metaObj;\n}\n" ); fprintf( out, " if ( metaObj ) {\n\treturn metaObj;\n}\n" );
fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->lock();\n" ); fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->lock();\n" );
fprintf( out, " if ( metaObj ) {\n\tif (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n }\n#endif // QT_THREAD_SUPPORT\n" ); fprintf( out, " if ( metaObj ) {\n\tif (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n }\n#endif // TQT_THREAD_SUPPORT\n" );
if ( isTQObject ) if ( isTQObject )
fprintf( out, " TQMetaObject* parentObject = staticTQtMetaObject();\n" ); fprintf( out, " TQMetaObject* parentObject = staticTQtMetaObject();\n" );
else if ( !g->superClassName.isEmpty() ) else if ( !g->superClassName.isEmpty() )
@ -5933,7 +5933,7 @@ void generateClass() // generate C++ source code for a class
// Setup cleanup handler and return meta object // Setup cleanup handler and return meta object
// //
fprintf( out, " cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() ); fprintf( out, " cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() );
fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n#endif // QT_THREAD_SUPPORT\n" ); fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n#endif // TQT_THREAD_SUPPORT\n" );
fprintf( out, " return metaObj;\n}\n" ); fprintf( out, " return metaObj;\n}\n" );
// //

2
src/qt.pro
Unescape View File

@ -121,7 +121,7 @@ thread {
!win32-borland:TARGET = tqt-mt !win32-borland:TARGET = tqt-mt
win32-borland:TARGET = qtmt win32-borland:TARGET = qtmt
embedded:TARGET = qte-mt embedded:TARGET = qte-mt
DEFINES += QT_THREAD_SUPPORT DEFINES += TQT_THREAD_SUPPORT
} }
!cups:DEFINES += QT_NO_CUPS !cups:DEFINES += QT_NO_CUPS

2
src/tools/ntqglist.h
Unescape View File

@ -150,7 +150,7 @@ private:
TQLNode *locate( uint ); // get node at i'th pos TQLNode *locate( uint ); // get node at i'th pos
TQLNode *unlink(); // unlink node TQLNode *unlink(); // unlink node
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
// TQMutex* mutex; // TQMutex* mutex;
#endif #endif

2
src/tools/ntqmutex.h
Unescape View File

@ -45,7 +45,7 @@
#include "ntqglobal.h" #include "ntqglobal.h"
#endif // QT_H #endif // QT_H
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
class TQMutexPrivate; class TQMutexPrivate;

2
src/tools/ntqsemaphore.h
Unescape View File

@ -45,7 +45,7 @@
#include "ntqglobal.h" #include "ntqglobal.h"
#endif // QT_H #endif // QT_H
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
class TQSemaphorePrivate; class TQSemaphorePrivate;

4
src/tools/ntqthreadstorage.h
Unescape View File

@ -39,7 +39,7 @@
#ifndef TQTHREADSTORAGE_H #ifndef TQTHREADSTORAGE_H
#define TQTHREADSTORAGE_H #define TQTHREADSTORAGE_H
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#ifndef QT_H #ifndef QT_H
#include "ntqglobal.h" #include "ntqglobal.h"
@ -90,6 +90,6 @@ public:
{ (void) d.set( t ); } { (void) d.set( t ); }
}; };
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#endif // TQTHREADSTORAGE_H #endif // TQTHREADSTORAGE_H

2
src/tools/ntqwaitcondition.h
Unescape View File

@ -45,7 +45,7 @@
#include "ntqglobal.h" #include "ntqglobal.h"
#endif // QT_H #endif // QT_H
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include <limits.h> #include <limits.h>

2
src/tools/qcom_p.h
Unescape View File

@ -273,7 +273,7 @@ public: \
ulong release() {if(!--qtrefcount){delete this;return 0;}return qtrefcount;} ulong release() {if(!--qtrefcount){delete this;return 0;}return qtrefcount;}
#ifndef Q_EXPORT_COMPONENT #ifndef Q_EXPORT_COMPONENT
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#define QT_THREADED_BUILD 1 #define QT_THREADED_BUILD 1
#define Q_UCM_FLAGS_STRING "11" #define Q_UCM_FLAGS_STRING "11"
#else #else

10
src/tools/qcomlibrary.cpp
Unescape View File

@ -48,9 +48,9 @@
#include <errno.h> #include <errno.h>
#endif // NO_ERROR_H #endif // NO_ERROR_H
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
# include "qmutexpool_p.h" # include "qmutexpool_p.h"
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#ifndef QT_DEBUG_COMPONENT #ifndef QT_DEBUG_COMPONENT
# if defined(QT_DEBUG) # if defined(QT_DEBUG)
@ -94,7 +94,7 @@ static bool qt_verify( const TQString& library, uint version, uint flags,
const TQCString &key, bool warn ) const TQCString &key, bool warn )
{ {
uint our_flags = 1; uint our_flags = 1;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
our_flags |= 2; our_flags |= 2;
#endif #endif
@ -398,10 +398,10 @@ void TQComLibrary::createInstanceInternal()
bool query_done = FALSE; bool query_done = FALSE;
bool warn_mismatch = TRUE; bool warn_mismatch = TRUE;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &cache ) : 0 ); tqt_global_mutexpool->get( &cache ) : 0 );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( ! cache ) { if ( ! cache ) {
cache = new TQSettings; cache = new TQSettings;

2
src/tools/qcriticalsection_p.cpp
Unescape View File

@ -36,7 +36,7 @@
** **
**********************************************************************/ **********************************************************************/
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "qt_windows.h" #include "qt_windows.h"

2
src/tools/qcriticalsection_p.h
Unescape View File

@ -54,7 +54,7 @@
// //
// //
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#if defined(Q_WS_WIN) #if defined(Q_WS_WIN)

8
src/tools/qcstring.cpp
Unescape View File

@ -43,9 +43,9 @@
#include "ntqregexp.h" #include "ntqregexp.h"
#include "ntqdatastream.h" #include "ntqdatastream.h"
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
# include <private/qmutexpool_p.h> # include <private/qmutexpool_p.h>
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
@ -312,10 +312,10 @@ TQ_UINT16 tqChecksum( const char *data, uint len )
{ {
if ( !crc_tbl_init ) { // create lookup table if ( !crc_tbl_init ) { // create lookup table
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &crc_tbl_init ) : 0 ); tqt_global_mutexpool->get( &crc_tbl_init ) : 0 );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( !crc_tbl_init ) { if ( !crc_tbl_init ) {
createCRC16Table(); createCRC16Table();

10
src/tools/qdatetime.cpp
Unescape View File

@ -1039,7 +1039,7 @@ TQDate TQDate::currentDate( TQt::TimeSpec ts )
time( &ltime ); time( &ltime );
tm *t; 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 // use the reentrant versions of localtime() and gmtime() where available
tm res; tm res;
if ( ts == TQt::LocalTime ) if ( ts == TQt::LocalTime )
@ -1051,7 +1051,7 @@ TQDate TQDate::currentDate( TQt::TimeSpec ts )
t = localtime( &ltime ); t = localtime( &ltime );
else else
t = gmtime( &ltime ); 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 ); d.jd = gregorianToJulian( t->tm_year + 1900, t->tm_mon + 1, t->tm_mday );
#endif #endif
@ -1729,7 +1729,7 @@ bool TQTime::currentTime( TQTime *ct, TQt::TimeSpec ts )
time_t ltime = tv.tv_sec; time_t ltime = tv.tv_sec;
tm *t; 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 // use the reentrant versions of localtime() and gmtime() where available
tm res; tm res;
if ( ts == TQt::LocalTime ) if ( ts == TQt::LocalTime )
@ -1741,7 +1741,7 @@ bool TQTime::currentTime( TQTime *ct, TQt::TimeSpec ts )
t = localtime( &ltime ); t = localtime( &ltime );
else else
t = gmtime( &ltime ); 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 + ct->ds = (uint)( MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min +
1000 * t->tm_sec + tv.tv_usec / 1000 ); 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; time_t tmp = secsSince1Jan1970UTC;
tm *brokenDown = 0; 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 // posix compliant system
// use the reentrant versions of localtime() and gmtime() where available // use the reentrant versions of localtime() and gmtime() where available
tm res; tm res;

12
src/tools/qdir_unix.cpp
Unescape View File

@ -48,9 +48,9 @@
#include "ntqregexp.h" #include "ntqregexp.h"
#include "ntqstringlist.h" #include "ntqstringlist.h"
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
# include <private/qmutexpool_p.h> # include <private/qmutexpool_p.h>
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include <limits.h>
@ -237,7 +237,7 @@ bool TQDir::readDirEntries( const TQString &nameFilter,
if ( !dir ) if ( !dir )
return FALSE; // cannot read the directory 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 { union {
struct dirent mt_file; struct dirent mt_file;
char b[sizeof(struct dirent) + MAXNAMLEN + 1]; 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 ) while ( readdir_r(dir, &u.mt_file, &file ) == 0 && file )
#else #else
while ( (file = readdir(dir)) ) 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); TQString fn = TQFile::decodeName(file->d_name);
fi.setFile( *this, fn ); fi.setFile( *this, fn );
@ -311,10 +311,10 @@ const TQFileInfoList * TQDir::drives()
if ( !knownMemoryLeak ) { if ( !knownMemoryLeak ) {
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &knownMemoryLeak ) : 0 ); tqt_global_mutexpool->get( &knownMemoryLeak ) : 0 );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( !knownMemoryLeak ) { if ( !knownMemoryLeak ) {
knownMemoryLeak = new TQFileInfoList; knownMemoryLeak = new TQFileInfoList;

12
src/tools/qgarray.cpp
Unescape View File

@ -52,9 +52,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
# include <private/qmutexpool_p.h> # 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 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 ) if ( numItems < 2 )
return; return;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &cmp_item_size ) : 0 ); tqt_global_mutexpool->get( &cmp_item_size ) : 0 );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
cmp_item_size = sz; cmp_item_size = sz;
qsort( shd->data, numItems, sz, cmp_arr ); qsort( shd->data, numItems, sz, cmp_arr );
@ -752,10 +752,10 @@ int TQGArray::bsearch( const char *d, uint sz ) const
if ( !numItems ) if ( !numItems )
return -1; return -1;
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
TQMutexLocker locker( tqt_global_mutexpool ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &cmp_item_size ) : 0 ); tqt_global_mutexpool->get( &cmp_item_size ) : 0 );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
cmp_item_size = sz; cmp_item_size = sz;
char* r = (char*)::bsearch( d, shd->data, numItems, sz, cmp_arr ); char* r = (char*)::bsearch( d, shd->data, numItems, sz, cmp_arr );

182
src/tools/qglist.cpp
Unescape View File

@ -43,9 +43,9 @@
#include "ntqdatastream.h" #include "ntqdatastream.h"
#include "ntqvaluelist.h" #include "ntqvaluelist.h"
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "ntqmutex.h" #include "ntqmutex.h"
#endif // defined(QT_THREAD_SUPPORT) #endif // defined(TQT_THREAD_SUPPORT)
/*! /*!
\class TQLNode ntqglist.h \class TQLNode ntqglist.h
@ -225,7 +225,7 @@ TQDataStream &TQGList::write( TQDataStream &s, TQPtrCollection::Item ) const
TQGList::TQGList() TQGList::TQGList()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex = new TQMutex(true); //mutex = new TQMutex(true);
#endif #endif
firstNode = lastNode = curNode = 0; // initialize list firstNode = lastNode = curNode = 0; // initialize list
@ -241,7 +241,7 @@ TQGList::TQGList()
TQGList::TQGList( const TQGList & list ) TQGList::TQGList( const TQGList & list )
: TQPtrCollection( list ) : TQPtrCollection( list )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex = new TQMutex(true); //mutex = new TQMutex(true);
#endif #endif
firstNode = lastNode = curNode = 0; // initialize list 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 // twice on the same address! This is insane but let's try not to crash
// here. // here.
iterators = 0; iterators = 0;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//delete mutex; //delete mutex;
#endif #endif
} }
@ -337,11 +337,11 @@ bool TQGList::operator==( const TQGList &list ) const
TQLNode *TQGList::locate( uint index ) TQLNode *TQGList::locate( uint index )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
if ( index == (uint)curIndex ) { // current node ? if ( index == (uint)curIndex ) { // current node ?
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return curNode; return curNode;
@ -355,7 +355,7 @@ TQLNode *TQGList::locate( uint index )
bool forward; // direction to traverse bool forward; // direction to traverse
if ( index >= numNodes ) { if ( index >= numNodes ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return 0; return 0;
@ -388,7 +388,7 @@ TQLNode *TQGList::locate( uint index )
} }
} }
curIndex = index; // must update index curIndex = index; // must update index
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return curNode = node; return curNode = node;
@ -401,7 +401,7 @@ TQLNode *TQGList::locate( uint index )
void TQGList::inSort( TQPtrCollection::Item d ) void TQGList::inSort( TQPtrCollection::Item d )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
int index = 0; int index = 0;
@ -411,7 +411,7 @@ void TQGList::inSort( TQPtrCollection::Item d )
index++; index++;
} }
insertAt( index, d ); insertAt( index, d );
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
} }
@ -423,7 +423,7 @@ void TQGList::inSort( TQPtrCollection::Item d )
void TQGList::prepend( TQPtrCollection::Item d ) void TQGList::prepend( TQPtrCollection::Item d )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
register TQLNode *n = new TQLNode( newItem(d) ); register TQLNode *n = new TQLNode( newItem(d) );
@ -436,7 +436,7 @@ void TQGList::prepend( TQPtrCollection::Item d )
firstNode = curNode = n; // curNode affected firstNode = curNode = n; // curNode affected
numNodes++; numNodes++;
curIndex = 0; curIndex = 0;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
} }
@ -448,7 +448,7 @@ void TQGList::prepend( TQPtrCollection::Item d )
void TQGList::append( TQPtrCollection::Item d ) void TQGList::append( TQPtrCollection::Item d )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
register TQLNode *n = new TQLNode( newItem(d) ); register TQLNode *n = new TQLNode( newItem(d) );
@ -463,7 +463,7 @@ void TQGList::append( TQPtrCollection::Item d )
lastNode = curNode = n; // curNode affected lastNode = curNode = n; // curNode affected
curIndex = numNodes; curIndex = numNodes;
numNodes++; numNodes++;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
} }
@ -475,26 +475,26 @@ void TQGList::append( TQPtrCollection::Item d )
bool TQGList::insertAt( uint index, TQPtrCollection::Item d ) bool TQGList::insertAt( uint index, TQPtrCollection::Item d )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
if ( index == 0 ) { if ( index == 0 ) {
prepend( d ); prepend( d );
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return TRUE; return TRUE;
} }
else if ( index == numNodes ) { else if ( index == numNodes ) {
append( d ); append( d );
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return TRUE; return TRUE;
} }
TQLNode *nextNode = locate( index ); TQLNode *nextNode = locate( index );
if ( !nextNode ) { if ( !nextNode ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return FALSE; return FALSE;
@ -509,7 +509,7 @@ bool TQGList::insertAt( uint index, TQPtrCollection::Item d )
n->next = nextNode; n->next = nextNode;
curNode = n; // curIndex set by locate() curNode = n; // curIndex set by locate()
numNodes++; numNodes++;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return TRUE; return TRUE;
@ -522,11 +522,11 @@ bool TQGList::insertAt( uint index, TQPtrCollection::Item d )
void TQGList::relinkNode( TQLNode *n ) void TQGList::relinkNode( TQLNode *n )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
if ( n == firstNode ) { // already first if ( n == firstNode ) { // already first
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return; return;
@ -543,7 +543,7 @@ void TQGList::relinkNode( TQLNode *n )
firstNode = curNode = n; // curNode affected firstNode = curNode = n; // curNode affected
numNodes++; numNodes++;
curIndex = 0; curIndex = 0;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
} }
@ -555,11 +555,11 @@ void TQGList::relinkNode( TQLNode *n )
TQLNode *TQGList::unlink() TQLNode *TQGList::unlink()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
if ( curNode == 0 ) { // null current node if ( curNode == 0 ) { // null current node
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return 0; return 0;
@ -593,7 +593,7 @@ TQLNode *TQGList::unlink()
iterators->notifyRemove( n, curNode ); iterators->notifyRemove( n, curNode );
} }
numNodes--; numNodes--;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return n; return n;
@ -606,7 +606,7 @@ TQLNode *TQGList::unlink()
bool TQGList::removeNode( TQLNode *n ) bool TQGList::removeNode( TQLNode *n )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
#if defined(QT_CHECK_NULL) #if defined(QT_CHECK_NULL)
@ -622,7 +622,7 @@ bool TQGList::removeNode( TQLNode *n )
delete n; delete n;
curNode = firstNode; curNode = firstNode;
curIndex = curNode ? 0 : -1; curIndex = curNode ? 0 : -1;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return TRUE; return TRUE;
@ -636,25 +636,25 @@ bool TQGList::removeNode( TQLNode *n )
bool TQGList::remove( TQPtrCollection::Item d ) bool TQGList::remove( TQPtrCollection::Item d )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
if ( d && find(d) == -1 ) { if ( d && find(d) == -1 ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return FALSE; return FALSE;
} }
TQLNode *n = unlink(); TQLNode *n = unlink();
if ( !n ) { if ( !n ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return FALSE; return FALSE;
} }
deleteItem( n->data ); deleteItem( n->data );
delete n; delete n;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return TRUE; return TRUE;
@ -666,25 +666,25 @@ bool TQGList::remove( TQPtrCollection::Item d )
bool TQGList::removeRef( TQPtrCollection::Item d ) bool TQGList::removeRef( TQPtrCollection::Item d )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
if ( findRef(d) == -1 ) { if ( findRef(d) == -1 ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return FALSE; return FALSE;
} }
TQLNode *n = unlink(); TQLNode *n = unlink();
if ( !n ) { if ( !n ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return FALSE; return FALSE;
} }
deleteItem( n->data ); deleteItem( n->data );
delete n; delete n;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return TRUE; return TRUE;
@ -708,25 +708,25 @@ bool TQGList::removeRef( TQPtrCollection::Item d )
bool TQGList::removeAt( uint index ) bool TQGList::removeAt( uint index )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
if ( !locate(index) ) { if ( !locate(index) ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return FALSE; return FALSE;
} }
TQLNode *n = unlink(); TQLNode *n = unlink();
if ( !n ) { if ( !n ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return FALSE; return FALSE;
} }
deleteItem( n->data ); deleteItem( n->data );
delete n; delete n;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return TRUE; return TRUE;
@ -738,12 +738,12 @@ bool TQGList::removeAt( uint index )
*/ */
bool TQGList::replaceAt( uint index, TQPtrCollection::Item d ) bool TQGList::replaceAt( uint index, TQPtrCollection::Item d )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
TQLNode *n = locate( index ); TQLNode *n = locate( index );
if ( !n ) { if ( !n ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return FALSE; return FALSE;
@ -752,7 +752,7 @@ bool TQGList::replaceAt( uint index, TQPtrCollection::Item d )
deleteItem( n->data ); deleteItem( n->data );
n->data = newItem( d ); n->data = newItem( d );
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return TRUE; return TRUE;
@ -766,14 +766,14 @@ bool TQGList::replaceAt( uint index, TQPtrCollection::Item d )
TQPtrCollection::Item TQGList::takeNode( TQLNode *n ) TQPtrCollection::Item TQGList::takeNode( TQLNode *n )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
#if defined(QT_CHECK_NULL) #if defined(QT_CHECK_NULL)
if ( n == 0 || (n->prev && n->prev->next != n) || if ( n == 0 || (n->prev && n->prev->next != n) ||
(n->next && n->next->prev != n) ) { (n->next && n->next->prev != n) ) {
tqWarning( "TQGList::takeNode: Corrupted node" ); tqWarning( "TQGList::takeNode: Corrupted node" );
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return 0; return 0;
@ -785,7 +785,7 @@ TQPtrCollection::Item TQGList::takeNode( TQLNode *n )
delete n; // delete the node, not data delete n; // delete the node, not data
curNode = firstNode; curNode = firstNode;
curIndex = curNode ? 0 : -1; curIndex = curNode ? 0 : -1;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return d; return d;
@ -797,13 +797,13 @@ TQPtrCollection::Item TQGList::takeNode( TQLNode *n )
TQPtrCollection::Item TQGList::take() TQPtrCollection::Item TQGList::take()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
TQLNode *n = unlink(); // unlink node TQLNode *n = unlink(); // unlink node
Item d = n ? n->data : 0; Item d = n ? n->data : 0;
delete n; // delete node, keep contents delete n; // delete node, keep contents
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return d; return d;
@ -815,11 +815,11 @@ TQPtrCollection::Item TQGList::take()
TQPtrCollection::Item TQGList::takeAt( uint index ) TQPtrCollection::Item TQGList::takeAt( uint index )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
if ( !locate(index) ) { if ( !locate(index) ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return 0; return 0;
@ -827,7 +827,7 @@ TQPtrCollection::Item TQGList::takeAt( uint index )
TQLNode *n = unlink(); // unlink node TQLNode *n = unlink(); // unlink node
Item d = n ? n->data : 0; Item d = n ? n->data : 0;
delete n; // delete node, keep contents delete n; // delete node, keep contents
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return d; return d;
@ -839,14 +839,14 @@ TQPtrCollection::Item TQGList::takeAt( uint index )
TQPtrCollection::Item TQGList::takeFirst() TQPtrCollection::Item TQGList::takeFirst()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
first(); first();
TQLNode *n = unlink(); // unlink node TQLNode *n = unlink(); // unlink node
Item d = n ? n->data : 0; Item d = n ? n->data : 0;
delete n; delete n;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return d; return d;
@ -858,14 +858,14 @@ TQPtrCollection::Item TQGList::takeFirst()
TQPtrCollection::Item TQGList::takeLast() TQPtrCollection::Item TQGList::takeLast()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
last(); last();
TQLNode *n = unlink(); // unlink node TQLNode *n = unlink(); // unlink node
Item d = n ? n->data : 0; Item d = n ? n->data : 0;
delete n; delete n;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return d; return d;
@ -878,7 +878,7 @@ TQPtrCollection::Item TQGList::takeLast()
void TQGList::clear() void TQGList::clear()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
register TQLNode *n = firstNode; register TQLNode *n = firstNode;
@ -898,7 +898,7 @@ void TQGList::clear()
n = n->next; n = n->next;
delete prevNode; // deallocate node delete prevNode; // deallocate node
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
} }
@ -911,7 +911,7 @@ void TQGList::clear()
int TQGList::findRef( TQPtrCollection::Item d, bool fromStart ) int TQGList::findRef( TQPtrCollection::Item d, bool fromStart )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
register TQLNode *n; register TQLNode *n;
@ -929,7 +929,7 @@ int TQGList::findRef( TQPtrCollection::Item d, bool fromStart )
} }
curNode = n; curNode = n;
curIndex = n ? index : -1; curIndex = n ? index : -1;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return curIndex; // return position of item 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 ) int TQGList::find( TQPtrCollection::Item d, bool fromStart )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
register TQLNode *n; register TQLNode *n;
@ -961,7 +961,7 @@ int TQGList::find( TQPtrCollection::Item d, bool fromStart )
} }
curNode = n; curNode = n;
curIndex = n ? index : -1; curIndex = n ? index : -1;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return curIndex; // return position of item 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 uint TQGList::containsRef( TQPtrCollection::Item d ) const
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
register TQLNode *n = firstNode; register TQLNode *n = firstNode;
@ -984,7 +984,7 @@ uint TQGList::containsRef( TQPtrCollection::Item d ) const
count++; count++;
n = n->next; n = n->next;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return count; return count;
@ -997,7 +997,7 @@ uint TQGList::containsRef( TQPtrCollection::Item d ) const
uint TQGList::contains( TQPtrCollection::Item d ) const uint TQGList::contains( TQPtrCollection::Item d ) const
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
register TQLNode *n = firstNode; register TQLNode *n = firstNode;
@ -1008,7 +1008,7 @@ uint TQGList::contains( TQPtrCollection::Item d ) const
count++; count++;
n = n->next; n = n->next;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return count; return count;
@ -1058,17 +1058,17 @@ uint TQGList::contains( TQPtrCollection::Item d ) const
TQPtrCollection::Item TQGList::first() TQPtrCollection::Item TQGList::first()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
if ( firstNode ) { if ( firstNode ) {
curIndex = 0; curIndex = 0;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return (curNode=firstNode)->data; return (curNode=firstNode)->data;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return 0; return 0;
@ -1080,17 +1080,17 @@ TQPtrCollection::Item TQGList::first()
TQPtrCollection::Item TQGList::last() TQPtrCollection::Item TQGList::last()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
if ( lastNode ) { if ( lastNode ) {
curIndex = numNodes-1; curIndex = numNodes-1;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return (curNode=lastNode)->data; return (curNode=lastNode)->data;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return 0; return 0;
@ -1102,14 +1102,14 @@ TQPtrCollection::Item TQGList::last()
TQPtrCollection::Item TQGList::next() TQPtrCollection::Item TQGList::next()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
if ( curNode ) { if ( curNode ) {
if ( curNode->next ) { if ( curNode->next ) {
curIndex++; curIndex++;
curNode = curNode->next; curNode = curNode->next;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return curNode->data; return curNode->data;
@ -1117,7 +1117,7 @@ TQPtrCollection::Item TQGList::next()
curIndex = -1; curIndex = -1;
curNode = 0; curNode = 0;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return 0; return 0;
@ -1129,14 +1129,14 @@ TQPtrCollection::Item TQGList::next()
TQPtrCollection::Item TQGList::prev() TQPtrCollection::Item TQGList::prev()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
if ( curNode ) { if ( curNode ) {
if ( curNode->prev ) { if ( curNode->prev ) {
curIndex--; curIndex--;
curNode = curNode->prev; curNode = curNode->prev;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return curNode->data; return curNode->data;
@ -1144,7 +1144,7 @@ TQPtrCollection::Item TQGList::prev()
curIndex = -1; curIndex = -1;
curNode = 0; curNode = 0;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return 0; return 0;
@ -1157,12 +1157,12 @@ TQPtrCollection::Item TQGList::prev()
void TQGList::toVector( TQGVector *vector ) const void TQGList::toVector( TQGVector *vector ) const
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
vector->clear(); vector->clear();
if ( !vector->resize( count() ) ) { if ( !vector->resize( count() ) ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return; return;
@ -1174,14 +1174,14 @@ void TQGList::toVector( TQGVector *vector ) const
n = n->next; n = n->next;
i++; i++;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
} }
void TQGList::heapSortPushDown( TQPtrCollection::Item* heap, int first, int last ) void TQGList::heapSortPushDown( TQPtrCollection::Item* heap, int first, int last )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
int r = first; 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(); //mutex->unlock();
#endif #endif
} }
@ -1233,12 +1233,12 @@ void TQGList::heapSortPushDown( TQPtrCollection::Item* heap, int first, int last
void TQGList::sort() void TQGList::sort()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
uint n = count(); uint n = count();
if ( n < 2 ) { if ( n < 2 ) {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return; return;
@ -1273,7 +1273,7 @@ void TQGList::sort()
} }
delete [] realheap; delete [] realheap;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
} }
@ -1300,7 +1300,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQGList &list )
TQDataStream &TQGList::read( TQDataStream &s ) TQDataStream &TQGList::read( TQDataStream &s )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
uint num; uint num;
@ -1326,7 +1326,7 @@ TQDataStream &TQGList::read( TQDataStream &s )
} }
curNode = firstNode; curNode = firstNode;
curIndex = curNode ? 0 : -1; curIndex = curNode ? 0 : -1;
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return s; return s;
@ -1338,7 +1338,7 @@ TQDataStream &TQGList::read( TQDataStream &s )
TQDataStream &TQGList::write( TQDataStream &s ) const TQDataStream &TQGList::write( TQDataStream &s ) const
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
s << count(); // write number of items s << count(); // write number of items
@ -1347,7 +1347,7 @@ TQDataStream &TQGList::write( TQDataStream &s ) const
write( s, n->data ); write( s, n->data );
n = n->next; n = n->next;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return s; return s;
@ -1361,13 +1361,13 @@ TQDataStream &TQGList::write( TQDataStream &s ) const
*/ */
TQLNode* TQGList::erase( TQLNode* it ) TQLNode* TQGList::erase( TQLNode* it )
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->lock(); //mutex->lock();
#endif #endif
TQLNode* n = it; TQLNode* n = it;
it = it->next; it = it->next;
removeNode( n ); removeNode( n );
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
//mutex->unlock(); //mutex->unlock();
#endif #endif
return it; return it;

8
src/tools/qgvector.cpp
Unescape View File

@ -51,9 +51,9 @@
#include "ntqdatastream.h" #include "ntqdatastream.h"
#include <stdlib.h> #include <stdlib.h>
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
# include <private/qmutexpool_p.h> # include <private/qmutexpool_p.h>
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#define USE_MALLOC // comment to use new/delete #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 ? TQMutexLocker locker( tqt_global_mutexpool ?
tqt_global_mutexpool->get( &sort_vec ) : 0 ); tqt_global_mutexpool->get( &sort_vec ) : 0 );
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
sort_vec = (TQGVector*)this; sort_vec = (TQGVector*)this;
qsort( vec, count(), sizeof(Item), cmp_vec ); qsort( vec, count(), sizeof(Item), cmp_vec );

2
src/tools/qlocale.cpp
Unescape View File

@ -3244,7 +3244,7 @@ TQString TQLocalePrivate::doubleToString(double d,
TQString digits; TQString digits;
#ifdef QT_QLOCALE_USES_FCVT #ifdef QT_QLOCALE_USES_FCVT
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
static bool dummy_for_mutex; static bool dummy_for_mutex;
TQMutex *fcvt_mutex = tqt_global_mutexpool ? tqt_global_mutexpool->get( &dummy_for_mutex ) : 0; TQMutex *fcvt_mutex = tqt_global_mutexpool ? tqt_global_mutexpool->get( &dummy_for_mutex ) : 0;
# define FCVT_LOCK if (fcvt_mutex) fcvt_mutex->lock() # define FCVT_LOCK if (fcvt_mutex) fcvt_mutex->lock()

4
src/tools/qmutex_unix.cpp
Unescape View File

@ -38,7 +38,7 @@
** **
**********************************************************************/ **********************************************************************/
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "qplatformdefs.h" #include "qplatformdefs.h"
@ -720,4 +720,4 @@ int TQMutex::level()
\sa TQMutexLocker::TQMutexLocker() \sa TQMutexLocker::TQMutexLocker()
*/ */
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT

2
src/tools/qmutexpool.cpp
Unescape View File

@ -38,7 +38,7 @@
#include "qmutexpool_p.h" #include "qmutexpool_p.h"
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include <ntqthread.h> #include <ntqthread.h>

4
src/tools/qmutexpool_p.h
Unescape View File

@ -51,7 +51,7 @@
// //
// //
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#ifndef QT_H #ifndef QT_H
#include "ntqmutex.h" #include "ntqmutex.h"
@ -75,6 +75,6 @@ private:
extern Q_EXPORT TQMutexPool *tqt_global_mutexpool; extern Q_EXPORT TQMutexPool *tqt_global_mutexpool;
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#endif // TQMUTEXPOOL_P_H #endif // TQMUTEXPOOL_P_H

20
src/tools/qregexp.cpp
Unescape View File

@ -52,10 +52,10 @@
#include "ntqstring.h" #include "ntqstring.h"
#include "ntqtl.h" #include "ntqtl.h"
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include "ntqthreadstorage.h" #include "ntqthreadstorage.h"
#include <private/qthreadinstance_p.h> #include <private/qthreadinstance_p.h>
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#undef QT_TRANSLATE_NOOP #undef QT_TRANSLATE_NOOP
#define QT_TRANSLATE_NOOP( context, sourceText ) sourceText #define QT_TRANSLATE_NOOP( context, sourceText ) sourceText
@ -3212,25 +3212,25 @@ struct TQRegExpPrivate
#ifndef QT_NO_REGEXP_OPTIM #ifndef QT_NO_REGEXP_OPTIM
static TQSingleCleanupHandler<TQCache<TQRegExpEngine> > cleanup_cache; static TQSingleCleanupHandler<TQCache<TQRegExpEngine> > cleanup_cache;
# ifndef QT_THREAD_SUPPORT # ifndef TQT_THREAD_SUPPORT
static TQCache<TQRegExpEngine> *engineCache = 0; static TQCache<TQRegExpEngine> *engineCache = 0;
# endif // QT_THREAD_SUPPORT # endif // TQT_THREAD_SUPPORT
#endif // QT_NO_REGEXP_OPTIM #endif // QT_NO_REGEXP_OPTIM
static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern, static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern,
bool caseSensitive, bool deref ) bool caseSensitive, bool deref )
{ {
# ifdef QT_THREAD_SUPPORT # ifdef TQT_THREAD_SUPPORT
static TQThreadStorage<TQCache<TQRegExpEngine> *> engineCaches; static TQThreadStorage<TQCache<TQRegExpEngine> *> engineCaches;
TQCache<TQRegExpEngine> *engineCache = 0; TQCache<TQRegExpEngine> *engineCache = 0;
TQThreadInstance *currentThread = TQThreadInstance::current(); TQThreadInstance *currentThread = TQThreadInstance::current();
if (currentThread) if (currentThread)
engineCache = engineCaches.localData(); engineCache = engineCaches.localData();
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( !deref ) { if ( !deref ) {
#ifndef QT_NO_REGEXP_OPTIM #ifndef QT_NO_REGEXP_OPTIM
# ifdef QT_THREAD_SUPPORT # ifdef TQT_THREAD_SUPPORT
if ( currentThread ) if ( currentThread )
# endif # endif
{ {
@ -3251,18 +3251,18 @@ static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern,
if ( eng->deref() ) { if ( eng->deref() ) {
#ifndef QT_NO_REGEXP_OPTIM #ifndef QT_NO_REGEXP_OPTIM
# ifdef QT_THREAD_SUPPORT # ifdef TQT_THREAD_SUPPORT
if ( currentThread ) if ( currentThread )
# endif # endif
{ {
if ( engineCache == 0 ) { if ( engineCache == 0 ) {
engineCache = new TQCache<TQRegExpEngine>; engineCache = new TQCache<TQRegExpEngine>;
engineCache->setAutoDelete( TRUE ); engineCache->setAutoDelete( TRUE );
# ifdef QT_THREAD_SUPPORT # ifdef TQT_THREAD_SUPPORT
engineCaches.setLocalData(engineCache); engineCaches.setLocalData(engineCache);
# else # else
cleanup_cache.set( &engineCache ); cleanup_cache.set( &engineCache );
# endif // !QT_THREAD_SUPPORT # endif // !TQT_THREAD_SUPPORT
} }
if ( !pattern.isNull() && if ( !pattern.isNull() &&
engineCache->insert(pattern, eng, 4 + pattern.length() / 4) ) engineCache->insert(pattern, eng, 4 + pattern.length() / 4) )

4
src/tools/qsemaphore.cpp
Unescape View File

@ -38,7 +38,7 @@
** **
**********************************************************************/ **********************************************************************/
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "ntqsemaphore.h" #include "ntqsemaphore.h"
#include "ntqmutex.h" #include "ntqmutex.h"
@ -252,4 +252,4 @@ bool TQSemaphore::tryAccess(int n)
return TRUE; return TRUE;
} }
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT

128
src/tools/qstring.cpp
Unescape View File

@ -93,9 +93,9 @@
#define ULLONG_MAX TQ_UINT64_C(18446744073709551615) #define ULLONG_MAX TQ_UINT64_C(18446744073709551615)
#endif #endif
#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) #if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
#include "ntqmutex.h" #include "ntqmutex.h"
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
extern TQMutex *tqt_sharedStringMutex; extern TQMutex *tqt_sharedStringMutex;
@ -1053,9 +1053,9 @@ TQStringData::TQStringData() : TQShared(),
maxl(0), maxl(0),
islatin1(FALSE), islatin1(FALSE),
security_unpaged(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); mutex = new TQMutex(FALSE);
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
ref(); ref();
} }
@ -1067,9 +1067,9 @@ TQStringData::TQStringData(TQChar *u, uint l, uint m) : TQShared(),
maxl(m), maxl(m),
islatin1(FALSE), islatin1(FALSE),
security_unpaged(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); mutex = new TQMutex(FALSE);
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
} }
TQStringData::~TQStringData() { TQStringData::~TQStringData() {
@ -1084,12 +1084,12 @@ TQStringData::~TQStringData() {
if ( ascii ) { if ( ascii ) {
delete[] 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 ) { if ( mutex ) {
delete mutex; delete mutex;
mutex = NULL; mutex = NULL;
} }
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
} }
void TQStringData::setDirty() { void TQStringData::setDirty() {
@ -1457,14 +1457,14 @@ QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0);
TQStringData* TQString::makeSharedNull() 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(); 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 (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(); 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; return TQString::shared_null;
} }
@ -1474,9 +1474,9 @@ TQStringData* TQString::makeSharedNull()
that->d = TQString::shared_null; that->d = TQString::shared_null;
#endif #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(); 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; return TQString::shared_null;
} }
@ -1517,13 +1517,13 @@ TQString::TQString( const TQString &s ) :
d(s.d) d(s.d)
{ {
if ( d && (d != shared_null) ) { 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(); d->mutex->lock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
d->ref(); 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(); 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; return;
} }
#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) #if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
d->mutex->lock(); d->mutex->lock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
if ( d->deref() ) { 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(); d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
d->deleteSelf(); d->deleteSelf();
d = NULL; d = NULL;
} }
else { else {
#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) #if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
d->mutex->unlock(); 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() void TQString::deref()
{ {
if ( d && (d != shared_null) ) { 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(); d->mutex->lock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
if ( d->deref() ) { 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(); d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
if ( d != shared_null ) { if ( d != shared_null ) {
delete d; delete d;
} }
d = 0; d = 0;
} }
else { else {
#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) #if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
d->mutex->unlock(); 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 ) TQString &TQString::operator=( const TQString &s )
{ {
if ( s.d && (s.d != shared_null) ) { 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(); s.d->mutex->lock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
s.d->ref(); 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(); s.d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
} }
deref(); deref();
d = s.d; d = s.d;
@ -1883,9 +1883,9 @@ void TQString::truncate( uint newLen )
*/ */
void TQString::setLength( 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(); 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 ( d->count != 1 || newLen > d->maxl ||
( newLen * 4 < d->maxl && d->maxl > 4 ) ) { ( newLen * 4 < d->maxl && d->maxl > 4 ) ) {
@ -1896,24 +1896,24 @@ void TQString::setLength( uint newLen )
uint len = TQMIN( d->len, newLen ); uint len = TQMIN( d->len, newLen );
memcpy( nd, d->unicode, sizeof(TQChar) * len ); memcpy( nd, d->unicode, sizeof(TQChar) * len );
bool unpaged = d->security_unpaged; 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(); d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
deref(); deref();
d = new TQStringData( nd, newLen, newMax ); d = new TQStringData( nd, newLen, newMax );
setSecurityUnPaged(unpaged); setSecurityUnPaged(unpaged);
} }
else { else {
#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) #if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
d->mutex->unlock(); d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
} }
} }
else { else {
d->len = newLen; 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(); d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
d->setDirty(); d->setDirty();
} }
} }
@ -1999,21 +1999,21 @@ void TQString::squeeze()
*/ */
void TQString::grow( uint newLen ) 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(); 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 ( 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(); d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
setLength( newLen ); setLength( newLen );
} }
else { else {
d->len = newLen; 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(); d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
d->setDirty(); d->setDirty();
} }
} }
@ -6423,19 +6423,19 @@ TQString TQString::fromUcs2( const unsigned short *str )
*/ */
TQChar& TQString::ref(uint i) { 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(); 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 ( (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(); d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
subat( i ); subat( i );
} }
else { else {
#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) #if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
d->mutex->unlock(); d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
} }
d->setDirty(); d->setDirty();
return d->unicode[i]; return d->unicode[i];
@ -6523,9 +6523,9 @@ TQString& TQString::setUnicode( const TQChar *unicode, uint len )
} }
} }
else { else {
#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) #if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
d->mutex->lock(); 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 ) ) { if ( d->count != 1 || len > d->maxl || ( len * 4 < d->maxl && d->maxl > 4 ) ) {
// detach, grown or shrink // detach, grown or shrink
uint newMax = computeNewMax( len ); uint newMax = computeNewMax( len );
@ -6533,17 +6533,17 @@ TQString& TQString::setUnicode( const TQChar *unicode, uint len )
if ( unicode ) { if ( unicode ) {
memcpy( nd, unicode, sizeof(TQChar)*len ); 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(); d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
deref(); deref();
d = new TQStringData( nd, len, newMax ); d = new TQStringData( nd, len, newMax );
} }
else { else {
d->len = len; 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(); d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
d->setDirty(); d->setDirty();
if ( unicode ) { if ( unicode ) {
memcpy( d->unicode, unicode, sizeof(TQChar)*len ); memcpy( d->unicode, unicode, sizeof(TQChar)*len );
@ -7254,9 +7254,9 @@ TQConstString::TQConstString( const TQChar* unicode, uint length ) :
*/ */
TQConstString::~TQConstString() 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(); d->mutex->lock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
if ( d->count > 1 ) { if ( d->count > 1 ) {
TQChar* cp = QT_ALLOC_QCHAR_VEC( d->len ); TQChar* cp = QT_ALLOC_QCHAR_VEC( d->len );
@ -7268,9 +7268,9 @@ TQConstString::~TQConstString()
} }
// The original d->unicode is now unlinked. // 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(); d->mutex->unlock();
#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
} }
/*! /*!

4
src/tools/qthreadinstance_p.h
Unescape View File

@ -51,7 +51,7 @@
// //
// //
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#ifndef QT_H #ifndef QT_H
#include "ntqmutex.h" #include "ntqmutex.h"
@ -105,5 +105,5 @@ public:
bool disableThreadPostedEvents : 1; bool disableThreadPostedEvents : 1;
}; };
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#endif // TQTHREAD_P_H #endif // TQTHREAD_P_H

4
src/tools/qthreadstorage_unix.cpp
Unescape View File

@ -36,7 +36,7 @@
** **
**********************************************************************/ **********************************************************************/
#ifdef QT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include "qplatformdefs.h" #include "qplatformdefs.h"
@ -346,4 +346,4 @@ void TQThreadStorageData::finish( void **thread_storage )
\sa localData() hasLocalData() \sa localData() hasLocalData()
*/ */
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT

4
src/tools/qwaitcondition_unix.cpp
Unescape View File

@ -38,7 +38,7 @@
** **
**********************************************************************/ **********************************************************************/
#if defined(QT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "qplatformdefs.h" #include "qplatformdefs.h"
@ -313,4 +313,4 @@ bool TQWaitCondition::wait(TQMutex *mutex, unsigned long time)
return (ret == 0); return (ret == 0);
} }
#endif // QT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT

Write Preview
Loading…
Cancel
Save