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

---
 src/bookmarkssettingspage.cpp      | 2 +-
 src/bookmarkssidebarpage.cpp       | 4 ++--
 src/bookmartdeselector.cpp         | 2 +-
 src/detailsviewsettingspage.cpp    | 2 +-
 src/dolphin.cpp                    | 6 +++---
 src/dolphincontextmenu.cpp         | 4 ++--
 src/dolphindetailsview.cpp         | 4 ++--
 src/dolphindetailsviewsettings.cpp | 2 +-
 src/dolphiniconsview.cpp           | 2 +-
 src/dolphiniconsviewsettings.cpp   | 2 +-
 src/dolphinsettings.cpp            | 2 +-
 src/dolphinsettingsdialog.cpp      | 2 +-
 src/dolphinview.cpp                | 2 +-
 src/editbookmarkdialog.cpp         | 2 +-
 src/filterbar.cpp                  | 2 +-
 src/generalsettingspage.cpp        | 2 +-
 src/iconsviewsettingspage.cpp      | 2 +-
 src/infosidebarpage.cpp            | 4 ++--
 src/itemeffectsmanager.cpp         | 4 ++--
 src/main.cpp                       | 2 +-
 src/pixmapviewer.cpp               | 2 +-
 src/renamedialog.cpp               | 2 +-
 src/sidebars.cpp                   | 2 +-
 src/statusbarmessagelabel.cpp      | 2 +-
 src/statusbarspaceinfo.cpp         | 4 ++--
 src/undomanager.cpp                | 2 +-
 src/urlbutton.cpp                  | 2 +-
 src/urlnavigator.cpp               | 2 +-
 src/urlnavigatorbutton.cpp         | 4 ++--
 src/viewproperties.cpp             | 2 +-
 src/viewpropertiesdialog.cpp       | 4 ++--
 src/viewsettingspage.cpp           | 2 +-
 32 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/bookmarkssettingspage.cpp b/src/bookmarkssettingspage.cpp
index 3b465ba..851abe7 100644
--- a/src/bookmarkssettingspage.cpp
+++ b/src/bookmarkssettingspage.cpp
@@ -31,7 +31,7 @@
 #include <kbookmarkmanager.h>
 #include <kdialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include "dolphinsettings.h"
diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp
index a4e137f..e70e8af 100644
--- a/src/bookmarkssidebarpage.cpp
+++ b/src/bookmarkssidebarpage.cpp
@@ -26,8 +26,8 @@
 #include <tqpopupmenu.h>
 
 #include <kbookmarkmanager.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kurldrag.h>
 
 #include "dolphinsettings.h"
diff --git a/src/bookmartdeselector.cpp b/src/bookmartdeselector.cpp
index 4f2ea73..6de63b3 100644
--- a/src/bookmartdeselector.cpp
+++ b/src/bookmartdeselector.cpp
@@ -25,7 +25,7 @@
 #include <tqpixmap.h>
 
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kbookmarkmanager.h>
 
 #include "bookmartdeselector.h"
diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index 8cf3f50..ae044e0 100644
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -20,7 +20,7 @@
 
 #include "detailsviewsettingspage.h"
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdefontcombo.h>
 #include <tqspinbox.h>
diff --git a/src/dolphin.cpp b/src/dolphin.cpp
index 505e7ea..879ee5c 100644
--- a/src/dolphin.cpp
+++ b/src/dolphin.cpp
@@ -24,9 +24,9 @@
 #include <assert.h>
 
 #include <kbookmarkmanager.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpropertiesdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kstatusbar.h>
@@ -47,7 +47,7 @@
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 #include <kprotocolinfo.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 #include <krun.h>
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index f482133..7864b9f 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -24,10 +24,10 @@
 #include <kbookmarkmanager.h>
 #include <kbookmark.h>
 #include <ktrader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <tqdir.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <tdeaction.h>
diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 754c2c6..09765da 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -26,8 +26,8 @@
 #include <tqheader.h>
 #include <tqclipboard.h>
 #include <tqpainter.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tqscrollbar.h>
 #include <tqcursor.h>
 #include <tqstyle.h>
diff --git a/src/dolphindetailsviewsettings.cpp b/src/dolphindetailsviewsettings.cpp
index 82d4f63..92157f4 100644
--- a/src/dolphindetailsviewsettings.cpp
+++ b/src/dolphindetailsviewsettings.cpp
@@ -20,7 +20,7 @@
 
 #include "dolphindetailsviewsettings.h"
 #include "dolphindetailsview.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 
 DolphinDetailsViewSettings::DolphinDetailsViewSettings() :
diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index e5af6e4..9a6e248 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -23,7 +23,7 @@
 #include <kiconeffect.h>
 #include <tdeapplication.h>
 #include <tqobjectlist.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
 #include <tqclipboard.h>
 #include <assert.h>
diff --git a/src/dolphiniconsviewsettings.cpp b/src/dolphiniconsviewsettings.cpp
index 46de145..da39391 100644
--- a/src/dolphiniconsviewsettings.cpp
+++ b/src/dolphiniconsviewsettings.cpp
@@ -20,7 +20,7 @@
 
 #include "dolphiniconsviewsettings.h"
 #include <kicontheme.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 #include <assert.h>
 
diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index 8920b55..f9db006 100644
--- a/src/dolphinsettings.cpp
+++ b/src/dolphinsettings.cpp
@@ -25,7 +25,7 @@
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
 #include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "dolphin.h"
diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index 860e50f..dec4e32 100644
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "dolphinsettingsdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include "generalsettingspage.h"
 #include "viewsettingspage.h"
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 1a1774a..cad473a 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlayout.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/renamedlg.h>
 #include <assert.h>
diff --git a/src/editbookmarkdialog.cpp b/src/editbookmarkdialog.cpp
index ca8ab4c..bbb0644 100644
--- a/src/editbookmarkdialog.cpp
+++ b/src/editbookmarkdialog.cpp
@@ -20,7 +20,7 @@
 
 #include "editbookmarkdialog.h"
 #include <tqgrid.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index 1db6a4e..a0c0639 100644
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <kiconloader.h>
diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 546fb1e..1eb4395 100644
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -27,7 +27,7 @@
 #include <tqvbox.h>
 #include <tqgrid.h>
 #include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
 #include <tqpushbutton.h>
diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index bbe0522..41b2d6c 100644
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -28,7 +28,7 @@
 #include <kiconloader.h>
 #include <tdefontcombo.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 #include "dolphiniconsviewsettings.h"
diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index d12099a..cf6f527 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -34,12 +34,12 @@
 #include <tqhgroupbox.h>
 
 #include <kbookmarkmanager.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/previewjob.h>
 #include <tdefileitem.h>
 #include <kdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdefilemetainfo.h>
 
 #include "dolphin.h"
diff --git a/src/itemeffectsmanager.cpp b/src/itemeffectsmanager.cpp
index 0c1ea9b..cdd5091 100644
--- a/src/itemeffectsmanager.cpp
+++ b/src/itemeffectsmanager.cpp
@@ -22,10 +22,10 @@
 #include <kiconeffect.h>
 #include <tdeapplication.h>
 #include <tqobjectlist.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqclipboard.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "dolphin.h"
 #include "dolphinstatusbar.h"
diff --git a/src/main.cpp b/src/main.cpp
index f42af5b..e05261f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,7 +24,7 @@
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 
 static TDECmdLineOptions options[] =
diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp
index fcf5078..bdd830d 100644
--- a/src/pixmapviewer.cpp
+++ b/src/pixmapviewer.cpp
@@ -20,7 +20,7 @@
 
 #include "pixmapviewer.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tqpainter.h>
 
diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index abd3057..d9565fb 100644
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "renamedialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqvbox.h>
diff --git a/src/sidebars.cpp b/src/sidebars.cpp
index 114c6ed..7b65ff7 100644
--- a/src/sidebars.cpp
+++ b/src/sidebars.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqpixmap.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcombobox.h>
 
 #include "dolphinsettings.h"
diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 97035e1..f69b649 100644
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 #include <tqfontmetrics.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 StatusBarMessageLabel::StatusBarMessageLabel(TQWidget* parent) :
     TQWidget(parent),
diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index ccd2bdc..e80e975 100644
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -22,9 +22,9 @@
 
 #include <tqpainter.h>
 #include <tqtimer.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdiskfreesp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(TQWidget* parent) :
diff --git a/src/undomanager.cpp b/src/undomanager.cpp
index 4d554de..21c36b7 100644
--- a/src/undomanager.cpp
+++ b/src/undomanager.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "undomanager.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <tqtimer.h>
 #include <assert.h>
diff --git a/src/urlbutton.cpp b/src/urlbutton.cpp
index 10b0543..463420b 100644
--- a/src/urlbutton.cpp
+++ b/src/urlbutton.cpp
@@ -26,7 +26,7 @@
 #include <kurldrag.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "urlnavigator.h"
 #include "dolphin.h"
diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp
index 155853c..5e61955 100644
--- a/src/urlnavigator.cpp
+++ b/src/urlnavigator.cpp
@@ -25,7 +25,7 @@
 #include <kurl.h>
 #include <tqobjectlist.h>
 #include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tqpopupmenu.h>
 #include <tqlineedit.h>
diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index 04094e7..2066143 100644
--- a/src/urlnavigatorbutton.cpp
+++ b/src/urlnavigatorbutton.cpp
@@ -25,10 +25,10 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdeio/jobclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurl.h>
 #include <kurldrag.h>
diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index a7c4a77..e7d9449 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -24,7 +24,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 
diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index b089b6d..a6ab133 100644
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "viewpropertiesdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqvbox.h>
@@ -31,7 +31,7 @@
 #include <tqgroupbox.h>
 #include <tqcombobox.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <assert.h>
 
 #include "viewproperties.h"
diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index fe6e8bd..5d9b4dd 100644
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "iconsviewsettingspage.h"
 #include "detailsviewsettingspage.h"
 
-- 
cgit v1.2.1