Rename KLock and KTrader to avoid conflicts with KDE4

7 files changed, 14 insertions, 14 deletions

diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index 8eab27216..c66a28b06 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -62,7 +62,7 @@ void CfgComponent::slotComponentChanged(const TQString&) {
 }
 
 void CfgComponent::save(TDEConfig *cfg) {
-		// yes, this can happen if there are NO KTrader offers for this component
+		// yes, this can happen if there are NO TDETrader offers for this component
 		if (!m_lookupDict[ComponentSelector->currentText()])
 			return;
 
@@ -84,9 +84,9 @@ void CfgComponent::load(TDEConfig *cfg) {
 	TQString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure");
 
 	TQString MimeTypeOfInterest=cfg->readEntry("MimeTypeOfInterest");
-	KTrader::OfferList offers = KTrader::self()->query(MimeTypeOfInterest, "'"+ServiceTypeToConfigure+"' in ServiceTypes");
+	TDETrader::OfferList offers = TDETrader::self()->query(MimeTypeOfInterest, "'"+ServiceTypeToConfigure+"' in ServiceTypes");
 
-	for (KTrader::OfferList::Iterator tit = offers.begin(); tit != offers.end(); ++tit)
+	for (TDETrader::OfferList::Iterator tit = offers.begin(); tit != offers.end(); ++tit)
         {
 		ComponentSelector->insertItem((*tit)->name());
 		m_lookupDict.insert((*tit)->name(),new TQString((*tit)->desktopEntryName()));
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index 474394108..35a059710 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -126,9 +126,9 @@ void FilterOptions::load( bool useDefaults )
     m_favoriteEngines << "google" << "google_groups" << "google_news" << "webster" << "dmoz" << "wikipedia";
     m_favoriteEngines = config.readListEntry("FavoriteSearchEngines", m_favoriteEngines);
 
-    const KTrader::OfferList services = KTrader::self()->query("SearchProvider");
+    const TDETrader::OfferList services = TDETrader::self()->query("SearchProvider");
 
-    for (KTrader::OfferList::ConstIterator it = services.begin();
+    for (TDETrader::OfferList::ConstIterator it = services.begin();
          it != services.end(); ++it)
     {
       displaySearchProvider(new SearchProvider(*it),
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp b/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp
index 11b7ee692..f2cbdfc6f 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp
@@ -71,8 +71,8 @@ SearchProvider *SearchProvider::findByDesktopName(const TQString &name)
 
 SearchProvider *SearchProvider::findByKey(const TQString &key)
 {
-    KTrader::OfferList providers =
-        KTrader::self()->query("SearchProvider", TQString("'%1' in Keys").arg(key));
+    TDETrader::OfferList providers =
+        TDETrader::self()->query("SearchProvider", TQString("'%1' in Keys").arg(key));
     return providers.count() ? new SearchProvider(providers[0]) : 0;
 }
 
diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp
index 340391e32..c8b203d84 100644
--- a/kcontrol/filetypes/kserviceselectdlg.cpp
+++ b/kcontrol/filetypes/kserviceselectdlg.cpp
@@ -35,7 +35,7 @@ KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQS
     new TQLabel( i18n( "Select service:" ), vbox );
     m_listbox=new KListBox( vbox );
 
-    // Can't make a KTrader query since we don't have a servicetype to give,
+    // Can't make a TDETrader query since we don't have a servicetype to give,
     // we want all services that are not applications.......
     // So we have to do it the slow way
     // ### Why can't we query for KParts/ReadOnlyPart as the servicetype? Should work fine!
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 3ae4cf41b..1134dd8ed 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -305,10 +305,10 @@ void DesktopBehavior::load( bool useDefaults )
     bool bShowHidden = g_pConfig->readBoolEntry("ShowHidden", DEFAULT_SHOW_HIDDEN_ROOT_ICONS);
     showHiddenBox->setChecked(bShowHidden);
     //bool bVertAlign = g_pConfig->readBoolEntry("VertAlign", DEFAULT_VERT_ALIGN);
-    KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
+    TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
     previewListView->clear();
     TQStringList previews = g_pConfig->readListEntry("Preview");
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
         new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName()));
     new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/"));
     //
diff --git a/kcontrol/tdeio/fakeuaprovider.cpp b/kcontrol/tdeio/fakeuaprovider.cpp
index e00c63862..e13c680b8 100644
--- a/kcontrol/tdeio/fakeuaprovider.cpp
+++ b/kcontrol/tdeio/fakeuaprovider.cpp
@@ -71,15 +71,15 @@ FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString
 void FakeUASProvider::loadFromDesktopFiles()
 {
   m_providers.clear();
-  m_providers = KTrader::self()->query("UserAgentStrings");
+  m_providers = TDETrader::self()->query("UserAgentStrings");
 }
 
 void FakeUASProvider::parseDescription()
 {
   TQString tmp;
 
-  KTrader::OfferList::ConstIterator it = m_providers.begin();
-  KTrader::OfferList::ConstIterator lastItem = m_providers.end();
+  TDETrader::OfferList::ConstIterator it = m_providers.begin();
+  TDETrader::OfferList::ConstIterator lastItem = m_providers.end();
 
   for ( ; it != lastItem; ++it )
   {
diff --git a/kcontrol/tdeio/fakeuaprovider.h b/kcontrol/tdeio/fakeuaprovider.h
index 8aedb639d..01593c2d2 100644
--- a/kcontrol/tdeio/fakeuaprovider.h
+++ b/kcontrol/tdeio/fakeuaprovider.h
@@ -49,7 +49,7 @@ protected:
   void parseDescription();
 
 private:
-  KTrader::OfferList m_providers;
+  TDETrader::OfferList m_providers;
   TQStringList m_lstIdentity;
   TQStringList m_lstAlias;
   bool m_bIsDirty;