summaryrefslogtreecommitdiffstats
path: root/nsplugins/viewer/qxteventloop.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /nsplugins/viewer/qxteventloop.cpp
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'nsplugins/viewer/qxteventloop.cpp')
-rw-r--r--nsplugins/viewer/qxteventloop.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp
index b6eac9a4c..b34c1e03c 100644
--- a/nsplugins/viewer/qxteventloop.cpp
+++ b/nsplugins/viewer/qxteventloop.cpp
@@ -174,7 +174,7 @@ Boolean qmotif_event_dispatcher( XEvent *event )
}
last_xevent = event;
- bool delivered = ( tqApp->x11ProcessEvent( event ) != -1 );
+ bool delivered = ( qApp->x11ProcessEvent( event ) != -1 );
last_xevent = 0;
if ( qMotif ) {
switch ( event->type ) {
@@ -309,15 +309,15 @@ XtAppContext QXtEventLoop::applicationContext() const
void QXtEventLoop::appStartingUp()
{
- int argc = tqApp->argc();
+ int argc = qApp->argc();
XtDisplayInitialize( d->appContext,
TQPaintDevice::x11AppDisplay(),
- tqApp->name(),
+ qApp->name(),
d->applicationClass,
d->options,
d->numOptions,
&argc,
- tqApp->argv() );
+ qApp->argv() );
d->hookMeUp();
}
@@ -362,18 +362,18 @@ void qmotif_socknot_handler( XtPointer pointer, int *, XtInputId *id )
*/
void QXtEventLoop::registerSocketNotifier( TQSocketNotifier *notifier )
{
- XtInputMask tqmask;
+ XtInputMask mask;
switch ( notifier->type() ) {
case TQSocketNotifier::Read:
- tqmask = XtInputReadMask;
+ mask = XtInputReadMask;
break;
case TQSocketNotifier::Write:
- tqmask = XtInputWriteMask;
+ mask = XtInputWriteMask;
break;
case TQSocketNotifier::Exception:
- tqmask = XtInputExceptMask;
+ mask = XtInputExceptMask;
break;
default:
@@ -382,7 +382,7 @@ void QXtEventLoop::registerSocketNotifier( TQSocketNotifier *notifier )
}
XtInputId id = XtAppAddInput( d->appContext,
- notifier->socket(), (XtPointer) tqmask,
+ notifier->socket(), (XtPointer) mask,
qmotif_socknot_handler, this );
d->socknotDict.insert( id, notifier );
@@ -420,7 +420,7 @@ void qmotif_timeout_handler( XtPointer, XtIntervalId * )
*/
bool QXtEventLoop::processEvents( ProcessEventsFlags flags )
{
- // Qt uses posted events to do lots of delayed operations, like tqrepaints... these
+ // Qt uses posted events to do lots of delayed operations, like repaints... these
// need to be delivered before we go to sleep
TQApplication::sendPostedEvents();
@@ -436,23 +436,23 @@ bool QXtEventLoop::processEvents( ProcessEventsFlags flags )
qmotif_timeout_handler, 0 );
}
- // get the pending event tqmask from Xt and process the next event
- XtInputMask pendingtqmask = XtAppPending( d->appContext );
- XtInputMask tqmask = pendingtqmask;
- if ( pendingtqmask & XtIMTimer ) {
- tqmask &= ~XtIMTimer;
+ // get the pending event mask from Xt and process the next event
+ XtInputMask pendingmask = XtAppPending( d->appContext );
+ XtInputMask mask = pendingmask;
+ if ( pendingmask & XtIMTimer ) {
+ mask &= ~XtIMTimer;
// zero timers will starve the Xt X event dispatcher... so process
// something *instead* of a timer first...
- if ( tqmask != 0 )
- XtAppProcessEvent( d->appContext, tqmask );
+ if ( mask != 0 )
+ XtAppProcessEvent( d->appContext, mask );
// and process a timer afterwards
- tqmask = pendingtqmask & XtIMTimer;
+ mask = pendingmask & XtIMTimer;
}
if ( ( flags & WaitForMore ) )
XtAppProcessEvent( d->appContext, XtIMAll );
else
- XtAppProcessEvent( d->appContext, tqmask );
+ XtAppProcessEvent( d->appContext, mask );
int nevents = 0;
if ( ! ( flags & ExcludeSocketNotifiers ) )
@@ -463,7 +463,7 @@ bool QXtEventLoop::processEvents( ProcessEventsFlags flags )
}
d->activate_timers = FALSE;
- return ( (flags & WaitForMore) || ( pendingtqmask != 0 ) || nevents > 0 );
+ return ( (flags & WaitForMore) || ( pendingmask != 0 ) || nevents > 0 );
}
#include "qxteventloop.moc"