summaryrefslogtreecommitdiffstats
path: root/src/kernel/qeventloop_x11.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-06 20:38:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-06 20:38:40 -0600
commiteb1d1e0dec5720ace27395e290b7093cd68b150d (patch)
tree04a199ef5ea853d86a6f9a44716c0874d41c20f6 /src/kernel/qeventloop_x11.cpp
parentae8aba1e0f17943046e6bfa889b169f7fc41da0d (diff)
downloadtqt3-eb1d1e0dec5720ace27395e290b7093cd68b150d.tar.gz
tqt3-eb1d1e0dec5720ace27395e290b7093cd68b150d.zip
Automated update from qt3
Diffstat (limited to 'src/kernel/qeventloop_x11.cpp')
-rw-r--r--src/kernel/qeventloop_x11.cpp12
1 files changed, 6 insertions, 6 deletions
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() );
}