Rename additional header files to avoid conflicts with KDE4

19 files changed, 21 insertions, 21 deletions

diff --git a/kjsembed/bindings/netaccess_imp.cpp b/kjsembed/bindings/netaccess_imp.cpp
index 91dcf708..024a8764 100644
--- a/kjsembed/bindings/netaccess_imp.cpp
+++ b/kjsembed/bindings/netaccess_imp.cpp
@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 namespace KJSEmbed {
 namespace Bindings {
diff --git a/kjsembed/builtins/qdir_imp.cpp b/kjsembed/builtins/qdir_imp.cpp
index 6d4f674f..b2f50cba 100644
--- a/kjsembed/builtins/qdir_imp.cpp
+++ b/kjsembed/builtins/qdir_imp.cpp
@@ -6,7 +6,7 @@
 #include <kjs/object.h>
 
 #ifndef QT_ONLY
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #endif
 
diff --git a/kjsembed/builtins/qfile_imp.cpp b/kjsembed/builtins/qfile_imp.cpp
index 1c79bb35..1ead6bbf 100644
--- a/kjsembed/builtins/qfile_imp.cpp
+++ b/kjsembed/builtins/qfile_imp.cpp
@@ -6,7 +6,7 @@
 #include <tqfont.h>
 
 #ifndef QT_ONLY
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #endif
 
diff --git a/kjsembed/builtins/resources.cpp b/kjsembed/builtins/resources.cpp
index 7bf44e1b..22a6917c 100644
--- a/kjsembed/builtins/resources.cpp
+++ b/kjsembed/builtins/resources.cpp
@@ -19,7 +19,7 @@
 
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <jsproxy.h>
 #include <jsbinding.h>
diff --git a/kjsembed/cpptests/jsaccess/jsaccess.cpp b/kjsembed/cpptests/jsaccess/jsaccess.cpp
index 75c15024..a4ced6dd 100644
--- a/kjsembed/cpptests/jsaccess/jsaccess.cpp
+++ b/kjsembed/cpptests/jsaccess/jsaccess.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kjs/interpreter.h>
 
 #include <kjsembed/jsconsolewidget.h>
diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp
index 5092c27f..906e0691 100644
--- a/kjsembed/customobject_imp.cpp
+++ b/kjsembed/customobject_imp.cpp
@@ -51,7 +51,7 @@
 #include <tdelistview.h>
 #include <kurl.h>
 #include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <ksystemtray.h>
 #include <tdepopupmenu.h>
diff --git a/kjsembed/docs/embedding/simple-embed/main.cpp b/kjsembed/docs/embedding/simple-embed/main.cpp
index be2e894b..f7f4a9d1 100644
--- a/kjsembed/docs/embedding/simple-embed/main.cpp
+++ b/kjsembed/docs/embedding/simple-embed/main.cpp
@@ -22,7 +22,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE Application");
diff --git a/kjsembed/global.h b/kjsembed/global.h
index e2e4a652..7ab55e96 100644
--- a/kjsembed/global.h
+++ b/kjsembed/global.h
@@ -67,7 +67,7 @@ KJSEMBED_EXPORT TQTextStream *conerr();
  */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #else // QT_ONLY
 
diff --git a/kjsembed/jsbuiltin_imp.cpp b/kjsembed/jsbuiltin_imp.cpp
index d9f307d9..4aebd73d 100644
--- a/kjsembed/jsbuiltin_imp.cpp
+++ b/kjsembed/jsbuiltin_imp.cpp
@@ -27,9 +27,9 @@
 #ifndef QT_ONLY
 
 #include "global.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstddirs.h>
 #include "ksimpleprocess.h"
 
diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp
index 3ac44494..57015a6d 100644
--- a/kjsembed/jsconsolewidget.cpp
+++ b/kjsembed/jsconsolewidget.cpp
@@ -25,10 +25,10 @@
 
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <ktextedit.h>
diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp
index 2dbbe8e2..faac7212 100644
--- a/kjsembed/jsfactory.cpp
+++ b/kjsembed/jsfactory.cpp
@@ -48,7 +48,7 @@
 #include <dcopclient.h>
 #include <tdeaction.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kservice.h>
 #include <ksystemtray.h>
diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp
index 16f318bf..ed8718ea 100644
--- a/kjsembed/kjscmd.cpp
+++ b/kjsembed/kjscmd.cpp
@@ -29,7 +29,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 
 #include <kjs/interpreter.h>
diff --git a/kjsembed/ksimpleprocess.cpp b/kjsembed/ksimpleprocess.cpp
index 0a7ee1cc..c65449ee 100644
--- a/kjsembed/ksimpleprocess.cpp
+++ b/kjsembed/ksimpleprocess.cpp
@@ -20,7 +20,7 @@
  */
 #include "ksimpleprocess.h"
 #include <tqapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 static TQStringList  splitArgList( const TQString &args)
 {
 	TQStringList returnArgs = TQStringList::split( ' ', args);
diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp
index 70884cd5..b896481c 100644
--- a/kjsembed/plugin/jsconsoleplugin.cpp
+++ b/kjsembed/plugin/jsconsoleplugin.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include <jsfactory.h>
diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp
index 90143e4b..e311dfff 100644
--- a/kjsembed/plugins/imagefx_plugin.cpp
+++ b/kjsembed/plugins/imagefx_plugin.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 #include <kjsembed/jsfactory.h>
diff --git a/kjsembed/testkjsembed.cpp b/kjsembed/testkjsembed.cpp
index 94107e33..9ad274b4 100644
--- a/kjsembed/testkjsembed.cpp
+++ b/kjsembed/testkjsembed.cpp
@@ -20,7 +20,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kjs/interpreter.h>
 
 #include <jsconsolewidget.h>
diff --git a/kjsembed/tests/testkjsembed.cpp b/kjsembed/tests/testkjsembed.cpp
index 7fe664c3..b3ff219e 100644
--- a/kjsembed/tests/testkjsembed.cpp
+++ b/kjsembed/tests/testkjsembed.cpp
@@ -20,7 +20,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kjs/interpreter.h>
 
 #include <kjsembed/jsconsolewidget.h>
diff --git a/kjsembed/tools/doxygen2cons_cpp.xsl b/kjsembed/tools/doxygen2cons_cpp.xsl
index 91bad62b..f23e5e80 100644
--- a/kjsembed/tools/doxygen2cons_cpp.xsl
+++ b/kjsembed/tools/doxygen2cons_cpp.xsl
@@ -5,7 +5,7 @@
 <xsl:variable name="clazz" select="compoundname" />
 <xsl:variable name="consmeth" select="sectiondef/memberdef[@kind='function' and @prot='public']" />
 
-#include &lt;klocale.h>
+#include &lt;tdelocale.h>
 #include &lt;kjs/object.h>
 
 #include &lt;<xsl:value-of select="includes" />>
diff --git a/kjsembed/tools/doxygen2imp_cpp.xsl b/kjsembed/tools/doxygen2imp_cpp.xsl
index c485188c..a2be08d4 100644
--- a/kjsembed/tools/doxygen2imp_cpp.xsl
+++ b/kjsembed/tools/doxygen2imp_cpp.xsl
@@ -11,7 +11,7 @@
 #include &lt;qpixmap.h>
 #include &lt;qfont.h>
 
-#include &lt;klocale.h>
+#include &lt;tdelocale.h>
 #include &lt;kjs/object.h>
 #include &lt;kdebug.h>