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

---
 admin/kde.py          | 2 +-
 src/tdeio_locate.cpp  | 2 +-
 src/tdeio_locate.kcfg | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/kde.py b/admin/kde.py
index a67f722..d545474 100644
--- a/admin/kde.py
+++ b/admin/kde.py
@@ -348,7 +348,7 @@ def generate(env):
 
 	## ui file processing
 	def uic_processing(target, source, env):
-		inc_kde  ='#include <klocale.h>\n#include <kdialog.h>\n'
+		inc_kde  ='#include <tdelocale.h>\n#include <kdialog.h>\n'
 		inc_moc  ='#include "%s"\n' % target[2].name
 		comp_h   ='$QT_UIC -L $QTPLUGINS -nounload -o %s %s' % (target[0].path, source[0].path)
 		comp_c   ='$QT_UIC -L $QTPLUGINS -nounload -tr tr2i18n -impl %s %s' % (target[0].path, source[0].path)
diff --git a/src/tdeio_locate.cpp b/src/tdeio_locate.cpp
index 7440dae..3e53946 100644
--- a/src/tdeio_locate.cpp
+++ b/src/tdeio_locate.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <kde_file.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kuser.h>
 #include <tqfile.h>
diff --git a/src/tdeio_locate.kcfg b/src/tdeio_locate.kcfg
index f0525e7..6b86e9a 100644
--- a/src/tdeio_locate.kcfg
+++ b/src/tdeio_locate.kcfg
@@ -5,7 +5,7 @@
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
 
   <kcfgfile name="tdeio_locaterc"/>
-  <include>klocale.h</include>
+  <include>tdelocale.h</include>
   <group name="General">
 	<entry name="caseSensitivity" type="Int">
 		<label>Case sensitivity</label>
-- 
cgit v1.2.1