summaryrefslogtreecommitdiffstats
path: root/nsplugins
diff options
context:
space:
mode:
Diffstat (limited to 'nsplugins')
-rw-r--r--nsplugins/nspluginloader.cpp8
-rw-r--r--nsplugins/plugin_part.cpp2
-rw-r--r--nsplugins/pluginscan.cpp2
-rw-r--r--nsplugins/test/testnsplugin.cpp2
-rw-r--r--nsplugins/viewer/nsplugin.cpp4
5 files changed, 9 insertions, 9 deletions
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index edaa07717..8ddc26a42 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -201,8 +201,8 @@ NSPluginLoader::NSPluginLoader()
_filetype.setAutoDelete(true);
// trap dcop register events
- kapp->dcopClient()->setNotifications(true);
- TQObject::connect(kapp->dcopClient(),
+ tdeApp->dcopClient()->setNotifications(true);
+ TQObject::connect(tdeApp->dcopClient(),
TQ_SIGNAL(applicationRegistered(const TQCString&)),
this, TQ_SLOT(applicationRegistered(const TQCString&)));
@@ -376,9 +376,9 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType)
// wait for the process to run
int cnt = 0;
- while (!kapp->dcopClient()->isApplicationRegistered(_dcopid))
+ while (!tdeApp->dcopClient()->isApplicationRegistered(_dcopid))
{
- //kapp->processEvents(); // would lead to recursive calls in tdehtml
+ //tdeApp->processEvents(); // would lead to recursive calls in tdehtml
#ifdef HAVE_USLEEP
usleep( 50*1000 );
#else
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 3e5530f3a..500361464 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -301,7 +301,7 @@ bool PluginPart::openURL(const KURL &url)
emit setStatusBarText( i18n("Loading Netscape plugin for %1").arg(url.prettyURL()) );
// create plugin widget
- NSPluginInstance *inst = _loader->newInstance(_canvas, surl, smime, embed, argn, argv, kapp->dcopClient()->appId(), _callback->objId(), reload, post, _extension->urlArgs().postData);
+ NSPluginInstance *inst = _loader->newInstance(_canvas, surl, smime, embed, argn, argv, tdeApp->dcopClient()->appId(), _callback->objId(), reload, post, _extension->urlArgs().postData);
if ( inst ) {
_widget = inst;
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 0ed350abb..2e02b6d91 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -653,7 +653,7 @@ int main( int argc, char **argv )
printf("90\n"); fflush(stdout);
}
- DCOPClient *dcc = kapp->dcopClient();
+ DCOPClient *dcc = tdeApp->dcopClient();
if ( !dcc->isAttached() )
dcc->attach();
// Tel kded to update sycoca database.
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index 7ac24ee2c..821f17e29 100644
--- a/nsplugins/test/testnsplugin.cpp
+++ b/nsplugins/test/testnsplugin.cpp
@@ -46,7 +46,7 @@ TestNSPlugin::TestNSPlugin()
// file menu
KStdAction::openNew( this, TQ_SLOT(newView()), actionCollection());
KStdAction::close( this, TQ_SLOT(closeView()), actionCollection());
- KStdAction::quit( kapp, TQ_SLOT(quit()), actionCollection());
+ KStdAction::quit( tdeApp, TQ_SLOT(quit()), actionCollection());
createGUI( "testnspluginui.rc" );
}
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index d65b6c702..995b4a9a6 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -1323,7 +1323,7 @@ DCOPRef NSPluginViewer::newClass( TQString plugin )
_classes.insert( plugin, cls );
}
- return DCOPRef( kapp->dcopClient()->appId(), cls->objId() );
+ return DCOPRef( tdeApp->dcopClient()->appId(), cls->objId() );
}
@@ -1566,7 +1566,7 @@ DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, TQ_INT8 emb
}
_instances.append( inst );
- return DCOPRef(kapp->dcopClient()->appId(), inst->objId());
+ return DCOPRef(tdeApp->dcopClient()->appId(), inst->objId());
}