diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tqthreadinstance_p.h | 2 | ||||
| -rw-r--r-- | src/tools/tqthreadstorage_unix.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/tqthreadinstance_p.h b/src/tools/tqthreadinstance_p.h index 2778d5daa..ea34f3c5f 100644 --- a/src/tools/tqthreadinstance_p.h +++ b/src/tools/tqthreadinstance_p.h @@ -100,7 +100,7 @@ public: static void finish( TQThreadInstance * ); #endif // Q_OS_WIN32 - static void finishGuiThread( TQThreadInstance *d ); + static void finishCoreThread( TQThreadInstance *d ); TQEventLoop* eventLoop; int cleanupType; diff --git a/src/tools/tqthreadstorage_unix.cpp b/src/tools/tqthreadstorage_unix.cpp index 977ccf6bb..71b10822b 100644 --- a/src/tools/tqthreadstorage_unix.cpp +++ b/src/tools/tqthreadstorage_unix.cpp @@ -90,14 +90,14 @@ TQThreadStorageData::TQThreadStorageData( void (*func)( void * ) ) TQThreadStorageData::~TQThreadStorageData() { - // The Gui thread has static storage duration, TQThreadStorage are almost always static (it's + // The core thread has static storage duration, TQThreadStorage are almost always static (it's // technically possible to allocate those in the heap, but it's quite unusual). It's impossible // to predict whichever of those one gets destroyed first, but usually it's a TQThreadStorage. // In that case we have to do the cleanup of its storage ourself as it won't be possible after // nullifying the destructor below. - TQThread *guiThread = TQApplication::guiThread(); - if (guiThread) { - TQThreadInstance *d = guiThread->d; + TQThread *coreThread = TQApplication::coreThread(); + if (coreThread) { + TQThreadInstance *d = coreThread->d; TQMutexLocker locker( d->mutex() ); if (d->thread_storage && d->thread_storage[id]) { thread_storage_usage[id].func( d->thread_storage[id] ); |