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

---
 kcontrol/konqhtml/advancedTabDialog.cpp | 2 +-
 kcontrol/konqhtml/appearance.cpp        | 4 ++--
 kcontrol/konqhtml/domainlistview.cpp    | 4 ++--
 kcontrol/konqhtml/filteropts.cpp        | 4 ++--
 kcontrol/konqhtml/htmlopts.cpp          | 4 ++--
 kcontrol/konqhtml/javaopts.cpp          | 2 +-
 kcontrol/konqhtml/jsopts.cpp            | 2 +-
 kcontrol/konqhtml/jspolicies.cpp        | 2 +-
 kcontrol/konqhtml/khttpoptdlg.cpp       | 4 ++--
 kcontrol/konqhtml/nsconfigwidget.ui     | 2 +-
 kcontrol/konqhtml/pluginopts.cpp        | 4 ++--
 kcontrol/konqhtml/policydlg.cpp         | 4 ++--
 12 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'kcontrol/konqhtml')

diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp
index ba6e1b452..f8ca88c4c 100644
--- a/kcontrol/konqhtml/advancedTabDialog.cpp
+++ b/kcontrol/konqhtml/advancedTabDialog.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include "advancedTabDialog.h"
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index ad584f7e6..30272c3f6 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -13,9 +13,9 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <tdefontcombo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdehtmldefaults.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #if defined Q_WS_X11 && !defined K_WS_QTONLY
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index 87daeea69..fcddac791 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -25,8 +25,8 @@
 
 #include <tdeconfig.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "domainlistview.h"
 #include "policies.h"
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index 232a3169b..3ae9091a0 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -17,8 +17,8 @@
 */
 
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeaboutdata.h>
 #include <tdefiledialog.h>
 #include <dcopclient.h>
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index 2fe6eb963..0fb7f6021 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -15,8 +15,8 @@
 #include "advancedTabDialog.h"
 
 #include <konq_defaults.h> // include default values directly from konqueror
-#include <kglobalsettings.h> // get default for DEFAULT_CHANGECURSOR
-#include <klocale.h>
+#include <tdeglobalsettings.h> // get default for DEFAULT_CHANGECURSOR
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <knuminput.h>
 #include <kseparator.h>
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index f5cc93f12..e21910594 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -16,7 +16,7 @@
 #include <kurlrequester.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdehtml_settings.h>
 #include <knuminput.h>
 
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index adb00bd94..da5af132d 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -26,7 +26,7 @@
 #include "htmlopts.h"
 #include "policydlg.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "jsopts.h"
 
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index bdaa506cb..1debc0ace 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -27,7 +27,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "jspolicies.h"
 
diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp
index 6e79a59ec..7272e6e93 100644
--- a/kcontrol/konqhtml/khttpoptdlg.cpp
+++ b/kcontrol/konqhtml/khttpoptdlg.cpp
@@ -3,8 +3,8 @@
 
 #include <tqlayout.h> //CT
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include "khttpoptdlg.h"
 
 
diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui
index b784048e5..f3525430e 100644
--- a/kcontrol/konqhtml/nsconfigwidget.ui
+++ b/kcontrol/konqhtml/nsconfigwidget.ui
@@ -256,7 +256,7 @@
     </vbox>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">klocale.h</include>
+    <include location="global" impldecl="in declaration">tdelocale.h</include>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
     <include location="global" impldecl="in declaration">tdelistbox.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index d30a67264..f8e1ad10a 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -20,8 +20,8 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocio.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
diff --git a/kcontrol/konqhtml/policydlg.cpp b/kcontrol/konqhtml/policydlg.cpp
index 4f1529ed8..d38524e61 100644
--- a/kcontrol/konqhtml/policydlg.cpp
+++ b/kcontrol/konqhtml/policydlg.cpp
@@ -7,9 +7,9 @@
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kbuttonbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqpushbutton.h>
 
-- 
cgit v1.2.1