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 /arts/modules/mixers | |
parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'arts/modules/mixers')
-rw-r--r-- | arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc | 2 | ||||
-rw-r--r-- | arts/modules/mixers/simplemixerchannelguifactory_impl.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc index d97f1aa4..64b48ad7 100644 --- a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc +++ b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc @@ -12,7 +12,7 @@ namespace Arts { public: Widget createGui(Object object) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); MonoSimpleMixerChannel ch= DynamicCast(object); arts_return_val_if_fail(!ch.isNull(), Arts::Widget::null()); diff --git a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc b/arts/modules/mixers/simplemixerchannelguifactory_impl.cc index 0f585eb1..370865bf 100644 --- a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc +++ b/arts/modules/mixers/simplemixerchannelguifactory_impl.cc @@ -10,7 +10,7 @@ namespace Arts { public: Widget createGui(Object object) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); SimpleMixerChannel ch = DynamicCast(object); arts_return_val_if_fail(!ch.isNull(), Arts::Widget::null()); |