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/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 +-
 18 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'tdehtml/rendering')

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;
 
-- 
cgit v1.2.3