diff options
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 5cdb20522..6dbc044a4 100644 --- a/src/kernel/qmetaobject.cpp +++ b/src/kernel/qmetaobject.cpp @@ -283,8 +283,8 @@ TQMetaObject::~TQMetaObject() delete signalDict; delete d; #ifdef QT_THREAD_SUPPORT - TQMutexLocker( qt_global_mutexpool ? - qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + TQMutexLocker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); #endif // QT_THREAD_SUPPORT if ( qt_metaobjects ) { qt_metaobjects->remove( classname ); @@ -423,7 +423,7 @@ int TQMetaObject::findSignal( const char* n, bool super ) const if ( md ) { #if defined(QT_CHECK_RANGE) if ( offset != -1 ) { - qWarning( "TQMetaObject::findSignal:%s: Conflict with %s::%s", + tqWarning( "TQMetaObject::findSignal:%s: Conflict with %s::%s", className(), mo->className(), n ); return offset; } @@ -800,8 +800,8 @@ TQMetaObject *TQMetaObject::metaObject( const char *class_name ) if ( !qt_metaobjects ) return 0; #ifdef QT_THREAD_SUPPORT - TQMutexLocker( qt_global_mutexpool ? - qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + TQMutexLocker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); #endif // QT_THREAD_SUPPORT TQtStaticMetaObjectFunction func = (TQtStaticMetaObjectFunction)qt_metaobjects->find( class_name ); if ( func ) @@ -815,8 +815,8 @@ bool TQMetaObject::hasMetaObject( const char *class_name ) if ( !qt_metaobjects ) return FALSE; #ifdef QT_THREAD_SUPPORT - TQMutexLocker( qt_global_mutexpool ? - qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + TQMutexLocker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); #endif // QT_THREAD_SUPPORT return !!qt_metaobjects->find( class_name ); } @@ -1205,8 +1205,8 @@ TQMetaObjectCleanUp::TQMetaObjectCleanUp( const char *mo_name, TQtStaticMetaObje : metaObject( 0 ) { #ifdef QT_THREAD_SUPPORT - TQMutexLocker( qt_global_mutexpool ? - qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + TQMutexLocker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); #endif // QT_THREAD_SUPPORT if ( !qt_metaobjects ) qt_metaobjects = new TQAsciiDict<void>( 257 ); @@ -1227,8 +1227,8 @@ TQMetaObjectCleanUp::TQMetaObjectCleanUp() TQMetaObjectCleanUp::~TQMetaObjectCleanUp() { #ifdef QT_THREAD_SUPPORT - TQMutexLocker( qt_global_mutexpool ? - qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + TQMutexLocker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); #endif // QT_THREAD_SUPPORT if ( !--qt_metaobjects_count ) { delete qt_metaobjects; @@ -1245,7 +1245,7 @@ void TQMetaObjectCleanUp::setMetaObject( TQMetaObject *&mo ) { #if defined(QT_CHECK_RANGE) if ( metaObject ) - qWarning( "TQMetaObjectCleanUp::setMetaObject: Double use of TQMetaObjectCleanUp!" ); + tqWarning( "TQMetaObjectCleanUp::setMetaObject: Double use of TQMetaObjectCleanUp!" ); #endif metaObject = &mo; } |