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

---
 tdefile-plugins/au/tdefile_au.cpp         | 2 +-
 tdefile-plugins/avi/tdefile_avi.cpp       | 2 +-
 tdefile-plugins/flac/tdefile_flac.cpp     | 2 +-
 tdefile-plugins/m3u/tdefile_m3u.cpp       | 2 +-
 tdefile-plugins/mp3/tdefile_mp3.cpp       | 2 +-
 tdefile-plugins/mpc/tdefile_mpc.cpp       | 2 +-
 tdefile-plugins/mpeg/tdefile_mpeg.cpp     | 2 +-
 tdefile-plugins/ogg/tdefile_ogg.cpp       | 2 +-
 tdefile-plugins/sid/tdefile_sid.cpp       | 2 +-
 tdefile-plugins/theora/tdefile_theora.cpp | 2 +-
 tdefile-plugins/wav/tdefile_wav.cpp       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'tdefile-plugins')

diff --git a/tdefile-plugins/au/tdefile_au.cpp b/tdefile-plugins/au/tdefile_au.cpp
index 0b0b86f6..296a91d7 100644
--- a/tdefile-plugins/au/tdefile_au.cpp
+++ b/tdefile-plugins/au/tdefile_au.cpp
@@ -21,7 +21,7 @@
 #include "tdefile_au.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
diff --git a/tdefile-plugins/avi/tdefile_avi.cpp b/tdefile-plugins/avi/tdefile_avi.cpp
index b1c832bd..03866369 100644
--- a/tdefile-plugins/avi/tdefile_avi.cpp
+++ b/tdefile-plugins/avi/tdefile_avi.cpp
@@ -22,7 +22,7 @@
 #include "tdefile_avi.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
diff --git a/tdefile-plugins/flac/tdefile_flac.cpp b/tdefile-plugins/flac/tdefile_flac.cpp
index b7030998..85d52068 100644
--- a/tdefile-plugins/flac/tdefile_flac.cpp
+++ b/tdefile-plugins/flac/tdefile_flac.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <ksavefile.h>
 
diff --git a/tdefile-plugins/m3u/tdefile_m3u.cpp b/tdefile-plugins/m3u/tdefile_m3u.cpp
index a25234e8..7e0aad18 100644
--- a/tdefile-plugins/m3u/tdefile_m3u.cpp
+++ b/tdefile-plugins/m3u/tdefile_m3u.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include <tqcstring.h>
diff --git a/tdefile-plugins/mp3/tdefile_mp3.cpp b/tdefile-plugins/mp3/tdefile_mp3.cpp
index ccabd079..2d0e0022 100644
--- a/tdefile-plugins/mp3/tdefile_mp3.cpp
+++ b/tdefile-plugins/mp3/tdefile_mp3.cpp
@@ -23,7 +23,7 @@
 #include "tdefile_mp3.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
diff --git a/tdefile-plugins/mpc/tdefile_mpc.cpp b/tdefile-plugins/mpc/tdefile_mpc.cpp
index bc4828fd..9a6a3d42 100644
--- a/tdefile-plugins/mpc/tdefile_mpc.cpp
+++ b/tdefile-plugins/mpc/tdefile_mpc.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <ksavefile.h>
 
diff --git a/tdefile-plugins/mpeg/tdefile_mpeg.cpp b/tdefile-plugins/mpeg/tdefile_mpeg.cpp
index fd015422..f32c1576 100644
--- a/tdefile-plugins/mpeg/tdefile_mpeg.cpp
+++ b/tdefile-plugins/mpeg/tdefile_mpeg.cpp
@@ -25,7 +25,7 @@
 #include "tdefile_mpeg.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
diff --git a/tdefile-plugins/ogg/tdefile_ogg.cpp b/tdefile-plugins/ogg/tdefile_ogg.cpp
index b141acb1..bf1cbf94 100644
--- a/tdefile-plugins/ogg/tdefile_ogg.cpp
+++ b/tdefile-plugins/ogg/tdefile_ogg.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <ksavefile.h>
 
diff --git a/tdefile-plugins/sid/tdefile_sid.cpp b/tdefile-plugins/sid/tdefile_sid.cpp
index 543d5b87..b0d61459 100644
--- a/tdefile-plugins/sid/tdefile_sid.cpp
+++ b/tdefile-plugins/sid/tdefile_sid.cpp
@@ -18,7 +18,7 @@
 
 #include "tdefile_sid.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
diff --git a/tdefile-plugins/theora/tdefile_theora.cpp b/tdefile-plugins/theora/tdefile_theora.cpp
index 20e4e337..5c8fadb2 100644
--- a/tdefile-plugins/theora/tdefile_theora.cpp
+++ b/tdefile-plugins/theora/tdefile_theora.cpp
@@ -23,7 +23,7 @@
 #include "tdefile_theora.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "theora/theora.h"
diff --git a/tdefile-plugins/wav/tdefile_wav.cpp b/tdefile-plugins/wav/tdefile_wav.cpp
index 1c1f61ad..d0057b42 100644
--- a/tdefile-plugins/wav/tdefile_wav.cpp
+++ b/tdefile-plugins/wav/tdefile_wav.cpp
@@ -21,7 +21,7 @@
 #include "tdefile_wav.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
-- 
cgit v1.2.3