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

---
 konq-plugins/domtreeviewer/domlistviewitem.cpp      | 2 +-
 konq-plugins/domtreeviewer/domtreecommands.cpp      | 2 +-
 konq-plugins/domtreeviewer/domtreeview.cpp          | 6 +++---
 konq-plugins/domtreeviewer/domtreewindow.cpp        | 6 +++---
 konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'konq-plugins/domtreeviewer')

diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp
index d956ceb..6940675 100644
--- a/konq-plugins/domtreeviewer/domlistviewitem.cpp
+++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp
@@ -21,7 +21,7 @@
 #include <tqlistview.h>
 #include <tqapplication.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent )
   : TQListViewItem( parent ), m_node(node)
diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp
index 0bbb918..68aab4a 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.cpp
+++ b/konq-plugins/domtreeviewer/domtreecommands.cpp
@@ -23,7 +23,7 @@
 #include <dom/dom_doc.h>
 #include <dom/dom_exception.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqmap.h>
 
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index c474414..6735ca2 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -51,12 +51,12 @@
 #include <kdialog.h>
 #include <keditcl.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdehtml_part.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <tdeshortcut.h>
 #include <kstdguiitem.h>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index ee6946f..b8ce0cb 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -29,11 +29,11 @@
 #include <kcommand.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdehtml_part.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
index 0a38c77..e8c3591 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
@@ -7,7 +7,7 @@
 #include <klibloader.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include <tdehtml_part.h>
-- 
cgit v1.2.1