Rename KLock and KTrader to avoid conflicts with KDE4

6 files changed, 38 insertions, 38 deletions

diff --git a/parts/partexplorer/README.dox b/parts/partexplorer/README.dox
index 8a28ad5e..7c4c9322 100644
--- a/parts/partexplorer/README.dox
+++ b/parts/partexplorer/README.dox
@@ -1,7 +1,7 @@
 /** \class PartExplorerPlugin
-A Graphical tool for performing KTrader-like queries about registered services
+A Graphical tool for performing TDETrader-like queries about registered services
 
-PartExplorer is a frontend to KTrader class (http://developer.kde.org/documentation/library/3.1-api/tdeio/html/classKTrader.html)
+PartExplorer is a frontend to TDETrader class (http://developer.kde.org/documentation/library/3.1-api/tdeio/html/classTDETrader.html)
 and uses its syntax, no more no less: so before saying "it really sucks", give a look at
 http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html.
 
@@ -17,7 +17,7 @@ Last updated on 28.07.2003 by Mario Scalas
 
 \maintainer <a href="mailto:mario.scalas AT libero.it">Mario Scalas</a>
 
-\feature Performs KTrader-like queries about registered services
+\feature Performs TDETrader-like queries about registered services
 
 \bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=partexplorer&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">partexplorer component at Bugzilla database</a>
 
diff --git a/parts/partexplorer/kdevpartexplorer.desktop b/parts/partexplorer/kdevpartexplorer.desktop
index e6452113..ff432eeb 100644
--- a/parts/partexplorer/kdevpartexplorer.desktop
+++ b/parts/partexplorer/kdevpartexplorer.desktop
@@ -1,37 +1,37 @@
 [Desktop Entry]
 Type=Service
 Exec=blubb
-Comment=A Graphical tool for performing KTrader-like queries about registered services
-Comment[ca]=Una eina gràfica per a realitzar consultes del tipus KTrader sobre els serveis registrats
-Comment[da]=Et grafisk værktøj til at udføre KTrader-lignende forespørgsler om registrerede tjenester
+Comment=A Graphical tool for performing TDETrader-like queries about registered services
+Comment[ca]=Una eina gràfica per a realitzar consultes del tipus TDETrader sobre els serveis registrats
+Comment[da]=Et grafisk værktøj til at udføre TDETrader-lignende forespørgsler om registrerede tjenester
 Comment[de]=Ein grafisches Werkzeug, mit dem Abfragen nach im System verfügbaren Komponten durchgeführt werden können
-Comment[el]=Ένα γραφικό εργαλείο για την εκτέλεση ερωτήσεων όπως το KTrader σχετικά με καταχωρημένες υπηρεσίες
-Comment[es]=Una herramienta gráfica para realizar consultas del tipo KTrader sobre los servicios registrados
-Comment[et]=Graafiline vahend KTraderi-laadsete päringute sooritamiseks registreeritud teenuste kohta
-Comment[eu]=Erregistratutako zerbitzuei buruzko kontsultak egiteko, KTrader-en antzeko tresna grafikoa
-Comment[fa]=یک ابزار نگاره‌ای برای انجام KTrader- مثل پرس‌وجوهایی در مورد خدمات ثبت‌شده
-Comment[fr]=Un outil graphique pour effectuer des requêtes de type KTrader sur les services enregistrés
-Comment[gl]=Unha ferramente gráfica para realizar peticións tipo KTrader dos servizos rexistrados
-Comment[hu]=Grafikus felületű program a regisztrált szolgáltatások KTrader-szerű lekérdezéséhez
-Comment[it]=Uno strumento grafico per eseguire interrogazioni tipo KTrader sui servizi registrati
-Comment[ja]=登録されたサービスに関する KTrader のような質問を実行するための視覚化されたツール
-Comment[ms]=Alatan bergrafik untuk melaksanakan pertanyaan seperti-KTrader mengenai servis berdaftar
-Comment[nds]=En graafsch Warktüüch för KTrader-liek Anfragen över indragen Deensten.
-Comment[ne]=दर्ता गरेको सेवाका बारेमा क्वेरीहरू जस्तै-KTrader कार्यसम्पादन गर्नका लागि एउटा ग्राफिकल उपकरण
+Comment[el]=Ένα γραφικό εργαλείο για την εκτέλεση ερωτήσεων όπως το TDETrader σχετικά με καταχωρημένες υπηρεσίες
+Comment[es]=Una herramienta gráfica para realizar consultas del tipo TDETrader sobre los servicios registrados
+Comment[et]=Graafiline vahend TDETraderi-laadsete päringute sooritamiseks registreeritud teenuste kohta
+Comment[eu]=Erregistratutako zerbitzuei buruzko kontsultak egiteko, TDETrader-en antzeko tresna grafikoa
+Comment[fa]=یک ابزار نگاره‌ای برای انجام TDETrader- مثل پرس‌وجوهایی در مورد خدمات ثبت‌شده
+Comment[fr]=Un outil graphique pour effectuer des requêtes de type TDETrader sur les services enregistrés
+Comment[gl]=Unha ferramente gráfica para realizar peticións tipo TDETrader dos servizos rexistrados
+Comment[hu]=Grafikus felületű program a regisztrált szolgáltatások TDETrader-szerű lekérdezéséhez
+Comment[it]=Uno strumento grafico per eseguire interrogazioni tipo TDETrader sui servizi registrati
+Comment[ja]=登録されたサービスに関する TDETrader のような質問を実行するための視覚化されたツール
+Comment[ms]=Alatan bergrafik untuk melaksanakan pertanyaan seperti-TDETrader mengenai servis berdaftar
+Comment[nds]=En graafsch Warktüüch för TDETrader-liek Anfragen över indragen Deensten.
+Comment[ne]=दर्ता गरेको सेवाका बारेमा क्वेरीहरू जस्तै-TDETrader कार्यसम्पादन गर्नका लागि एउटा ग्राफिकल उपकरण
 Comment[nl]=Een grafische tool om naar geregistreerde diensten te zoeken
-Comment[pl]=Narzędzie graficzne do wykonywania zapytań na temat zarejestrowanych usług (jak KTrader)
-Comment[pt]=Uma ferramenta gráfica para efectuar pesquisas do tipo KTrader sobre os serviços registados
-Comment[pt_BR]=Uma ferramenta Gráfica para realizar consultas como KTrader sobre serviços registrados
-Comment[ru]=Графическое средство для выполнения запросов KTrader о зарегистрированных сервисах.
-Comment[sk]=Grafický nástroj pre vyhľadávanie KTraderregistrovaných služieb
-Comment[sr]=Графички алат за обављање упита налик KTrader-овим о регистрованим сервисима
-Comment[sr@Latn]=Grafički alat za obavljanje upita nalik KTrader-ovim o registrovanim servisima
-Comment[sv]=Ett grafiskt verktyg för att utföra KTrader-liknande förfrågningar om registrerade tjänster.
+Comment[pl]=Narzędzie graficzne do wykonywania zapytań na temat zarejestrowanych usług (jak TDETrader)
+Comment[pt]=Uma ferramenta gráfica para efectuar pesquisas do tipo TDETrader sobre os serviços registados
+Comment[pt_BR]=Uma ferramenta Gráfica para realizar consultas como TDETrader sobre serviços registrados
+Comment[ru]=Графическое средство для выполнения запросов TDETrader о зарегистрированных сервисах.
+Comment[sk]=Grafický nástroj pre vyhľadávanie TDETraderregistrovaných služieb
+Comment[sr]=Графички алат за обављање упита налик TDETrader-овим о регистрованим сервисима
+Comment[sr@Latn]=Grafički alat za obavljanje upita nalik TDETrader-ovim o registrovanim servisima
+Comment[sv]=Ett grafiskt verktyg för att utföra TDETrader-liknande förfrågningar om registrerade tjänster.
 Comment[ta]=வரைகலை கருவி மூலம் பதிப்பு சேவையில் இருந்து Kட்ரேடர் கேள்விகளை செயலாக்கலாம்.
-Comment[tg]=Воситаи графикӣ барои иҷро намудани дархостҳои KTrader дар бораи қайдкунии муҳаррирҳо
-Comment[tr]=Kayıtlı servisler için KTrader-benzeri sorgular yapmayı sağlayan bir grafiksel araç
-Comment[zh_CN]=调用KTrader的图形工具－就像查询已经注册的服务。
-Comment[zh_TW]=執行類似 KTrader 查詢註冊服務的圖形化工具
+Comment[tg]=Воситаи графикӣ барои иҷро намудани дархостҳои TDETrader дар бораи қайдкунии муҳаррирҳо
+Comment[tr]=Kayıtlı servisler için TDETrader-benzeri sorgular yapmayı sağlayan bir grafiksel araç
+Comment[zh_CN]=调用TDETrader的图形工具－就像查询已经注册的服务。
+Comment[zh_TW]=執行類似 TDETrader 查詢註冊服務的圖形化工具
 Name=KDevPartExplorer
 Name[da]=TDevelop Part-søger
 Name[nds]=TDevelop-Komponentkieker
diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp
index 837b0f85..bf2c9ddc 100644
--- a/parts/partexplorer/partexplorer_plugin.cpp
+++ b/parts/partexplorer/partexplorer_plugin.cpp
@@ -42,8 +42,8 @@ PartExplorerPlugin::PartExplorerPlugin(  TQObject *parent, const char *name, con
 
     KAction *action = new KAction( i18n("&Part Explorer"), 0, this, TQT_SLOT(slotShowForm()),
         actionCollection(), "show_partexplorerform" );
-    action->setToolTip(i18n("KTrader query execution"));
-    action->setWhatsThis(i18n("<b>Part explorer</b><p>Shows a dialog for KTrader query execution. Search your TDE documentation for more information about TDE services and KTrader."));
+    action->setToolTip(i18n("TDETrader query execution"));
+    action->setWhatsThis(i18n("<b>Part explorer</b><p>Shows a dialog for TDETrader query execution. Search your TDE documentation for more information about TDE services and TDETrader."));
 }
 
 PartExplorerPlugin::~PartExplorerPlugin()
diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp
index 5a24c2ea..b7e970cf 100644
--- a/parts/partexplorer/partexplorerform.cpp
+++ b/parts/partexplorer/partexplorerform.cpp
@@ -168,7 +168,7 @@ void PartExplorerForm::slotSearchRequested()
         " serviceType = " << serviceType << ", constraints = " << constraints << endl;
 
     // Query for requested services
-    KTrader::OfferList foundServices = KTrader::self()->query( serviceType, constraints );
+    TDETrader::OfferList foundServices = TDETrader::self()->query( serviceType, constraints );
     fillServiceList( foundServices );
 }
 
@@ -185,7 +185,7 @@ void PartExplorerForm::slotDisplayError( TQString errorMessage )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void PartExplorerForm::fillServiceList( const KTrader::OfferList &services )
+void PartExplorerForm::fillServiceList( const TDETrader::OfferList &services )
 {
     this->m_resultsList->clear();
 
@@ -199,7 +199,7 @@ void PartExplorerForm::fillServiceList( const KTrader::OfferList &services )
 
     KListViewItem *rootItem = 0;
 
-    KTrader::OfferList::ConstIterator it = services.begin();
+    TDETrader::OfferList::ConstIterator it = services.begin();
     for ( ; it != services.end(); ++it )
     {
         KService::Ptr service = (*it);
diff --git a/parts/partexplorer/partexplorerform.h b/parts/partexplorer/partexplorerform.h
index 7b9434ed..e5bcabc1 100644
--- a/parts/partexplorer/partexplorerform.h
+++ b/parts/partexplorer/partexplorerform.h
@@ -34,7 +34,7 @@ public:
     /**
     * Fills the widget with data gathered for system's query.
     */
-    void fillServiceList( const KTrader::OfferList &services );
+    void fillServiceList( const TDETrader::OfferList &services );
 
 public slots:
     void slotDisplayError( TQString );
diff --git a/parts/partexplorer/partexplorerformbase.ui b/parts/partexplorer/partexplorerformbase.ui
index 3e5e04a2..71b03693 100644
--- a/parts/partexplorer/partexplorerformbase.ui
+++ b/parts/partexplorer/partexplorerformbase.ui
@@ -24,7 +24,7 @@
         <string>PartExplorer</string>
     </property>
     <property name="toolTip" stdset="0">
-        <string>This is a front-end to KDE's KTrader: search your KDE documentation for more information about KDE services and KTrader</string>
+        <string>This is a front-end to KDE's TDETrader: search your KDE documentation for more information about KDE services and TDETrader</string>
     </property>
     <vbox>
         <property name="name">