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

---
 src/app/bookmarkdialog.cpp         | 2 +-
 src/app/bookmarkviewcontroller.cpp | 4 ++--
 src/app/configdialog.cpp           | 4 ++--
 src/app/dirviewcontroller.cpp      | 2 +-
 src/app/history.cpp                | 2 +-
 src/app/kipiinterface.cpp          | 2 +-
 src/app/main.cpp                   | 2 +-
 src/app/mainwindow.cpp             | 8 ++++----
 src/app/metaedit.cpp               | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/app')

diff --git a/src/app/bookmarkdialog.cpp b/src/app/bookmarkdialog.cpp
index d3646e4..33271be 100644
--- a/src/app/bookmarkdialog.cpp
+++ b/src/app/bookmarkdialog.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdefile.h>
 #include <kicondialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 // Local
diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp
index 18f21cb..f6e4b32 100644
--- a/src/app/bookmarkviewcontroller.cpp
+++ b/src/app/bookmarkviewcontroller.cpp
@@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeversion.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdetoolbar.h>
 #include <kurl.h>
diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
index 39e7153..792a7a2 100644
--- a/src/app/configdialog.cpp
+++ b/src/app/configdialog.cpp
@@ -37,9 +37,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdirsize.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurllabel.h>
 #include <kurlrequester.h>
 
diff --git a/src/app/dirviewcontroller.cpp b/src/app/dirviewcontroller.cpp
index 0775279..805391c 100644
--- a/src/app/dirviewcontroller.cpp
+++ b/src/app/dirviewcontroller.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpropsdlg.h>
 
 // Local
diff --git a/src/app/history.cpp b/src/app/history.cpp
index 1bfe115..d88e8a0 100644
--- a/src/app/history.cpp
+++ b/src/app/history.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeversion.h>
 #include <tdestdaccel.h>
diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp
index e5feecf..73c0453 100644
--- a/src/app/kipiinterface.cpp
+++ b/src/app/kipiinterface.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <kdebug.h>
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 // KIPI
diff --git a/src/app/main.cpp b/src/app/main.cpp
index b304e5c..041b9cb 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "gvcore/cache.h"
 #include "gvcore/fileviewcontroller.h"
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index d5f013d..f61d799 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -41,16 +41,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klargefile.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kpropsdlg.h>
 #include <kprotocolinfo.h>
diff --git a/src/app/metaedit.cpp b/src/app/metaedit.cpp
index 7aa3ced..1a3a006 100644
--- a/src/app/metaedit.cpp
+++ b/src/app/metaedit.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local
 #include "gvcore/document.h"
-- 
cgit v1.2.1