summaryrefslogtreecommitdiffstats
path: root/extensions/nsplugin
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-27 02:13:42 -0600
committerTimothy Pearson <[email protected]>2012-02-27 02:13:42 -0600
commit520c05ef06ce203ad32470730f68402bc7719157 (patch)
tree8d0bb18bbbecb4c837e232848905e5819db84b81 /extensions/nsplugin
parentb82553bf90cb5311cfe8e673b07cf6cffc95fd3c (diff)
downloadtqt3-520c05ef06ce203ad32470730f68402bc7719157.tar.gz
tqt3-520c05ef06ce203ad32470730f68402bc7719157.zip
Automated update from qt3
Diffstat (limited to 'extensions/nsplugin')
-rw-r--r--extensions/nsplugin/src/qnp.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/extensions/nsplugin/src/qnp.cpp b/extensions/nsplugin/src/qnp.cpp
index e26bb9582..108223fa3 100644
--- a/extensions/nsplugin/src/qnp.cpp
+++ b/extensions/nsplugin/src/qnp.cpp
@@ -218,9 +218,9 @@ static HHOOK hhook = 0;
LRESULT CALLBACK FilterProc( int nCode, WPARAM wParam, LPARAM lParam )
{
- if ( qApp ) {
- qApp->sendPostedEvents();
- qApp->eventLoop()->activateSocketNotifiers();
+ if ( tqApp ) {
+ tqApp->sendPostedEvents();
+ tqApp->eventLoop()->activateSocketNotifiers();
qWinProcessConfigRequests();
}
@@ -326,7 +326,7 @@ NPP_Shutdown(void)
if ( original_x_errhandler )
XSetErrorHandler( original_x_errhandler );
#endif
- if ( qApp) {
+ if ( tqApp) {
#ifdef Q_WS_WIN32
if ( hhook )
UnhookWindowsHookEx( hhook );
@@ -469,7 +469,7 @@ NPP_SetWindow(NPP instance, NPWindow* window)
This->height = window->height;
- if (!qApp) {
+ if (!tqApp) {
#ifdef Q_WS_X11
// We are the first TQt-based plugin to arrive
event_loop = new TQNPXt( "qnp", XtDisplayToApplicationContext(This->display) );
@@ -1734,7 +1734,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
do_deliver = FALSE;
last_xevent = event;
- bool delivered = do_deliver && ( qApp->x11ProcessEvent( event ) != -1 );
+ bool delivered = do_deliver && ( tqApp->x11ProcessEvent( event ) != -1 );
last_xevent = 0;
if ( qnpxt ) {
switch ( event->type ) {
@@ -1887,15 +1887,15 @@ void TQNPXt::appStartingUp()
XtFree( (char *) displays );
if ( ! display_found ) {
- 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();