diff options
Diffstat (limited to 'src/kernel/tqeventloop_x11.cpp')
| -rw-r--r-- | src/kernel/tqeventloop_x11.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/kernel/tqeventloop_x11.cpp b/src/kernel/tqeventloop_x11.cpp index 09fc42e82..97fb570dd 100644 --- a/src/kernel/tqeventloop_x11.cpp +++ b/src/kernel/tqeventloop_x11.cpp @@ -146,7 +146,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) if ( tqt_is_gui_used ) { TQApplication::sendPostedEvents(); - if (TQApplication::isGuiThread()) { + if (TQApplication::isCoreThread()) { // Two loops so that posted events accumulate while ( XPending( TQPaintDevice::x11AppDisplay() ) ) { // also flushes output buffer @@ -220,7 +220,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) static timeval zerotm; timeval *tm = 0; if ( ! ( flags & ExcludeTimers ) ) { - if (TQApplication::isGuiThread()) { + if (TQApplication::isCoreThread()) { tm = qt_wait_timer(); // wait for TQt timers if ( !canWait ) { if ( !tm ) @@ -235,7 +235,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) // Socket notifier events are only activated in the core application event loop, // so filter them out in other event loops. int highest = 0; - if (!(flags & ExcludeSocketNotifiers) && TQApplication::isGuiThread()) { + if (!(flags & ExcludeSocketNotifiers) && TQApplication::isCoreThread()) { // return the highest fd we can wait for input on if ( d->sn_highest >= 0 ) { // has socket notifier(s) if ( d->sn_vec[0].list && ! d->sn_vec[0].list->isEmpty() ) @@ -266,7 +266,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) FD_ZERO( &d->sn_vec[2].select_fds ); } - if ( tqt_is_gui_used && TQApplication::isGuiThread() ) { + if ( tqt_is_gui_used && TQApplication::isCoreThread() ) { // select for events on the event socket - only on X11 FD_SET( d->xfd, &d->sn_vec[0].select_fds ); highest = TQMAX( highest, d->xfd ); @@ -308,7 +308,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) // we are awake, broadcast it emit awake(); - emit tqApp->guiThreadAwake(); + emit tqApp->coreThreadAwake(); if (nsel == -1) { if (errno == EBADF) { @@ -374,7 +374,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) // activate socket notifiers if (!(flags & ExcludeSocketNotifiers) && nsel > 0 && d->sn_highest >= 0 && - TQApplication::isGuiThread()) { + TQApplication::isCoreThread()) { // if select says data is ready on any socket, then set the socket notifier // to pending int i; @@ -396,7 +396,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) // activate timers if ( ! ( flags & ExcludeTimers ) ) { - if (TQApplication::isGuiThread()) { + if (TQApplication::isCoreThread()) { nevents += activateTimers(); } } @@ -415,7 +415,7 @@ bool TQEventLoop::hasPendingEvents() const #endif // TQT_THREAD_SUPPORT extern uint qGlobalPostedEventsCount(); // from tqapplication.cpp - return ( qGlobalPostedEventsCount() || ( (tqt_is_gui_used && TQApplication::isGuiThread()) ? XPending( TQPaintDevice::x11AppDisplay() ) : 0)); + return ( qGlobalPostedEventsCount() || ( (tqt_is_gui_used && TQApplication::isCoreThread()) ? XPending( TQPaintDevice::x11AppDisplay() ) : 0)); } void TQEventLoop::appStartingUp() |