diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
| commit | 27430f06c6cc2187c639f59f342f07f1fde91a8b (patch) | |
| tree | 493c1095950b7f0a82690cedac1b749666be1b47 /noatun/modules/kaiman | |
| parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
| download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/kaiman')
| -rw-r--r-- | noatun/modules/kaiman/pref.cpp | 8 | ||||
| -rw-r--r-- | noatun/modules/kaiman/userinterface.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
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 |