diff options
| author | Michele Calgaro <[email protected]> | 2018-09-18 01:19:46 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-09-18 01:19:46 +0900 |
| commit | 2df70f03d493f5226821dd2e1da3759e3abceb02 (patch) | |
| tree | f105d7829be7401bd27b833e0e26cf64c6a62ad1 /src/kernel/qmetaobject.cpp | |
| parent | f849f22528ee9eb5eeb1f9aa92822846b2b3e01f (diff) | |
| download | qt3-2df70f03d493f5226821dd2e1da3759e3abceb02.tar.gz qt3-2df70f03d493f5226821dd2e1da3759e3abceb02.zip | |
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.
Diffstat (limited to 'src/kernel/qmetaobject.cpp')
| -rw-r--r-- | src/kernel/qmetaobject.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
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 <private/qmutexpool_p.h> -#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<void>( 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; |