From 27430f06c6cc2187c639f59f342f07f1fde91a8b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:46 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- noatun/modules/kaiman/pref.cpp | 8 ++++---- noatun/modules/kaiman/userinterface.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'noatun/modules/kaiman') diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index 1077613b..eea42474 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -52,7 +52,7 @@ KaimanPrefDlg::~KaimanPrefDlg() void KaimanPrefDlg::save() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Kaiman"); config->writeEntry("SkinResource", skin() ); config->sync(); @@ -67,13 +67,13 @@ void KaimanPrefDlg::reopen() { _skinList->clear(); // fill with available skins - KGlobal::dirs()->addResourceType("skins", KStandardDirs::kde_default("data") + "noatun/skins/kaiman/"); - TQStringList list = KGlobal::dirs()->resourceDirs("skins"); + TDEGlobal::dirs()->addResourceType("skins", KStandardDirs::kde_default("data") + "noatun/skins/kaiman/"); + TQStringList list = TDEGlobal::dirs()->resourceDirs("skins"); for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++) readSkinDir(*it); // load current config - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Kaiman"); TQString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN ); TQListBoxItem *item = _skinList->findItem( skin ); diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index 7faecc3b..e5dec5b5 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -80,7 +80,7 @@ Kaiman::Kaiman() _altSkin = false; // init config - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Kaiman"); // load skin -- cgit v1.2.1