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

---
 tdehtml/css/csshelper.cpp             |  2 +-
 tdehtml/css/cssparser.cpp             |  2 +-
 tdehtml/css/cssstyleselector.cpp      |  2 +-
 tdehtml/ecma/kjs_debugwin.cpp         | 10 +++++-----
 tdehtml/ecma/kjs_html.cpp             |  4 ++--
 tdehtml/ecma/kjs_mozilla.cpp          |  2 +-
 tdehtml/ecma/kjs_navigator.cpp        |  4 ++--
 tdehtml/ecma/kjs_proxy.cpp            |  6 +++---
 tdehtml/ecma/kjs_window.cpp           |  6 +++---
 tdehtml/html/dtd.cpp                  |  2 +-
 tdehtml/html/html_documentimpl.cpp    |  4 ++--
 tdehtml/html/html_elementimpl.cpp     |  2 +-
 tdehtml/html/html_formimpl.cpp        |  6 +++---
 tdehtml/html/html_imageimpl.cpp       |  2 +-
 tdehtml/html/html_tableimpl.cpp       |  2 +-
 tdehtml/html/htmlparser.cpp           |  2 +-
 tdehtml/html/htmltokenizer.cpp        |  2 +-
 tdehtml/java/kjavaapplet.cpp          |  2 +-
 tdehtml/java/kjavaappletcontext.cpp   |  4 ++--
 tdehtml/java/kjavaappletserver.cpp    |  4 ++--
 tdehtml/java/kjavaappletviewer.cpp    |  2 +-
 tdehtml/java/kjavaappletwidget.cpp    |  2 +-
 tdehtml/java/kjavaprocess.cpp         |  2 +-
 tdehtml/misc/arena.cpp                |  2 +-
 tdehtml/misc/decoder.cpp              |  4 ++--
 tdehtml/misc/htmlhashes.cpp           |  2 +-
 tdehtml/misc/htmltags.h               |  2 +-
 tdehtml/misc/knsplugininstaller.cpp   |  6 +++---
 tdehtml/misc/loader.cpp               |  4 ++--
 tdehtml/misc/loader_jpeg.cpp          |  2 +-
 tdehtml/misc/maketags                 |  2 +-
 tdehtml/rendering/font.cpp            |  2 +-
 tdehtml/rendering/render_applet.cpp   |  2 +-
 tdehtml/rendering/render_body.cpp     |  2 +-
 tdehtml/rendering/render_box.cpp      |  2 +-
 tdehtml/rendering/render_canvas.cpp   |  2 +-
 tdehtml/rendering/render_flow.cpp     |  2 +-
 tdehtml/rendering/render_form.cpp     |  4 ++--
 tdehtml/rendering/render_frames.cpp   |  4 ++--
 tdehtml/rendering/render_image.cpp    |  2 +-
 tdehtml/rendering/render_inline.cpp   |  2 +-
 tdehtml/rendering/render_line.cpp     |  2 +-
 tdehtml/rendering/render_list.cpp     |  2 +-
 tdehtml/rendering/render_object.cpp   |  2 +-
 tdehtml/rendering/render_object.h     |  2 +-
 tdehtml/rendering/render_replaced.cpp |  2 +-
 tdehtml/rendering/render_table.cpp    |  2 +-
 tdehtml/rendering/render_text.cpp     |  2 +-
 tdehtml/rendering/table_layout.cpp    |  2 +-
 tdehtml/tdehtml_ext.cpp               |  4 ++--
 tdehtml/tdehtml_factory.cpp           |  2 +-
 tdehtml/tdehtml_pagecache.cpp         |  2 +-
 tdehtml/tdehtml_part.cpp              | 10 +++++-----
 tdehtml/tdehtml_printsettings.cpp     |  2 +-
 tdehtml/tdehtml_run.cpp               |  2 +-
 tdehtml/tdehtml_settings.cc           |  8 ++++----
 tdehtml/tdehtmlimage.cpp              |  2 +-
 tdehtml/tdehtmlview.cpp               |  2 +-
 tdehtml/tdemultipart/tdemultipart.cpp |  6 +++---
 tdehtml/test_regression.cpp           |  2 +-
 tdehtml/xml/dom_docimpl.cpp           |  4 ++--
 tdehtml/xml/dom_nodeimpl.cpp          |  2 +-
 tdehtml/xml/xml_tokenizer.cpp         |  2 +-
 63 files changed, 95 insertions(+), 95 deletions(-)

(limited to 'tdehtml')

diff --git a/tdehtml/css/csshelper.cpp b/tdehtml/css/csshelper.cpp
index 02b5b3d39..a6ea9c38b 100644
--- a/tdehtml/css/csshelper.cpp
+++ b/tdehtml/css/csshelper.cpp
@@ -28,7 +28,7 @@
 #include <tqfontdatabase.h>
 
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "rendering/render_style.h"
diff --git a/tdehtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp
index b33151b59..8b11c78d2 100644
--- a/tdehtml/css/cssparser.cpp
+++ b/tdehtml/css/cssparser.cpp
@@ -26,7 +26,7 @@
 #define YYDEBUG 0
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 
 #include "cssparser.h"
diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp
index 2a1fb5477..79f8ba251 100644
--- a/tdehtml/css/cssstyleselector.cpp
+++ b/tdehtml/css/cssstyleselector.cpp
@@ -57,7 +57,7 @@ using namespace DOM;
 
 #include <kstandarddirs.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tqfile.h>
 #include <tqvaluelist.h>
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>
diff --git a/tdehtml/html/dtd.cpp b/tdehtml/html/dtd.cpp
index accc8b855..d3ea86d51 100644
--- a/tdehtml/html/dtd.cpp
+++ b/tdehtml/html/dtd.cpp
@@ -26,7 +26,7 @@
 using namespace DOM;
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 // priority of tags. Closing tags of higher priority close tags of lower
 // priority.
diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index e4f090973..52ada7a7b 100644
--- a/tdehtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -47,9 +47,9 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "css/cssproperties.h"
 #include "css/cssstyleselector.h"
diff --git a/tdehtml/html/html_elementimpl.cpp b/tdehtml/html/html_elementimpl.cpp
index 1153e8b7f..fc116caf3 100644
--- a/tdehtml/html/html_elementimpl.cpp
+++ b/tdehtml/html/html_elementimpl.cpp
@@ -50,7 +50,7 @@
 #include "xml/dom2_eventsimpl.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "html_elementimpl.h"
 
 using namespace DOM;
diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index 372904e0e..6fae233dd 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -47,12 +47,12 @@
 #include "rendering/render_form.h"
 
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #ifndef TDEHTML_NO_WALLET
 #include <tdewallet.h>
 #endif
diff --git a/tdehtml/html/html_imageimpl.cpp b/tdehtml/html/html_imageimpl.cpp
index b1972aad4..a006b3bd0 100644
--- a/tdehtml/html/html_imageimpl.cpp
+++ b/tdehtml/html/html_imageimpl.cpp
@@ -29,7 +29,7 @@
 #include "tdehtml_part.h"
 
 #include <kstringhandler.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "rendering/render_image.h"
diff --git a/tdehtml/html/html_tableimpl.cpp b/tdehtml/html/html_tableimpl.cpp
index 71fe14773..f14ad8583 100644
--- a/tdehtml/html/html_tableimpl.cpp
+++ b/tdehtml/html/html_tableimpl.cpp
@@ -43,7 +43,7 @@
 #include "rendering/render_table.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 using namespace tdehtml;
 using namespace DOM;
diff --git a/tdehtml/html/htmlparser.cpp b/tdehtml/html/htmlparser.cpp
index f7cc1daaf..31d3d4c17 100644
--- a/tdehtml/html/htmlparser.cpp
+++ b/tdehtml/html/htmlparser.cpp
@@ -56,7 +56,7 @@
 
 #include "html/htmlparser.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace DOM;
 using namespace tdehtml;
diff --git a/tdehtml/html/htmltokenizer.cpp b/tdehtml/html/htmltokenizer.cpp
index 62d3ffab6..292d1773d 100644
--- a/tdehtml/html/htmltokenizer.cpp
+++ b/tdehtml/html/htmltokenizer.cpp
@@ -50,7 +50,7 @@
 #include "css/csshelper.h"
 #include "ecma/kjs_proxy.h"
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ctype.h>
 #include <assert.h>
 #include <tqvariant.h>
diff --git a/tdehtml/java/kjavaapplet.cpp b/tdehtml/java/kjavaapplet.cpp
index 70a39afbc..a28e541e2 100644
--- a/tdehtml/java/kjavaapplet.cpp
+++ b/tdehtml/java/kjavaapplet.cpp
@@ -22,7 +22,7 @@
 #include "kjavaappletwidget.h"
 #include "kjavaappletcontext.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeparts/browserextension.h>
 
diff --git a/tdehtml/java/kjavaappletcontext.cpp b/tdehtml/java/kjavaappletcontext.cpp
index 76914a5dc..b644b67ca 100644
--- a/tdehtml/java/kjavaappletcontext.cpp
+++ b/tdehtml/java/kjavaappletcontext.cpp
@@ -23,8 +23,8 @@
 #include "kjavaappletserver.h"
 #include "kjavaprocess.h"
 #include "kjavaapplet.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tqmap.h>
 #include <tqguardedptr.h>
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 5d108ffcf..952fe143b 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -27,13 +27,13 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/browserextension.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 #include <tdeio/job.h>
-#include <tdeio/kprotocolmanager.h>
+#include <tdeio/tdeprotocolmanager.h>
 #include <ksslcertificate.h>
 #include <ksslcertchain.h>
 #include <kssl.h>
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index 5d5b47fbf..f80690aa9 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -32,7 +32,7 @@
 #include <klibloader.h>
 #include <tdeaboutdata.h>
 #include <kstaticdeleter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
diff --git a/tdehtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp
index c096261cd..a1f5b8f11 100644
--- a/tdehtml/java/kjavaappletwidget.cpp
+++ b/tdehtml/java/kjavaappletwidget.cpp
@@ -24,7 +24,7 @@
 
 #include <twin.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 
diff --git a/tdehtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp
index 1ff68dd74..6b505c343 100644
--- a/tdehtml/java/kjavaprocess.cpp
+++ b/tdehtml/java/kjavaprocess.cpp
@@ -22,7 +22,7 @@
 #include "kjavaprocess.h"
 
 #include <kdebug.h>
-#include <tdeio/kprotocolmanager.h>
+#include <tdeio/tdeprotocolmanager.h>
 
 #include <tqtextstream.h>
 #include <tqmap.h>
diff --git a/tdehtml/misc/arena.cpp b/tdehtml/misc/arena.cpp
index cfbce24ab..e2513ba36 100644
--- a/tdehtml/misc/arena.cpp
+++ b/tdehtml/misc/arena.cpp
@@ -45,7 +45,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "arena.h"
 
 #ifdef HAVE_GETPAGESIZE
diff --git a/tdehtml/misc/decoder.cpp b/tdehtml/misc/decoder.cpp
index 6000aa9cf..28c8a5e9d 100644
--- a/tdehtml/misc/decoder.cpp
+++ b/tdehtml/misc/decoder.cpp
@@ -39,12 +39,12 @@ using namespace tdehtml;
 #include <tqregexp.h>
 #include <tqtextcodec.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 #include <ctype.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/tdehtml/misc/htmlhashes.cpp b/tdehtml/misc/htmlhashes.cpp
index e073f0964..376007819 100644
--- a/tdehtml/misc/htmlhashes.cpp
+++ b/tdehtml/misc/htmlhashes.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "htmlhashes.h"
 #include "htmltags.c"
diff --git a/tdehtml/misc/htmltags.h b/tdehtml/misc/htmltags.h
index d8fbb3236..bf9a8ded8 100644
--- a/tdehtml/misc/htmltags.h
+++ b/tdehtml/misc/htmltags.h
@@ -5,7 +5,7 @@
 #define TDEHTML_TAGS_H
 
 #include "dom/dom_string.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 KDE_NO_EXPORT const char* getTagName(unsigned short id);
 
diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index 0edcc34ea..b8b94cd6b 100644
--- a/tdehtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
@@ -24,11 +24,11 @@
 #include "knsplugininstaller.moc"
 
 #include <kdebug.h>
-#include <kdiroperator.h> 
+#include <tdediroperator.h> 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
-#include <ktempfile.h> 
+#include <tdetempfile.h> 
 #include <netaccess.h>
 
 #include <tqbuttongroup.h>
diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index b7f42aa29..7621b5e4f 100644
--- a/tdehtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -59,7 +59,7 @@
 #include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kimageio.h>
 #include <kcharsets.h>
 #include <kiconloader.h>
@@ -71,7 +71,7 @@
 #ifdef IMAGE_TITLES
 #include <tqfile.h>
 #include <tdefilemetainfo.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #endif
 
 #include "html/html_documentimpl.h"
diff --git a/tdehtml/misc/loader_jpeg.cpp b/tdehtml/misc/loader_jpeg.cpp
index 72816817f..9ee5378f9 100644
--- a/tdehtml/misc/loader_jpeg.cpp
+++ b/tdehtml/misc/loader_jpeg.cpp
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <setjmp.h>
 #include <tqdatetime.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 extern "C" {
 #define XMD_H
diff --git a/tdehtml/misc/maketags b/tdehtml/misc/maketags
index b2b472892..8a6abf0ed 100644
--- a/tdehtml/misc/maketags
+++ b/tdehtml/misc/maketags
@@ -41,7 +41,7 @@ print header <<EOF;
 #define TDEHTML_TAGS_H
 
 #include "dom/dom_string.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 KDE_NO_EXPORT const char* getTagName(unsigned short id);
 
diff --git a/tdehtml/rendering/font.cpp b/tdehtml/rendering/font.cpp
index b7632fc8d..c70073940 100644
--- a/tdehtml/rendering/font.cpp
+++ b/tdehtml/rendering/font.cpp
@@ -33,7 +33,7 @@
 #include "tdehtml_settings.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqpainter.h>
 #include <tqfontdatabase.h>
diff --git a/tdehtml/rendering/render_applet.cpp b/tdehtml/rendering/render_applet.cpp
index d14a93553..eb9762897 100644
--- a/tdehtml/rendering/render_applet.cpp
+++ b/tdehtml/rendering/render_applet.cpp
@@ -20,7 +20,7 @@
  *
  */
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdebug.h>
 
diff --git a/tdehtml/rendering/render_body.cpp b/tdehtml/rendering/render_body.cpp
index 80a613000..820b1b872 100644
--- a/tdehtml/rendering/render_body.cpp
+++ b/tdehtml/rendering/render_body.cpp
@@ -25,7 +25,7 @@
 #include "xml/dom_docimpl.h"
 #include "tdehtmlview.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 using namespace tdehtml;
diff --git a/tdehtml/rendering/render_box.cpp b/tdehtml/rendering/render_box.cpp
index d138d3ee2..85e1f6665 100644
--- a/tdehtml/rendering/render_box.cpp
+++ b/tdehtml/rendering/render_box.cpp
@@ -45,7 +45,7 @@
 
 #include <tdehtmlview.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <assert.h>
 
 
diff --git a/tdehtml/rendering/render_canvas.cpp b/tdehtml/rendering/render_canvas.cpp
index a3dc548b2..862f374b2 100644
--- a/tdehtml/rendering/render_canvas.cpp
+++ b/tdehtml/rendering/render_canvas.cpp
@@ -29,7 +29,7 @@
 #include "tdehtmlview.h"
 #include "tdehtml_part.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 using namespace tdehtml;
 
diff --git a/tdehtml/rendering/render_flow.cpp b/tdehtml/rendering/render_flow.cpp
index 272ceb2db..a535b218e 100644
--- a/tdehtml/rendering/render_flow.cpp
+++ b/tdehtml/rendering/render_flow.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <assert.h>
 #include <tqpainter.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "rendering/render_flow.h"
 #include "rendering/render_text.h"
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 89f38a7b2..9d302bfc8 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -30,8 +30,8 @@
 #include <kfind.h>
 #include <kfinddialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kreplace.h>
 #include <kreplacedialog.h>
 #include <tdespell.h>
diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index 12d0d75ec..68c66495a 100644
--- a/tdehtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -39,9 +39,9 @@
 #include "misc/knsplugininstaller.h"
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtimer.h>
 #include <tqpainter.h>
diff --git a/tdehtml/rendering/render_image.cpp b/tdehtml/rendering/render_image.cpp
index b41911e3a..ad8f18bb3 100644
--- a/tdehtml/rendering/render_image.cpp
+++ b/tdehtml/rendering/render_image.cpp
@@ -32,7 +32,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "css/csshelper.h"
 #include "misc/helper.h"
diff --git a/tdehtml/rendering/render_inline.cpp b/tdehtml/rendering/render_inline.cpp
index aee43a817..15bc1b0df 100644
--- a/tdehtml/rendering/render_inline.cpp
+++ b/tdehtml/rendering/render_inline.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "rendering/render_arena.h"
 #include "rendering/render_inline.h"
diff --git a/tdehtml/rendering/render_line.cpp b/tdehtml/rendering/render_line.cpp
index b518d3a43..d8bc8d0e2 100644
--- a/tdehtml/rendering/render_line.cpp
+++ b/tdehtml/rendering/render_line.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <assert.h>
 #include <tqpainter.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "rendering/render_flow.h"
 #include "rendering/render_text.h"
diff --git a/tdehtml/rendering/render_list.cpp b/tdehtml/rendering/render_list.cpp
index 5af983a72..cc9ba4e5b 100644
--- a/tdehtml/rendering/render_list.cpp
+++ b/tdehtml/rendering/render_list.cpp
@@ -35,7 +35,7 @@
 #include "xml/dom_docimpl.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqvaluelist.h>
 
 //#define BOX_DEBUG
diff --git a/tdehtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp
index 1d16057a2..a979e1dc1 100644
--- a/tdehtml/rendering/render_object.cpp
+++ b/tdehtml/rendering/render_object.cpp
@@ -45,7 +45,7 @@
 #include "misc/loader.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqpainter.h>
 #include "tdehtmlview.h"
 #include <tdehtml_part.h>
diff --git a/tdehtml/rendering/render_object.h b/tdehtml/rendering/render_object.h
index 8d066201c..bf120ff84 100644
--- a/tdehtml/rendering/render_object.h
+++ b/tdehtml/rendering/render_object.h
@@ -32,7 +32,7 @@
 #include <tqvaluelist.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "xml/dom_docimpl.h"
 #include "misc/tdehtmllayout.h"
diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp
index 5a96d06f0..2d991c3a2 100644
--- a/tdehtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -35,7 +35,7 @@
 #include <tqevent.h>
 #include <tqapplication.h>
 #include <tqlineedit.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqobjectlist.h>
 #include <tqvaluevector.h>
 
diff --git a/tdehtml/rendering/render_table.cpp b/tdehtml/rendering/render_table.cpp
index 8a75c73f2..9f2cc3366 100644
--- a/tdehtml/rendering/render_table.cpp
+++ b/tdehtml/rendering/render_table.cpp
@@ -40,7 +40,7 @@
 #include "rendering/render_line.h"
 #include "xml/dom_docimpl.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqapplication.h>
 #include <tqstyle.h>
diff --git a/tdehtml/rendering/render_text.cpp b/tdehtml/rendering/render_text.cpp
index d125b04c6..411f3f221 100644
--- a/tdehtml/rendering/render_text.cpp
+++ b/tdehtml/rendering/render_text.cpp
@@ -43,7 +43,7 @@
 #include <tqimage.h>
 #include <tqpainter.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <assert.h>
 #include <limits.h>
 #include <math.h>
diff --git a/tdehtml/rendering/table_layout.cpp b/tdehtml/rendering/table_layout.cpp
index eb8153331..97a6a4c91 100644
--- a/tdehtml/rendering/table_layout.cpp
+++ b/tdehtml/rendering/table_layout.cpp
@@ -23,7 +23,7 @@
 #include "table_layout.h"
 #include "render_table.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 using namespace tdehtml;
 
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 3cc65676d..b7dfb8a42 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -44,7 +44,7 @@
 #include <tqdragobject.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
 #include <kprocess.h>
@@ -54,7 +54,7 @@
 #include <kurldrag.h>
 #include <kstringhandler.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <krun.h>
 #include <kurifilter.h>
diff --git a/tdehtml/tdehtml_factory.cpp b/tdehtml/tdehtml_factory.cpp
index b52476ea1..4094030c6 100644
--- a/tdehtml/tdehtml_factory.cpp
+++ b/tdehtml/tdehtml_factory.cpp
@@ -31,7 +31,7 @@
 
 #include <kinstance.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 
diff --git a/tdehtml/tdehtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp
index c2e0a89e1..319dd8162 100644
--- a/tdehtml/tdehtml_pagecache.cpp
+++ b/tdehtml/tdehtml_pagecache.cpp
@@ -21,7 +21,7 @@
 #include "tdehtml_pagecache.h"
 
 #include <kstaticdeleter.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 
 #include <tqintdict.h>
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index c4bba759c..28b15c7d1 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -78,18 +78,18 @@ using namespace DOM;
 #include <tdeio/job.h>
 #include <tdeio/global.h>
 #include <tdeio/netaccess.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <ktrader.h>
 #include <kdatastream.h>
-#include <ktempfile.h>
-#include <kglobalsettings.h>
+#include <tdetempfile.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
 #include <tdeapplication.h>
 #include <tdeparts/browserinterface.h>
diff --git a/tdehtml/tdehtml_printsettings.cpp b/tdehtml/tdehtml_printsettings.cpp
index 251c3403f..19fe7bdbf 100644
--- a/tdehtml/tdehtml_printsettings.cpp
+++ b/tdehtml/tdehtml_printsettings.cpp
@@ -19,7 +19,7 @@
 
 #include "tdehtml_printsettings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
diff --git a/tdehtml/tdehtml_run.cpp b/tdehtml/tdehtml_run.cpp
index 2a5fd1861..499616cce 100644
--- a/tdehtml/tdehtml_run.cpp
+++ b/tdehtml/tdehtml_run.cpp
@@ -24,7 +24,7 @@
 #include "tdehtml_run.h"
 #include <tdeio/job.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "tdehtml_ext.h"
 #include <tqwidget.h>
 
diff --git a/tdehtml/tdehtml_settings.cc b/tdehtml/tdehtml_settings.cc
index 8e36f5891..7f799e311 100644
--- a/tdehtml/tdehtml_settings.cc
+++ b/tdehtml/tdehtml_settings.cc
@@ -21,14 +21,14 @@
 
 #include "tdehtml_settings.h"
 #include "tdehtmldefaults.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqregexp.h>
 #include <tqvaluevector.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 /**
  * @internal
diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp
index bf05d8495..31311cb3d 100644
--- a/tdehtml/tdehtmlimage.cpp
+++ b/tdehtml/tdehtmlimage.cpp
@@ -32,7 +32,7 @@
 #include <tdeio/job.h>
 #include <kinstance.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 K_EXPORT_COMPONENT_FACTORY( tdehtmlimagefactory /*NOT the part name, see Makefile.am*/, TDEHTMLImageFactory )
 
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 010075f2a..16b274cbd 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -67,7 +67,7 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kprinter.h>
 #include <ksimpleconfig.h>
diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp
index dd864d65b..201f1ef60 100644
--- a/tdehtml/tdemultipart/tdemultipart.cpp
+++ b/tdehtml/tdemultipart/tdemultipart.cpp
@@ -22,11 +22,11 @@
 #include <tqvbox.h>
 #include <kinstance.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 #include <tqfile.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/genericfactory.h>
 #include <tdehtml_part.h>
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 028fadc36..62842e086 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -65,7 +65,7 @@
 #include <tdeio/job.h>
 #include <tdemainwindow.h>
 #include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqcolor.h>
 #include <tqcursor.h>
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index 47836b41e..423a2a51e 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -46,7 +46,7 @@
 #include <tqptrstack.h>
 #include <tqpaintdevicemetrics.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 #include "rendering/counter_tree.h"
@@ -60,7 +60,7 @@
 #include "tdehtmlview.h"
 #include "tdehtml_part.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstringhandler.h>
 #include <krfcdate.h>
 #include "tdehtml_settings.h"
diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp
index ac8ca630e..7e2e1bc5f 100644
--- a/tdehtml/xml/dom_nodeimpl.cpp
+++ b/tdehtml/xml/dom_nodeimpl.cpp
@@ -33,7 +33,7 @@
 #include "xml/dom_nodeimpl.h"
 #include "xml/dom_restyler.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "rendering/render_text.h"
diff --git a/tdehtml/xml/xml_tokenizer.cpp b/tdehtml/xml/xml_tokenizer.cpp
index 44f90673f..2ee90097b 100644
--- a/tdehtml/xml/xml_tokenizer.cpp
+++ b/tdehtml/xml/xml_tokenizer.cpp
@@ -36,7 +36,7 @@
 #include "tdehtml_part.h"
 #include <tqvariant.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace DOM;
 using namespace tdehtml;
-- 
cgit v1.2.1