Rename KLock and KTrader to avoid conflicts with KDE4

konversation/src/autoreplace_preferences.cpp

@@ -41,7 +41,7 @@ Autoreplace_Config::Autoreplace_Config(TQWidget* parent, const char* name)
   m_newItemSelected=false;
 
   //Check if the regexp editor is installed
-  bool installed = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
+  bool installed = !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
 
   if(installed)
   {
@@ -233,7 +233,7 @@ void Autoreplace_Config::entrySelected(TQListViewItem* autoreplaceEntry)
   replacementLabel->setEnabled(enabled);
   replacementInput->setEnabled(enabled);
 
-  if(!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty())
+  if(!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty())
   {
     regExpEditorButton->setEnabled(enabled);
   }

konversation/src/highlight_preferences.cpp

@@ -164,7 +164,7 @@ void Highlight_Config::updateButtons()
 {
   bool enabled = highlightListView->selectedItem() != NULL;
   // is the kregexpeditor installed?
-  bool installed = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
+  bool installed = !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
   // enable or disable edit widgets
   patternLabel->setEnabled(enabled);
   patternInput->setEnabled(enabled);