Rename additional header files to avoid conflicts with KDE4

developer-doc/phb/src-examples.docbook

@@ -197,12 +197,12 @@ signals:
 
 // ----------------------------------------------------------------------------
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kcolorbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/converter/convertertest.cpp

@@ -26,9 +26,9 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "convertertest.h"

kmymoney2/converter/imymoneyreader.h

@@ -33,7 +33,7 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/converter/mymoneygncreader.cpp

@@ -32,9 +32,9 @@ email                : mte@users.sourceforge.net
 // ----------------------------------------------------------------------------
 // KDE Includes
 #ifndef _GNCFILEANON
-  #include <klocale.h>
+  #include <tdelocale.h>
   #include <tdeconfig.h>
-  #include <kmessagebox.h>
+  #include <tdemessagebox.h>
 #endif
 
 // ----------------------------------------------------------------------------

kmymoney2/converter/mymoneyqifprofile.cpp

@@ -24,9 +24,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcalendarsystem.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/converter/mymoneyqifreader.cpp

@@ -36,8 +36,8 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kprogress.h>

kmymoney2/converter/mymoneyqifreader.h

@@ -33,7 +33,7 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 #include <kurl.h>
 

kmymoney2/converter/mymoneyqifwriter.cpp

@@ -28,8 +28,8 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Headers

kmymoney2/converter/mymoneystatementreader.cpp

@@ -34,8 +34,8 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>

kmymoney2/converter/mymoneystatementreader.h

@@ -34,7 +34,7 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/converter/mymoneytemplate.cpp

@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <ksavefile.h>
 

kmymoney2/converter/webpricequote.cpp

@@ -29,14 +29,14 @@
 #include <tdeio/netaccess.h>
 #include <tdeio/scheduler.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kcalendarsystem.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // ----------------------------------------------------------------------------
 // Project Headers

kmymoney2/dialogs/investactivities.cpp

@@ -23,7 +23,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/investtransactioneditor.cpp

@@ -30,10 +30,10 @@
 // KDE Includes
 
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/dialogs/kaccountselectdlg.cpp

@@ -28,11 +28,11 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 #include <kactivelabel.h>

kmymoney2/dialogs/kbackupdlg.cpp

@@ -28,13 +28,13 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tdeconfig.h>
 #include <kdirselectdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kguiitem.h>

kmymoney2/dialogs/kbalancechartdlg.cpp

@@ -29,7 +29,7 @@
 // KDE Includes
 
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/kbalancewarning.cpp

@@ -24,8 +24,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/kcategoryreassigndlg.cpp

@@ -22,10 +22,10 @@
 // KDE Includes
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/kchooseimportexportdlg.cpp

@@ -17,8 +17,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqpixmap.h>
@@ -27,9 +27,9 @@
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kchooseimportexportdlg.h"
 

kmymoney2/dialogs/kcsvprogressdlg.cpp

@@ -17,8 +17,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqpixmap.h>
@@ -35,9 +35,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/dialogs/kcurrencycalculator.cpp

@@ -32,7 +32,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
 #include <kstdguiitem.h>

kmymoney2/dialogs/kcurrencyeditdlg.cpp

@@ -36,11 +36,11 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/dialogs/keditequityentrydlg.cpp

@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kcombobox.h>

kmymoney2/dialogs/keditequityentrydlg.h

@@ -31,7 +31,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/dialogs/keditloanwizard.cpp

@@ -30,8 +30,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 

kmymoney2/dialogs/keditscheduledlg.cpp

@@ -28,8 +28,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <klineedit.h>

kmymoney2/dialogs/kendingbalancedlg.cpp

@@ -23,7 +23,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <kactivelabel.h>

kmymoney2/dialogs/kendingbalancedlg.h

@@ -30,7 +30,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/kenterscheduledlg.cpp

@@ -25,8 +25,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <kiconloader.h>

kmymoney2/dialogs/kequitypriceupdatedlg.cpp

@@ -35,14 +35,14 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <ktextedit.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <kprogress.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/dialogs/kexportdlg.cpp

@@ -27,10 +27,10 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>

kmymoney2/dialogs/kfindtransactiondlg.cpp

@@ -28,8 +28,8 @@
 // KDE Includes
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kpushbutton.h>
 #include <klineedit.h>

kmymoney2/dialogs/kgncimportoptionsdlg.cpp

@@ -28,7 +28,7 @@
 #include <tdeapplication.h>
 #include <kurlrequester.h>
 #include <ktextbrowser.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/kgncpricesourcedlg.cpp

@@ -29,7 +29,7 @@
 #include <tdeapplication.h>
 #include <kurlrequester.h>
 #include <ktextbrowser.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/kgpgkeyselectiondlg.cpp

@@ -24,7 +24,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <keditlistbox.h>
 #include <kled.h>
 

kmymoney2/dialogs/kimportdlg.cpp

@@ -32,13 +32,13 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <kstandarddirs.h>

kmymoney2/dialogs/kmergetransactionsdlg.cpp

@@ -24,7 +24,7 @@
 #include <kpushbutton.h>
 #include <tdeapplication.h>
 #include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/kmymoneypricedlg.cpp

@@ -32,7 +32,7 @@
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/kmymoneysplittable.cpp

@@ -36,10 +36,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecompletionbox.h>
 #include <kpushbutton.h>
 #include <tdepopupmenu.h>

kmymoney2/dialogs/knewaccountdlg.cpp

@@ -40,9 +40,9 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <tdelistview.h>
 #include <kstandarddirs.h>
@@ -50,7 +50,7 @@
 #include <kpushbutton.h>
 #include <kled.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/knewbankdlg.cpp

@@ -27,10 +27,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kguiitem.h>
 #include <klineedit.h>

kmymoney2/dialogs/knewbankdlg.h

@@ -25,7 +25,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/knewbudgetdlg.cpp

@@ -27,8 +27,8 @@
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/knewequityentrydlg.h

@@ -24,7 +24,7 @@
 #define KNEWEQUITYENTRY_H
 
 #include <tqdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "../dialogs/knewequityentrydecl.h"
 

kmymoney2/dialogs/knewfiledlg.cpp

@@ -26,16 +26,16 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #if KDE_IS_VERSION(3,1,90)
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #endif
 
 // ----------------------------------------------------------------------------

kmymoney2/dialogs/knewfiledlg.h

@@ -23,7 +23,7 @@
 
 // ----------------------------------------------------------------------------
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/knewinvestmentwizard.cpp

@@ -27,9 +27,9 @@
 #include <kpushbutton.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/knewloanwizard.cpp

@@ -32,10 +32,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 

kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp

@@ -25,8 +25,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <tdelistbox.h>
 #include <tdelistview.h>

kmymoney2/dialogs/kpayeereassigndlg.cpp

@@ -24,10 +24,10 @@
 // KDE Includes
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/kreconciledlg.cpp

@@ -14,9 +14,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 

kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp

@@ -57,7 +57,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/ksecuritylisteditor.cpp

@@ -27,9 +27,9 @@
 #include <tdelistview.h>
 #include <kguiitem.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/ksplittransactiondlg.cpp

@@ -35,10 +35,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kactivelabel.h>
 #include <kstdguiitem.h>

kmymoney2/dialogs/kstartdlg.cpp

@@ -35,13 +35,13 @@
 
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 #include <tdefile.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/kstartdlg.h

@@ -22,7 +22,7 @@
 
 #include <kdialogbase.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefontdialog.h>
 #include <kurlrequester.h>
 #include <kiconview.h>

kmymoney2/dialogs/kupdatestockpricedlg.h

@@ -37,7 +37,7 @@
 // KDE Includes
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/dialogs/mymoneyqifprofileeditor.cpp

@@ -28,11 +28,11 @@
 // KDE Includes
 
 #include "kdecompat.h"
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <kiconloader.h>

kmymoney2/dialogs/settings/ksettingsgpg.cpp

@@ -28,8 +28,8 @@
 #include <klineedit.h>
 #include <keditlistbox.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/settings/ksettingshome.cpp

@@ -25,10 +25,10 @@
 
 #include <tdelistview.h>
 #include <kpushbutton.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp

@@ -25,8 +25,8 @@
 // KDE Includes
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>

kmymoney2/dialogs/settings/ksettingsplugins.cpp

@@ -25,7 +25,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kpluginselector.h>
 

kmymoney2/dialogs/tdeconfirmmanualenterdlg.cpp

@@ -23,11 +23,11 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/tdeselectdatabasedlg.cpp

@@ -37,8 +37,8 @@
 #include <tdeapplication.h>
 #include <kurlrequester.h>
 #include <ktextbrowser.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/tdeselecttransactionsdlg.cpp

@@ -25,7 +25,7 @@
 #include <kstdguiitem.h>
 #include <tdeapplication.h>
 #include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/dialogs/transactioneditor.cpp

@@ -28,12 +28,12 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 #include <kiconloader.h>
 #include <kguiitem.h>

kmymoney2/dialogs/transactionmatcher.cpp

@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/kmymoney2.cpp

@@ -50,13 +50,13 @@
 #include <tdeapplication.h>
 #include <tdeshortcut.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <ktip.h>
@@ -64,7 +64,7 @@
 #include <kprogress.h>
 #include <tdeio/netaccess.h>
 #include <dcopclient.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <tdeparts/componentfactory.h>
 #include <krun.h>
 #include <tdeconfigdialog.h>

kmymoney2/kmymoneyglobalsettings.cpp

@@ -22,7 +22,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/kmymoneyutils.cpp

@@ -26,10 +26,10 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 

kmymoney2/kstartuplogo.cpp

@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 

kmymoney2/main.cpp

@@ -33,10 +33,10 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktip.h>
 #include <dcopclient.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/mymoney/mymoneyaccount.cpp

@@ -26,7 +26,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/mymoney/mymoneyfile.cpp

@@ -27,7 +27,7 @@
 // KDE Includes
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/mymoney/mymoneyinstitution.cpp

@@ -21,7 +21,7 @@
 
 // ----------------------------------------------------------------------------
 // KDE Includes
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/mymoney/mymoneymoney.h

@@ -76,7 +76,7 @@ public:
   };
 
   enum signPosition {
-    // keep those in sync with the ones defined in klocale.h
+    // keep those in sync with the ones defined in tdelocale.h
     ParensAround = 0,
     BeforeQuantityMoney = 1,
     AfterQuantityMoney = 2,

kmymoney2/mymoney/mymoneyscheduled.cpp

@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/mymoney/mymoneyscheduletest.cpp

@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 // Include internationalization
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "mymoneyscheduletest.h"
 

kmymoney2/mymoney/mymoneysecurity.cpp

@@ -26,7 +26,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/mymoney/storage/mymoneystoragesql.cpp

@@ -32,7 +32,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/mymoney/storage/mymoneystoragexml.cpp

@@ -31,7 +31,7 @@
 // KDE Includes
 
 #include "kdecompat.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp

@@ -34,10 +34,10 @@
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp

@@ -33,9 +33,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <tdeapplication.h>

kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp

@@ -35,7 +35,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kled.h>
 #include <kcombobox.h>
 

kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp

@@ -33,7 +33,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 

kmymoney2/plugins/ofximport/ofximporterplugin.cpp

@@ -32,7 +32,7 @@
 #include <tdefile.h>
 #include <kurl.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/plugins/ofximport/ofxpartner.cpp

@@ -40,8 +40,8 @@
 
 
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/plugins/pluginloader.cpp

@@ -31,7 +31,7 @@
 #include <kdialog.h>
 #include <tdeconfig.h>
 #include <kpluginselector.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/reports/listtable.cpp

@@ -28,7 +28,7 @@
 // This is just needed for i18n().  Once I figure out how to handle i18n
 // without using this macro directly, I'll be freed of KDE dependency.
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/reports/objectinfotable.cpp

@@ -28,7 +28,7 @@
 // This is just needed for i18n().  Once I figure out how to handle i18n
 // without using this macro directly, I'll be freed of KDE dependency.
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/reports/pivotgrid.cpp

@@ -39,8 +39,8 @@
 // (e.g. MyMoneyAccount::Checkings) into their text representation.  We also
 // use that text representation in the core data structure of the report. (Ace)
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcalendarsystem.h>
 

kmymoney2/reports/pivotgridtest.cpp

@@ -22,9 +22,9 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 // DOH, mmreport.h uses this without including it!!

kmymoney2/reports/pivottable.cpp

@@ -40,8 +40,8 @@
 // (e.g. MyMoneyAccount::Checkings) into their text representation.  We also
 // use that text representation in the core data structure of the report. (Ace)
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcalendarsystem.h>
 

kmymoney2/reports/pivottabletest.cpp

@@ -22,9 +22,9 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 // DOH, mmreport.h uses this without including it!!

kmymoney2/reports/querytable.cpp

@@ -34,7 +34,7 @@
 // This is just needed for i18n().  Once I figure out how to handle i18n
 // without using this macro directly, I'll be freed of KDE dependency.
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/reports/querytabletest.cpp

@@ -21,9 +21,9 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "querytabletest.h"

kmymoney2/reports/reportaccount.cpp

@@ -28,7 +28,7 @@
 // (e.g. MyMoneyAccount::Checkings) into their text representation.  We also
 // use that text representation in the core data structure of the report. (Ace)
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/reports/reportstestcommon.cpp

@@ -22,9 +22,9 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "kreportsviewtest.h"

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>

kmymoney2/views/kbudgetview.cpp

@@ -34,10 +34,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kguiitem.h>

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>

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>
 

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>

kmymoney2/views/khomeview.cpp

@@ -37,8 +37,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.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>
 
 // ----------------------------------------------------------------------------

kmymoney2/views/kinstitutionsview.cpp

@@ -25,7 +25,7 @@
 // KDE Includes
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/views/kinvestmentview.cpp

@@ -24,7 +24,7 @@
 // KDE Includes
 
 #include "kdecompat.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/views/kmymoneyfile.cpp

@@ -25,7 +25,7 @@
  */
 #if 0
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kmymoneyfile.h"
 #include "../mymoney/storage/mymoneyseqaccessmgr.h"

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>

kmymoney2/views/kpayeesview.cpp

@@ -45,9 +45,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kguiitem.h>

kmymoney2/views/kreportsview.cpp

@@ -49,17 +49,17 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <klocale.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

kmymoney2/views/kscheduledlistitem.cpp

@@ -30,9 +30,9 @@
 // KDE Includes
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/views/kscheduledview.cpp

@@ -33,12 +33,12 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.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>

kmymoney2/widgets/kaccounttemplateselector.cpp

@@ -25,8 +25,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdelistview.h>
 #include <ktextedit.h>

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); }

kmymoney2/widgets/kbudgetvalues.cpp

@@ -30,10 +30,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcalendarsystem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 

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); }

kmymoney2/widgets/kmymoneyaccountselector.cpp

@@ -34,7 +34,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/widgets/kmymoneyaccounttree.cpp

@@ -31,9 +31,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 

kmymoney2/widgets/kmymoneyaccounttreebase.cpp

@@ -31,9 +31,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 

kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp

@@ -17,7 +17,7 @@
 
 // ----------------------------------------------------------------------------
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/widgets/kmymoneybriefschedule.cpp

@@ -31,8 +31,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 

kmymoney2/widgets/kmymoneycalculator.cpp

@@ -30,8 +30,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

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>

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>

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>

kmymoney2/widgets/kmymoneydateinput.cpp

@@ -34,8 +34,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include "kdecompat.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <tdeshortcut.h>

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 <tdeglobal.h>
-#include <kglobalsettings.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)

kmymoney2/widgets/kmymoneyedit.cpp

@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kiconloader.h>

kmymoney2/widgets/kmymoneygpgconfig.cpp

@@ -25,8 +25,8 @@
 // KDE Includes
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kled.h>
 

kmymoney2/widgets/kmymoneylineedit.cpp

@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp

@@ -24,8 +24,8 @@
 // KDE Includes
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>

kmymoney2/widgets/kmymoneypriceview.cpp

@@ -32,12 +32,12 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

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

kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp

@@ -53,9 +53,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include "kdecompat.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

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

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>
 

kmymoney2/widgets/register.cpp

@@ -30,8 +30,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 

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

kmymoney2/widgets/scheduledtransaction.cpp

@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes

kmymoney2/widgets/stdtransactiondownloaded.cpp

@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/widgets/stdtransactionmatched.cpp

@@ -23,7 +23,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------

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>

kmymoney2/widgets/transaction.cpp

@@ -25,8 +25,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

kmymoney2/widgets/transactionform.cpp

@@ -29,8 +29,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 

kmymoney2/widgets/transactionsortoption.ui.h

@@ -14,7 +14,7 @@
 // KDE Includes
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp

@@ -29,10 +29,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistbox.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/wizards/newuserwizard/knewuserwizard.cpp

@@ -30,7 +30,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kstandarddirs.h>
 #include <klineedit.h>
@@ -39,9 +39,9 @@
 #include <kurlrequester.h>
 #include <tdeio/netaccess.h>
 #include <kurl.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kactivelabel.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/wizards/wizardpages/currency.cpp

@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 // ----------------------------------------------------------------------------

kmymoney2/wizards/wizardpages/userinfo.cpp

@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 // ----------------------------------------------------------------------------

libkgpgfile/kgpgfile.cpp

@@ -35,7 +35,7 @@
 // KDE Includes
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kpassdlg.h>
 #include <klibloader.h>