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

---
 kmymoney2/views/kaccountsview.cpp      |  2 +-
 kmymoney2/views/kbudgetview.cpp        |  6 +++---
 kmymoney2/views/kcategoriesview.cpp    |  2 +-
 kmymoney2/views/kforecastview.cpp      |  2 +-
 kmymoney2/views/kgloballedgerview.cpp  |  4 ++--
 kmymoney2/views/khomeview.cpp          |  8 ++++----
 kmymoney2/views/kinstitutionsview.cpp  |  2 +-
 kmymoney2/views/kinvestmentview.cpp    |  2 +-
 kmymoney2/views/kmymoneyfile.cpp       |  2 +-
 kmymoney2/views/kmymoneyview.cpp       |  6 +++---
 kmymoney2/views/kpayeesview.cpp        |  6 +++---
 kmymoney2/views/kreportsview.cpp       | 10 +++++-----
 kmymoney2/views/kscheduledlistitem.cpp |  6 +++---
 kmymoney2/views/kscheduledview.cpp     |  6 +++---
 14 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'kmymoney2/views')

diff --git a/kmymoney2/views/kaccountsview.cpp b/kmymoney2/views/kaccountsview.cpp
index 1dbced9..e2ac90b 100644
--- a/kmymoney2/views/kaccountsview.cpp
+++ b/kmymoney2/views/kaccountsview.cpp
@@ -26,7 +26,7 @@
 // KDE Includes
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kiconview.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/views/kbudgetview.cpp b/kmymoney2/views/kbudgetview.cpp
index cb3049b..bd43dbb 100644
--- a/kmymoney2/views/kbudgetview.cpp
+++ b/kmymoney2/views/kbudgetview.cpp
@@ -34,10 +34,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/views/kcategoriesview.cpp b/kmymoney2/views/kcategoriesview.cpp
index 1c08e62..f431576 100644
--- a/kmymoney2/views/kcategoriesview.cpp
+++ b/kmymoney2/views/kcategoriesview.cpp
@@ -29,7 +29,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/views/kforecastview.cpp b/kmymoney2/views/kforecastview.cpp
index a102fcd..f4c706b 100644
--- a/kmymoney2/views/kforecastview.cpp
+++ b/kmymoney2/views/kforecastview.cpp
@@ -28,7 +28,7 @@
 // KDE Includes
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kpushbutton.h>
 
diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp
index 0ea4fe3..18546c0 100644
--- a/kmymoney2/views/kgloballedgerview.cpp
+++ b/kmymoney2/views/kgloballedgerview.cpp
@@ -28,10 +28,10 @@
 // KDE Includes
 
 #include "kdecompat.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
index d51f908..8c0ba14 100644
--- a/kmymoney2/views/khomeview.cpp
+++ b/kmymoney2/views/khomeview.cpp
@@ -37,8 +37,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdehtmlview.h>
 #include <tdeconfig.h>
@@ -46,10 +46,10 @@
 #include <tdemainwindow.h>
 #include <tdeactioncollection.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/views/kinstitutionsview.cpp b/kmymoney2/views/kinstitutionsview.cpp
index 87c0fc1..5838d24 100644
--- a/kmymoney2/views/kinstitutionsview.cpp
+++ b/kmymoney2/views/kinstitutionsview.cpp
@@ -25,7 +25,7 @@
 // KDE Includes
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/views/kinvestmentview.cpp b/kmymoney2/views/kinvestmentview.cpp
index 9edf43a..9b7f479 100644
--- a/kmymoney2/views/kinvestmentview.cpp
+++ b/kmymoney2/views/kinvestmentview.cpp
@@ -24,7 +24,7 @@
 // KDE Includes
 
 #include "kdecompat.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/views/kmymoneyfile.cpp b/kmymoney2/views/kmymoneyfile.cpp
index 76d3ea1..9f9e3ca 100644
--- a/kmymoney2/views/kmymoneyfile.cpp
+++ b/kmymoney2/views/kmymoneyfile.cpp
@@ -25,7 +25,7 @@
  */
 #if 0
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kmymoneyfile.h"
 #include "../mymoney/storage/mymoneyseqaccessmgr.h"
diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp
index a5b4ef5..ba127b6 100644
--- a/kmymoney2/views/kmymoneyview.cpp
+++ b/kmymoney2/views/kmymoneyview.cpp
@@ -43,15 +43,15 @@
 #include "kdecompat.h"
 
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksavefile.h>
 #include <kfilterdev.h>
 #include <kfilterbase.h>
diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp
index 65bd90d..c615ecd 100644
--- a/kmymoney2/views/kpayeesview.cpp
+++ b/kmymoney2/views/kpayeesview.cpp
@@ -45,9 +45,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp
index e8b9d46..e4d6e6e 100755
--- a/kmymoney2/views/kreportsview.cpp
+++ b/kmymoney2/views/kreportsview.cpp
@@ -49,17 +49,17 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdehtmlview.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/views/kscheduledlistitem.cpp b/kmymoney2/views/kscheduledlistitem.cpp
index d509521..c3971e0 100644
--- a/kmymoney2/views/kscheduledlistitem.cpp
+++ b/kmymoney2/views/kscheduledlistitem.cpp
@@ -30,9 +30,9 @@
 // KDE Includes
 
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/views/kscheduledview.cpp b/kmymoney2/views/kscheduledview.cpp
index ed52339..5893f93 100644
--- a/kmymoney2/views/kscheduledview.cpp
+++ b/kmymoney2/views/kscheduledview.cpp
@@ -33,12 +33,12 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kpushbutton.h>
 #include <tdelistviewsearchline.h>
-- 
cgit v1.2.1