Rename additional header files to avoid conflicts with KDE4

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)

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>

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>