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 /kmix/kmixctrl.cpp | |
| parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
| download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmix/kmixctrl.cpp')
| -rw-r--r-- | kmix/kmixctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |