Rename KLock and KTrader to avoid conflicts with KDE4

34 files changed, 107 insertions, 107 deletions

diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index aa8aaedb9..5ef3c78e8 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -602,9 +602,9 @@ void KateMainWindow::mSlotFixOpenWithMenu()
   KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() );
   //kdDebug(13001)<<"13000"<<"url: "<<m_viewManager->activeView()->getDoc()->url().prettyURL()<<"mime type: "<<mime->name()<<endl;
   // some checking goes here...
-  KTrader::OfferList offers = KTrader::self()->query(mime->name(), "Type == 'Application'");
+  TDETrader::OfferList offers = TDETrader::self()->query(mime->name(), "Type == 'Application'");
   // for each one, insert a menu item...
-  for(KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it) {
+  for(TDETrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it) {
     if ((*it)->name() == "Kate") continue;
     documentOpenWith->popupMenu()->insertItem( SmallIcon( (*it)->icon() ), (*it)->name() );
   }
@@ -629,7 +629,7 @@ void KateMainWindow::slotOpenWithMenuAction(int idx)
 
   TQString qry = TQString("((Type == 'Application') and (Name == '%1'))").arg( appname.latin1() );
   KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() );
-  KTrader::OfferList offers = KTrader::self()->query(mime->name(), qry);
+  TDETrader::OfferList offers = TDETrader::self()->query(mime->name(), qry);
 
   if (!offers.isEmpty()) {
     KService::Ptr app = offers.first();
diff --git a/kate/app/katepluginmanager.cpp b/kate/app/katepluginmanager.cpp
index 4fe15d4f4..8f6fae52c 100644
--- a/kate/app/katepluginmanager.cpp
+++ b/kate/app/katepluginmanager.cpp
@@ -57,9 +57,9 @@ KatePluginManager *KatePluginManager::self()
 
 void KatePluginManager::setupPluginList ()
 {
-  TQValueList<KService::Ptr> traderList= KTrader::self()->query("Kate/Plugin", "(not ('Kate/ProjectPlugin' in ServiceTypes)) and (not ('Kate/InitPlugin' in ServiceTypes))");
+  TQValueList<KService::Ptr> traderList= TDETrader::self()->query("Kate/Plugin", "(not ('Kate/ProjectPlugin' in ServiceTypes)) and (not ('Kate/InitPlugin' in ServiceTypes))");
 
-  for(KTrader::OfferList::Iterator it(traderList.begin()); it != traderList.end(); ++it)
+  for(TDETrader::OfferList::Iterator it(traderList.begin()); it != traderList.end(); ++it)
   {
     KService::Ptr ptr = (*it);
 
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;
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index 7182a8d0f..04215d59d 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -272,7 +272,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     TQToolTip::add(binaryContextCb,binaryTooltip);
 
     TQPushButton* editRegExp = 0;
-    if ( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
+    if ( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
       // The editor is available, so lets use it.
       editRegExp = new TQPushButton(i18n("&Edit..."), pages[2], "editRegExp");
     }
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 79ed0d6b6..464dd87de 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -2122,7 +2122,7 @@ void KMenu::initSearch()
     if (!m_search_plugin) {
       m_search_plugin_interface = new TQObject( this, "m_search_plugin_interface" );
       new MyKickoffSearchInterface( this, m_search_plugin_interface, "kickoffsearch interface" );
-      KTrader::OfferList offers = KTrader::self()->query("KickoffSearch/Plugin");
+      TDETrader::OfferList offers = TDETrader::self()->query("KickoffSearch/Plugin");
 
       KService::Ptr service = *offers.begin();
       if (service) {
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index 99f30841d..fd81beffc 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -284,7 +284,7 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
     listView->setSorting( -1 ); // newly inserted items just append unsorted
 
     cbUseGUIRegExpEditor = new TQCheckBox( i18n("&Use graphical editor for editing regular expressions" ), this );
-    if ( KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
+    if ( TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
     {
 	cbUseGUIRegExpEditor->hide();
 	cbUseGUIRegExpEditor->setChecked( false );
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index 899d27f84..f5586af62 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -165,7 +165,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
  is configured to reuse always,
  or it's not configured to never reuse, and the URL to-be-opened is "safe".
  The URL is safe, if the view used to view it is listed in the allowed KPart's.
- In order to find out the part, mimetype is needed, and KTrader is needed.
+ In order to find out the part, mimetype is needed, and TDETrader is needed.
  If mimetype is not known, KMimeType is used (which doesn't work e.g. for remote
  URLs, but oh well). Since this function may be running without a TDEApplication
  instance, I'm actually quite surprised it works, and it may sooner or later break.
@@ -222,7 +222,7 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString&
     }
     if( mimetype.isEmpty())
 	mimetype = KMimeType::findByURL( KURL( url ) )->name();
-    KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ),
+    TDETrader::OfferList offers = TDETrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ),
 	TQString::null, TQString::null );
     KService::Ptr serv;
     if( offers.count() > 0 )
@@ -529,7 +529,7 @@ bool clientApp::doIt()
     {
       KURL::List urls;
       urls.append( args->url(1) );
-      const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null );
+      const TDETrader::OfferList offers = TDETrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null );
       if (offers.isEmpty()) return 1;
       KService::Ptr serv = offers.first();
       return KRun::run( *serv, urls );
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index b5848dd8c..7ce0752e2 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -226,9 +226,9 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     m_pamPreview->insert( m_paEnablePreviews );
     m_pamPreview->insert( new KActionSeparator(this) );
 
-    KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" );
+    TDETrader::OfferList plugins = TDETrader::self()->query( "ThumbCreator" );
     TQMap< TQString, KToggleAction* > previewActions;
-    for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
+    for ( TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
     {
         if ( KToggleAction*& preview = previewActions[ ( *it )->name() ] )
             preview->setName( TQCString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() );
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc
index 4f7fdf842..c730991b5 100644
--- a/konqueror/konq_factory.cc
+++ b/konqueror/konq_factory.cc
@@ -86,14 +86,14 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const cha
 KonqViewFactory KonqFactory::createView( const TQString &serviceType,
                                          const TQString &serviceName,
                                          KService::Ptr *serviceImpl,
-                                         KTrader::OfferList *partServiceOffers,
-                                         KTrader::OfferList *appServiceOffers,
+                                         TDETrader::OfferList *partServiceOffers,
+                                         TDETrader::OfferList *appServiceOffers,
 					 bool forceAutoEmbed )
 {
   kdDebug(1202) << "Trying to create view for \"" << serviceType << "\"" << endl;
 
   // We need to get those in any case
-  KTrader::OfferList offers, appOffers;
+  TDETrader::OfferList offers, appOffers;
 
   // Query the trader
   getOffers( serviceType, &offers, &appOffers );
@@ -126,7 +126,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType,
   // Look for this service
   if ( !serviceName.isEmpty() )
   {
-      KTrader::OfferList::Iterator it = offers.begin();
+      TDETrader::OfferList::Iterator it = offers.begin();
       for ( ; it != offers.end() && !service ; ++it )
       {
           if ( (*it)->desktopEntryName() == serviceName )
@@ -149,7 +149,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType,
                            .arg(service->name()).arg(KLibLoader::self()->lastErrorMessage()));
   }
 
-  KTrader::OfferList::Iterator it = offers.begin();
+  TDETrader::OfferList::Iterator it = offers.begin();
   for ( ; !factory && it != offers.end() ; ++it )
   {
     service = (*it);
@@ -193,19 +193,19 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType,
 }
 
 void KonqFactory::getOffers( const TQString & serviceType,
-                             KTrader::OfferList *partServiceOffers,
-                             KTrader::OfferList *appServiceOffers )
+                             TDETrader::OfferList *partServiceOffers,
+                             TDETrader::OfferList *appServiceOffers )
 {
     if ( appServiceOffers )
     {
-        *appServiceOffers = KTrader::self()->query( serviceType, "Application",
+        *appServiceOffers = TDETrader::self()->query( serviceType, "Application",
 "DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'",
                                                     TQString::null );
     }
 
     if ( partServiceOffers )
     {
-        *partServiceOffers = KTrader::self()->query( serviceType, "KParts/ReadOnlyPart",
+        *partServiceOffers = TDETrader::self()->query( serviceType, "KParts/ReadOnlyPart",
                                                      TQString::null, TQString::null );
     }
 }
diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h
index d856dbfa6..5d771354e 100644
--- a/konqueror/konq_factory.h
+++ b/konqueror/konq_factory.h
@@ -69,13 +69,13 @@ public:
   static KonqViewFactory createView( const TQString &serviceType,
 				     const TQString &serviceName = TQString::null,
 				     KService::Ptr *serviceImpl = 0,
-				     KTrader::OfferList *partServiceOffers = 0,
-				     KTrader::OfferList *appServiceOffers = 0,
+				     TDETrader::OfferList *partServiceOffers = 0,
+				     TDETrader::OfferList *appServiceOffers = 0,
 				     bool forceAutoEmbed = false );
 
   static void getOffers( const TQString & serviceType,
-                         KTrader::OfferList *partServiceOffers = 0,
-                         KTrader::OfferList *appServiceOffers = 0);
+                         TDETrader::OfferList *partServiceOffers = 0,
+                         TDETrader::OfferList *appServiceOffers = 0);
 
   static const TDEAboutData* aboutData();
 
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc
index a2be33e4e..94aaf8ba1 100644
--- a/konqueror/konq_guiclients.cc
+++ b/konqueror/konq_guiclients.cc
@@ -28,7 +28,7 @@
 #include <kiconloader.h>
 
 PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
-                                        const KTrader::OfferList &embeddingServices,
+                                        const TDETrader::OfferList &embeddingServices,
                                         bool showEmbeddingServices, bool doTabHandling )
 {
     //giving a name to each guiclient: just for debugging
@@ -66,8 +66,8 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
 
     if ( showEmbeddingServices )
     {
-        KTrader::OfferList::ConstIterator it = embeddingServices.begin();
-        KTrader::OfferList::ConstIterator end = embeddingServices.end();
+        TDETrader::OfferList::ConstIterator it = embeddingServices.begin();
+        TDETrader::OfferList::ConstIterator end = embeddingServices.end();
 
         if ( embeddingServices.count() == 1 )
         {
@@ -166,8 +166,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
   m_mainWindow = mainWindow;
   m_actions.setAutoDelete( true );
 
-  KTrader::OfferList offers = KTrader::self()->query( "Browser/View" );
-  KTrader::OfferList::Iterator it = offers.begin();
+  TDETrader::OfferList offers = TDETrader::self()->query( "Browser/View" );
+  TDETrader::OfferList::Iterator it = offers.begin();
   while ( it != offers.end() )
   {
     TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" );
@@ -188,8 +188,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
   if ( m_empty )
     return;
 
-  KTrader::OfferList::ConstIterator cIt = offers.begin();
-  KTrader::OfferList::ConstIterator cEnd = offers.end();
+  TDETrader::OfferList::ConstIterator cIt = offers.begin();
+  TDETrader::OfferList::ConstIterator cEnd = offers.end();
   for (; cIt != cEnd; ++cIt )
   {
     TQString description = i18n( "Show %1" ).arg( (*cIt)->name() );
diff --git a/konqueror/konq_guiclients.h b/konqueror/konq_guiclients.h
index 10e1d495c..238153371 100644
--- a/konqueror/konq_guiclients.h
+++ b/konqueror/konq_guiclients.h
@@ -55,7 +55,7 @@ class KonqView;
 class PopupMenuGUIClient : public KXMLGUIClient
 {
 public:
-  PopupMenuGUIClient( KonqMainWindow *mainWindow, const KTrader::OfferList &embeddingServices,
+  PopupMenuGUIClient( KonqMainWindow *mainWindow, const TDETrader::OfferList &embeddingServices,
                       bool isIntoTrash, bool doTabHandling );
   virtual ~PopupMenuGUIClient();
 
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 5ad4c6eae..0f3aeeb5e 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -1571,9 +1571,9 @@ void KonqMainWindow::slotOpenWith()
 
   TQString serviceName = TQT_TQOBJECT_CONST(sender())->name();
 
-  KTrader::OfferList offers = m_currentView->appServiceOffers();
-  KTrader::OfferList::ConstIterator it = offers.begin();
-  KTrader::OfferList::ConstIterator end = offers.end();
+  TDETrader::OfferList offers = m_currentView->appServiceOffers();
+  TDETrader::OfferList::ConstIterator it = offers.begin();
+  TDETrader::OfferList::ConstIterator end = offers.end();
   for (; it != end; ++it )
     if ( (*it)->desktopEntryName() == serviceName )
     {
@@ -1615,9 +1615,9 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
 
   // iterate over all services, update the toolbar service map
   // and check if we can do a quick property-based viewmode change
-  const KTrader::OfferList offers = m_currentView->partServiceOffers();
-  KTrader::OfferList::ConstIterator oIt = offers.begin();
-  KTrader::OfferList::ConstIterator oEnd = offers.end();
+  const TDETrader::OfferList offers = m_currentView->partServiceOffers();
+  TDETrader::OfferList::ConstIterator oIt = offers.begin();
+  TDETrader::OfferList::ConstIterator oEnd = offers.end();
   const TQString currentServiceKey = viewModeActionKey( m_currentView->service() );
   for (; oIt != oEnd; ++oIt )
   {
@@ -4725,7 +4725,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
       TQString currentServiceName = currentView->service()->desktopEntryName();
 
       // List of services for the "Preview In" submenu.
-      m_popupEmbeddingServices = KTrader::self()->query(
+      m_popupEmbeddingServices = TDETrader::self()->query(
           m_popupServiceType,
           "KParts/ReadOnlyPart",
           // Obey "HideFromMenus". It defaults to false so we want "absent or true"
@@ -5032,9 +5032,9 @@ void KonqMainWindow::updateOpenWithActions()
   if (!kapp->authorizeKAction("openwith"))
      return;
 
-  const KTrader::OfferList & services = m_currentView->appServiceOffers();
-  KTrader::OfferList::ConstIterator it = services.begin();
-  KTrader::OfferList::ConstIterator end = services.end();
+  const TDETrader::OfferList & services = m_currentView->appServiceOffers();
+  TDETrader::OfferList::ConstIterator it = services.begin();
+  TDETrader::OfferList::ConstIterator end = services.end();
   for (; it != end; ++it )
   {
     KAction *action = new KAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() );
@@ -5089,7 +5089,7 @@ void KonqMainWindow::updateViewModeActions()
       m_viewModeToolBarServices.clear();
   }
 
-  KTrader::OfferList services = m_currentView->partServiceOffers();
+  TDETrader::OfferList services = m_currentView->partServiceOffers();
 
   if ( services.count() <= 1 )
     return;
@@ -5110,8 +5110,8 @@ void KonqMainWindow::updateViewModeActions()
   TDEConfig * config = TDEGlobal::config();
   config->setGroup( "ModeToolBarServices" );
 
-  KTrader::OfferList::ConstIterator it = services.begin();
-  KTrader::OfferList::ConstIterator end = services.end();
+  TDETrader::OfferList::ConstIterator it = services.begin();
+  TDETrader::OfferList::ConstIterator end = services.end();
   for (; it != end; ++it )
   {
       TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" );
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index d1b6e0c01..026f150c8 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -734,7 +734,7 @@ private:
 
   ToggleViewGUIClient *m_toggleViewGUIClient;
 
-  KTrader::OfferList m_popupEmbeddingServices;
+  TDETrader::OfferList m_popupEmbeddingServices;
   TQString m_popupService;
   TQString m_popupServiceType;
   KURL m_popupURL;
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index c19438668..023b1e19f 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -59,8 +59,8 @@ KonqView::KonqView( KonqViewFactory &viewFactory,
                     KonqFrame* viewFrame,
                     KonqMainWindow *mainWindow,
                     const KService::Ptr &service,
-                    const KTrader::OfferList &partServiceOffers,
-                    const KTrader::OfferList &appServiceOffers,
+                    const TDETrader::OfferList &partServiceOffers,
+                    const TDETrader::OfferList &appServiceOffers,
                     const TQString &serviceType,
                     bool passiveMode
                     )
@@ -325,7 +325,7 @@ bool KonqView::changeViewMode( const TQString &serviceType,
   }
 
   kdDebug(1202) << "Switching view modes..." << endl;
-  KTrader::OfferList partServiceOffers, appServiceOffers;
+  TDETrader::OfferList partServiceOffers, appServiceOffers;
   KService::Ptr service = 0L;
   KonqViewFactory viewFactory = KonqFactory::createView( serviceType, serviceName, &service, &partServiceOffers, &appServiceOffers, forceAutoEmbed );
 
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index 6a63bff9f..55f0f1069 100644
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@@ -82,8 +82,8 @@ public:
             KonqFrame* viewFrame,
             KonqMainWindow * mainWindow,
             const KService::Ptr &service,
-            const KTrader::OfferList &partServiceOffers,
-            const KTrader::OfferList &appServiceOffers,
+            const TDETrader::OfferList &partServiceOffers,
+            const TDETrader::OfferList &appServiceOffers,
             const TQString &serviceType,
             bool passiveMode);
 
@@ -281,8 +281,8 @@ public:
 
   TQString caption() const { return m_caption; }
 
-  KTrader::OfferList partServiceOffers() { return m_partServiceOffers; }
-  KTrader::OfferList appServiceOffers() { return m_appServiceOffers; }
+  TDETrader::OfferList partServiceOffers() { return m_partServiceOffers; }
+  TDETrader::OfferList appServiceOffers() { return m_appServiceOffers; }
 
   KonqMainWindow *mainWindow() const { return m_pMainWindow; }
 
@@ -465,8 +465,8 @@ private:
   uint m_bBackRightClick:1;
   uint m_bHierarchicalView:1;
   uint m_bDisableScrolling:1;
-  KTrader::OfferList m_partServiceOffers;
-  KTrader::OfferList m_appServiceOffers;
+  TDETrader::OfferList m_partServiceOffers;
+  TDETrader::OfferList m_appServiceOffers;
   KService::Ptr m_service;
   TQString m_serviceType;
   TQString m_caption;
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index b2ff4b475..f570322dc 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@@ -65,7 +65,7 @@ KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQStri
 {
   //kdDebug(1202) << "KonqViewManager::Initialize()" << endl;
   KService::Ptr service;
-  KTrader::OfferList partServiceOffers, appServiceOffers;
+  TDETrader::OfferList partServiceOffers, appServiceOffers;
   KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ );
   if ( newViewFactory.isNull() )
   {
@@ -106,7 +106,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
   KonqFrame* splitFrame = m_pMainWindow->currentView()->frame();
 
   KService::Ptr service;
-  KTrader::OfferList partServiceOffers, appServiceOffers;
+  TDETrader::OfferList partServiceOffers, appServiceOffers;
 
   KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, forceAutoEmbed );
 
@@ -217,7 +217,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
   TQString locationBarURL = m_pMainWindow->currentView()->locationBarURL();
 
   KService::Ptr service;
-  KTrader::OfferList partServiceOffers, appServiceOffers;
+  TDETrader::OfferList partServiceOffers, appServiceOffers;
 
   KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers );
 
@@ -328,7 +328,7 @@ KonqView* KonqViewManager::addTab(const TQString &serviceType, const TQString &s
   }
 
   KService::Ptr service;
-  KTrader::OfferList partServiceOffers, appServiceOffers;
+  TDETrader::OfferList partServiceOffers, appServiceOffers;
 
   KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ );
 
@@ -984,8 +984,8 @@ KonqView *KonqViewManager::chooseNextView( KonqView *view )
 KonqViewFactory KonqViewManager::createView( const TQString &serviceType,
                                           const TQString &serviceName,
                                           KService::Ptr &service,
-                                          KTrader::OfferList &partServiceOffers,
-                                          KTrader::OfferList &appServiceOffers,
+                                          TDETrader::OfferList &partServiceOffers,
+                                          TDETrader::OfferList &appServiceOffers,
                                           bool forceAutoEmbed )
 {
   kdDebug(1202) << "KonqViewManager::createView" << endl;
@@ -1018,8 +1018,8 @@ KonqViewFactory KonqViewManager::createView( const TQString &serviceType,
 KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
                                       KonqViewFactory &viewFactory,
                                       const KService::Ptr &service,
-                                      const KTrader::OfferList &partServiceOffers,
-                                      const KTrader::OfferList &appServiceOffers,
+                                      const TDETrader::OfferList &partServiceOffers,
+                                      const TDETrader::OfferList &appServiceOffers,
                                       const TQString &serviceType,
                                       bool passiveMode,
                                       bool openAfterCurrentPage )
@@ -1471,7 +1471,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
     //kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl;
 
     KService::Ptr service;
-    KTrader::OfferList partServiceOffers, appServiceOffers;
+    TDETrader::OfferList partServiceOffers, appServiceOffers;
 
     KonqViewFactory viewFactory = KonqFactory::createView( serviceType, serviceName, &service, &partServiceOffers, &appServiceOffers, true /*forceAutoEmbed*/ );
     if ( viewFactory.isNull() )
diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h
index 766cfb799..a7dbf939c 100644
--- a/konqueror/konq_viewmgr.h
+++ b/konqueror/konq_viewmgr.h
@@ -325,8 +325,8 @@ private:
   KonqViewFactory createView( const TQString &serviceType,
                               const TQString &serviceName,
                               KService::Ptr &service,
-                              KTrader::OfferList &partServiceOffers,
-                              KTrader::OfferList &appServiceOffers,
+                              TDETrader::OfferList &partServiceOffers,
+                              TDETrader::OfferList &appServiceOffers,
 			      bool forceAutoEmbed = false );
 
   /**
@@ -336,8 +336,8 @@ private:
   KonqView *setupView( KonqFrameContainerBase *parentContainer,
                        KonqViewFactory &viewFactory,
                        const KService::Ptr &service,
-                       const KTrader::OfferList &partServiceOffers,
-                       const KTrader::OfferList &appServiceOffers,
+                       const TDETrader::OfferList &partServiceOffers,
+                       const TDETrader::OfferList &appServiceOffers,
                        const TQString &serviceType,
                        bool passiveMode, bool openAfterCurrentPage = false);
 
diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp
index 6d643dd9b..e642918d4 100644
--- a/konqueror/kttsplugin/tdehtmlkttsd.cpp
+++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp
@@ -37,7 +37,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons
     : Plugin( parent, name )
 {
     // If KTTSD is not installed, hide action.
-    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)
     {
         (void) new KAction( i18n("&Speak Text"),
@@ -46,7 +46,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons
             actionCollection(), "tools_kttsd" );
     }
     else
-        kdDebug() << "TDEHTMLPLuginKTTSD::TDEHTMLPluginKTTSD: KTrader did not find KTTSD." << endl;
+        kdDebug() << "TDEHTMLPLuginKTTSD::TDEHTMLPluginKTTSD: TDETrader did not find KTTSD." << endl;
 }
 
 TDEHTMLPluginKTTSD::~TDEHTMLPluginKTTSD()
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index af7177b2e..01bdc1d7a 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -770,7 +770,7 @@ void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent,  const TQSt
     KonqSidebarTreeModule * module = 0L;
 
     // Here's where we need to create the right module...
-    // ### TODO: make this KTrader/KLibrary based.
+    // ### TODO: make this TDETrader/KLibrary based.
     TQString moduleName = cfg.readEntry( "X-TDE-TreeModule" );
     TQString showHidden=cfg.readEntry("X-TDE-TreeModule-ShowHidden");
 
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 81449c514..364aa2f29 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -4263,7 +4263,7 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ )
   TQHBox* row = new TQHBox( (TQWidget*)group );
   m_asRegExp = new TQCheckBox( i18n("As &regular expression"), row, "asRegexp" );
 
-  if (!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) {
+  if (!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) {
     m_editRegExp = new TQPushButton( i18n("&Edit..."), row, "editRegExp" );
     connect( m_asRegExp, TQT_SIGNAL( toggled(bool) ), m_editRegExp, TQT_SLOT( setEnabled(bool) ) );
     connect( m_editRegExp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditRegExp() ) );
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index 6faea6540..1aa8f422f 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -490,8 +490,8 @@ one holds the types, wich are NOT supposed to be shown. We need to take care of
 void KEyeCandyPage::enablePreview(bool currSettings){
 	TQStringList desktopPreviews;
 	TQStringList konquerorNoPreviews;
-	KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
-	for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) {
+	TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
+	for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) {
 		if(prevOther){
 			desktopPreviews.append((*it)->desktopEntryName());
 			kdDebug() << "Adding Preview:" << (*it)->desktopEntryName() << endl;
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index 4c1c23549..7a23b35a8 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -373,7 +373,7 @@ void SplashInstaller::slotSetTheme(int id)
         infoTxt += "</qt>";
 
         TQString pluginName( cnf.readEntry( "Engine", "Default" ) ); // Perhaps no default is better?
-        if ((KTrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName))).isEmpty())
+        if ((TDETrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName))).isEmpty())
         {
           enabled = false;
           error = i18n("This theme requires the plugin %1 which is not installed.").arg(pluginName);
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index 4cbfc2513..e889a2f4b 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -346,7 +346,7 @@ void KSplash::loadTheme( const TQString& theme )
 
 ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQString& theme )
 {
-  // Since we may be called before the DCOP server is active, we cannot use the KTrader framework for obtaining plugins. In its
+  // Since we may be called before the DCOP server is active, we cannot use the TDETrader framework for obtaining plugins. In its
   // place, we use the following naive heuristic to locate plugins. If we are not in managed mode, and we are not in testing mode
   // either, we assume that we have been called by starttde. In this case, we simply try to load the library whose name should
   // conform to the following specification:
@@ -369,7 +369,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri
   else
   {
     // Fancier way of locating plugins.
-    KService::List list= KTrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName));
+    KService::List list= TDETrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName));
     KService::Ptr ptr;
     if (!list.isEmpty())
     {
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index 34f5791a6..cd349da99 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -1912,8 +1912,8 @@ void KonqIconViewWidget::updatePreviewMimeTypes()
         d->pPreviewMimeTypes->clear();
 
     // Load the list of plugins to determine which mimetypes are supported
-    KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
-    KTrader::OfferList::ConstIterator it;
+    TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
+    TDETrader::OfferList::ConstIterator it;
 
     for ( it = plugins.begin(); it != plugins.end(); ++it ) {
         if ( d->previewSettings.contains((*it)->desktopEntryName()) ) {
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index e11ef9046..9d25cf794 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -847,7 +847,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
             }
         }
 
-        KTrader::OfferList offers;
+        TDETrader::OfferList offers;
 
         if (kapp->authorizeKAction("openwith"))
         {
@@ -864,7 +864,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                 ++it;
             }
 
-            offers = KTrader::self()->query( first, constraint );
+            offers = TDETrader::self()->query( first, constraint );
         }
 
         //// Ok, we have everything, now insert
@@ -895,7 +895,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                     text.appendChild( m_doc.createTextNode( i18n("&Open With") ) );
                 }
 
-                KTrader::OfferList::ConstIterator it = offers.begin();
+                TDETrader::OfferList::ConstIterator it = offers.begin();
                 for( ; it != offers.end(); it++ )
                 {
                     KService::Ptr service = (*it);
@@ -1179,14 +1179,14 @@ void KonqPopupMenu::addPlugins()
 {
     // search for Konq_PopupMenuPlugins inspired by simons kpropsdlg
     //search for a plugin with the right protocol
-    KTrader::OfferList plugin_offers;
+    TDETrader::OfferList plugin_offers;
     unsigned int pluginCount = 0;
-    plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
+    plugin_offers = TDETrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
     if ( plugin_offers.isEmpty() )
         return; // no plugins installed do not bother about it
 
-    KTrader::OfferList::ConstIterator iterator = plugin_offers.begin();
-    KTrader::OfferList::ConstIterator end = plugin_offers.end();
+    TDETrader::OfferList::ConstIterator iterator = plugin_offers.begin();
+    TDETrader::OfferList::ConstIterator end = plugin_offers.end();
 
     addGroup( "plugins" );
     // travers the offerlist
diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc
index 8a179672e..bc8aa4e9d 100644
--- a/libkonq/konq_propsview.cc
+++ b/libkonq/konq_propsview.cc
@@ -563,8 +563,8 @@ const TQStringList& KonqPropsView::previewSettings()
         d->previewsToShow = new TQStringList;
 
         if (d->previewsEnabled) {
-            KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" );
-            for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
+            TDETrader::OfferList plugins = TDETrader::self()->query( "ThumbCreator" );
+            for ( TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
             {
             TQString name = (*it)->desktopEntryName();
             if ( ! m_dontPreview.contains(name) )
diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp
index 27180f14d..5a8210b23 100644
--- a/tdeioslave/thumbnail/thumbnail.cpp
+++ b/tdeioslave/thumbnail/thumbnail.cpp
@@ -70,7 +70,7 @@
 // iconSize     - the size of the overlay icon to use if any
 // iconAlpha    - the transparency value used for icon overlays
 // plugin       - the name of the plugin library to be used for thumbnail creation.
-//                Provided by the application to save an addition KTrader
+//                Provided by the application to save an addition TDETrader
 //                query here.
 // shmid        - the shared memory segment id to write the image's data to.
 //                The segment is assumed to provide enough space for a 32-bit
@@ -240,10 +240,10 @@ void ThumbnailProtocol::get(const KURL &url)
 #ifdef THUMBNAIL_HACK
         if (plugin.isEmpty())
         {
-            KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
+            TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
             TQMap<TQString, KService::Ptr> mimeMap;
     
-            for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
+            for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
             {
                 TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
                 for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)