Rename KLock and KTrader to avoid conflicts with KDE4

5 files changed, 9 insertions, 9 deletions

diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 3ff787eaf..9fb07f79a 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -238,9 +238,9 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
 void Part::loadPlugins()
 {
     // "[X-TDE-akregator-plugintype] == 'storage'"
-    KTrader::OfferList offers = PluginManager::query();
+    TDETrader::OfferList offers = PluginManager::query();
 
-    for( KTrader::OfferList::ConstIterator it = offers.begin(), end = offers.end(); it != end; ++it )
+    for( TDETrader::OfferList::ConstIterator it = offers.begin(), end = offers.end(); it != end; ++it )
     {
         Akregator::Plugin* plugin = PluginManager::createFromService(*it);
         if (plugin)
diff --git a/akregator/src/akregator_plugin.desktop b/akregator/src/akregator_plugin.desktop
index bb02126c2..096e655c8 100644
--- a/akregator/src/akregator_plugin.desktop
+++ b/akregator/src/akregator_plugin.desktop
@@ -69,7 +69,7 @@ Type=TQStringList
 [PropertyDef::X-TDE-akregator-email]
 Type=TQStringList
 
-# Priority of the plugin. When KTrader returns multiple offers, the one with the highest rank is chosen.
+# Priority of the plugin. When TDETrader returns multiple offers, the one with the highest rank is chosen.
 # Range: 0 (disabled) - 255 (highest)
 [PropertyDef::X-TDE-akregator-rank]
 Type=int
diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp
index efa034691..87e77a3bb 100644
--- a/akregator/src/pluginmanager.cpp
+++ b/akregator/src/pluginmanager.cpp
@@ -39,7 +39,7 @@ PluginManager::m_store;
 // PUBLIC INTERFACE
 /////////////////////////////////////////////////////////////////////////////////////
 
-KTrader::OfferList
+TDETrader::OfferList
 PluginManager::query( const TQString& constraint )
 {
     // Add versioning constraint
@@ -53,14 +53,14 @@ PluginManager::query( const TQString& constraint )
 
     kdDebug() << "Plugin trader constraint: " << str << endl;
 
-    return KTrader::self()->query( "Akregator/Plugin", str );
+    return TDETrader::self()->query( "Akregator/Plugin", str );
 }
 
 
 Plugin*
 PluginManager::createFromQuery( const TQString &constraint )
 {
-    KTrader::OfferList offers = query( constraint );
+    TDETrader::OfferList offers = query( constraint );
 
     if ( offers.isEmpty() ) {
         kdWarning() << k_funcinfo << "No matching plugin found.\n";
@@ -156,7 +156,7 @@ PluginManager::getService( const Plugin* plugin )
 void
 PluginManager::showAbout( const TQString &constraint )
 {
-    KTrader::OfferList offers = query( constraint );
+    TDETrader::OfferList offers = query( constraint );
 
     if ( offers.isEmpty() )
         return;
diff --git a/akregator/src/pluginmanager.h b/akregator/src/pluginmanager.h
index 3121bbc04..eea903f40 100644
--- a/akregator/src/pluginmanager.h
+++ b/akregator/src/pluginmanager.h
@@ -55,7 +55,7 @@ class PluginManager
          * @return            A list of services that satisfy the query
          * @see               http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html
          */
-        static KTrader::OfferList query( const TQString& constraint = TQString() );
+        static TDETrader::OfferList query( const TQString& constraint = TQString() );
 
         /**
          * Load and instantiate plugin from query
diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp
index 6b96fe1e0..30d75a54b 100644
--- a/akregator/src/speechclient.cpp
+++ b/akregator/src/speechclient.cpp
@@ -153,7 +153,7 @@ bool SpeechClient::isTextToSpeechInstalled() const
 
 void SpeechClient::setupSpeechSystem()
 {
-    KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
+    TDETrader::OfferList offers = TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
     if (offers.count() == 0)
     {
         kdDebug() << "KTTSD not installed, disable support" << endl;