diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 10:49:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 10:49:49 -0600 |
| commit | dc5f267664506a312203c26bfe9001a448b0bb0f (patch) | |
| tree | a78c7f15e87303d22b89619db42fc56ad8f4a046 /ksplashml | |
| parent | 98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff) | |
| download | tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'ksplashml')
| -rw-r--r-- | ksplashml/kcmksplash/installer.cpp | 2 | ||||
| -rw-r--r-- | ksplashml/wndmain.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp index 4c1c23549..7a23b35a8 100644 --- a/ksplashml/kcmksplash/installer.cpp +++ b/ksplashml/kcmksplash/installer.cpp @@ -373,7 +373,7 @@ void SplashInstaller::slotSetTheme(int id) infoTxt += "</qt>"; TQString pluginName( cnf.readEntry( "Engine", "Default" ) ); // Perhaps no default is better? - if ((KTrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName))).isEmpty()) + if ((TDETrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName))).isEmpty()) { enabled = false; error = i18n("This theme requires the plugin %1 which is not installed.").arg(pluginName); diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp index 4cbfc2513..e889a2f4b 100644 --- a/ksplashml/wndmain.cpp +++ b/ksplashml/wndmain.cpp @@ -346,7 +346,7 @@ void KSplash::loadTheme( const TQString& theme ) ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQString& theme ) { - // Since we may be called before the DCOP server is active, we cannot use the KTrader framework for obtaining plugins. In its + // Since we may be called before the DCOP server is active, we cannot use the TDETrader framework for obtaining plugins. In its // place, we use the following naive heuristic to locate plugins. If we are not in managed mode, and we are not in testing mode // either, we assume that we have been called by starttde. In this case, we simply try to load the library whose name should // conform to the following specification: @@ -369,7 +369,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri else { // Fancier way of locating plugins. - KService::List list= KTrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName)); + KService::List list= TDETrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName)); KService::Ptr ptr; if (!list.isEmpty()) { |