From d18f282f3a4cb64a392d77c00e2b7a0e9cbc0fd1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 10:43:27 -0600 Subject: [PATCH] Rename KLock and KTrader to avoid conflicts with KDE4 --- konversation/src/autoreplace_preferences.cpp | 4 ++-- konversation/src/highlight_preferences.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp index 88ed31c..5cb2075 100644 --- a/konversation/src/autoreplace_preferences.cpp +++ b/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); } diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp index 99a8df8..ccbdc0a 100644 --- a/konversation/src/highlight_preferences.cpp +++ b/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);