summaryrefslogtreecommitdiffstats
path: root/noatun-plugins/charlatan
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:51 -0600
commit4c097708c4cc24f3b8e4c21f14644f5715767d47 (patch)
treee8ca4b1d3a3b3de0d18e5f144dcef9b36f830b84 /noatun-plugins/charlatan
parent0642ee50634d90e255c6f45194f6a47dc1157cde (diff)
downloadtdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.tar.gz
tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'noatun-plugins/charlatan')
-rw-r--r--noatun-plugins/charlatan/charlatanui.cpp2
-rw-r--r--noatun-plugins/charlatan/configmodule.cpp4
-rw-r--r--noatun-plugins/charlatan/userinterface.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/noatun-plugins/charlatan/charlatanui.cpp b/noatun-plugins/charlatan/charlatanui.cpp
index a2a9bec..36113ff 100644
--- a/noatun-plugins/charlatan/charlatanui.cpp
+++ b/noatun-plugins/charlatan/charlatanui.cpp
@@ -27,7 +27,7 @@ extern "C"
{
Plugin * create_plugin()
{
- KGlobal::locale()->insertCatalogue("charlatanui");
+ TDEGlobal::locale()->insertCatalogue("charlatanui");
return new Charlatan;
}
}
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index 3624e0b..08056ae 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -53,7 +53,7 @@ CharlatanConfigModule::CharlatanConfigModule(TQObject * parent)
void
CharlatanConfigModule::save()
{
- KConfig * c(KGlobal::config());
+ KConfig * c(TDEGlobal::config());
c->setGroup("CharlatanInterface");
c->writeEntry("ScrollTitle", scroll_->isChecked());
c->sync();
@@ -63,7 +63,7 @@ CharlatanConfigModule::save()
void
CharlatanConfigModule::reopen()
{
- KConfig * c(KGlobal::config());
+ KConfig * c(TDEGlobal::config());
c->setGroup("CharlatanInterface");
scroll_->setChecked(c->readBoolEntry("ScrollTitle", true));
}
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index 7f7a41f..b708f02 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -394,7 +394,7 @@ void Charlatan::slotTimeout()
void Charlatan::loadConfig()
{
- KConfig * c(KGlobal::config());
+ KConfig * c(TDEGlobal::config());
c->setGroup("CharlatanInterface");
titleLabel_->setScroll(c->readBoolEntry("ScrollTitle", true));
}