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

---
 konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp | 2 +-
 konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp     | 2 +-
 konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp   | 2 +-
 konqueror/sidebar/trees/history_module/history_module.cpp   | 2 +-
 konqueror/sidebar/trees/history_module/history_module.h     | 4 ++--
 konqueror/sidebar/trees/history_module/history_settings.cpp | 2 +-
 konqueror/sidebar/trees/history_module/kcmhistory.cpp       | 6 +++---
 konqueror/sidebar/trees/konq_sidebartree.cpp                | 2 +-
 konqueror/sidebar/trees/konqsidebar_tree.h                  | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'konqueror/sidebar/trees')

diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index b190790de..675642c36 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -26,7 +26,7 @@
 #include <kbookmarkdrag.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 637c428dc..15c162d70 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -23,7 +23,7 @@
 #include <konq_operations.h>
 #include <konq_drag.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kuserprofile.h>
 #include <tqapplication.h>
 #include <tqclipboard.h>
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index 61e5eb43f..4f6ee0686 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kprotocolinfo.h>
 #include <kdesktopfile.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdirlister.h>
 #include "konqsidebariface_p.h"
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index a6c092e0e..6d5ac5094 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kstaticdeleter.h>
 
diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h
index 5c114a164..933097455 100644
--- a/konqueror/sidebar/trees/history_module/history_module.h
+++ b/konqueror/sidebar/trees/history_module/history_module.h
@@ -24,8 +24,8 @@
 #include <tqdict.h>
 #include <tqpixmap.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <konq_sidebartreemodule.h>
 
 #include "history_item.h"
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 5614122ca..eb1621ae9 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -1,7 +1,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <dcopclient.h>
 
 #include "history_settings.h"
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 52005e2b5..70e42e113 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -33,10 +33,10 @@
 #include <kdialog.h>
 #include <tdefontdialog.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include "history_dlg.h"
 
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index e690c6000..1e8f4d791 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kdirnotify_stub.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h
index 5a198eeca..bdc58ad0c 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.h
+++ b/konqueror/sidebar/trees/konqsidebar_tree.h
@@ -9,7 +9,7 @@
 #include <kdialogbase.h>
 #include <tqcombobox.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 class KonqSidebarTree;
 class TQVBox;
-- 
cgit v1.2.1