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 --- kmix/kmixctrl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kmix/kmixctrl.cpp') diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp index 60c27c48..8cf04523 100644 --- a/kmix/kmixctrl.cpp +++ b/kmix/kmixctrl.cpp @@ -73,7 +73,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) if ( args->isSet("restore") ) { for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next()) { - mixer->volumeLoad( KGlobal::config() ); + mixer->volumeLoad( TDEGlobal::config() ); } } @@ -81,7 +81,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) if ( args->isSet("save") ) { for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next()) - mixer->volumeSave( KGlobal::config() ); + mixer->volumeSave( TDEGlobal::config() ); } MixerToolBox::deinitMixer(); -- cgit v1.2.1