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/splitplaylist/view.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'noatun/modules/splitplaylist/view.cpp') diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index 15963929..764cbc7e 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -662,7 +662,7 @@ View::View(SplitPlaylist *) mFinder = new Finder(this); - applyMainWindowSettings(KGlobal::config(), "SPL Window"); + applyMainWindowSettings(TDEGlobal::config(), "SPL Window"); list->setFocus(); } @@ -797,7 +797,7 @@ void View::init() list->openGlobal(internalURL); } - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup("splitplaylist"); // this has to come after openGlobal, since openGlobal emits modified() @@ -942,7 +942,7 @@ void View::setModified(void) void View::saveState(void) { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup("splitplaylist"); config.writeEntry("modified", modified); @@ -955,14 +955,14 @@ void View::saveState(void) item=SPL->getAfter(item), i++; config.writeEntry("current", i); - saveMainWindowSettings(KGlobal::config(), "SPL Window"); + saveMainWindowSettings(TDEGlobal::config(), "SPL Window"); config.sync(); } void View::configureToolBars() { - saveMainWindowSettings(KGlobal::config(), "SPL Window"); + saveMainWindowSettings(TDEGlobal::config(), "SPL Window"); KEditToolbar dlg(actionCollection(), "splui.rc"); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); dlg.exec(); @@ -971,7 +971,7 @@ void View::configureToolBars() void View::newToolBarConfig() { createGUI("splui.rc"); - applyMainWindowSettings(KGlobal::config(), "SPL Window"); + applyMainWindowSettings(TDEGlobal::config(), "SPL Window"); } // turns the sorting on or off -- cgit v1.2.1