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/converter/convertertest.cpp          | 6 +++---
 kmymoney2/converter/imymoneyreader.h           | 2 +-
 kmymoney2/converter/mymoneygncreader.cpp       | 4 ++--
 kmymoney2/converter/mymoneyqifprofile.cpp      | 4 ++--
 kmymoney2/converter/mymoneyqifreader.cpp       | 4 ++--
 kmymoney2/converter/mymoneyqifreader.h         | 2 +-
 kmymoney2/converter/mymoneyqifwriter.cpp       | 4 ++--
 kmymoney2/converter/mymoneystatementreader.cpp | 4 ++--
 kmymoney2/converter/mymoneystatementreader.h   | 2 +-
 kmymoney2/converter/mymoneytemplate.cpp        | 4 ++--
 kmymoney2/converter/webpricequote.cpp          | 6 +++---
 11 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'kmymoney2/converter')

diff --git a/kmymoney2/converter/convertertest.cpp b/kmymoney2/converter/convertertest.cpp
index bbe0ec4..04a8b58 100644
--- a/kmymoney2/converter/convertertest.cpp
+++ b/kmymoney2/converter/convertertest.cpp
@@ -26,9 +26,9 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "convertertest.h"
diff --git a/kmymoney2/converter/imymoneyreader.h b/kmymoney2/converter/imymoneyreader.h
index 92f8963..0a4f12d 100644
--- a/kmymoney2/converter/imymoneyreader.h
+++ b/kmymoney2/converter/imymoneyreader.h
@@ -33,7 +33,7 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp
index d617bb0..dcf7d56 100644
--- a/kmymoney2/converter/mymoneygncreader.cpp
+++ b/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
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp
index a40685f..803aa97 100644
--- a/kmymoney2/converter/mymoneyqifprofile.cpp
+++ b/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>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp
index 33c844b..a656da1 100644
--- a/kmymoney2/converter/mymoneyqifreader.cpp
+++ b/kmymoney2/converter/mymoneyqifreader.cpp
@@ -36,8 +36,8 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kprogress.h>
diff --git a/kmymoney2/converter/mymoneyqifreader.h b/kmymoney2/converter/mymoneyqifreader.h
index e2f6638..6f9d5f0 100644
--- a/kmymoney2/converter/mymoneyqifreader.h
+++ b/kmymoney2/converter/mymoneyqifreader.h
@@ -33,7 +33,7 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 #include <kurl.h>
 
diff --git a/kmymoney2/converter/mymoneyqifwriter.cpp b/kmymoney2/converter/mymoneyqifwriter.cpp
index 9fed9d5..b9e3e9f 100644
--- a/kmymoney2/converter/mymoneyqifwriter.cpp
+++ b/kmymoney2/converter/mymoneyqifwriter.cpp
@@ -28,8 +28,8 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Headers
diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
index 87fa409..1cd2f46 100644
--- a/kmymoney2/converter/mymoneystatementreader.cpp
+++ b/kmymoney2/converter/mymoneystatementreader.cpp
@@ -34,8 +34,8 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kmymoney2/converter/mymoneystatementreader.h b/kmymoney2/converter/mymoneystatementreader.h
index c0b2273..812a602 100644
--- a/kmymoney2/converter/mymoneystatementreader.h
+++ b/kmymoney2/converter/mymoneystatementreader.h
@@ -34,7 +34,7 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/converter/mymoneytemplate.cpp b/kmymoney2/converter/mymoneytemplate.cpp
index 721e96a..fdf9cc9 100644
--- a/kmymoney2/converter/mymoneytemplate.cpp
+++ b/kmymoney2/converter/mymoneytemplate.cpp
@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <ksavefile.h>
 
diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp
index f211744..ab1849f 100644
--- a/kmymoney2/converter/webpricequote.cpp
+++ b/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
-- 
cgit v1.2.1