Rename KLock and KTrader to avoid conflicts with KDE4

4 files changed, 8 insertions, 8 deletions

diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp
index 973c9ff..0a63269 100644
--- a/kttsd/libkttsd/selecttalkerdlg.cpp
+++ b/kttsd/libkttsd/selecttalkerdlg.cpp
@@ -88,7 +88,7 @@ SelectTalkerDlg::SelectTalkerDlg(
 
     cb = m_widget->synthComboBox;
     cb->insertItem( TQString() );
-    KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin");
+    TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/SynthPlugin");
     for(unsigned int i=0; i < offers.count() ; ++i)
         cb->insertItem(offers[i]->name());
 
diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp
index 25b674e..5ae1afa 100644
--- a/kttsd/libkttsd/talkercode.cpp
+++ b/kttsd/libkttsd/talkercode.cpp
@@ -484,7 +484,7 @@ void TalkerCode::parseTalkerCode(const TQString &talkerCode)
 }
 
 /**
-* Uses KTrader to convert a translated Synth Plugin Name to DesktopEntryName.
+* Uses TDETrader to convert a translated Synth Plugin Name to DesktopEntryName.
 * @param name                   The translated plugin name.  From Name= line in .desktop file.
 * @return                       DesktopEntryName.  The name of the .desktop file (less .desktop).
 *                               TQString() if not found.
@@ -492,21 +492,21 @@ void TalkerCode::parseTalkerCode(const TQString &talkerCode)
 /*static*/ TQString TalkerCode::TalkerNameToDesktopEntryName(const TQString& name)
 {
     if (name.isEmpty()) return TQString();
-    KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin");
+    TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/SynthPlugin");
     for (uint ndx = 0; ndx < offers.count(); ++ndx)
         if (offers[ndx]->name() == name) return offers[ndx]->desktopEntryName();
     return TQString();
 }
 
 /**
-* Uses KTrader to convert a DesktopEntryName into a translated Synth Plugin Name.
+* Uses TDETrader to convert a DesktopEntryName into a translated Synth Plugin Name.
 * @param desktopEntryName       The DesktopEntryName.
 * @return                       The translated Name of the plugin, from Name= line in .desktop file.
 */
 /*static*/ TQString TalkerCode::TalkerDesktopEntryNameToName(const TQString& desktopEntryName)
 {
     if (desktopEntryName.isEmpty()) return TQString();
-    KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin",
+    TDETrader::OfferList offers = TDETrader::self()->query("KTTSD/SynthPlugin",
     TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
 
     if (offers.count() == 1)
diff --git a/kttsd/libkttsd/talkercode.h b/kttsd/libkttsd/talkercode.h
index f8cbc16..fe6830b 100644
--- a/kttsd/libkttsd/talkercode.h
+++ b/kttsd/libkttsd/talkercode.h
@@ -164,7 +164,7 @@ class KDE_EXPORT TalkerCode
         static TQString stripPrefer( const TQString& code, bool& preferred);
 
         /**
-        * Uses KTrader to convert a translated Synth Plugin Name to DesktopEntryName.
+        * Uses TDETrader to convert a translated Synth Plugin Name to DesktopEntryName.
         * @param name                   The translated plugin name.  From Name= line in .desktop file.
         * @return                       DesktopEntryName.  The name of the .desktop file (less .desktop).
         *                               TQString() if not found.
@@ -172,7 +172,7 @@ class KDE_EXPORT TalkerCode
         static TQString TalkerNameToDesktopEntryName(const TQString& name);
 
         /**
-        * Uses KTrader to convert a DesktopEntryName into a translated Synth Plugin Name.
+        * Uses TDETrader to convert a DesktopEntryName into a translated Synth Plugin Name.
         * @param desktopEntryName       The DesktopEntryName.
         * @return                       The translated Name of the plugin, from Name= line in .desktop file.
         */
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index 836b615..1df1c7b 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -161,7 +161,7 @@ Player* TestPlayer::createPlayerObject(int playerOption)
             break;
         }
     }
-    KTrader::OfferList offers = KTrader::self()->query(
+    TDETrader::OfferList offers = TDETrader::self()->query(
             "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").arg(plugInName));
 
     if(offers.count() == 1)