From 86aa055b2351aa71ba2c83e0447eaccf06e29718 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:49:48 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tderadio3/plugins/recording/encoder.cpp               | 2 +-
 tderadio3/plugins/recording/encoder_mp3.cpp           | 2 +-
 tderadio3/plugins/recording/encoder_ogg.cpp           | 2 +-
 tderadio3/plugins/recording/encoder_pcm.cpp           | 2 +-
 tderadio3/plugins/recording/recording-datamonitor.cpp | 2 +-
 tderadio3/plugins/recording/recording-monitor.cpp     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tderadio3/plugins/recording')

diff --git a/tderadio3/plugins/recording/encoder.cpp b/tderadio3/plugins/recording/encoder.cpp
index c1e27c3..b1c054f 100644
--- a/tderadio3/plugins/recording/encoder.cpp
+++ b/tderadio3/plugins/recording/encoder.cpp
@@ -30,7 +30,7 @@
 
 #include <tdeconfig.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 RecordingEncoding::RecordingEncoding(TQObject *parent,            SoundStreamID ssid,
                                      const RecordingConfig &cfg, const RadioStation *rs,
diff --git a/tderadio3/plugins/recording/encoder_mp3.cpp b/tderadio3/plugins/recording/encoder_mp3.cpp
index 2ec1e1d..456850f 100644
--- a/tderadio3/plugins/recording/encoder_mp3.cpp
+++ b/tderadio3/plugins/recording/encoder_mp3.cpp
@@ -18,7 +18,7 @@
 #include "encoder_mp3.h"
 
 #include <tqmutex.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 RecordingEncodingMP3::RecordingEncodingMP3(TQObject *parent,            SoundStreamID ssid,
                                            const RecordingConfig &cfg, const RadioStation *rs,
diff --git a/tderadio3/plugins/recording/encoder_ogg.cpp b/tderadio3/plugins/recording/encoder_ogg.cpp
index fa61ab1..ca093b9 100644
--- a/tderadio3/plugins/recording/encoder_ogg.cpp
+++ b/tderadio3/plugins/recording/encoder_ogg.cpp
@@ -17,7 +17,7 @@
 
 #include "encoder_ogg.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 
 RecordingEncodingOgg::RecordingEncodingOgg(TQObject *parent,            SoundStreamID ssid,
diff --git a/tderadio3/plugins/recording/encoder_pcm.cpp b/tderadio3/plugins/recording/encoder_pcm.cpp
index 1143bc3..24a8ab6 100644
--- a/tderadio3/plugins/recording/encoder_pcm.cpp
+++ b/tderadio3/plugins/recording/encoder_pcm.cpp
@@ -18,7 +18,7 @@
 #include "encoder_pcm.h"
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 RecordingEncodingPCM::RecordingEncodingPCM(TQObject *parent,            SoundStreamID ssid,
                                            const RecordingConfig &cfg, const RadioStation *rs,
diff --git a/tderadio3/plugins/recording/recording-datamonitor.cpp b/tderadio3/plugins/recording/recording-datamonitor.cpp
index f2bbe8e..cd8b7e1 100644
--- a/tderadio3/plugins/recording/recording-datamonitor.cpp
+++ b/tderadio3/plugins/recording/recording-datamonitor.cpp
@@ -27,7 +27,7 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define CHANNEL_H_MIN   20
 #define BLOCK_W_MIN     10
diff --git a/tderadio3/plugins/recording/recording-monitor.cpp b/tderadio3/plugins/recording/recording-monitor.cpp
index 0e0bd62..ee1514b 100644
--- a/tderadio3/plugins/recording/recording-monitor.cpp
+++ b/tderadio3/plugins/recording/recording-monitor.cpp
@@ -25,7 +25,7 @@
 #include <tqcheckbox.h>
 #include <kcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 
-- 
cgit v1.2.1