Rename KLock and KTrader to avoid conflicts with KDE4

konq-plugins/sidebar/metabar/src/defaultplugin.cpp

@@ -166,9 +166,9 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node)
         }
       }
       else{ //other files
-        KTrader::OfferList offers;
+        TDETrader::OfferList offers;
         
-        offers = KTrader::self()->query(item->mimetype(), "Type == 'Application'");
+        offers = TDETrader::self()->query(item->mimetype(), "Type == 'Application'");
         if(!offers.isEmpty()){
           TDEConfig config("metabarrc", true, false);
           config.setGroup("General");
@@ -177,7 +177,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node)
           int max = config.readNumEntry("MaxEntries", 5);
           
           runMap.clear();      
-          KTrader::OfferList::ConstIterator it = offers.begin();
+          TDETrader::OfferList::ConstIterator it = offers.begin();
           
           for(; it != offers.end(); it++){
             TQString nam;

konq-plugins/uachanger/uachangerplugin.cpp

@@ -87,7 +87,7 @@ void UAChangerPlugin::slotReloadDescriptions()
 
 void UAChangerPlugin::parseDescFiles()
 {
-  KTrader::OfferList list = KTrader::self()->query("UserAgentStrings");
+  TDETrader::OfferList list = TDETrader::self()->query("UserAgentStrings");
   if ( list.count() == 0 )
     return;
 
@@ -111,8 +111,8 @@ void UAChangerPlugin::parseDescFiles()
      }
   }
 
-  KTrader::OfferList::ConstIterator it = list.begin();
-  KTrader::OfferList::ConstIterator lastItem = list.end();
+  TDETrader::OfferList::ConstIterator it = list.begin();
+  TDETrader::OfferList::ConstIterator lastItem = list.end();
 
   for ( ; it != lastItem; ++it )
   {