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

(limited to 'tdehtml/html')

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>
-- 
cgit v1.2.1