diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /nsplugins/viewer/qxteventloop.cpp | |
parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip |
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'nsplugins/viewer/qxteventloop.cpp')
-rw-r--r-- | nsplugins/viewer/qxteventloop.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp index b34c1e03c..327eaa77e 100644 --- a/nsplugins/viewer/qxteventloop.cpp +++ b/nsplugins/viewer/qxteventloop.cpp @@ -154,12 +154,12 @@ Boolean qmotif_event_dispatcher( XEvent *event ) TQApplication::sendPostedEvents(); TQWidgetIntDict *mapper = &static_d->mapper; - TQWidget* qMotif = mapper->find( event->xany.window ); + TQWidget* qMotif = mapper->tqfind( event->xany.window ); if ( !qMotif && TQWidget::find( event->xany.window) == 0 ) { // event is not for Qt, try Xt Display* dpy = TQPaintDevice::x11AppDisplay(); Widget w = XtWindowToWidget( dpy, event->xany.window ); - while ( w && ! ( qMotif = mapper->find( XtWindow( w ) ) ) ) { + while ( w && ! ( qMotif = mapper->tqfind( XtWindow( w ) ) ) ) { if ( XtIsShell( w ) ) { break; } @@ -174,7 +174,7 @@ Boolean qmotif_event_dispatcher( XEvent *event ) } last_xevent = event; - bool delivered = ( qApp->x11ProcessEvent( event ) != -1 ); + bool delivered = ( tqApp->x11ProcessEvent( event ) != -1 ); last_xevent = 0; if ( qMotif ) { switch ( event->type ) { @@ -309,15 +309,15 @@ XtAppContext QXtEventLoop::applicationContext() const void QXtEventLoop::appStartingUp() { - int argc = qApp->argc(); + int argc = tqApp->argc(); XtDisplayInitialize( d->appContext, TQPaintDevice::x11AppDisplay(), - qApp->name(), + tqApp->name(), d->applicationClass, d->options, d->numOptions, &argc, - qApp->argv() ); + tqApp->argv() ); d->hookMeUp(); } @@ -352,7 +352,7 @@ void QXtEventLoop::unregisterWidget( TQWidget* w ) void qmotif_socknot_handler( XtPointer pointer, int *, XtInputId *id ) { QXtEventLoop *eventloop = (QXtEventLoop *) pointer; - TQSocketNotifier *socknot = static_d->socknotDict.find( *id ); + TQSocketNotifier *socknot = static_d->socknotDict.tqfind( *id ); if ( ! socknot ) // this shouldn't happen return; eventloop->setSocketNotifierPending( socknot ); @@ -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 repaints... these + // Qt uses posted events to do lots of delayed operations, like tqrepaints... these // need to be delivered before we go to sleep TQApplication::sendPostedEvents(); |