Rename KLock and KTrader to avoid conflicts with KDE4

14 files changed, 56 insertions, 56 deletions

diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 9dcb06f0..1d641040 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -339,8 +339,8 @@ void AppWizardDialog::loadVcs()
 	m_vcsForm->stack->addWidget( 0, i++ );
 
 	// We query for all vcs integrators for KDevelop
-	KTrader::OfferList offers = KTrader::self()->query("TDevelop/VCSIntegrator", "");
-	KTrader::OfferList::const_iterator serviceIt = offers.begin();
+	TDETrader::OfferList offers = TDETrader::self()->query("TDevelop/VCSIntegrator", "");
+	TDETrader::OfferList::const_iterator serviceIt = offers.begin();
 	for (; serviceIt != offers.end(); ++serviceIt)
 	{
 		KService::Ptr service = *serviceIt;
@@ -1023,7 +1023,7 @@ void AppWizardDialog::openAfterGeneration()
 	DomUtil::writeMapEntry( projectDOM, "substmap", m_pCurrentAppInfo->subMap );
 
 	//save the selected vcs
-	KTrader::OfferList offers = KTrader::self()->query("TDevelop/VCSIntegrator", TQString("[X-TDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText()));
+	TDETrader::OfferList offers = TDETrader::self()->query("TDevelop/VCSIntegrator", TQString("[X-TDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText()));
 	if (offers.count() == 1)
 	{
 		KService::Ptr service = offers.first();
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index b7680c16..9c38ccef 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -502,8 +502,8 @@ void ImportDialog::scanAvailableVCS()
 {
 //    vcsCombo->insertStringList( m_part->registeredVersionControls() );
     int i = 0;
-    KTrader::OfferList offers = KTrader::self()->query("TDevelop/VersionControl");
-    KTrader::OfferList::const_iterator it = offers.begin();
+    TDETrader::OfferList offers = TDETrader::self()->query("TDevelop/VersionControl");
+    TDETrader::OfferList::const_iterator it = offers.begin();
     while( it != offers.end() )
     {
         vcsCombo->insertItem( (*it)->genericName(), i++ );
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 298e2083..6b3a2d6d 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -161,8 +161,8 @@ void KDiffTextEdit::searchExtParts()
   init = true;
 
   // search all parts that can handle text/x-diff
-  KTrader::OfferList offers = KTrader::self()->query("text/x-diff", "('KParts/ReadOnlyPart' in ServiceTypes) and ('text/x-diff' in ServiceTypes) and (DesktopEntryName != 'katepart')");
-  KTrader::OfferList::const_iterator it;
+  TDETrader::OfferList offers = TDETrader::self()->query("text/x-diff", "('KParts/ReadOnlyPart' in ServiceTypes) and ('text/x-diff' in ServiceTypes) and (DesktopEntryName != 'katepart')");
+  TDETrader::OfferList::const_iterator it;
   for ( it = offers.begin(); it != offers.end(); ++it ) {
     KService::Ptr ptr = (*it);
     extPartsTranslated << ptr->name();
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index b436520f..71054460 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -124,11 +124,11 @@ DocumentationPart::~DocumentationPart()
 
 void DocumentationPart::loadDocumentationPlugins()
 {
-    KTrader::OfferList docPluginOffers =
-        KTrader::self()->query(TQString::fromLatin1("TDevelop/DocumentationPlugins"),
+    TDETrader::OfferList docPluginOffers =
+        TDETrader::self()->query(TQString::fromLatin1("TDevelop/DocumentationPlugins"),
             TQString("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION));
 
-    KTrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin();
+    TDETrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin();
     for ( ; serviceIt != docPluginOffers.end(); ++serviceIt )
     {               
         KService::Ptr docPluginService;
diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp
index 85cfe9f0..321b1db7 100644
--- a/parts/openwith/openwithpart.cpp
+++ b/parts/openwith/openwithpart.cpp
@@ -67,10 +67,10 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context)
 
 	// hmmm.. what to do here? open every different mimetype seperately? Just go with the first for now..
 	TQString mimeType = KMimeType::findByURL(m_urls.first(), 0, true, true)->name();
-	KTrader::OfferList offers = KTrader::self()->query(mimeType, "Type == 'Application'");
+	TDETrader::OfferList offers = TDETrader::self()->query(mimeType, "Type == 'Application'");
 	if (offers.count() > 0)
 	{
-		KTrader::OfferList::Iterator it;
+		TDETrader::OfferList::Iterator it;
 		for (it = offers.begin(); it != offers.end(); ++it)
 		{
 			KAction *action = new KAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName( (*it)->desktopEntryPath() ).data());
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">
diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp
index 87432791..3fcdd761 100644
--- a/parts/replace/replacedlgimpl.cpp
+++ b/parts/replace/replacedlgimpl.cpp
@@ -50,7 +50,7 @@ ReplaceDlgImpl::ReplaceDlgImpl(TQWidget* parent, const char* name, bool modal, W
     connect( strings_regexp_radio, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleExpression( bool ) ) );
 
     // disable the editor button if the regexp editor isn't installed
-    if ( KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
+    if ( TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
     {
         strings_regexp_radio->disconnect( regexp_button );
     }
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index cd7da532..0d39038e 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -111,14 +111,14 @@ void SnippetPart::slotConfigWidget( KDialogBase *dlg )
 
 TQStringList SnippetPart::getAllLanguages()
 {
-    KTrader::OfferList languageSupportOffers =
-        KTrader::self()->query(TQString::fromLatin1("TDevelop/LanguageSupport"),
+    TDETrader::OfferList languageSupportOffers =
+        TDETrader::self()->query(TQString::fromLatin1("TDevelop/LanguageSupport"),
                                TQString::fromLatin1("[X-TDevelop-Version] == %1"
                                ).arg( TDEVELOP_PLUGIN_VERSION ));
     
     TQStringList languages;
 
-    for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it)
+    for (TDETrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it)
     {
         TQString language = (*it)->property("X-TDevelop-Language").toString();
         languages.append(language);
diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
index c087d415..2fe41c9c 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp
+++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
@@ -52,8 +52,8 @@ void VCSManagerProjectConfig::setup( )
 	int current = 0;
 
 	TQString constraint = TQString("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION);
-	KTrader::OfferList offers = KTrader::self()->query("TDevelop/VersionControl", constraint );
-	KTrader::OfferList::const_iterator it = offers.begin();
+	TDETrader::OfferList offers = TDETrader::self()->query("TDevelop/VersionControl", constraint );
+	TDETrader::OfferList::const_iterator it = offers.begin();
 	for ( int i = 1; it != offers.end(); ++it, ++i )
 	{
 		vcsCombo->insertItem( (*it)->genericName(), i );