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

---
 tdeioslave/audiocd/audiocd.cpp                      | 2 +-
 tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp        | 2 +-
 tdeioslave/audiocd/plugins/lame/encoderlame.cpp     | 6 +++---
 tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'tdeioslave')

diff --git a/tdeioslave/audiocd/audiocd.cpp b/tdeioslave/audiocd/audiocd.cpp
index 2366847b..5d1e54a8 100644
--- a/tdeioslave/audiocd/audiocd.cpp
+++ b/tdeioslave/audiocd/audiocd.cpp
@@ -49,7 +49,7 @@ extern "C"
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 // CDDB
diff --git a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
index bd1e721f..2287b668 100644
--- a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
+++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
@@ -18,7 +18,7 @@
 
 #include <tdeconfig.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
index 509e1c39..0e2ddef3 100644
--- a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
+++ b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
@@ -27,11 +27,11 @@
 #include <kprocess.h>
 #include <kdebug.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tqfileinfo.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include "collectingprocess.h"
 
diff --git a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp
index f1a5bad5..5507b6f2 100644
--- a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp
+++ b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp
@@ -35,8 +35,8 @@
 #include <knuminput.h>
 #include <tqgroupbox.h>
 
-#include <kglobal.h>  
-#include <klocale.h>
+#include <tdeglobal.h>  
+#include <tdelocale.h>
 
 extern "C"
 {
-- 
cgit v1.2.1