From 2df70f03d493f5226821dd2e1da3759e3abceb02 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 18 Sep 2018 01:19:46 +0900 Subject: Revert "QT_THREAD_SUPPORT -> TQT_THREAD_SUPPORT conversion to align to updated admin module" The original commit was a mistake and should not have been pushed. This reverts commit f849f22528ee9eb5eeb1f9aa92822846b2b3e01f. --- src/codecs/qtextcodec.cpp | 12 +- src/codecs/qtextcodecfactory.cpp | 6 +- src/dialogs/qfiledialog.cpp | 10 +- src/inputmethod/qinputcontextfactory.cpp | 6 +- src/kernel/qapplication.cpp | 74 ++++++------- src/kernel/qapplication.h | 18 +-- src/kernel/qapplication_x11.cpp | 8 +- src/kernel/qeventloop.cpp | 6 +- src/kernel/qeventloop.h | 4 +- src/kernel/qeventloop_unix_glib.cpp | 68 ++++++------ src/kernel/qeventloop_x11.cpp | 10 +- src/kernel/qeventloop_x11_glib.cpp | 20 ++-- src/kernel/qfont_x11.cpp | 4 +- src/kernel/qgplugin.h | 2 +- src/kernel/qmetaobject.cpp | 24 ++-- src/kernel/qobject.cpp | 162 +++++++++++++-------------- src/kernel/qobject.h | 6 +- src/kernel/qthread.cpp | 8 +- src/kernel/qthread.h | 4 +- src/kernel/qthread_unix.cpp | 4 +- src/kernel/qwidget.cpp | 4 +- src/moc/moc.y | 6 +- src/moc/moc_yacc.cpp | 6 +- src/qt.pro | 2 +- src/tools/qcom_p.h | 2 +- src/tools/qcomlibrary.cpp | 10 +- src/tools/qcriticalsection_p.cpp | 2 +- src/tools/qcriticalsection_p.h | 2 +- src/tools/qcstring.cpp | 8 +- src/tools/qdatetime.cpp | 10 +- src/tools/qdir_unix.cpp | 12 +- src/tools/qgarray.cpp | 12 +- src/tools/qglist.cpp | 182 +++++++++++++++---------------- src/tools/qglist.h | 2 +- src/tools/qgvector.cpp | 8 +- src/tools/qlocale.cpp | 2 +- src/tools/qmutex.h | 2 +- src/tools/qmutex_unix.cpp | 4 +- src/tools/qmutexpool.cpp | 2 +- src/tools/qmutexpool_p.h | 4 +- src/tools/qregexp.cpp | 20 ++-- src/tools/qsemaphore.cpp | 4 +- src/tools/qsemaphore.h | 2 +- src/tools/qstring.cpp | 128 +++++++++++----------- src/tools/qthreadinstance_p.h | 4 +- src/tools/qthreadstorage.h | 4 +- src/tools/qthreadstorage_unix.cpp | 4 +- src/tools/qwaitcondition.h | 2 +- src/tools/qwaitcondition_unix.cpp | 4 +- 49 files changed, 455 insertions(+), 455 deletions(-) (limited to 'src') diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp index b85f5e9..80d0093 100644 --- a/src/codecs/qtextcodec.cpp +++ b/src/codecs/qtextcodec.cpp @@ -75,9 +75,9 @@ # include "qfontcodecs_p.h" #endif -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #include #include @@ -121,12 +121,12 @@ void QTextCodec::deleteAllCodecs() if ( !all ) return; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &all ) : 0 ); if ( !all ) return; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT destroying_is_ok = TRUE; @@ -151,11 +151,11 @@ static inline void setup() { if ( all ) return; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &all ) : 0 ); if ( all ) return; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT realSetup(); } diff --git a/src/codecs/qtextcodecfactory.cpp b/src/codecs/qtextcodecfactory.cpp index 6a7766e..85a5d00 100644 --- a/src/codecs/qtextcodecfactory.cpp +++ b/src/codecs/qtextcodecfactory.cpp @@ -48,9 +48,9 @@ #include #include "qtextcodecinterface_p.h" -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #include @@ -63,7 +63,7 @@ static void create_manager() if ( manager ) // already created return; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT // protect manager creation QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &manager ) : 0); diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index 2d7f374..7666770 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -100,9 +100,9 @@ #endif #ifdef Q_WS_WIN -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #endif // Q_WS_WIN #if !defined(Q_OS_TEMP) @@ -527,7 +527,7 @@ static void resolveLibs() static bool triedResolve = FALSE; if ( !triedResolve ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT // protect initialization QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &triedResolve ) : 0 ); @@ -3203,7 +3203,7 @@ void QFileDialog::setDir( const QString & pathstr ) i++; QCString user; if ( i == 1 ) { -#if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) +#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) # ifndef _POSIX_LOGIN_NAME_MAX # define _POSIX_LOGIN_NAME_MAX 9 @@ -3222,7 +3222,7 @@ void QFileDialog::setDir( const QString & pathstr ) user = dr.mid( 1, i-1 ).local8Bit(); dr = dr.mid( i, dr.length() ); struct passwd *pw; -#if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_FREEBSD) && !defined(Q_OS_OPENBSD) +#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_FREEBSD) && !defined(Q_OS_OPENBSD) struct passwd mt_pw; char buffer[2048]; if ( ::getpwnam_r( user, &mt_pw, buffer, 2048, &pw ) == 0 && pw == &mt_pw ) diff --git a/src/inputmethod/qinputcontextfactory.cpp b/src/inputmethod/qinputcontextfactory.cpp index ee0eb94..50aa7fb 100644 --- a/src/inputmethod/qinputcontextfactory.cpp +++ b/src/inputmethod/qinputcontextfactory.cpp @@ -43,9 +43,9 @@ #include "qapplication.h" -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #include -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #include @@ -62,7 +62,7 @@ static void create_manager() if( manager ) // already created return; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT // protect manager creation QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &manager ) : 0); diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index a8500c0..d87d2e5 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -65,11 +65,11 @@ #endif #include "qfontdata_p.h" -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) # include "qmutex.h" # include "qthread.h" # include -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #include @@ -375,7 +375,7 @@ QStringList *QApplication::app_libpaths = 0; bool QApplication::metaComposeUnicode = FALSE; int QApplication::composedUnicode = 0; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutex *QApplication::qt_mutex = 0; QMutex *qt_sharedStringMutex = 0; Q_EXPORT QMutex * qt_sharedMetaObjectMutex = 0; @@ -388,13 +388,13 @@ Q_EXPORT Qt::HANDLE qt_get_application_thread_id() { return qt_application_thread_id; } -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT -#ifndef TQT_THREAD_SUPPORT +#ifndef QT_THREAD_SUPPORT QEventLoop *QApplication::eventloop = 0; // application event loop #endif -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QEventLoop* QApplication::currentEventLoop() { QThread* thread = QThread::currentThreadObject(); if (thread) { @@ -541,7 +541,7 @@ QClipboard *qt_clipboard = 0; // global clipboard object #endif QWidgetList * qt_modal_stack=0; // stack of modal widgets -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT // thread wrapper for the main() thread class QCoreApplicationThread : public QThread { @@ -605,9 +605,9 @@ static QPostEventList *globalPostedEvents = 0; // list of posted events uint qGlobalPostedEventsCount() { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( postevent_mutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if (!globalPostedEvents) { return 0; @@ -1035,7 +1035,7 @@ QApplication::QApplication(Display *dpy, int argc, char **argv, #endif // Q_WS_X11 -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QThread* QApplication::guiThread() { return mainThread(); } @@ -1069,7 +1069,7 @@ void QApplication::init_precmdline() void QApplication::initialize( int argc, char **argv, bool enable_sm ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT qt_mutex = new QMutex( TRUE ); qt_sharedStringMutex = new QMutex( TRUE ); qt_sharedMetaObjectMutex = new QMutex( TRUE ); @@ -1078,7 +1078,7 @@ void QApplication::initialize( int argc, char **argv, bool enable_sm ) #endif // QT_USE_GLIBMAINLOOP postevent_mutex = new QMutex( TRUE ); qt_application_thread_id = QThread::currentThread(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT app_argc = argc; app_argv = argv; @@ -1226,12 +1226,12 @@ QApplication::~QApplication() app_libpaths = 0; #endif -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT delete qt_mutex; qt_mutex = 0; delete postevent_mutex; postevent_mutex = 0; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if( qApp == this ) { if ( postedEvents ) @@ -1254,7 +1254,7 @@ QApplication::~QApplication() session_key = 0; #endif //QT_NO_SESSIONMANAGER -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT delete qt_sharedMetaObjectMutex; qt_sharedMetaObjectMutex = 0; delete qt_sharedStringMutex; @@ -1263,7 +1263,7 @@ QApplication::~QApplication() delete qt_timerListMutex; qt_timerListMutex = 0; #endif // QT_USE_GLIBMAINLOOP -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT qt_explicit_app_style = FALSE; qt_app_has_font = FALSE; @@ -2521,9 +2521,9 @@ bool QApplication::notify( QObject *receiver, QEvent *e ) } if ( e->type() == QEvent::ChildRemoved && receiver->postedEvents) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( postevent_mutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if (globalPostedEvents) { // the QObject destructor calls QObject::removeChild, which calls @@ -2868,7 +2868,7 @@ bool QApplication::internalNotify( QObject *receiver, QEvent * e) } if (!handled) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) int locklevel = 0; int llcount; if (QApplication::qt_mutex) { @@ -2881,7 +2881,7 @@ bool QApplication::internalNotify( QObject *receiver, QEvent * e) } #endif consumed = receiver->event( e ); -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (QApplication::qt_mutex) { for (llcount=0; llcountlock(); @@ -3365,9 +3365,9 @@ void QApplication::postEvent( QObject *receiver, QEvent *event ) return; } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( postevent_mutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( !globalPostedEvents ) { // create list globalPostedEvents = new QPostEventList; @@ -3461,7 +3461,7 @@ void QApplication::postEvent( QObject *receiver, QEvent *event ) l->append( pe ); globalPostedEvents->append( pe ); -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT // Wake up the receiver thread event loop QThread* thread = receiver->contextThreadObject(); if (thread) { @@ -3514,7 +3514,7 @@ void QApplication::sendPostedEvents( QObject *receiver, int event_type ) sendPostedEvents( 0, QEvent::ChildInserted ); } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( postevent_mutex ); #endif @@ -3571,9 +3571,9 @@ void QApplication::sendPostedEvents( QObject *receiver, int event_type ) } } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if ( locker.mutex() ) locker.mutex()->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT // after all that work, it's time to deliver the event. if ( e->type() == QEvent::Paint && r->isWidgetType() ) { QWidget * w = (QWidget*)r; @@ -3585,9 +3585,9 @@ void QApplication::sendPostedEvents( QObject *receiver, int event_type ) sent = TRUE; QApplication::sendEvent( r, e ); } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if ( locker.mutex() ) locker.mutex()->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT delete e; // careful when adding anything below this point - the @@ -3646,9 +3646,9 @@ void QApplication::removePostedEvents( QObject *receiver, int event_type ) return; } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( postevent_mutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT // the QObject destructor calls this function directly. this can // happen while the event loop is in the middle of posting events, @@ -3699,9 +3699,9 @@ void QApplication::removePostedEvent( QEvent * event ) return; } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( postevent_mutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( !globalPostedEvents ) { #if defined(QT_DEBUG) @@ -3797,7 +3797,7 @@ void QApplication::removePostedEvent( QEvent * event ) } void qThreadTerminationHandlerRecursive( QObject* object, QThread* originThread, QThread* destinationThread ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QThread* objectThread = object->contextThreadObject(); if (objectThread && (objectThread == originThread)) { QThread::CleanupType cleanupType = objectThread->cleanupType(); @@ -3822,7 +3822,7 @@ void qThreadTerminationHandlerRecursive( QObject* object, QThread* originThread, for ( childObject = children.first(); childObject; childObject = children.next() ) { qThreadTerminationHandlerRecursive(childObject, originThread, destinationThread); } -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT } /*!\internal @@ -3831,14 +3831,14 @@ void qThreadTerminationHandlerRecursive( QObject* object, QThread* originThread, for thread destruction. */ void QApplication::threadTerminationHandler( QThread *originThread ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_mutex ); QThread* destinationThread = guiThread(); const QObjectList* objects = QObject::objectTrees(); for ( QObjectListIt objectit( *objects ) ; *objectit; ++objectit ) { qThreadTerminationHandlerRecursive((*objectit), originThread, destinationThread); } -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT } /*!\internal @@ -4190,7 +4190,7 @@ bool QApplication::desktopSettingsAware() \sa lock(), unlock() \link threads.html Thread Support in Qt\endlink */ -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) void QApplication::lock() { qt_mutex->lock(); diff --git a/src/kernel/qapplication.h b/src/kernel/qapplication.h index bc24bc6..dca2138 100644 --- a/src/kernel/qapplication.h +++ b/src/kernel/qapplication.h @@ -61,10 +61,10 @@ class QIMEvent; class QWSDecoration; #endif -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT class QMutex; class QThread; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT class QApplication; @@ -297,7 +297,7 @@ public: static bool x11_apply_settings(); #endif void wakeUpGuiThread(); -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) void lock(); void unlock(bool wakeUpGui = TRUE); bool locked(); @@ -354,9 +354,9 @@ private slots: #endif public: -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT static QMutex *qt_mutex; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT private: int app_argc; @@ -372,7 +372,7 @@ private: #ifndef QT_NO_CURSOR static QCursor *app_cursor; #endif -#ifndef TQT_THREAD_SUPPORT +#ifndef QT_THREAD_SUPPORT static QEventLoop* eventloop; #endif static int app_tracking; @@ -436,9 +436,9 @@ private: friend class QDialog; friend class QAccelManager; friend class QEvent; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT friend class QThread; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT friend class QTranslator; friend class QEventLoop; friend Q_EXPORT void qt_ucm_initialize( QApplication * ); @@ -458,7 +458,7 @@ private: static QEventLoop* currentEventLoop(); public: -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT static QThread* guiThread(); static void threadTerminationHandler( QThread * ); #endif diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index 35abe06..c93c60f 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -97,7 +97,7 @@ #endif // QT_NO_IM #include "qinternal_p.h" // shared double buffer cleanup -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) # include "qthread.h" #endif @@ -1645,7 +1645,7 @@ void qt_init_internal( int *argcptr, char **argv, setlocale( LC_ALL, "" ); // use correct char set mapping setlocale( LC_NUMERIC, "C" ); // make sprintf()/scanf() work -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (( qt_is_gui_used ) && ( !display )) { // If Qt is running standalone with a GUI, initialize X11 threading XInitThreads(); @@ -2210,7 +2210,7 @@ void qt_init_internal( int *argcptr, char **argv, QPainter::initialize(); } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) QThread::initialize(); #endif @@ -2498,7 +2498,7 @@ void qt_cleanup() QColor::cleanup(); QSharedDoubleBuffer::cleanup(); } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) QThread::cleanup(); #endif diff --git a/src/kernel/qeventloop.cpp b/src/kernel/qeventloop.cpp index dd88e78..82ff666 100644 --- a/src/kernel/qeventloop.cpp +++ b/src/kernel/qeventloop.cpp @@ -41,7 +41,7 @@ #include "qapplication.h" #include "qdatetime.h" -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include "qthread.h" # include "private/qthreadinstance_p.h" #endif @@ -116,7 +116,7 @@ QEventLoop::QEventLoop( QObject *parent, const char *name ) init(); -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QThread* thread = QThread::currentThreadObject(); if (thread) { if (thread->d) { @@ -135,7 +135,7 @@ QEventLoop::~QEventLoop() { cleanup(); delete d; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QThread* thread = QThread::currentThreadObject(); if (thread) { if (thread->d) { diff --git a/src/kernel/qeventloop.h b/src/kernel/qeventloop.h index 4aaee26..a3ee01d 100644 --- a/src/kernel/qeventloop.h +++ b/src/kernel/qeventloop.h @@ -59,9 +59,9 @@ struct timeval; //stdc struct struct TimerInfo; //internal structure (qeventloop_mac.cpp) #endif -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) class QMutex; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT class Q_EXPORT QEventLoop : public QObject diff --git a/src/kernel/qeventloop_unix_glib.cpp b/src/kernel/qeventloop_unix_glib.cpp index a71807a..c41acce 100644 --- a/src/kernel/qeventloop_unix_glib.cpp +++ b/src/kernel/qeventloop_unix_glib.cpp @@ -46,7 +46,7 @@ #include "qbitarray.h" #include "qmutex.h" -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #include "qthread.h" #endif @@ -55,11 +55,11 @@ #include -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #ifdef QT_USE_GLIBMAINLOOP extern QMutex *qt_timerListMutex; #endif // QT_USE_GLIBMAINLOOP -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT /***************************************************************************** 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 { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) qt_timerListMutex->lock(); #endif TimerInfo *t = timerList->first(); @@ -209,7 +209,7 @@ static void insertTimer( const TimerInfo *ti ) // insert timer info into list qDebug( "QObject: %d timers now exist for object %s::%s", dangerCount, ti->obj->className(), ti->obj->name() ); } #endif -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) qt_timerListMutex->unlock(); #endif } @@ -235,7 +235,7 @@ static inline void getTime( timeval &t ) // get time of day static void repairTimer( const timeval &time ) // repair broken timer { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) qt_timerListMutex->lock(); #endif timeval diff = watchtime - time; @@ -244,7 +244,7 @@ static void repairTimer( const timeval &time ) // repair broken timer t->timeout = t->timeout - diff; t = timerList->next(); } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) qt_timerListMutex->unlock(); #endif } @@ -262,7 +262,7 @@ static void repairTimer( const timeval &time ) // repair broken timer timeval *qt_wait_timer() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) qt_timerListMutex->lock(); #endif static timeval tm; @@ -288,19 +288,19 @@ timeval *qt_wait_timer() if ( qt_wait_timer_max && *qt_wait_timer_max < tm ) { tm = *qt_wait_timer_max; } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) qt_timerListMutex->unlock(); #endif return &tm; } if ( qt_wait_timer_max ) { tm = *qt_wait_timer_max; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) qt_timerListMutex->unlock(); #endif return &tm; } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) qt_timerListMutex->unlock(); #endif return 0; // no timers @@ -316,7 +316,7 @@ static void initTimers() // initialize timers timerBitVec->clearBit( i ); } timerList = new TimerList; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) qt_timerListMutex = new QMutex(true); #endif Q_CHECK_PTR( timerList ); @@ -336,18 +336,18 @@ void cleanupTimers() // Main timer functions for starting and killing timers int qStartTimer( int interval, QObject *obj ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->lock(); #endif if ( !timerList ) { // initialize timer data initTimers(); -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->lock(); #endif } int id = allocTimerId(); // get free timer id if ( (id <= 0) || (id > (int)timerBitVec->size()) || (!obj) ) { // cannot create timer -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->unlock(); #endif return 0; @@ -363,7 +363,7 @@ int qStartTimer( int interval, QObject *obj ) t->timeout = currentTime + t->interval; t->obj = obj; insertTimer( t ); // put timer in list -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->unlock(); #endif return id; @@ -371,12 +371,12 @@ int qStartTimer( int interval, QObject *obj ) bool qKillTimer( int id ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->lock(); #endif register TimerInfo *t; if ( (!timerList) || (id <= 0) || (id > (int)timerBitVec->size()) || (!timerBitVec->testBit( id-1 )) ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->unlock(); #endif return FALSE; // not init'd or invalid timer @@ -389,13 +389,13 @@ bool qKillTimer( int id ) bool ret; timerBitVec->clearBit( id-1 ); // set timer inactive ret = timerList->remove(); -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->unlock(); #endif return ret; } else { // id not found -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->unlock(); #endif return FALSE; @@ -404,12 +404,12 @@ bool qKillTimer( int id ) bool qKillTimer( QObject *obj ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->lock(); #endif register TimerInfo *t; if ( !timerList ) { // not initialized -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->unlock(); #endif return FALSE; @@ -425,7 +425,7 @@ bool qKillTimer( QObject *obj ) t = timerList->next(); } } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->unlock(); #endif return TRUE; @@ -632,11 +632,11 @@ int QEventLoop::timeToWait() const int QEventLoop::activateTimers() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->lock(); #endif if ( !timerList || !timerList->count() ) { // no timers -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->unlock(); #endif return 0; @@ -682,11 +682,11 @@ int QEventLoop::activateTimers() if ( t->interval.tv_usec > 0 || t->interval.tv_sec > 0 ) { n_act++; } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->unlock(); #endif QTimerEvent e( t->id ); -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) // Be careful...the current thread may not be the target object's thread! if ((!t->obj) || (QThread::currentThreadObject() && QThread::currentThreadObject()->threadPostedEventsDisabled()) || @@ -696,17 +696,17 @@ int QEventLoop::activateTimers() else { QApplication::postEvent( t->obj, new QTimerEvent(e) ); // post event to correct thread } -#else // defined(TQT_THREAD_SUPPORT) +#else // defined(QT_THREAD_SUPPORT) QApplication::sendEvent( t->obj, &e ); // send event -#endif // defined(TQT_THREAD_SUPPORT) -#if defined(TQT_THREAD_SUPPORT) +#endif // defined(QT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->lock(); #endif if ( timerList->findRef( begin ) == -1 ) { begin = 0; } } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (qt_timerListMutex) qt_timerListMutex->unlock(); #endif return n_act; @@ -731,7 +731,7 @@ int QEventLoop::activateSocketNotifiers() printf("activate sn : send event fd=%d\n", sn->gPollFD.fd ); #endif sn->pending = FALSE; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) // Be careful...the current thread may not be the target object's thread! if ((!sn->obj) || (QThread::currentThreadObject() && QThread::currentThreadObject()->threadPostedEventsDisabled()) || @@ -741,9 +741,9 @@ int QEventLoop::activateSocketNotifiers() else { QApplication::postEvent( sn->obj, new QEvent(event) ); // post event to correct thread } -#else // defined(TQT_THREAD_SUPPORT) +#else // defined(QT_THREAD_SUPPORT) QApplication::sendEvent( sn->obj, &event ); // send event -#endif // defined(TQT_THREAD_SUPPORT) +#endif // defined(QT_THREAD_SUPPORT) n_act++; } } diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp index cb019d3..2839ca0 100644 --- a/src/kernel/qeventloop_x11.cpp +++ b/src/kernel/qeventloop_x11.cpp @@ -43,9 +43,9 @@ #include "qcolor_p.h" #include "qt_x11_p.h" -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) # include "qmutex.h" -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #include @@ -138,7 +138,7 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags ) XEvent event; int nevents = 0; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) QMutexLocker locker( QApplication::qt_mutex ); #endif @@ -283,7 +283,7 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags ) // unlock the GUI mutex and select. when we return from this function, there is // something for us to do -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if ( locker.mutex() ) locker.mutex()->unlock(); else return false; #endif @@ -298,7 +298,7 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags ) } while (nsel == -1 && (errno == EINTR || errno == EAGAIN)); // relock the GUI mutex before processing any pending events -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if ( locker.mutex() ) locker.mutex()->lock(); else return false; #endif diff --git a/src/kernel/qeventloop_x11_glib.cpp b/src/kernel/qeventloop_x11_glib.cpp index 5c38c7b..2bf1f63 100644 --- a/src/kernel/qeventloop_x11_glib.cpp +++ b/src/kernel/qeventloop_x11_glib.cpp @@ -46,10 +46,10 @@ #include "qcolor_p.h" #include "qt_x11_p.h" -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) # include "qmutex.h" # include "qthread.h" -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #include @@ -295,7 +295,7 @@ bool QEventLoop::processX11Events() XEvent event; int nevents = 0; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) QMutexLocker locker( QApplication::qt_mutex ); #endif @@ -383,7 +383,7 @@ bool QEventLoop::gsourcePrepare(GSource *gs, int * timeout) ProcessEventsFlags flags = d->pev_flags; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) QMutexLocker locker( QApplication::qt_mutex ); #endif @@ -535,10 +535,10 @@ bool QEventLoop::gsourceDispatch(GSource *gs) { Q_UNUSED(gs); // relock the GUI mutex before processing any pending events -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) QMutexLocker locker( QApplication::qt_mutex ); #endif -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (locker.mutex()) locker.mutex()->lock(); #endif @@ -608,13 +608,13 @@ bool QEventLoop::gsourceDispatch(GSource *gs) { // color approx. optimization - only on X11 qt_reset_color_avail(); -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (locker.mutex()) locker.mutex()->unlock(); #endif processX11Events(); } else { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) if (locker.mutex()) locker.mutex()->unlock(); #endif } @@ -629,9 +629,9 @@ bool QEventLoop::gsourceDispatch(GSource *gs) { bool QEventLoop::hasPendingEvents() const { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( QApplication::qt_mutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT extern uint qGlobalPostedEventsCount(); // from qapplication.cpp return ( qGlobalPostedEventsCount() || ( (qt_is_gui_used && QApplication::isGuiThread()) ? XPending( QPaintDevice::x11AppDisplay() ) : 0)); diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp index 477cd33..fea0b58 100644 --- a/src/kernel/qfont_x11.cpp +++ b/src/kernel/qfont_x11.cpp @@ -269,13 +269,13 @@ void QFont::initialize() QString sample; if ( ttmp != -1 ) { -#if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) +#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) // use the reentrant versions of localtime() where available tm res; tt = localtime_r( &ttmp, &res ); #else tt = localtime( &ttmp ); -#endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS +#endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS if ( tt != 0 && strftime( samp, 64, "%A%B", tt ) > 0 ) if ( codec ) diff --git a/src/kernel/qgplugin.h b/src/kernel/qgplugin.h index fc36be0..5ebcc5d 100644 --- a/src/kernel/qgplugin.h +++ b/src/kernel/qgplugin.h @@ -66,7 +66,7 @@ #endif #ifndef Q_EXPORT_PLUGIN -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #define QT_THREADED_BUILD 1 #define Q_PLUGIN_FLAGS_STRING "11" #else diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp index 1bc0499..ba12615 100644 --- a/src/kernel/qmetaobject.cpp +++ b/src/kernel/qmetaobject.cpp @@ -41,9 +41,9 @@ #include "qmetaobject.h" #include "qasciidict.h" -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #include -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT /*! \class QMetaData qmetaobject.h @@ -282,10 +282,10 @@ QMetaObject::~QMetaObject() delete slotDict; // delete dicts delete signalDict; delete d; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker( qt_global_mutexpool ? qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( qt_metaobjects ) { qt_metaobjects->remove( classname ); if ( qt_metaobjects->isEmpty() ) { @@ -799,10 +799,10 @@ QMetaObject *QMetaObject::metaObject( const char *class_name ) { if ( !qt_metaobjects ) return 0; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker( qt_global_mutexpool ? qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT QtStaticMetaObjectFunction func = (QtStaticMetaObjectFunction)qt_metaobjects->find( class_name ); if ( func ) return func(); @@ -814,10 +814,10 @@ bool QMetaObject::hasMetaObject( const char *class_name ) { if ( !qt_metaobjects ) return FALSE; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker( qt_global_mutexpool ? qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT return !!qt_metaobjects->find( class_name ); } @@ -1204,10 +1204,10 @@ bool QMetaProperty::reset( QObject* o ) const QMetaObjectCleanUp::QMetaObjectCleanUp( const char *mo_name, QtStaticMetaObjectFunction func ) : metaObject( 0 ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker( qt_global_mutexpool ? qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( !qt_metaobjects ) qt_metaobjects = new QAsciiDict( 257 ); qt_metaobjects->insert( mo_name, (void*)func ); @@ -1226,10 +1226,10 @@ QMetaObjectCleanUp::QMetaObjectCleanUp() QMetaObjectCleanUp::~QMetaObjectCleanUp() { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker( qt_global_mutexpool ? qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( !--qt_metaobjects_count ) { delete qt_metaobjects; qt_metaobjects = 0; diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp index 607a035..b48531e 100644 --- a/src/kernel/qobject.cpp +++ b/src/kernel/qobject.cpp @@ -52,7 +52,7 @@ // QStyleControlElementData #include "qstyle.h" -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #include "qmutex.h" #include #include "qthread.h" @@ -130,16 +130,16 @@ QStyleControlElementDataPrivate* QObject::controlElementDataPrivateObject() { return d->controlElementDataPrivate; } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) void QObject::moveToThread_helper(QThread *targetThread) { QEvent e(QEvent::ThreadChange); QApplication::sendEvent(this, &e); -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( d->childObjectListMutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if (childObjects) { QObject *child; @@ -155,9 +155,9 @@ void QObject::setThreadObject_helper(QThread *targetThread) { d->ownThread = targetThread; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( d->childObjectListMutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if (childObjects) { QObject *child; @@ -185,9 +185,9 @@ void QObject::setThreadObject_helper(QThread *targetThread) */ void QObject::moveToThread(QThread *targetThread) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( QApplication::qt_mutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if (parentObj) { #if defined(QT_DEBUG) @@ -491,7 +491,7 @@ void *qt_find_obj_child( QObject *parent, const char *type, const char *name ) return 0; } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT /*! Returns a pointer to the QThread* associated with @@ -530,12 +530,12 @@ static void qt_spy_signal( QObject* sender, int signal, QUObject* o ) s.sprintf( "%s_%s", mo->className(), sigData->name ); int slot = qt_preliminary_signal_spy->metaObject()->findSlot( s, TRUE ); if ( slot >= 0 ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT // protect access to qt_spy_signal_sender void * const address = &qt_spy_signal_sender; QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( address ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT QObject* old_sender = qt_spy_signal_sender; qt_spy_signal_sender = sender; @@ -554,7 +554,7 @@ static void qt_spy_signal( QObject* sender, int signal, QUObject* o ) static QObjectList* object_trees = 0; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT static QMutex *obj_trees_mutex = 0; #endif @@ -562,7 +562,7 @@ static void cleanup_object_trees() { delete object_trees; object_trees = 0; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT delete obj_trees_mutex; obj_trees_mutex = 0; #endif @@ -576,7 +576,7 @@ static void ensure_object_trees() static void insert_tree( QObject* obj ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if ( !obj_trees_mutex ) obj_trees_mutex = new QMutex(); QMutexLocker locker( obj_trees_mutex ); @@ -589,7 +589,7 @@ static void insert_tree( QObject* obj ) static void remove_tree( QObject* obj ) { if ( object_trees ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( obj_trees_mutex ); #endif object_trees->removeRef( obj ); @@ -780,10 +780,10 @@ QObject::~QObject() delete childObjects; } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT delete d->childObjectListMutex; delete d->senderObjectListMutex; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT delete d; } @@ -1079,17 +1079,17 @@ bool QObject::event( QEvent *e ) QSenderObjectList* sol; QObject* oldSender = 0; sol = senderObjects; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( sol ) { oldSender = sol->currentSender; sol->ref(); sol->currentSender = metaEvent->sender(); } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT QUObject *o = metaEvent->data(); if (metaEvent->type() == QMetaCallEvent::MetaCallEmit) { qt_emit( metaEvent->id(), o ); @@ -1097,9 +1097,9 @@ bool QObject::event( QEvent *e ) if (metaEvent->type() == QMetaCallEvent::MetaCallInvoke) { qt_invoke( metaEvent->id(), o ); } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if (sol ) { sol->currentSender = oldSender; if ( sol->deref() ) { @@ -1108,9 +1108,9 @@ bool QObject::event( QEvent *e ) sol = NULL; } } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if (sol) sol->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT } else { qWarning("QObject: Ignoring metacall event from non-owning thread"); @@ -1617,9 +1617,9 @@ QConnectionList *QObject::receivers( int signal ) const void QObject::insertChild( QObject *obj ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( d->childObjectListMutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( obj->isTree ) { remove_tree( obj ); @@ -1663,9 +1663,9 @@ void QObject::insertChild( QObject *obj ) void QObject::removeChild( QObject *obj ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( d->childObjectListMutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( childObjects && childObjects->removeRef(obj) ) { obj->parentObj = 0; @@ -1903,12 +1903,12 @@ const QObject *QObject::sender() { #ifndef QT_NO_PRELIMINARY_SIGNAL_SPY if ( this == qt_preliminary_signal_spy ) { -# ifdef TQT_THREAD_SUPPORT +# ifdef QT_THREAD_SUPPORT // protect access to qt_spy_signal_sender void * const address = &qt_spy_signal_sender; QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( address ) : 0 ); -# endif // TQT_THREAD_SUPPORT +# endif // QT_THREAD_SUPPORT return qt_spy_signal_sender; } #endif @@ -2252,24 +2252,24 @@ void QObject::connectInternal( const QObject *sender, int signal_index, const QO Q_CHECK_PTR( c ); clist->append( c ); if ( !r->senderObjects ) { // create list of senders -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT r->d->senderObjectListMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT r->senderObjects = new QSenderObjectList; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT r->senderObjects->listMutex->lock(); r->d->senderObjectListMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT } else { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT r->senderObjects->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT } r->senderObjects->append( s ); // add sender to list -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT r->senderObjects->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT } @@ -2475,25 +2475,25 @@ bool QObject::disconnectInternal( const QObject *sender, int signal_index, c = clist->first(); while ( c ) { // for all receivers... if ( r == 0 ) { // remove all receivers -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT removeObjFromList( c->object()->senderObjects, s ); -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT success = TRUE; c = clist->next(); } else if ( r == c->object() && ( (member_index == -1) || ((member_index == c->member()) && (c->memberType() == membcode)) ) ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT removeObjFromList( c->object()->senderObjects, s, TRUE ); -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT success = TRUE; clist->remove(); c = clist->current(); @@ -2512,25 +2512,25 @@ bool QObject::disconnectInternal( const QObject *sender, int signal_index, c = clist->first(); while ( c ) { // for all receivers... if ( r == 0 ) { // remove all receivers -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT removeObjFromList( c->object()->senderObjects, s, TRUE ); -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT success = TRUE; c = clist->next(); } else if ( r == c->object() && ( (member_index == -1) || ((member_index == c->member()) && (c->memberType() == membcode)) ) ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT removeObjFromList( c->object()->senderObjects, s, TRUE ); -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT success = TRUE; clist->remove(); c = clist->current(); @@ -2772,9 +2772,9 @@ void QObject::activate_signal( QConnectionList *clist, QUObject *o ) c = clist->first(); object = c->object(); sol = object->senderObjects; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( sol ) { oldSender = sol->currentSender; sol->ref(); @@ -2785,13 +2785,13 @@ void QObject::activate_signal( QConnectionList *clist, QUObject *o ) (object->d->disableThreadPostedEvents) || (currentThread && currentThread->threadPostedEventsDisabled()) || (currentThread && object->d->ownThread == currentThread)) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT object->qt_emit( c->member(), o ); -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT } else { if (object->d->ownThread && !object->d->ownThread->finished()) { @@ -2807,13 +2807,13 @@ void QObject::activate_signal( QConnectionList *clist, QUObject *o ) (object->d->disableThreadPostedEvents) || (currentThread && currentThread->threadPostedEventsDisabled()) || (currentThread && object->d->ownThread == currentThread)) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT object->qt_invoke( c->member(), o ); -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT } else { if (object->d->ownThread && !object->d->ownThread->finished()) { @@ -2832,9 +2832,9 @@ void QObject::activate_signal( QConnectionList *clist, QUObject *o ) sol = NULL; } } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if (sol) sol->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT } else { QConnection *cd = 0; QConnectionListIt it(*clist); @@ -2845,9 +2845,9 @@ void QObject::activate_signal( QConnectionList *clist, QUObject *o ) cd = c; object = c->object(); sol = object->senderObjects; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( sol ) { oldSender = sol->currentSender; sol->ref(); @@ -2858,13 +2858,13 @@ void QObject::activate_signal( QConnectionList *clist, QUObject *o ) (object->d->disableThreadPostedEvents) || (currentThread && currentThread->threadPostedEventsDisabled()) || (currentThread && object->d->ownThread == currentThread)) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT object->qt_emit( c->member(), o ); -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT } else { if (object->d->ownThread && !object->d->ownThread->finished()) { @@ -2880,13 +2880,13 @@ void QObject::activate_signal( QConnectionList *clist, QUObject *o ) (object->d->disableThreadPostedEvents) || (currentThread && currentThread->threadPostedEventsDisabled()) || (currentThread && object->d->ownThread == currentThread)) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT object->qt_invoke( c->member(), o ); -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT sol->listMutex->lock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT } else { if (object->d->ownThread && !object->d->ownThread->finished()) { @@ -2905,9 +2905,9 @@ void QObject::activate_signal( QConnectionList *clist, QUObject *o ) sol = NULL; } } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT if (sol) sol->listMutex->unlock(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT } } } @@ -3046,9 +3046,9 @@ void QObject::dumpObjectTree() void QObject::dumpObjectInfo() { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( d->senderObjectListMutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #if defined(QT_DEBUG) qDebug( "OBJECT %s::%s", className(), name( "unnamed" ) ); diff --git a/src/kernel/qobject.h b/src/kernel/qobject.h index 1cdc677..3a86cb9 100644 --- a/src/kernel/qobject.h +++ b/src/kernel/qobject.h @@ -64,7 +64,7 @@ class QObjectUserData; #endif struct QUObject; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT class QThread; #endif @@ -230,14 +230,14 @@ private: // Disabled copy constructor and operator= #endif public: -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QThread* contextThreadObject() const; void moveToThread(QThread *targetThread); void disableThreadPostedEvents(bool disable); #endif private: -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT void moveToThread_helper(QThread *targetThread); void setThreadObject_helper(QThread *targetThread); #endif diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp index 9cab1f5..4eeb823 100644 --- a/src/kernel/qthread.cpp +++ b/src/kernel/qthread.cpp @@ -36,7 +36,7 @@ ** **********************************************************************/ -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #include "qplatformdefs.h" @@ -132,9 +132,9 @@ QThread::QThread() { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( QApplication::qt_mutex ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT d = new QThreadInstance; d->init(0); @@ -282,4 +282,4 @@ void QEventLoopThread::run() if (eventLoop) eventLoop->exec(); } -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT diff --git a/src/kernel/qthread.h b/src/kernel/qthread.h index 2dae5ab..675e3a3 100644 --- a/src/kernel/qthread.h +++ b/src/kernel/qthread.h @@ -41,7 +41,7 @@ #ifndef QTHREAD_H #define QTHREAD_H -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #ifndef QT_H #include "qwindowdefs.h" @@ -150,6 +150,6 @@ class Q_EXPORT QEventLoopThread : public QThread virtual void run(); }; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #endif // QTHREAD_H diff --git a/src/kernel/qthread_unix.cpp b/src/kernel/qthread_unix.cpp index 4d70385..1358250 100644 --- a/src/kernel/qthread_unix.cpp +++ b/src/kernel/qthread_unix.cpp @@ -36,7 +36,7 @@ ** **********************************************************************/ -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #include "qplatformdefs.h" @@ -557,4 +557,4 @@ QThread *QThread::currentThreadObject() } -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp index 1f24dc5..461c7f3 100644 --- a/src/kernel/qwidget.cpp +++ b/src/kernel/qwidget.cpp @@ -56,7 +56,7 @@ #include "qstyle.h" #include "qmetaobject.h" #include "qguardedptr.h" -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #include "qthread.h" #endif #if defined(QT_ACCESSIBILITY_SUPPORT) @@ -890,7 +890,7 @@ QWidget::QWidget( QWidget *parent, const char *name, WFlags f, NFlags n ) } #endif -#if defined(TQT_THREAD_SUPPORT) && defined(QT_CHECK_STATE) +#if defined(QT_THREAD_SUPPORT) && defined(QT_CHECK_STATE) if (QThread::currentThreadObject() != QApplication::guiThread()) { qFatal( "QWidget: Cannot create a QWidget outside of the main GUI thread" ); } diff --git a/src/moc/moc.y b/src/moc/moc.y index 5759d34..90f72ab 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -2987,8 +2987,8 @@ void generateClass() // generate C++ source code for a class // fprintf( out, "QMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() ); fprintf( out, " if ( metaObj ) {\n\treturn metaObj;\n}\n" ); - fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n if (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->lock();\n" ); - fprintf( out, " if ( metaObj ) {\n\tif (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n }\n#endif // TQT_THREAD_SUPPORT\n" ); + fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->lock();\n" ); + fprintf( out, " if ( metaObj ) {\n\tif (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n }\n#endif // QT_THREAD_SUPPORT\n" ); if ( isQObject ) fprintf( out, " QMetaObject* parentObject = staticQtMetaObject();\n" ); 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 // fprintf( out, " cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() ); - fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n if (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->unlock();\n#endif // TQT_THREAD_SUPPORT\n" ); + fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->unlock();\n#endif // QT_THREAD_SUPPORT\n" ); fprintf( out, " return metaObj;\n}\n" ); // diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index f49b2c1..bf152b3 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -5813,8 +5813,8 @@ void generateClass() // generate C++ source code for a class // fprintf( out, "QMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() ); fprintf( out, " if ( metaObj ) {\n\treturn metaObj;\n}\n" ); - fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n if (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->lock();\n" ); - fprintf( out, " if ( metaObj ) {\n\tif (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n }\n#endif // TQT_THREAD_SUPPORT\n" ); + fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->lock();\n" ); + fprintf( out, " if ( metaObj ) {\n\tif (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n }\n#endif // QT_THREAD_SUPPORT\n" ); if ( isQObject ) fprintf( out, " QMetaObject* parentObject = staticQtMetaObject();\n" ); else if ( !g->superClassName.isEmpty() ) @@ -5884,7 +5884,7 @@ void generateClass() // generate C++ source code for a class // Setup cleanup handler and return meta object // fprintf( out, " cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() ); - fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n if (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->unlock();\n#endif // TQT_THREAD_SUPPORT\n" ); + fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->unlock();\n#endif // QT_THREAD_SUPPORT\n" ); fprintf( out, " return metaObj;\n}\n" ); // diff --git a/src/qt.pro b/src/qt.pro index 9abbcb0..97867f2 100644 --- a/src/qt.pro +++ b/src/qt.pro @@ -121,7 +121,7 @@ thread { !win32-borland:TARGET = qt-mt win32-borland:TARGET = qtmt embedded:TARGET = qte-mt - DEFINES += TQT_THREAD_SUPPORT + DEFINES += QT_THREAD_SUPPORT } !cups:DEFINES += QT_NO_CUPS diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h index 65a47c7..f563d4f 100644 --- a/src/tools/qcom_p.h +++ b/src/tools/qcom_p.h @@ -273,7 +273,7 @@ public: \ ulong release() {if(!--qtrefcount){delete this;return 0;}return qtrefcount;} #ifndef Q_EXPORT_COMPONENT -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #define QT_THREADED_BUILD 1 #define Q_UCM_FLAGS_STRING "11" #else diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp index 2c7da71..8d13549 100644 --- a/src/tools/qcomlibrary.cpp +++ b/src/tools/qcomlibrary.cpp @@ -48,9 +48,9 @@ #include #endif // NO_ERROR_H -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include "qmutexpool_p.h" -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #ifndef QT_DEBUG_COMPONENT # if defined(QT_DEBUG) @@ -94,7 +94,7 @@ static bool qt_verify( const QString& library, uint version, uint flags, const QCString &key, bool warn ) { uint our_flags = 1; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) our_flags |= 2; #endif @@ -398,10 +398,10 @@ void QComLibrary::createInstanceInternal() bool query_done = FALSE; bool warn_mismatch = TRUE; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &cache ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( ! cache ) { cache = new QSettings; diff --git a/src/tools/qcriticalsection_p.cpp b/src/tools/qcriticalsection_p.cpp index dd2ba70..cc625d2 100644 --- a/src/tools/qcriticalsection_p.cpp +++ b/src/tools/qcriticalsection_p.cpp @@ -36,7 +36,7 @@ ** **********************************************************************/ -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #include "qt_windows.h" diff --git a/src/tools/qcriticalsection_p.h b/src/tools/qcriticalsection_p.h index cd0a047..9e2f555 100644 --- a/src/tools/qcriticalsection_p.h +++ b/src/tools/qcriticalsection_p.h @@ -54,7 +54,7 @@ // // -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #if defined(Q_WS_WIN) diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp index 002ea59..9abf9e7 100644 --- a/src/tools/qcstring.cpp +++ b/src/tools/qcstring.cpp @@ -43,9 +43,9 @@ #include "qregexp.h" #include "qdatastream.h" -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #include #include @@ -312,10 +312,10 @@ Q_UINT16 qChecksum( const char *data, uint len ) { if ( !crc_tbl_init ) { // create lookup table -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &crc_tbl_init ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( !crc_tbl_init ) { createCRC16Table(); diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp index b4307f9..6e96161 100644 --- a/src/tools/qdatetime.cpp +++ b/src/tools/qdatetime.cpp @@ -1039,7 +1039,7 @@ QDate QDate::currentDate( Qt::TimeSpec ts ) time( <ime ); tm *t; -# if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) +# if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) // use the reentrant versions of localtime() and gmtime() where available tm res; if ( ts == Qt::LocalTime ) @@ -1051,7 +1051,7 @@ QDate QDate::currentDate( Qt::TimeSpec ts ) t = localtime( <ime ); else t = gmtime( <ime ); -# endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS +# endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS d.jd = gregorianToJulian( t->tm_year + 1900, t->tm_mon + 1, t->tm_mday ); #endif @@ -1729,7 +1729,7 @@ bool QTime::currentTime( QTime *ct, Qt::TimeSpec ts ) time_t ltime = tv.tv_sec; tm *t; -# if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) +# if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) // use the reentrant versions of localtime() and gmtime() where available tm res; if ( ts == Qt::LocalTime ) @@ -1741,7 +1741,7 @@ bool QTime::currentTime( QTime *ct, Qt::TimeSpec ts ) t = localtime( <ime ); else t = gmtime( <ime ); -# endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS +# endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS ct->ds = (uint)( MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min + 1000 * t->tm_sec + tv.tv_usec / 1000 ); @@ -2042,7 +2042,7 @@ void QDateTime::setTime_t( time_t secsSince1Jan1970UTC, Qt::TimeSpec ts ) time_t tmp = secsSince1Jan1970UTC; tm *brokenDown = 0; -#if defined(Q_OS_UNIX) && defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) +#if defined(Q_OS_UNIX) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) // posix compliant system // use the reentrant versions of localtime() and gmtime() where available tm res; diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp index 05b434c..5c0c393 100644 --- a/src/tools/qdir_unix.cpp +++ b/src/tools/qdir_unix.cpp @@ -48,9 +48,9 @@ #include "qregexp.h" #include "qstringlist.h" -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #include #include @@ -237,7 +237,7 @@ bool QDir::readDirEntries( const QString &nameFilter, if ( !dir ) return FALSE; // cannot read the directory -#if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) +#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) union { struct dirent mt_file; char b[sizeof(struct dirent) + MAXNAMLEN + 1]; @@ -245,7 +245,7 @@ bool QDir::readDirEntries( const QString &nameFilter, while ( readdir_r(dir, &u.mt_file, &file ) == 0 && file ) #else while ( (file = readdir(dir)) ) -#endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS +#endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS { QString fn = QFile::decodeName(file->d_name); fi.setFile( *this, fn ); @@ -311,10 +311,10 @@ const QFileInfoList * QDir::drives() if ( !knownMemoryLeak ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &knownMemoryLeak ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( !knownMemoryLeak ) { knownMemoryLeak = new QFileInfoList; diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp index 298d1a2..8a27510 100644 --- a/src/tools/qgarray.cpp +++ b/src/tools/qgarray.cpp @@ -52,9 +52,9 @@ #include #include -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT /* If USE_MALLOC isn't defined, we use new[] and delete[] to allocate @@ -733,10 +733,10 @@ void QGArray::sort( uint sz ) if ( numItems < 2 ) return; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &cmp_item_size ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT cmp_item_size = sz; qsort( shd->data, numItems, sz, cmp_arr ); @@ -752,10 +752,10 @@ int QGArray::bsearch( const char *d, uint sz ) const if ( !numItems ) return -1; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &cmp_item_size ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT cmp_item_size = sz; char* r = (char*)::bsearch( d, shd->data, numItems, sz, cmp_arr ); diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp index c8ed5a6..fb94427 100644 --- a/src/tools/qglist.cpp +++ b/src/tools/qglist.cpp @@ -43,9 +43,9 @@ #include "qdatastream.h" #include "qvaluelist.h" -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #include "qmutex.h" -#endif // defined(TQT_THREAD_SUPPORT) +#endif // defined(QT_THREAD_SUPPORT) /*! \class QLNode qglist.h @@ -225,7 +225,7 @@ QDataStream &QGList::write( QDataStream &s, QPtrCollection::Item ) const QGList::QGList() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex = new QMutex(true); #endif firstNode = lastNode = curNode = 0; // initialize list @@ -241,7 +241,7 @@ QGList::QGList() QGList::QGList( const QGList & list ) : QPtrCollection( list ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex = new QMutex(true); #endif firstNode = lastNode = curNode = 0; // initialize list @@ -268,7 +268,7 @@ QGList::~QGList() // twice on the same address! This is insane but let's try not to crash // here. iterators = 0; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //delete mutex; #endif } @@ -337,11 +337,11 @@ bool QGList::operator==( const QGList &list ) const QLNode *QGList::locate( uint index ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif if ( index == (uint)curIndex ) { // current node ? -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return curNode; @@ -355,7 +355,7 @@ QLNode *QGList::locate( uint index ) bool forward; // direction to traverse if ( index >= numNodes ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return 0; @@ -388,7 +388,7 @@ QLNode *QGList::locate( uint index ) } } curIndex = index; // must update index -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return curNode = node; @@ -401,7 +401,7 @@ QLNode *QGList::locate( uint index ) void QGList::inSort( QPtrCollection::Item d ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif int index = 0; @@ -411,7 +411,7 @@ void QGList::inSort( QPtrCollection::Item d ) index++; } insertAt( index, d ); -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif } @@ -423,7 +423,7 @@ void QGList::inSort( QPtrCollection::Item d ) void QGList::prepend( QPtrCollection::Item d ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif register QLNode *n = new QLNode( newItem(d) ); @@ -436,7 +436,7 @@ void QGList::prepend( QPtrCollection::Item d ) firstNode = curNode = n; // curNode affected numNodes++; curIndex = 0; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif } @@ -448,7 +448,7 @@ void QGList::prepend( QPtrCollection::Item d ) void QGList::append( QPtrCollection::Item d ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif register QLNode *n = new QLNode( newItem(d) ); @@ -463,7 +463,7 @@ void QGList::append( QPtrCollection::Item d ) lastNode = curNode = n; // curNode affected curIndex = numNodes; numNodes++; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif } @@ -475,26 +475,26 @@ void QGList::append( QPtrCollection::Item d ) bool QGList::insertAt( uint index, QPtrCollection::Item d ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif if ( index == 0 ) { prepend( d ); -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return TRUE; } else if ( index == numNodes ) { append( d ); -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return TRUE; } QLNode *nextNode = locate( index ); if ( !nextNode ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return FALSE; @@ -509,7 +509,7 @@ bool QGList::insertAt( uint index, QPtrCollection::Item d ) n->next = nextNode; curNode = n; // curIndex set by locate() numNodes++; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return TRUE; @@ -522,11 +522,11 @@ bool QGList::insertAt( uint index, QPtrCollection::Item d ) void QGList::relinkNode( QLNode *n ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif if ( n == firstNode ) { // already first -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return; @@ -543,7 +543,7 @@ void QGList::relinkNode( QLNode *n ) firstNode = curNode = n; // curNode affected numNodes++; curIndex = 0; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif } @@ -555,11 +555,11 @@ void QGList::relinkNode( QLNode *n ) QLNode *QGList::unlink() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif if ( curNode == 0 ) { // null current node -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return 0; @@ -593,7 +593,7 @@ QLNode *QGList::unlink() iterators->notifyRemove( n, curNode ); } numNodes--; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return n; @@ -606,7 +606,7 @@ QLNode *QGList::unlink() bool QGList::removeNode( QLNode *n ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif #if defined(QT_CHECK_NULL) @@ -622,7 +622,7 @@ bool QGList::removeNode( QLNode *n ) delete n; curNode = firstNode; curIndex = curNode ? 0 : -1; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return TRUE; @@ -636,25 +636,25 @@ bool QGList::removeNode( QLNode *n ) bool QGList::remove( QPtrCollection::Item d ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif if ( d && find(d) == -1 ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return FALSE; } QLNode *n = unlink(); if ( !n ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return FALSE; } deleteItem( n->data ); delete n; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return TRUE; @@ -666,25 +666,25 @@ bool QGList::remove( QPtrCollection::Item d ) bool QGList::removeRef( QPtrCollection::Item d ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif if ( findRef(d) == -1 ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return FALSE; } QLNode *n = unlink(); if ( !n ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return FALSE; } deleteItem( n->data ); delete n; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return TRUE; @@ -708,25 +708,25 @@ bool QGList::removeRef( QPtrCollection::Item d ) bool QGList::removeAt( uint index ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif if ( !locate(index) ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return FALSE; } QLNode *n = unlink(); if ( !n ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return FALSE; } deleteItem( n->data ); delete n; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return TRUE; @@ -738,12 +738,12 @@ bool QGList::removeAt( uint index ) */ bool QGList::replaceAt( uint index, QPtrCollection::Item d ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif QLNode *n = locate( index ); if ( !n ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return FALSE; @@ -752,7 +752,7 @@ bool QGList::replaceAt( uint index, QPtrCollection::Item d ) deleteItem( n->data ); n->data = newItem( d ); } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return TRUE; @@ -766,14 +766,14 @@ bool QGList::replaceAt( uint index, QPtrCollection::Item d ) QPtrCollection::Item QGList::takeNode( QLNode *n ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif #if defined(QT_CHECK_NULL) if ( n == 0 || (n->prev && n->prev->next != n) || (n->next && n->next->prev != n) ) { qWarning( "QGList::takeNode: Corrupted node" ); -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return 0; @@ -785,7 +785,7 @@ QPtrCollection::Item QGList::takeNode( QLNode *n ) delete n; // delete the node, not data curNode = firstNode; curIndex = curNode ? 0 : -1; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return d; @@ -797,13 +797,13 @@ QPtrCollection::Item QGList::takeNode( QLNode *n ) QPtrCollection::Item QGList::take() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif QLNode *n = unlink(); // unlink node Item d = n ? n->data : 0; delete n; // delete node, keep contents -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return d; @@ -815,11 +815,11 @@ QPtrCollection::Item QGList::take() QPtrCollection::Item QGList::takeAt( uint index ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif if ( !locate(index) ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return 0; @@ -827,7 +827,7 @@ QPtrCollection::Item QGList::takeAt( uint index ) QLNode *n = unlink(); // unlink node Item d = n ? n->data : 0; delete n; // delete node, keep contents -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return d; @@ -839,14 +839,14 @@ QPtrCollection::Item QGList::takeAt( uint index ) QPtrCollection::Item QGList::takeFirst() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif first(); QLNode *n = unlink(); // unlink node Item d = n ? n->data : 0; delete n; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return d; @@ -858,14 +858,14 @@ QPtrCollection::Item QGList::takeFirst() QPtrCollection::Item QGList::takeLast() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif last(); QLNode *n = unlink(); // unlink node Item d = n ? n->data : 0; delete n; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return d; @@ -878,7 +878,7 @@ QPtrCollection::Item QGList::takeLast() void QGList::clear() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif register QLNode *n = firstNode; @@ -898,7 +898,7 @@ void QGList::clear() n = n->next; delete prevNode; // deallocate node } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif } @@ -911,7 +911,7 @@ void QGList::clear() int QGList::findRef( QPtrCollection::Item d, bool fromStart ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif register QLNode *n; @@ -929,7 +929,7 @@ int QGList::findRef( QPtrCollection::Item d, bool fromStart ) } curNode = n; curIndex = n ? index : -1; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return curIndex; // return position of item @@ -943,7 +943,7 @@ int QGList::findRef( QPtrCollection::Item d, bool fromStart ) int QGList::find( QPtrCollection::Item d, bool fromStart ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif register QLNode *n; @@ -961,7 +961,7 @@ int QGList::find( QPtrCollection::Item d, bool fromStart ) } curNode = n; curIndex = n ? index : -1; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return curIndex; // return position of item @@ -974,7 +974,7 @@ int QGList::find( QPtrCollection::Item d, bool fromStart ) uint QGList::containsRef( QPtrCollection::Item d ) const { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif register QLNode *n = firstNode; @@ -984,7 +984,7 @@ uint QGList::containsRef( QPtrCollection::Item d ) const count++; n = n->next; } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return count; @@ -997,7 +997,7 @@ uint QGList::containsRef( QPtrCollection::Item d ) const uint QGList::contains( QPtrCollection::Item d ) const { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif register QLNode *n = firstNode; @@ -1008,7 +1008,7 @@ uint QGList::contains( QPtrCollection::Item d ) const count++; n = n->next; } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return count; @@ -1058,17 +1058,17 @@ uint QGList::contains( QPtrCollection::Item d ) const QPtrCollection::Item QGList::first() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif if ( firstNode ) { curIndex = 0; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return (curNode=firstNode)->data; } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return 0; @@ -1080,17 +1080,17 @@ QPtrCollection::Item QGList::first() QPtrCollection::Item QGList::last() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif if ( lastNode ) { curIndex = numNodes-1; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return (curNode=lastNode)->data; } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return 0; @@ -1102,14 +1102,14 @@ QPtrCollection::Item QGList::last() QPtrCollection::Item QGList::next() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif if ( curNode ) { if ( curNode->next ) { curIndex++; curNode = curNode->next; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return curNode->data; @@ -1117,7 +1117,7 @@ QPtrCollection::Item QGList::next() curIndex = -1; curNode = 0; } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return 0; @@ -1129,14 +1129,14 @@ QPtrCollection::Item QGList::next() QPtrCollection::Item QGList::prev() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif if ( curNode ) { if ( curNode->prev ) { curIndex--; curNode = curNode->prev; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return curNode->data; @@ -1144,7 +1144,7 @@ QPtrCollection::Item QGList::prev() curIndex = -1; curNode = 0; } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return 0; @@ -1157,12 +1157,12 @@ QPtrCollection::Item QGList::prev() void QGList::toVector( QGVector *vector ) const { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif vector->clear(); if ( !vector->resize( count() ) ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return; @@ -1174,14 +1174,14 @@ void QGList::toVector( QGVector *vector ) const n = n->next; i++; } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif } void QGList::heapSortPushDown( QPtrCollection::Item* heap, int first, int last ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif int r = first; @@ -1218,7 +1218,7 @@ void QGList::heapSortPushDown( QPtrCollection::Item* heap, int first, int last ) } } } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif } @@ -1233,12 +1233,12 @@ void QGList::heapSortPushDown( QPtrCollection::Item* heap, int first, int last ) void QGList::sort() { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif uint n = count(); if ( n < 2 ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return; @@ -1273,7 +1273,7 @@ void QGList::sort() } delete [] realheap; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif } @@ -1300,7 +1300,7 @@ QDataStream &operator<<( QDataStream &s, const QGList &list ) QDataStream &QGList::read( QDataStream &s ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif uint num; @@ -1326,7 +1326,7 @@ QDataStream &QGList::read( QDataStream &s ) } curNode = firstNode; curIndex = curNode ? 0 : -1; -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return s; @@ -1338,7 +1338,7 @@ QDataStream &QGList::read( QDataStream &s ) QDataStream &QGList::write( QDataStream &s ) const { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif s << count(); // write number of items @@ -1347,7 +1347,7 @@ QDataStream &QGList::write( QDataStream &s ) const write( s, n->data ); n = n->next; } -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return s; @@ -1361,13 +1361,13 @@ QDataStream &QGList::write( QDataStream &s ) const */ QLNode* QGList::erase( QLNode* it ) { -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->lock(); #endif QLNode* n = it; it = it->next; removeNode( n ); -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) //mutex->unlock(); #endif return it; diff --git a/src/tools/qglist.h b/src/tools/qglist.h index 14674c1..dfacf47 100644 --- a/src/tools/qglist.h +++ b/src/tools/qglist.h @@ -150,7 +150,7 @@ private: QLNode *locate( uint ); // get node at i'th pos QLNode *unlink(); // unlink node -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) // QMutex* mutex; #endif diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp index 44f5992..154d07d 100644 --- a/src/tools/qgvector.cpp +++ b/src/tools/qgvector.cpp @@ -51,9 +51,9 @@ #include "qdatastream.h" #include -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #define USE_MALLOC // comment to use new/delete @@ -405,10 +405,10 @@ void QGVector::sort() // sort vector } } -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &sort_vec ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT sort_vec = (QGVector*)this; qsort( vec, count(), sizeof(Item), cmp_vec ); diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp index 72294a9..a20ea83 100644 --- a/src/tools/qlocale.cpp +++ b/src/tools/qlocale.cpp @@ -3244,7 +3244,7 @@ QString QLocalePrivate::doubleToString(double d, QString digits; #ifdef QT_QLOCALE_USES_FCVT -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT static bool dummy_for_mutex; QMutex *fcvt_mutex = qt_global_mutexpool ? qt_global_mutexpool->get( &dummy_for_mutex ) : 0; # define FCVT_LOCK if (fcvt_mutex) fcvt_mutex->lock() diff --git a/src/tools/qmutex.h b/src/tools/qmutex.h index e9dd8ea..1dec4d2 100644 --- a/src/tools/qmutex.h +++ b/src/tools/qmutex.h @@ -45,7 +45,7 @@ #include "qglobal.h" #endif // QT_H -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) class QMutexPrivate; diff --git a/src/tools/qmutex_unix.cpp b/src/tools/qmutex_unix.cpp index d43fd03..fde558f 100644 --- a/src/tools/qmutex_unix.cpp +++ b/src/tools/qmutex_unix.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #include "qplatformdefs.h" @@ -720,4 +720,4 @@ int QMutex::level() \sa QMutexLocker::QMutexLocker() */ -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT diff --git a/src/tools/qmutexpool.cpp b/src/tools/qmutexpool.cpp index 6d61316..61b02d7 100644 --- a/src/tools/qmutexpool.cpp +++ b/src/tools/qmutexpool.cpp @@ -38,7 +38,7 @@ #include "qmutexpool_p.h" -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #include diff --git a/src/tools/qmutexpool_p.h b/src/tools/qmutexpool_p.h index 9568882..b7bcb33 100644 --- a/src/tools/qmutexpool_p.h +++ b/src/tools/qmutexpool_p.h @@ -51,7 +51,7 @@ // // -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #ifndef QT_H #include "qmutex.h" @@ -75,6 +75,6 @@ private: extern Q_EXPORT QMutexPool *qt_global_mutexpool; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #endif // QMUTEXPOOL_P_H diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp index 6d6790b..5b990f8 100644 --- a/src/tools/qregexp.cpp +++ b/src/tools/qregexp.cpp @@ -52,10 +52,10 @@ #include "qstring.h" #include "qtl.h" -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #include "qthreadstorage.h" #include -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #undef QT_TRANSLATE_NOOP #define QT_TRANSLATE_NOOP( context, sourceText ) sourceText @@ -3212,25 +3212,25 @@ struct QRegExpPrivate #ifndef QT_NO_REGEXP_OPTIM static QSingleCleanupHandler > cleanup_cache; -# ifndef TQT_THREAD_SUPPORT +# ifndef QT_THREAD_SUPPORT static QCache *engineCache = 0; -# endif // TQT_THREAD_SUPPORT +# endif // QT_THREAD_SUPPORT #endif // QT_NO_REGEXP_OPTIM static void regexpEngine( QRegExpEngine *&eng, const QString &pattern, bool caseSensitive, bool deref ) { -# ifdef TQT_THREAD_SUPPORT +# ifdef QT_THREAD_SUPPORT static QThreadStorage *> engineCaches; QCache *engineCache = 0; QThreadInstance *currentThread = QThreadInstance::current(); if (currentThread) engineCache = engineCaches.localData(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( !deref ) { #ifndef QT_NO_REGEXP_OPTIM -# ifdef TQT_THREAD_SUPPORT +# ifdef QT_THREAD_SUPPORT if ( currentThread ) # endif { @@ -3251,18 +3251,18 @@ static void regexpEngine( QRegExpEngine *&eng, const QString &pattern, if ( eng->deref() ) { #ifndef QT_NO_REGEXP_OPTIM -# ifdef TQT_THREAD_SUPPORT +# ifdef QT_THREAD_SUPPORT if ( currentThread ) # endif { if ( engineCache == 0 ) { engineCache = new QCache; engineCache->setAutoDelete( TRUE ); -# ifdef TQT_THREAD_SUPPORT +# ifdef QT_THREAD_SUPPORT engineCaches.setLocalData(engineCache); # else cleanup_cache.set( &engineCache ); -# endif // !TQT_THREAD_SUPPORT +# endif // !QT_THREAD_SUPPORT } if ( !pattern.isNull() && engineCache->insert(pattern, eng, 4 + pattern.length() / 4) ) diff --git a/src/tools/qsemaphore.cpp b/src/tools/qsemaphore.cpp index 500a29b..43ea17e 100644 --- a/src/tools/qsemaphore.cpp +++ b/src/tools/qsemaphore.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #include "qsemaphore.h" #include "qmutex.h" @@ -252,4 +252,4 @@ bool QSemaphore::tryAccess(int n) return TRUE; } -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT diff --git a/src/tools/qsemaphore.h b/src/tools/qsemaphore.h index 2bd2d98..24572a6 100644 --- a/src/tools/qsemaphore.h +++ b/src/tools/qsemaphore.h @@ -45,7 +45,7 @@ #include "qglobal.h" #endif // QT_H -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) class QSemaphorePrivate; diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index c7b0c95..1288fd7 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -93,9 +93,9 @@ #define ULLONG_MAX Q_UINT64_C(18446744073709551615) #endif -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) #include "qmutex.h" -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE extern QMutex *qt_sharedStringMutex; @@ -1053,9 +1053,9 @@ QStringData::QStringData() : QShared(), maxl(0), islatin1(FALSE), security_unpaged(FALSE) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) mutex = new QMutex(FALSE); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE ref(); } @@ -1067,9 +1067,9 @@ QStringData::QStringData(QChar *u, uint l, uint m) : QShared(), maxl(m), islatin1(FALSE), security_unpaged(FALSE) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) mutex = new QMutex(FALSE); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } QStringData::~QStringData() { @@ -1084,12 +1084,12 @@ QStringData::~QStringData() { if ( ascii ) { delete[] ascii; } -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) if ( mutex ) { delete mutex; mutex = NULL; } -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } void QStringData::setDirty() { @@ -1457,14 +1457,14 @@ QT_STATIC_CONST_IMPL QChar QChar::nbsp((ushort)0x00a0); QStringData* QString::makeSharedNull() { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) if (qt_sharedStringMutex) qt_sharedStringMutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if (QString::shared_null) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) if (qt_sharedStringMutex) qt_sharedStringMutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE return QString::shared_null; } @@ -1474,9 +1474,9 @@ QStringData* QString::makeSharedNull() that->d = QString::shared_null; #endif -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) if (qt_sharedStringMutex) qt_sharedStringMutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE return QString::shared_null; } @@ -1517,13 +1517,13 @@ QString::QString( const QString &s ) : d(s.d) { if ( d && (d != shared_null) ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE d->ref(); -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } } @@ -1676,20 +1676,20 @@ QString::~QString() return; } -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d->deref() ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE d->deleteSelf(); d = NULL; } else { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } } @@ -1711,22 +1711,22 @@ void QString::real_detach() void QString::deref() { if ( d && (d != shared_null) ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d->deref() ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d != shared_null ) { delete d; } d = 0; } else { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } } } @@ -1769,13 +1769,13 @@ void QStringData::deleteSelf() QString &QString::operator=( const QString &s ) { if ( s.d && (s.d != shared_null) ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) s.d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE s.d->ref(); -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) s.d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } deref(); d = s.d; @@ -1883,9 +1883,9 @@ void QString::truncate( uint newLen ) */ void QString::setLength( uint newLen ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d->count != 1 || newLen > d->maxl || ( newLen * 4 < d->maxl && d->maxl > 4 ) ) { @@ -1896,24 +1896,24 @@ void QString::setLength( uint newLen ) uint len = QMIN( d->len, newLen ); memcpy( nd, d->unicode, sizeof(QChar) * len ); bool unpaged = d->security_unpaged; -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE deref(); d = new QStringData( nd, newLen, newMax ); setSecurityUnPaged(unpaged); } else { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } } else { d->len = newLen; -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE d->setDirty(); } } @@ -1999,21 +1999,21 @@ void QString::squeeze() */ void QString::grow( uint newLen ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d->count != 1 || newLen > d->maxl ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE setLength( newLen ); } else { d->len = newLen; -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE d->setDirty(); } } @@ -6423,19 +6423,19 @@ QString QString::fromUcs2( const unsigned short *str ) */ QChar& QString::ref(uint i) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( (d->count != 1) || (i >= d->len) ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE subat( i ); } else { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } d->setDirty(); return d->unicode[i]; @@ -6523,9 +6523,9 @@ QString& QString::setUnicode( const QChar *unicode, uint len ) } } else { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d->count != 1 || len > d->maxl || ( len * 4 < d->maxl && d->maxl > 4 ) ) { // detach, grown or shrink uint newMax = computeNewMax( len ); @@ -6533,17 +6533,17 @@ QString& QString::setUnicode( const QChar *unicode, uint len ) if ( unicode ) { memcpy( nd, unicode, sizeof(QChar)*len ); } -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE deref(); d = new QStringData( nd, len, newMax ); } else { d->len = len; -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE d->setDirty(); if ( unicode ) { memcpy( d->unicode, unicode, sizeof(QChar)*len ); @@ -7254,9 +7254,9 @@ QConstString::QConstString( const QChar* unicode, uint length ) : */ QConstString::~QConstString() { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d->count > 1 ) { QChar* cp = QT_ALLOC_QCHAR_VEC( d->len ); @@ -7268,9 +7268,9 @@ QConstString::~QConstString() } // The original d->unicode is now unlinked. -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } /*! diff --git a/src/tools/qthreadinstance_p.h b/src/tools/qthreadinstance_p.h index 865664e..87dbe6c 100644 --- a/src/tools/qthreadinstance_p.h +++ b/src/tools/qthreadinstance_p.h @@ -51,7 +51,7 @@ // // -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #ifndef QT_H #include "qmutex.h" @@ -105,5 +105,5 @@ public: bool disableThreadPostedEvents : 1; }; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #endif // QTHREAD_P_H diff --git a/src/tools/qthreadstorage.h b/src/tools/qthreadstorage.h index df3c515..b012ede 100644 --- a/src/tools/qthreadstorage.h +++ b/src/tools/qthreadstorage.h @@ -39,7 +39,7 @@ #ifndef QTHREADSTORAGE_H #define QTHREADSTORAGE_H -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #ifndef QT_H #include "qglobal.h" @@ -90,6 +90,6 @@ public: { (void) d.set( t ); } }; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #endif // QTHREADSTORAGE_H diff --git a/src/tools/qthreadstorage_unix.cpp b/src/tools/qthreadstorage_unix.cpp index 3dddd88..248a0ad 100644 --- a/src/tools/qthreadstorage_unix.cpp +++ b/src/tools/qthreadstorage_unix.cpp @@ -36,7 +36,7 @@ ** **********************************************************************/ -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #include "qplatformdefs.h" @@ -346,4 +346,4 @@ void QThreadStorageData::finish( void **thread_storage ) \sa localData() hasLocalData() */ -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT diff --git a/src/tools/qwaitcondition.h b/src/tools/qwaitcondition.h index aad455e..ac263ed 100644 --- a/src/tools/qwaitcondition.h +++ b/src/tools/qwaitcondition.h @@ -45,7 +45,7 @@ #include "qglobal.h" #endif // QT_H -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #include diff --git a/src/tools/qwaitcondition_unix.cpp b/src/tools/qwaitcondition_unix.cpp index 4807cb5..5c3c23c 100644 --- a/src/tools/qwaitcondition_unix.cpp +++ b/src/tools/qwaitcondition_unix.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#if defined(TQT_THREAD_SUPPORT) +#if defined(QT_THREAD_SUPPORT) #include "qplatformdefs.h" @@ -313,4 +313,4 @@ bool QWaitCondition::wait(QMutex *mutex, unsigned long time) return (ret == 0); } -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT -- cgit v1.2.3