summaryrefslogtreecommitdiffstats
path: root/arts/modules/common
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:46 -0600
commit27430f06c6cc2187c639f59f342f07f1fde91a8b (patch)
tree493c1095950b7f0a82690cedac1b749666be1b47 /arts/modules/common
parent794a886cbd6d6893d62026f3800b95051652fc5a (diff)
downloadtdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz
tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'arts/modules/common')
-rw-r--r--arts/modules/common/env_mixeritem_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc
index 0f4db5e8..6f4e0e48 100644
--- a/arts/modules/common/env_mixeritem_impl.cc
+++ b/arts/modules/common/env_mixeritem_impl.cc
@@ -272,7 +272,7 @@ public:
}
Widget initialize(MixerItem item)
{
- KGlobal::locale()->insertCatalogue( "artsmodules" );
+ TDEGlobal::locale()->insertCatalogue( "artsmodules" );
VBox vbox;
vbox._addChild(self(),"the_gui_updating_widget");
@@ -301,7 +301,7 @@ class MixerGuiFactory_impl : virtual public MixerGuiFactory_skel
public:
Widget createGui(Object object)
{
- KGlobal::locale()->insertCatalogue( "artsmodules" );
+ TDEGlobal::locale()->insertCatalogue( "artsmodules" );
arts_return_val_if_fail(!object.isNull(), Arts::Widget::null());
std::string iface = object._interfaceName();