summaryrefslogtreecommitdiffstats
path: root/arts/modules
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
parent9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff)
downloadtdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz
tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'arts/modules')
-rw-r--r--arts/modules/common/env_mixeritem_impl.cc4
-rw-r--r--arts/modules/effects/fivebandmonocomplexeq_impl.cc4
-rw-r--r--arts/modules/effects/freeverbguifactory_impl.cc4
-rw-r--r--arts/modules/effects/monostereoconversion_impl.cc4
-rw-r--r--arts/modules/effects/stereocompressorguifactory_impl.cc4
-rw-r--r--arts/modules/effects/synth_stereo_fir_equalizer_impl.cc4
-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
9 files changed, 17 insertions, 17 deletions
diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc
index 6f4e0e48..6fee8b44 100644
--- a/arts/modules/common/env_mixeritem_impl.cc
+++ b/arts/modules/common/env_mixeritem_impl.cc
@@ -4,8 +4,8 @@
#include "connect.h"
#include "../runtime/sequenceutils.h"
#include <stdio.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <vector>
diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
index 148f1a0d..59d0ef44 100644
--- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc
+++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
@@ -26,8 +26,8 @@
#include <artsmoduleseffects.h>
#include <connect.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Arts {
diff --git a/arts/modules/effects/freeverbguifactory_impl.cc b/arts/modules/effects/freeverbguifactory_impl.cc
index c15a5bfd..4b5d4d34 100644
--- a/arts/modules/effects/freeverbguifactory_impl.cc
+++ b/arts/modules/effects/freeverbguifactory_impl.cc
@@ -24,8 +24,8 @@
#include "debug.h"
#include "connect.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace std;
using namespace Arts;
diff --git a/arts/modules/effects/monostereoconversion_impl.cc b/arts/modules/effects/monostereoconversion_impl.cc
index deee99fd..9bf1bbee 100644
--- a/arts/modules/effects/monostereoconversion_impl.cc
+++ b/arts/modules/effects/monostereoconversion_impl.cc
@@ -26,8 +26,8 @@
#include <artsmoduleseffects.h>
#include <connect.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Arts {
diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cc
index 3c05ab9f..0dd523e8 100644
--- a/arts/modules/effects/stereocompressorguifactory_impl.cc
+++ b/arts/modules/effects/stereocompressorguifactory_impl.cc
@@ -17,8 +17,8 @@
*/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "artsmoduleseffects.h"
#include "connect.h"
diff --git a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
index 364375c2..8f15a4dc 100644
--- a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
+++ b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
@@ -31,8 +31,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace std;
using namespace Arts;
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 {