diff options
Diffstat (limited to 'libtdepim/komposer/core/pluginmanager.cpp')
| -rw-r--r-- | libtdepim/komposer/core/pluginmanager.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index 2e5aa4f6..577baf15 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 2; -*- /** * pluginmanager.cpp * Most of this code has been lifted from Martijn's KopetePluginManager class @@ -35,8 +34,8 @@ #include <tdeparts/componentfactory.h> #include <kplugininfo.h> #include <ksettings/dispatcher.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <kurl.h> @@ -75,11 +74,11 @@ PluginManager::PluginManager( TQObject *parent ) // can remain in control when all windows are removed. // This way we can unload plugins asynchronously, which is more // robust if they are still doing processing. - kapp->ref(); + tdeApp->ref(); d->shutdownMode = Private::StartingUp; KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), - this, TQT_SLOT( loadAllPlugins() ) ); + this, TQ_SLOT( loadAllPlugins() ) ); d->plugins = KPluginInfo::fromServices( TDETrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ), @@ -169,7 +168,7 @@ PluginManager::shutdown() } } - TQTimer::singleShot( 3000, this, TQT_SLOT(slotShutdownTimeout()) ); + TQTimer::singleShot( 3000, this, TQ_SLOT(slotShutdownTimeout()) ); } void @@ -217,7 +216,7 @@ PluginManager::slotShutdownDone() { d->shutdownMode = Private::DoneShutdown; - kapp->deref(); + tdeApp->deref(); } void @@ -257,7 +256,7 @@ PluginManager::loadAllPlugins() } // Schedule the plugins to load - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); } void PluginManager::slotLoadNextPlugin() @@ -279,7 +278,7 @@ void PluginManager::slotLoadNextPlugin() // allPluginsLoaded() signal's handling. This has the added benefit that // the signal is delayed one event loop, so the accounts are more likely // to be instantiated. - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); } Plugin* @@ -290,7 +289,7 @@ PluginManager::loadPlugin( const TQString &pluginId, return loadPluginInternal( pluginId ); } else { d->pluginsToLoad.push( pluginId ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); return 0; } } @@ -318,10 +317,10 @@ PluginManager::loadPluginInternal( const TQString &pluginId ) d->loadedPlugins.insert( info, plugin ); info->setPluginEnabled( true ); - connect( plugin, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(slotPluginDestroyed(TQObject*)) ); - connect( plugin, TQT_SIGNAL(readyForUnload()), - this, TQT_SLOT(slotPluginReadyForUnload()) ); + connect( plugin, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(slotPluginDestroyed(TQObject*)) ); + connect( plugin, TQ_SIGNAL(readyForUnload()), + this, TQ_SLOT(slotPluginReadyForUnload()) ); kdDebug() << k_funcinfo << "Successfully loaded plugin '" << pluginId << "'" << endl; @@ -397,7 +396,7 @@ PluginManager::slotPluginDestroyed( TQObject *plugin ) { // Use a timer to make sure any pending deleteLater() calls have // been handled first - TQTimer::singleShot( 0, this, TQT_SLOT(slotShutdownDone()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotShutdownDone()) ); } } |