diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:11:59 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:11:59 -0600 |
commit | 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch) | |
tree | df1e10cc7504665622d096f9ba80dc9e56f3afb8 /src/tools/qthreadstorage_unix.cpp | |
parent | a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff) | |
download | qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip |
Undo prior accidental commit
Diffstat (limited to 'src/tools/qthreadstorage_unix.cpp')
-rw-r--r-- | src/tools/qthreadstorage_unix.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/qthreadstorage_unix.cpp b/src/tools/qthreadstorage_unix.cpp index 63dbb7a..248a0ad 100644 --- a/src/tools/qthreadstorage_unix.cpp +++ b/src/tools/qthreadstorage_unix.cpp @@ -80,7 +80,7 @@ QThreadStorageData::QThreadStorageData( void (*func)( void * ) ) thread_storage_usage[id].func = func; #ifdef QTHREADSTORAGE_DEBUG - tqDebug( "QThreadStorageData: allocated id %d", id ); + qDebug( "QThreadStorageData: allocated id %d", id ); #endif // QTHREADSTORAGE_DEBUG pthread_mutex_unlock( &thread_storage_mutex ); @@ -93,7 +93,7 @@ QThreadStorageData::~QThreadStorageData() thread_storage_usage[id].func = 0; #ifdef QTHREADSTORAGE_DEBUG - tqDebug( "QThreadStorageData: released id %d", id ); + qDebug( "QThreadStorageData: released id %d", id ); #endif // QTHREADSTORAGE_DEBUG pthread_mutex_unlock( &thread_storage_mutex ); @@ -103,7 +103,7 @@ void **QThreadStorageData::get() const { QThreadInstance *d = QThreadInstance::current(); if (!d) { - tqWarning("QThreadStorage can only be used with threads started with QThread"); + qWarning("QThreadStorage can only be used with threads started with QThread"); return 0; } QMutexLocker locker( d->mutex() ); @@ -114,13 +114,13 @@ void **QThreadStorageData::set( void *p ) { QThreadInstance *d = QThreadInstance::current(); if (!d) { - tqWarning("QThreadStorage can only be used with threads started with QThread"); + qWarning("QThreadStorage can only be used with threads started with QThread"); return 0; } QMutexLocker locker( d->mutex() ); if ( !d->thread_storage ) { #ifdef QTHREADSTORAGE_DEBUG - tqDebug( "QThreadStorageData: allocating storage for thread %lx", + qDebug( "QThreadStorageData: allocating storage for thread %lx", (unsigned long) pthread_self() ); #endif // QTHREADSTORAGE_DEBUG @@ -142,7 +142,7 @@ void QThreadStorageData::finish( void **thread_storage ) if ( ! thread_storage ) return; // nothing to do #ifdef QTHREADSTORAGE_DEBUG - tqDebug( "QThreadStorageData: destroying storage for thread %lx", + qDebug( "QThreadStorageData: destroying storage for thread %lx", (unsigned long) pthread_self() ); #endif // QTHREADSTORAGE_DEBUG @@ -150,7 +150,7 @@ void QThreadStorageData::finish( void **thread_storage ) if ( ! thread_storage[i] ) continue; if ( ! thread_storage_usage[i].used ) { #ifdef QT_CHECK_STATE - tqWarning( "QThreadStorage: thread %lx exited after QThreadStorage destroyed", + qWarning( "QThreadStorage: thread %lx exited after QThreadStorage destroyed", (unsigned long) pthread_self() ); #endif // QT_CHECK_STATE continue; |