diff options
Diffstat (limited to 'nsplugins/nspluginloader.cpp')
| -rw-r--r-- | nsplugins/nspluginloader.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 4a19140b5..80634f72a 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -28,11 +28,11 @@ #include <tdeapplication.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <dcopclient.h> #include <dcopstub.h> @@ -69,7 +69,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj) if (cfg.readBoolEntry("demandLoad", false)) { _button = new TQPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this)); _layout->addWidget(_button, 0, 0); - connect(_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadPlugin())); + connect(_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(loadPlugin())); show(); } else { _button = 0L; @@ -80,7 +80,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj) // and use 'resize_count' to wait for that one more resize to come (plus a timer // for a possible timeout). Only then flash is actually initialized ('inited' is true). resize_count = 1; - TQTimer::singleShot( 1000, this, TQT_SLOT( doLoadPlugin())); + TQTimer::singleShot( 1000, this, TQ_SLOT( doLoadPlugin())); } } @@ -201,10 +201,10 @@ NSPluginLoader::NSPluginLoader() _filetype.setAutoDelete(true); // trap dcop register events - kapp->dcopClient()->setNotifications(true); - TQObject::connect(kapp->dcopClient(), - TQT_SIGNAL(applicationRegistered(const TQCString&)), - this, TQT_SLOT(applicationRegistered(const TQCString&))); + tdeApp->dcopClient()->setNotifications(true); + TQObject::connect(tdeApp->dcopClient(), + TQ_SIGNAL(applicationRegistered(const TQCString&)), + this, TQ_SLOT(applicationRegistered(const TQCString&))); // load configuration TDEConfig cfg("kcmnspluginrc", false); @@ -272,7 +272,7 @@ void NSPluginLoader::scanPlugins() continue; } - TQStringList desc = TQStringList::split(':', line, TRUE); + TQStringList desc = TQStringList::split(':', line, true); TQString mime = desc[0].stripWhiteSpace(); TQStringList suffixes = TQStringList::split(',', desc[1].stripWhiteSpace()); if (!mime.isEmpty()) @@ -337,8 +337,8 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType) int pid = (int)getpid(); _dcopid.sprintf("nspluginviewer-%d", pid); - connect( _process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processTerminated(TDEProcess*)) ); + connect( _process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processTerminated(TDEProcess*)) ); // find the external viewer process TQString viewer = TDEGlobal::dirs()->findExe("nspluginviewer"); @@ -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 |