summaryrefslogtreecommitdiffstats
path: root/arts/modules/mixers
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:58:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:58:20 -0600
commit6915c95d7c4a42d19ebbec3c87c1e308b20ec272 (patch)
tree027fb6e879e17c2d65cbea9eab5c9da028618972 /arts/modules/mixers
parent9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff)
downloadtdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz
tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'arts/modules/mixers')
-rw-r--r--arts/modules/mixers/littlestereomixerchannel_impl.cc2
-rw-r--r--arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc4
-rw-r--r--arts/modules/mixers/simplemixerchannelguifactory_impl.cc4
3 files changed, 5 insertions, 5 deletions
diff --git a/arts/modules/mixers/littlestereomixerchannel_impl.cc b/arts/modules/mixers/littlestereomixerchannel_impl.cc
index 84aaef5f..3b14fa39 100644
--- a/arts/modules/mixers/littlestereomixerchannel_impl.cc
+++ b/arts/modules/mixers/littlestereomixerchannel_impl.cc
@@ -28,7 +28,7 @@
#include <debug.h>
#include "artsgui.h"
-#include <klocale.h>
+#include <tdelocale.h>
using namespace Arts;
diff --git a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
index 64b48ad7..ab35e4fc 100644
--- a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
+++ b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
@@ -2,8 +2,8 @@
#include "debug.h"
#include "connect.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Arts {
diff --git a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc b/arts/modules/mixers/simplemixerchannelguifactory_impl.cc
index 370865bf..0a36470d 100644
--- a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc
+++ b/arts/modules/mixers/simplemixerchannelguifactory_impl.cc
@@ -2,8 +2,8 @@
#include "debug.h"
#include "connect.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Arts {
class SimpleMixerChannelGuiFactory_impl : virtual public SimpleMixerChannelGuiFactory_skel {