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/widgets/kaccounttemplateselector.cpp     | 4 ++--
 kmymoney2/widgets/kaccounttemplateselectordecl.cpp | 2 +-
 kmymoney2/widgets/kbudgetvalues.cpp                | 6 +++---
 kmymoney2/widgets/kbudgetvaluesdecl.cpp            | 2 +-
 kmymoney2/widgets/kmymoneyaccountselector.cpp      | 2 +-
 kmymoney2/widgets/kmymoneyaccounttree.cpp          | 6 +++---
 kmymoney2/widgets/kmymoneyaccounttreebase.cpp      | 6 +++---
 kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp  | 2 +-
 kmymoney2/widgets/kmymoneybriefschedule.cpp        | 4 ++--
 kmymoney2/widgets/kmymoneycalculator.cpp           | 4 ++--
 kmymoney2/widgets/kmymoneycalendar.cpp             | 4 ++--
 kmymoney2/widgets/kmymoneycategory.cpp             | 2 +-
 kmymoney2/widgets/kmymoneycombo.cpp                | 2 +-
 kmymoney2/widgets/kmymoneydateinput.cpp            | 4 ++--
 kmymoney2/widgets/kmymoneydatetbl.cpp              | 6 +++---
 kmymoney2/widgets/kmymoneyedit.cpp                 | 4 ++--
 kmymoney2/widgets/kmymoneygpgconfig.cpp            | 4 ++--
 kmymoney2/widgets/kmymoneylineedit.cpp             | 4 ++--
 kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp    | 4 ++--
 kmymoney2/widgets/kmymoneypriceview.cpp            | 6 +++---
 kmymoney2/widgets/kmymoneyscheduledcalendar.cpp    | 4 ++--
 kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp     | 6 +++---
 kmymoney2/widgets/kmymoneytitlelabel.cpp           | 4 ++--
 kmymoney2/widgets/kmymoneywizard.cpp               | 4 ++--
 kmymoney2/widgets/register.cpp                     | 4 ++--
 kmymoney2/widgets/registersearchline.cpp           | 2 +-
 kmymoney2/widgets/scheduledtransaction.cpp         | 2 +-
 kmymoney2/widgets/stdtransactiondownloaded.cpp     | 2 +-
 kmymoney2/widgets/stdtransactionmatched.cpp        | 2 +-
 kmymoney2/widgets/tdelistviewsearchline.cpp        | 2 +-
 kmymoney2/widgets/transaction.cpp                  | 4 ++--
 kmymoney2/widgets/transactionform.cpp              | 4 ++--
 kmymoney2/widgets/transactionsortoption.ui.h       | 2 +-
 33 files changed, 60 insertions(+), 60 deletions(-)

(limited to 'kmymoney2/widgets')

diff --git a/kmymoney2/widgets/kaccounttemplateselector.cpp b/kmymoney2/widgets/kaccounttemplateselector.cpp
index 1c90f8e..22af851 100644
--- a/kmymoney2/widgets/kaccounttemplateselector.cpp
+++ b/kmymoney2/widgets/kaccounttemplateselector.cpp
@@ -25,8 +25,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdelistview.h>
 #include <ktextedit.h>
diff --git a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp
index 40c6f3e..a68806d 100644
--- a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp
+++ b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #ifndef KMM_I18N
 #define KMM_I18N
 inline TQString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }
diff --git a/kmymoney2/widgets/kbudgetvalues.cpp b/kmymoney2/widgets/kbudgetvalues.cpp
index 1ee3520..3552156 100644
--- a/kmymoney2/widgets/kbudgetvalues.cpp
+++ b/kmymoney2/widgets/kbudgetvalues.cpp
@@ -30,10 +30,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcalendarsystem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kmymoney2/widgets/kbudgetvaluesdecl.cpp b/kmymoney2/widgets/kbudgetvaluesdecl.cpp
index f33b87f..b61c5e5 100644
--- a/kmymoney2/widgets/kbudgetvaluesdecl.cpp
+++ b/kmymoney2/widgets/kbudgetvaluesdecl.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #ifndef KMM_I18N
 #define KMM_I18N
 inline TQString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }
diff --git a/kmymoney2/widgets/kmymoneyaccountselector.cpp b/kmymoney2/widgets/kmymoneyaccountselector.cpp
index 17f8756..e3f37d5 100644
--- a/kmymoney2/widgets/kmymoneyaccountselector.cpp
+++ b/kmymoney2/widgets/kmymoneyaccountselector.cpp
@@ -34,7 +34,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/widgets/kmymoneyaccounttree.cpp b/kmymoney2/widgets/kmymoneyaccounttree.cpp
index c67c7b0..bcd2e33 100644
--- a/kmymoney2/widgets/kmymoneyaccounttree.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttree.cpp
@@ -31,9 +31,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 
diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp
index f943d57..1689719 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp
@@ -31,9 +31,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 
diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
index ec198d6..72400f2 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
@@ -17,7 +17,7 @@
 
 // ----------------------------------------------------------------------------
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneybriefschedule.cpp b/kmymoney2/widgets/kmymoneybriefschedule.cpp
index 3e9ab7b..ff75732 100644
--- a/kmymoney2/widgets/kmymoneybriefschedule.cpp
+++ b/kmymoney2/widgets/kmymoneybriefschedule.cpp
@@ -31,8 +31,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 
diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp
index cf3f7e6..3f01010 100644
--- a/kmymoney2/widgets/kmymoneycalculator.cpp
+++ b/kmymoney2/widgets/kmymoneycalculator.cpp
@@ -30,8 +30,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp
index a5d9622..09142e9 100644
--- a/kmymoney2/widgets/kmymoneycalendar.cpp
+++ b/kmymoney2/widgets/kmymoneycalendar.cpp
@@ -60,9 +60,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include "kdecompat.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <kdebug.h>
diff --git a/kmymoney2/widgets/kmymoneycategory.cpp b/kmymoney2/widgets/kmymoneycategory.cpp
index 99474f3..9fb0563 100644
--- a/kmymoney2/widgets/kmymoneycategory.cpp
+++ b/kmymoney2/widgets/kmymoneycategory.cpp
@@ -27,7 +27,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp
index 915e8d3..f816b21 100644
--- a/kmymoney2/widgets/kmymoneycombo.cpp
+++ b/kmymoney2/widgets/kmymoneycombo.cpp
@@ -26,7 +26,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp
index eedd535..bb76c90 100644
--- a/kmymoney2/widgets/kmymoneydateinput.cpp
+++ b/kmymoney2/widgets/kmymoneydateinput.cpp
@@ -34,8 +34,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include "kdecompat.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <tdeshortcut.h>
diff --git a/kmymoney2/widgets/kmymoneydatetbl.cpp b/kmymoney2/widgets/kmymoneydatetbl.cpp
index 07f8b8a..3ccbcb9 100644
--- a/kmymoney2/widgets/kmymoneydatetbl.cpp
+++ b/kmymoney2/widgets/kmymoneydatetbl.cpp
@@ -55,10 +55,10 @@
 // KDE Includes
 #include "kdecompat.h"
 #include <kdatetbl.h> // Use the classes available for maximum re-use
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
 #if KDE_IS_VERSION(3,2,0)
diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp
index cb04111..586686d 100644
--- a/kmymoney2/widgets/kmymoneyedit.cpp
+++ b/kmymoney2/widgets/kmymoneyedit.cpp
@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kiconloader.h>
diff --git a/kmymoney2/widgets/kmymoneygpgconfig.cpp b/kmymoney2/widgets/kmymoneygpgconfig.cpp
index afc7d6b..e2dc761 100644
--- a/kmymoney2/widgets/kmymoneygpgconfig.cpp
+++ b/kmymoney2/widgets/kmymoneygpgconfig.cpp
@@ -25,8 +25,8 @@
 // KDE Includes
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kled.h>
 
diff --git a/kmymoney2/widgets/kmymoneylineedit.cpp b/kmymoney2/widgets/kmymoneylineedit.cpp
index b7c96ab..e6e3791 100644
--- a/kmymoney2/widgets/kmymoneylineedit.cpp
+++ b/kmymoney2/widgets/kmymoneylineedit.cpp
@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
index 6f04112..3b1c485 100644
--- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
+++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
@@ -24,8 +24,8 @@
 // KDE Includes
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp
index 83b9ba5..86d32a4 100644
--- a/kmymoney2/widgets/kmymoneypriceview.cpp
+++ b/kmymoney2/widgets/kmymoneypriceview.cpp
@@ -32,12 +32,12 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp
index 68eaf48..33bf247 100644
--- a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp
+++ b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp
@@ -27,9 +27,9 @@
 
 // ----------------------------------------------------------------------------
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
index 964b0f6..f793859 100644
--- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
+++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
@@ -53,9 +53,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include "kdecompat.h"
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneytitlelabel.cpp b/kmymoney2/widgets/kmymoneytitlelabel.cpp
index b73f458..ae006cd 100644
--- a/kmymoney2/widgets/kmymoneytitlelabel.cpp
+++ b/kmymoney2/widgets/kmymoneytitlelabel.cpp
@@ -26,10 +26,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp
index c9190c9..e210350 100644
--- a/kmymoney2/widgets/kmymoneywizard.cpp
+++ b/kmymoney2/widgets/kmymoneywizard.cpp
@@ -27,10 +27,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
diff --git a/kmymoney2/widgets/register.cpp b/kmymoney2/widgets/register.cpp
index 51bde1f..78c379a 100644
--- a/kmymoney2/widgets/register.cpp
+++ b/kmymoney2/widgets/register.cpp
@@ -30,8 +30,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 
diff --git a/kmymoney2/widgets/registersearchline.cpp b/kmymoney2/widgets/registersearchline.cpp
index 626db9b..65a79be 100644
--- a/kmymoney2/widgets/registersearchline.cpp
+++ b/kmymoney2/widgets/registersearchline.cpp
@@ -28,7 +28,7 @@
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/scheduledtransaction.cpp b/kmymoney2/widgets/scheduledtransaction.cpp
index cb47fdb..8f15207 100644
--- a/kmymoney2/widgets/scheduledtransaction.cpp
+++ b/kmymoney2/widgets/scheduledtransaction.cpp
@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/stdtransactiondownloaded.cpp b/kmymoney2/widgets/stdtransactiondownloaded.cpp
index caabdbf..d62927c 100644
--- a/kmymoney2/widgets/stdtransactiondownloaded.cpp
+++ b/kmymoney2/widgets/stdtransactiondownloaded.cpp
@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/widgets/stdtransactionmatched.cpp b/kmymoney2/widgets/stdtransactionmatched.cpp
index 9900c3c..372dfca 100644
--- a/kmymoney2/widgets/stdtransactionmatched.cpp
+++ b/kmymoney2/widgets/stdtransactionmatched.cpp
@@ -23,7 +23,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/widgets/tdelistviewsearchline.cpp b/kmymoney2/widgets/tdelistviewsearchline.cpp
index 4c72bdf..bc6ccf5 100644
--- a/kmymoney2/widgets/tdelistviewsearchline.cpp
+++ b/kmymoney2/widgets/tdelistviewsearchline.cpp
@@ -23,7 +23,7 @@
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqapplication.h>
 #include <tqtimer.h>
diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp
index 2773258..684e960 100644
--- a/kmymoney2/widgets/transaction.cpp
+++ b/kmymoney2/widgets/transaction.cpp
@@ -25,8 +25,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/kmymoney2/widgets/transactionform.cpp b/kmymoney2/widgets/transactionform.cpp
index 281bcc5..9d94110 100644
--- a/kmymoney2/widgets/transactionform.cpp
+++ b/kmymoney2/widgets/transactionform.cpp
@@ -29,8 +29,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 
diff --git a/kmymoney2/widgets/transactionsortoption.ui.h b/kmymoney2/widgets/transactionsortoption.ui.h
index 2bf069f..34d0b04 100644
--- a/kmymoney2/widgets/transactionsortoption.ui.h
+++ b/kmymoney2/widgets/transactionsortoption.ui.h
@@ -14,7 +14,7 @@
 // KDE Includes
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 // ----------------------------------------------------------------------------
-- 
cgit v1.2.1