From eb1d1e0dec5720ace27395e290b7093cd68b150d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 6 Mar 2012 20:38:40 -0600 Subject: Automated update from qt3 --- src/kernel/qeventloop_x11.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/kernel/qeventloop_x11.cpp') diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp index bada85fdd..0ae387051 100644 --- a/src/kernel/qeventloop_x11.cpp +++ b/src/kernel/qeventloop_x11.cpp @@ -60,7 +60,7 @@ static const int XKeyRelease = KeyRelease; #undef KeyRelease // from qapplication.cpp -extern bool qt_is_gui_used; +extern bool tqt_is_gui_used; // from qeventloop_unix.cpp extern timeval *qt_wait_timer(); @@ -117,7 +117,7 @@ void TQEventLoop::init() // intitialize the X11 parts of the event loop d->xfd = -1; - if ( qt_is_gui_used ) + if ( tqt_is_gui_used ) d->xfd = XConnectionNumber( TQPaintDevice::x11AppDisplay() ); } @@ -139,11 +139,11 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) int nevents = 0; #if defined(QT_THREAD_SUPPORT) - TQMutexLocker locker( TQApplication::qt_mutex ); + TQMutexLocker locker( TQApplication::tqt_mutex ); #endif // handle gui and posted events - if ( qt_is_gui_used ) { + if ( tqt_is_gui_used ) { TQApplication::sendPostedEvents(); // Two loops so that posted events accumulate @@ -261,7 +261,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) FD_ZERO( &d->sn_vec[2].select_fds ); } - if ( qt_is_gui_used ) { + if ( tqt_is_gui_used ) { // 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 ); @@ -407,7 +407,7 @@ bool TQEventLoop::hasPendingEvents() const void TQEventLoop::appStartingUp() { - if ( qt_is_gui_used ) + if ( tqt_is_gui_used ) d->xfd = XConnectionNumber( TQPaintDevice::x11AppDisplay() ); } -- cgit v1.2.1