Rename KLock and KTrader to avoid conflicts with KDE4

quanta/components/debugger/debuggermanager.cpp

@@ -88,8 +88,8 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU
   if(!projectname.isEmpty())
   {
 
-    KTrader::OfferList offers = KTrader::self()->query("Quanta/Debugger");
-    KTrader::OfferList::ConstIterator iterDbg;
+    TDETrader::OfferList offers = TDETrader::self()->query("Quanta/Debugger");
+    TDETrader::OfferList::ConstIterator iterDbg;
     for(iterDbg = offers.begin(); iterDbg != offers.end(); ++iterDbg)
     {
       KService::Ptr service = *iterDbg;

quanta/project/project.cpp

@@ -484,8 +484,8 @@ void Project::slotOptions()
 
 
   // Debuggers Combo
-  KTrader::OfferList offers = KTrader::self()->query("Quanta/Debugger");
-  KTrader::OfferList::ConstIterator iterDbg;
+  TDETrader::OfferList offers = TDETrader::self()->query("Quanta/Debugger");
+  TDETrader::OfferList::ConstIterator iterDbg;
   optionsPage.comboDebuggerClient->clear();
   optionsPage.comboDebuggerClient->insertItem(i18n("No Debugger"));
   int idxDbg = 0;

quanta/project/projectprivate.cpp

@@ -1494,8 +1494,8 @@ void ProjectPrivate::slotAddDirectory()
 void ProjectPrivate::slotDebuggerOptions()
 {
   // Debuggers Combo
-  KTrader::OfferList offers = KTrader::self()->query("Quanta/Debugger");
-  KTrader::OfferList::ConstIterator iterDbg;
+  TDETrader::OfferList offers = TDETrader::self()->query("Quanta/Debugger");
+  TDETrader::OfferList::ConstIterator iterDbg;
   for(iterDbg = offers.begin(); iterDbg != offers.end(); ++iterDbg)
   {
     KService::Ptr service = *iterDbg;

quanta/treeviews/basetreeview.cpp

@@ -593,7 +593,7 @@ void BaseTreeView::insertOpenWithMenu(KPopupMenu *menu, int position)
   m_openWithActions.clear();
   KURL urlToOpen = currentURL();
   TQString mimeType = KMimeType::findByURL(urlToOpen, 0, true, true)->name();
-  KTrader::OfferList offers = KTrader::self()->query(mimeType, "Type == 'Application'");
+  TDETrader::OfferList offers = TDETrader::self()->query(mimeType, "Type == 'Application'");
   TQDict<QuantaPlugin> plugins = QuantaPluginInterface::ref()->plugins();   
   m_pluginIds.clear();
 
@@ -602,7 +602,7 @@ void BaseTreeView::insertOpenWithMenu(KPopupMenu *menu, int position)
     m_openWithMenu = new KPopupMenu(this);
     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());