Rename additional header files to avoid conflicts with KDE4

6 files changed, 16 insertions, 16 deletions

diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index f1b2b430d..b7bd23de3 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -41,17 +41,17 @@
 #include <tqpainter.h>
 #include <tqscrollbar.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kguiitem.h>
 #include <tdepopupmenu.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeaction.h>
 #include <tdeactioncollection.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeshortcut.h>
 #include <tdeconfig.h>
 #include <tdeconfigbase.h>
diff --git a/tdehtml/ecma/kjs_html.cpp b/tdehtml/ecma/kjs_html.cpp
index 8a63ba943..abd059e75 100644
--- a/tdehtml/ecma/kjs_html.cpp
+++ b/tdehtml/ecma/kjs_html.cpp
@@ -56,9 +56,9 @@
 #include "rendering/render_frames.h"
 #include "rendering/render_layer.h"
 
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdebug.h>
 
diff --git a/tdehtml/ecma/kjs_mozilla.cpp b/tdehtml/ecma/kjs_mozilla.cpp
index 6fc7688dd..d26aabb5e 100644
--- a/tdehtml/ecma/kjs_mozilla.cpp
+++ b/tdehtml/ecma/kjs_mozilla.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kjs_mozilla.h"
diff --git a/tdehtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp
index 03bc22987..296290744 100644
--- a/tdehtml/ecma/kjs_navigator.cpp
+++ b/tdehtml/ecma/kjs_navigator.cpp
@@ -21,13 +21,13 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
-#include <tdeio/kprotocolmanager.h>
+#include <tdeio/tdeprotocolmanager.h>
 #include <tdeio/kmimetype.h>
 #include <tdeio/kservice.h>
 #include <tdeio/ktrader.h>
diff --git a/tdehtml/ecma/kjs_proxy.cpp b/tdehtml/ecma/kjs_proxy.cpp
index 578cd30f0..bdd7183fe 100644
--- a/tdehtml/ecma/kjs_proxy.cpp
+++ b/tdehtml/ecma/kjs_proxy.cpp
@@ -38,10 +38,10 @@
 #include "xml/dom_nodeimpl.h"
 #include "tdehtmlpart_p.h"
 #include <tdehtml_part.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/time.h>
diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp
index 1d38de27e..554781cb9 100644
--- a/tdehtml/ecma/kjs_window.cpp
+++ b/tdehtml/ecma/kjs_window.cpp
@@ -36,9 +36,9 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 #include <tdeparts/browserinterface.h>
 #include <twin.h>
@@ -50,7 +50,7 @@
 #ifndef KONQ_EMBEDDED
 #include <kbookmarkmanager.h>
 #endif
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <assert.h>
 #include <tqstyle.h>
 #include <tqobjectlist.h>