summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:43:27 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:43:27 -0600
commitd18f282f3a4cb64a392d77c00e2b7a0e9cbc0fd1 (patch)
tree97d8de5f599bdb77af36fbdfe0d92e71c481e29e
parentb04a76ca0d071cad5ccbd7a0d878b99a196e184d (diff)
downloadkonversation-d18f282f.tar.gz
konversation-d18f282f.zip
Rename KLock and KTrader to avoid conflicts with KDE4
-rw-r--r--konversation/src/autoreplace_preferences.cpp4
-rw-r--r--konversation/src/highlight_preferences.cpp2
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);