diff options
Diffstat (limited to 'src/kernel/qeventloop_x11_glib.cpp')
| -rw-r--r-- | src/kernel/qeventloop_x11_glib.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/kernel/qeventloop_x11_glib.cpp b/src/kernel/qeventloop_x11_glib.cpp index 4b44fe8f2..20d72dba5 100644 --- a/src/kernel/qeventloop_x11_glib.cpp +++ b/src/kernel/qeventloop_x11_glib.cpp @@ -43,14 +43,11 @@ #include "ntqeventloop.h" #include "ntqapplication.h" #include "ntqbitarray.h" +#include "ntqmutex.h" +#include "ntqthread.h" #include "qcolor_p.h" #include "qt_x11_p.h" -#if defined(TQT_THREAD_SUPPORT) -# include "ntqmutex.h" -# include "ntqthread.h" -#endif // TQT_THREAD_SUPPORT - #include <errno.h> #include <glib.h> @@ -295,7 +292,7 @@ bool TQEventLoop::processX11Events() XEvent event; int nevents = 0; -#if defined(TQT_THREAD_SUPPORT) +#ifndef TQT_NO_THREAD TQMutexLocker locker( TQApplication::tqt_mutex ); #endif @@ -383,7 +380,7 @@ bool TQEventLoop::gsourcePrepare(GSource *gs, int * timeout) ProcessEventsFlags flags = d->pev_flags; -#if defined(TQT_THREAD_SUPPORT) +#ifndef TQT_NO_THREAD TQMutexLocker locker( TQApplication::tqt_mutex ); #endif @@ -535,10 +532,8 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) { Q_UNUSED(gs); // relock the GUI mutex before processing any pending events -#if defined(TQT_THREAD_SUPPORT) +#ifndef TQT_NO_THREAD TQMutexLocker locker( TQApplication::tqt_mutex ); -#endif -#if defined(TQT_THREAD_SUPPORT) if (locker.mutex()) locker.mutex()->lock(); #endif @@ -608,13 +603,13 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) { // color approx. optimization - only on X11 qt_reset_color_avail(); -#if defined(TQT_THREAD_SUPPORT) +#ifndef TQT_NO_THREAD if (locker.mutex()) locker.mutex()->unlock(); #endif processX11Events(); } else { -#if defined(TQT_THREAD_SUPPORT) +#ifndef TQT_NO_THREAD if (locker.mutex()) locker.mutex()->unlock(); #endif } @@ -629,9 +624,9 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) { bool TQEventLoop::hasPendingEvents() const { -#ifdef TQT_THREAD_SUPPORT +#ifndef TQT_NO_THREAD TQMutexLocker locker( TQApplication::tqt_mutex ); -#endif // TQT_THREAD_SUPPORT +#endif // TQT_NO_THREAD extern uint qGlobalPostedEventsCount(); // from qapplication.cpp return ( qGlobalPostedEventsCount() || ( (tqt_is_gui_used && TQApplication::isGuiThread()) ? XPending( TQPaintDevice::x11AppDisplay() ) : 0)); |