summaryrefslogtreecommitdiffstats
path: root/kmymoney2/mymoney
diff options
context:
space:
mode:
Diffstat (limited to 'kmymoney2/mymoney')
-rw-r--r--kmymoney2/mymoney/mymoneyaccount.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyaccount.h8
-rw-r--r--kmymoney2/mymoney/mymoneyaccounttest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneybudget.h4
-rw-r--r--kmymoney2/mymoney/mymoneycategory.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyexception.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyexception.h4
-rw-r--r--kmymoney2/mymoney/mymoneyexceptiontest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyfile.cpp6
-rw-r--r--kmymoney2/mymoney/mymoneyfile.h4
-rw-r--r--kmymoney2/mymoney/mymoneyfiletest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyfinancialcalculator.cpp5
-rw-r--r--kmymoney2/mymoney/mymoneyfinancialcalculator.h4
-rw-r--r--kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp5
-rw-r--r--kmymoney2/mymoney/mymoneyforecast.h10
-rw-r--r--kmymoney2/mymoney/mymoneyforecasttest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyinstitution.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyinstitution.h10
-rw-r--r--kmymoney2/mymoney/mymoneyinstitutiontest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyinvesttransaction.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyinvesttransaction.h2
-rw-r--r--kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneykeyvaluecontainer.h4
-rw-r--r--kmymoney2/mymoney/mymoneykeyvaluecontainertest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneymoney.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneymoney.h4
-rw-r--r--kmymoney2/mymoney/mymoneymoneytest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyobject.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyobject.h4
-rw-r--r--kmymoney2/mymoney/mymoneyobjectcontainer.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyobjectcontainer.h4
-rw-r--r--kmymoney2/mymoney/mymoneyobjecttest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyobserver.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyobserver.h4
-rw-r--r--kmymoney2/mymoney/mymoneypayee.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneypayee.h4
-rw-r--r--kmymoney2/mymoney/mymoneypayeetest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyprice.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyprice.h4
-rw-r--r--kmymoney2/mymoney/mymoneypricetest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyreport.h4
-rw-r--r--kmymoney2/mymoney/mymoneyscheduled.cpp5
-rw-r--r--kmymoney2/mymoney/mymoneyscheduled.h8
-rw-r--r--kmymoney2/mymoney/mymoneyscheduletest.cpp5
-rw-r--r--kmymoney2/mymoney/mymoneysecurity.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneysecurity.h4
-rw-r--r--kmymoney2/mymoney/mymoneysecuritytest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneysplit.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneysplit.h12
-rw-r--r--kmymoney2/mymoney/mymoneysplittest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneystatement.cpp5
-rw-r--r--kmymoney2/mymoney/mymoneystatement.h4
-rw-r--r--kmymoney2/mymoney/mymoneysubject.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneytransaction.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneytransaction.h12
-rw-r--r--kmymoney2/mymoney/mymoneytransactionfilter.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneytransactionfilter.h4
-rw-r--r--kmymoney2/mymoney/mymoneytransactiontest.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyutils.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyutils.h4
-rw-r--r--kmymoney2/mymoney/storage/Makefile.am4
-rw-r--r--kmymoney2/mymoney/storage/imymoneyserialize.cpp4
-rw-r--r--kmymoney2/mymoney/storage/imymoneyserialize.h16
-rw-r--r--kmymoney2/mymoney/storage/imymoneystorage.cpp4
-rw-r--r--kmymoney2/mymoney/storage/imymoneystorageformat.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp5
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneymaptest.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneystorageanon.cpp6
-rw-r--r--kmymoney2/mymoney/storage/mymoneystoragedump.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneystoragesql.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneystoragesql.h31
-rw-r--r--kmymoney2/mymoney/storage/mymoneystoragexml.cpp5
75 files changed, 241 insertions, 143 deletions
diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp
index 56c0112..3b48602 100644
--- a/kmymoney2/mymoney/mymoneyaccount.cpp
+++ b/kmymoney2/mymoney/mymoneyaccount.cpp
@@ -16,6 +16,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneyaccount.h b/kmymoney2/mymoney/mymoneyaccount.h
index 8ab368c..f919a42 100644
--- a/kmymoney2/mymoney/mymoneyaccount.h
+++ b/kmymoney2/mymoney/mymoneyaccount.h
@@ -17,10 +17,6 @@
#ifndef MYMONEYACCOUNT_H
#define MYMONEYACCOUNT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
@@ -34,14 +30,14 @@
// ----------------------------------------------------------------------------
// Project Includes
+#include <kmymoney/export.h>
#include <kmymoney/mymoneymoney.h>
#include <kmymoney/mymoneyobject.h>
#include <kmymoney/mymoneykeyvaluecontainer.h>
#include <kmymoney/mymoneysecurity.h>
+#include <kmymoney/mymoneyutils.h>
#include <kmymoney2/views/kmymoneytransaction.h>
#include <kmymoney2/mymoney/mymoneysplit.h>
-#include <kmymoney/export.h>
-#include "mymoneyutils.h"
class MyMoneyTransaction;
class MyMoneyInstitution;
class MyMoneySplit;
diff --git a/kmymoney2/mymoney/mymoneyaccounttest.cpp b/kmymoney2/mymoney/mymoneyaccounttest.cpp
index 12ea7f1..0c2e292 100644
--- a/kmymoney2/mymoney/mymoneyaccounttest.cpp
+++ b/kmymoney2/mymoney/mymoneyaccounttest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneyaccounttest.h"
#include <kmymoney/mymoneyexception.h>
#include <kmymoney/mymoneysplit.h>
diff --git a/kmymoney2/mymoney/mymoneybudget.h b/kmymoney2/mymoney/mymoneybudget.h
index fcf20c4..6461370 100644
--- a/kmymoney2/mymoney/mymoneybudget.h
+++ b/kmymoney2/mymoney/mymoneybudget.h
@@ -18,10 +18,6 @@
#ifndef MYMONEYBUDGET_H
#define MYMONEYBUDGET_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneycategory.cpp b/kmymoney2/mymoney/mymoneycategory.cpp
index 9a51b53..a45eaad 100644
--- a/kmymoney2/mymoney/mymoneycategory.cpp
+++ b/kmymoney2/mymoney/mymoneycategory.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneycategory.h"
MyMoneyCategory::MyMoneyCategory()
diff --git a/kmymoney2/mymoney/mymoneyexception.cpp b/kmymoney2/mymoney/mymoneyexception.cpp
index 47d32fc..c0cdc82 100644
--- a/kmymoney2/mymoney/mymoneyexception.cpp
+++ b/kmymoney2/mymoney/mymoneyexception.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneyexception.h"
MyMoneyException::MyMoneyException(const TQString& msg, const TQString& file, const unsigned long line)
diff --git a/kmymoney2/mymoney/mymoneyexception.h b/kmymoney2/mymoney/mymoneyexception.h
index 41020b3..ac616a9 100644
--- a/kmymoney2/mymoney/mymoneyexception.h
+++ b/kmymoney2/mymoney/mymoneyexception.h
@@ -23,10 +23,6 @@
#ifndef MYMONEYEXCEPTION_H
#define MYMONEYEXCEPTION_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneyexceptiontest.cpp b/kmymoney2/mymoney/mymoneyexceptiontest.cpp
index 9d036ff..1470670 100644
--- a/kmymoney2/mymoney/mymoneyexceptiontest.cpp
+++ b/kmymoney2/mymoney/mymoneyexceptiontest.cpp
@@ -15,6 +15,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneyexceptiontest.h"
MyMoneyExceptionTest::MyMoneyExceptionTest()
diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp
index 2c78d8f..8091e91 100644
--- a/kmymoney2/mymoney/mymoneyfile.cpp
+++ b/kmymoney2/mymoney/mymoneyfile.cpp
@@ -16,6 +16,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
@@ -40,8 +44,6 @@
#ifndef HAVE_CONFIG_H
#define VERSION "UNKNOWN"
-#else
-#include "config.h"
#endif
const TQString MyMoneyFile::OpeningBalancesPrefix = I18N_NOOP("Opening Balances");
diff --git a/kmymoney2/mymoney/mymoneyfile.h b/kmymoney2/mymoney/mymoneyfile.h
index 9bd7514..d072149 100644
--- a/kmymoney2/mymoney/mymoneyfile.h
+++ b/kmymoney2/mymoney/mymoneyfile.h
@@ -17,10 +17,6 @@
#ifndef MYMONEYFILE_H
#define MYMONEYFILE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneyfiletest.cpp b/kmymoney2/mymoney/mymoneyfiletest.cpp
index 1c25abd..1204683 100644
--- a/kmymoney2/mymoney/mymoneyfiletest.cpp
+++ b/kmymoney2/mymoney/mymoneyfiletest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneyfiletest.h"
#include <iostream>
diff --git a/kmymoney2/mymoney/mymoneyfinancialcalculator.cpp b/kmymoney2/mymoney/mymoneyfinancialcalculator.cpp
index d6686a6..cdf84db 100644
--- a/kmymoney2/mymoney/mymoneyfinancialcalculator.cpp
+++ b/kmymoney2/mymoney/mymoneyfinancialcalculator.cpp
@@ -20,12 +20,13 @@
* *
***************************************************************************/
-#include <math.h>
-#include <stdio.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include <math.h>
+#include <stdio.h>
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneyfinancialcalculator.h b/kmymoney2/mymoney/mymoneyfinancialcalculator.h
index c603d12..d66b3c1 100644
--- a/kmymoney2/mymoney/mymoneyfinancialcalculator.h
+++ b/kmymoney2/mymoney/mymoneyfinancialcalculator.h
@@ -23,10 +23,6 @@
#ifndef MYMONEYFINANCIALCALCULATOR_H
#define MYMONEYFINANCIALCALCULATOR_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <cmath>
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp b/kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp
index fa5b1a3..a2e578b 100644
--- a/kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp
+++ b/kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp
@@ -13,6 +13,11 @@
* (at your option) any later version. *
* *
***************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <iostream>
#include <math.h>
diff --git a/kmymoney2/mymoney/mymoneyforecast.h b/kmymoney2/mymoney/mymoneyforecast.h
index 6fa231c..30d4cbd 100644
--- a/kmymoney2/mymoney/mymoneyforecast.h
+++ b/kmymoney2/mymoney/mymoneyforecast.h
@@ -18,10 +18,6 @@
#ifndef MYMONEYFORECAST_H
#define MYMONEYFORECAST_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
@@ -32,12 +28,12 @@
// ----------------------------------------------------------------------------
// Project Includes
-#include <kmymoney/mymoneyobject.h>
+#include <kmymoney/export.h>
#include <kmymoney/mymoneyaccount.h>
+#include <kmymoney/mymoneybudget.h>
#include <kmymoney/mymoneymoney.h>
+#include <kmymoney/mymoneyobject.h>
#include <kmymoney/mymoneyscheduled.h>
-#include <kmymoney/export.h>
-#include "mymoneybudget.h"
/**
*
diff --git a/kmymoney2/mymoney/mymoneyforecasttest.cpp b/kmymoney2/mymoney/mymoneyforecasttest.cpp
index dc829cd..c63b176 100644
--- a/kmymoney2/mymoney/mymoneyforecasttest.cpp
+++ b/kmymoney2/mymoney/mymoneyforecasttest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneyforecasttest.h"
#include <iostream>
diff --git a/kmymoney2/mymoney/mymoneyinstitution.cpp b/kmymoney2/mymoney/mymoneyinstitution.cpp
index b9ab329..4971afa 100644
--- a/kmymoney2/mymoney/mymoneyinstitution.cpp
+++ b/kmymoney2/mymoney/mymoneyinstitution.cpp
@@ -16,6 +16,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneyinstitution.h b/kmymoney2/mymoney/mymoneyinstitution.h
index b4c1cf1..b91c0da 100644
--- a/kmymoney2/mymoney/mymoneyinstitution.h
+++ b/kmymoney2/mymoney/mymoneyinstitution.h
@@ -17,10 +17,6 @@
#ifndef MYMONEYINSTITUTION_H
#define MYMONEYINSTITUTION_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
@@ -32,10 +28,10 @@
// ----------------------------------------------------------------------------
// Project Includes
-#include "mymoneyutils.h"
-#include <kmymoney/mymoneyobject.h>
-#include <kmymoney/mymoneykeyvaluecontainer.h>
#include <kmymoney/export.h>
+#include <kmymoney/mymoneykeyvaluecontainer.h>
+#include <kmymoney/mymoneyobject.h>
+#include <kmymoney/mymoneyutils.h>
class MyMoneyFile;
class MyMoneyMoney;
diff --git a/kmymoney2/mymoney/mymoneyinstitutiontest.cpp b/kmymoney2/mymoney/mymoneyinstitutiontest.cpp
index 2e537d0..556c26b 100644
--- a/kmymoney2/mymoney/mymoneyinstitutiontest.cpp
+++ b/kmymoney2/mymoney/mymoneyinstitutiontest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneyinstitutiontest.h"
#include <kmymoney/mymoneyexception.h>
diff --git a/kmymoney2/mymoney/mymoneyinvesttransaction.cpp b/kmymoney2/mymoney/mymoneyinvesttransaction.cpp
index 675e746..585e345 100644
--- a/kmymoney2/mymoney/mymoneyinvesttransaction.cpp
+++ b/kmymoney2/mymoney/mymoneyinvesttransaction.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneyinvesttransaction.h"
#if 0
diff --git a/kmymoney2/mymoney/mymoneyinvesttransaction.h b/kmymoney2/mymoney/mymoneyinvesttransaction.h
index ee09456..1f60ac0 100644
--- a/kmymoney2/mymoney/mymoneyinvesttransaction.h
+++ b/kmymoney2/mymoney/mymoneyinvesttransaction.h
@@ -23,7 +23,7 @@
#ifndef MYMONEYINVESTTRANSACTION_H
#define MYMONEYINVESTTRANSACTION_H
-#include "mymoneytransaction.h"
+#include <kmymoney/mymoneytransaction.h>
#if 0
/**
diff --git a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
index cabf772..2203ea0 100644
--- a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
+++ b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
@@ -15,6 +15,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneykeyvaluecontainer.h b/kmymoney2/mymoney/mymoneykeyvaluecontainer.h
index 9be002e..9b8de1b 100644
--- a/kmymoney2/mymoney/mymoneykeyvaluecontainer.h
+++ b/kmymoney2/mymoney/mymoneykeyvaluecontainer.h
@@ -23,10 +23,6 @@
* @author Thomas Baumgart
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneykeyvaluecontainertest.cpp b/kmymoney2/mymoney/mymoneykeyvaluecontainertest.cpp
index bc1757d..e7e45fd 100644
--- a/kmymoney2/mymoney/mymoneykeyvaluecontainertest.cpp
+++ b/kmymoney2/mymoney/mymoneykeyvaluecontainertest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneykeyvaluecontainertest.h"
#include <kmymoney/mymoneyexception.h>
diff --git a/kmymoney2/mymoney/mymoneymoney.cpp b/kmymoney2/mymoney/mymoneymoney.cpp
index 304a905..ec10a0e 100644
--- a/kmymoney2/mymoney/mymoneymoney.cpp
+++ b/kmymoney2/mymoney/mymoneymoney.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// make sure, that this is defined before we even include any other header file
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS // force definition of min and max values
diff --git a/kmymoney2/mymoney/mymoneymoney.h b/kmymoney2/mymoney/mymoneymoney.h
index f857b8f..97534b5 100644
--- a/kmymoney2/mymoney/mymoneymoney.h
+++ b/kmymoney2/mymoney/mymoneymoney.h
@@ -18,10 +18,6 @@
#include <stdlib.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef HAVE_ATOLL
# ifdef HAVE_STRTOLL
# define atoll(a) strtoll(a, 0, 10)
diff --git a/kmymoney2/mymoney/mymoneymoneytest.cpp b/kmymoney2/mymoney/mymoneymoneytest.cpp
index 81967a1..116cee9 100644
--- a/kmymoney2/mymoney/mymoneymoneytest.cpp
+++ b/kmymoney2/mymoney/mymoneymoneytest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// make sure, that this is defined before we even include any other header file
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS // force definition of min and max values
diff --git a/kmymoney2/mymoney/mymoneyobject.cpp b/kmymoney2/mymoney/mymoneyobject.cpp
index a415a7c..c58d58c 100644
--- a/kmymoney2/mymoney/mymoneyobject.cpp
+++ b/kmymoney2/mymoney/mymoneyobject.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneyobject.h b/kmymoney2/mymoney/mymoneyobject.h
index cd8d43d..73fd080 100644
--- a/kmymoney2/mymoney/mymoneyobject.h
+++ b/kmymoney2/mymoney/mymoneyobject.h
@@ -17,10 +17,6 @@
#ifndef MYMONEYOBJECT_H
#define MYMONEYOBJECT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneyobjectcontainer.cpp b/kmymoney2/mymoney/mymoneyobjectcontainer.cpp
index 7517e17..63f4d1c 100644
--- a/kmymoney2/mymoney/mymoneyobjectcontainer.cpp
+++ b/kmymoney2/mymoney/mymoneyobjectcontainer.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneyobjectcontainer.h b/kmymoney2/mymoney/mymoneyobjectcontainer.h
index 977bef6..e678ba3 100644
--- a/kmymoney2/mymoney/mymoneyobjectcontainer.h
+++ b/kmymoney2/mymoney/mymoneyobjectcontainer.h
@@ -17,10 +17,6 @@
#ifndef MYMONEYOBJECTCONTAINER_H
#define MYMONEYOBJECTCONTAINER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneyobjecttest.cpp b/kmymoney2/mymoney/mymoneyobjecttest.cpp
index b69d63a..3921c47 100644
--- a/kmymoney2/mymoney/mymoneyobjecttest.cpp
+++ b/kmymoney2/mymoney/mymoneyobjecttest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneyobjecttest.h"
#include "mymoneyaccount.h"
diff --git a/kmymoney2/mymoney/mymoneyobserver.cpp b/kmymoney2/mymoney/mymoneyobserver.cpp
index f343003..337c149 100644
--- a/kmymoney2/mymoney/mymoneyobserver.cpp
+++ b/kmymoney2/mymoney/mymoneyobserver.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneyobserver.h"
MyMoneyObserver::MyMoneyObserver()
diff --git a/kmymoney2/mymoney/mymoneyobserver.h b/kmymoney2/mymoney/mymoneyobserver.h
index 3ec05d0..e71a786 100644
--- a/kmymoney2/mymoney/mymoneyobserver.h
+++ b/kmymoney2/mymoney/mymoneyobserver.h
@@ -23,10 +23,6 @@
#ifndef MYMONEYOBSERVER_H
#define MYMONEYOBSERVER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneypayee.cpp b/kmymoney2/mymoney/mymoneypayee.cpp
index c924b62..d0211aa 100644
--- a/kmymoney2/mymoney/mymoneypayee.cpp
+++ b/kmymoney2/mymoney/mymoneypayee.cpp
@@ -16,6 +16,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneypayee.h b/kmymoney2/mymoney/mymoneypayee.h
index b8ffadf..118b320 100644
--- a/kmymoney2/mymoney/mymoneypayee.h
+++ b/kmymoney2/mymoney/mymoneypayee.h
@@ -19,10 +19,6 @@
#ifndef MYMONEYPAYEE_H
#define MYMONEYPAYEE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneypayeetest.cpp b/kmymoney2/mymoney/mymoneypayeetest.cpp
index 0dad126..ceb636e 100644
--- a/kmymoney2/mymoney/mymoneypayeetest.cpp
+++ b/kmymoney2/mymoney/mymoneypayeetest.cpp
@@ -11,6 +11,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneypayeetest.h"
#include <iostream>
#include <fstream>
diff --git a/kmymoney2/mymoney/mymoneyprice.cpp b/kmymoney2/mymoney/mymoneyprice.cpp
index a65ba65..b51e810 100644
--- a/kmymoney2/mymoney/mymoneyprice.cpp
+++ b/kmymoney2/mymoney/mymoneyprice.cpp
@@ -24,6 +24,10 @@
* @author Thomas Baumgart
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneyprice.h b/kmymoney2/mymoney/mymoneyprice.h
index 9c4f1c0..673b78f 100644
--- a/kmymoney2/mymoney/mymoneyprice.h
+++ b/kmymoney2/mymoney/mymoneyprice.h
@@ -23,10 +23,6 @@
#ifndef MYMONEYPRICE_H
#define MYMONEYPRICE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneypricetest.cpp b/kmymoney2/mymoney/mymoneypricetest.cpp
index 444754a..5018ff9 100644
--- a/kmymoney2/mymoney/mymoneypricetest.cpp
+++ b/kmymoney2/mymoney/mymoneypricetest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneypricetest.h"
#include "mymoneyexception.h"
diff --git a/kmymoney2/mymoney/mymoneyreport.h b/kmymoney2/mymoney/mymoneyreport.h
index a7bfc98..16e91b5 100644
--- a/kmymoney2/mymoney/mymoneyreport.h
+++ b/kmymoney2/mymoney/mymoneyreport.h
@@ -18,10 +18,6 @@
#ifndef MYMONEYREPORT_H
#define MYMONEYREPORT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
#include <tqmap.h>
diff --git a/kmymoney2/mymoney/mymoneyscheduled.cpp b/kmymoney2/mymoney/mymoneyscheduled.cpp
index d2ac663..3891d6b 100644
--- a/kmymoney2/mymoney/mymoneyscheduled.cpp
+++ b/kmymoney2/mymoney/mymoneyscheduled.cpp
@@ -15,6 +15,11 @@
* (at your option) any later version. *
* *
***************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneyscheduled.h b/kmymoney2/mymoney/mymoneyscheduled.h
index 1258b00..9761cc3 100644
--- a/kmymoney2/mymoney/mymoneyscheduled.h
+++ b/kmymoney2/mymoney/mymoneyscheduled.h
@@ -19,10 +19,6 @@
#ifndef MYMONEYSCHEDULED_H
#define MYMONEYSCHEDULED_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
@@ -34,10 +30,10 @@
// ----------------------------------------------------------------------------
// Project Includes
-#include "mymoneytransaction.h"
-#include "mymoneyaccount.h"
#include <kmymoney/export.h>
+#include <kmymoney/mymoneyaccount.h>
#include <kmymoney/mymoneyobject.h>
+#include <kmymoney/mymoneytransaction.h>
class MyMoneyStorageANON;
diff --git a/kmymoney2/mymoney/mymoneyscheduletest.cpp b/kmymoney2/mymoney/mymoneyscheduletest.cpp
index ae45e97..fb6d542 100644
--- a/kmymoney2/mymoney/mymoneyscheduletest.cpp
+++ b/kmymoney2/mymoney/mymoneyscheduletest.cpp
@@ -13,6 +13,11 @@
* (at your option) any later version. *
* *
***************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// Include internationalization
#include <tdelocale.h>
diff --git a/kmymoney2/mymoney/mymoneysecurity.cpp b/kmymoney2/mymoney/mymoneysecurity.cpp
index a6c1ab8..20c5fd4 100644
--- a/kmymoney2/mymoney/mymoneysecurity.cpp
+++ b/kmymoney2/mymoney/mymoneysecurity.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneysecurity.h b/kmymoney2/mymoney/mymoneysecurity.h
index 4013a45..5c37dd6 100644
--- a/kmymoney2/mymoney/mymoneysecurity.h
+++ b/kmymoney2/mymoney/mymoneysecurity.h
@@ -23,10 +23,6 @@
#ifndef MYMONEYSECURITY_H
#define MYMONEYSECURITY_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneysecuritytest.cpp b/kmymoney2/mymoney/mymoneysecuritytest.cpp
index 69be2ba..3be9bd2 100644
--- a/kmymoney2/mymoney/mymoneysecuritytest.cpp
+++ b/kmymoney2/mymoney/mymoneysecuritytest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneysecuritytest.h"
MyMoneySecurityTest::MyMoneySecurityTest()
diff --git a/kmymoney2/mymoney/mymoneysplit.cpp b/kmymoney2/mymoney/mymoneysplit.cpp
index 4e650d3..9120f28 100644
--- a/kmymoney2/mymoney/mymoneysplit.cpp
+++ b/kmymoney2/mymoney/mymoneysplit.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneysplit.h"
#include "mymoneytransaction.h"
diff --git a/kmymoney2/mymoney/mymoneysplit.h b/kmymoney2/mymoney/mymoneysplit.h
index b300aa1..b32edb7 100644
--- a/kmymoney2/mymoney/mymoneysplit.h
+++ b/kmymoney2/mymoney/mymoneysplit.h
@@ -23,10 +23,6 @@
#ifndef MYMONEYSPLIT_H
#define MYMONEYSPLIT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
@@ -36,12 +32,12 @@
// ----------------------------------------------------------------------------
// Project Includes
-#include "mymoneyexception.h"
-#include "mymoneyutils.h"
-#include "mymoneymoney.h"
#include <kmymoney/export.h>
-#include <kmymoney/mymoneyobject.h>
+#include <kmymoney/mymoneyexception.h>
#include <kmymoney/mymoneykeyvaluecontainer.h>
+#include <kmymoney/mymoneymoney.h>
+#include <kmymoney/mymoneyobject.h>
+#include <kmymoney/mymoneyutils.h>
class MyMoneyTransaction;
/**
diff --git a/kmymoney2/mymoney/mymoneysplittest.cpp b/kmymoney2/mymoney/mymoneysplittest.cpp
index 806b556..8171520 100644
--- a/kmymoney2/mymoney/mymoneysplittest.cpp
+++ b/kmymoney2/mymoney/mymoneysplittest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneysplittest.h"
#include <kmymoney/mymoneyexception.h>
diff --git a/kmymoney2/mymoney/mymoneystatement.cpp b/kmymoney2/mymoney/mymoneystatement.cpp
index 9e61e09..89a374b 100644
--- a/kmymoney2/mymoney/mymoneystatement.cpp
+++ b/kmymoney2/mymoney/mymoneystatement.cpp
@@ -21,6 +21,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
@@ -32,7 +36,6 @@
// ----------------------------------------------------------------------------
// Project Includes
-#include "../../kdecompat.h"
#include "mymoneystatement.h"
const TQStringList kAccountTypeTxt = TQStringList::split(",","none,checkings,savings,investment,creditcard,invalid");
diff --git a/kmymoney2/mymoney/mymoneystatement.h b/kmymoney2/mymoney/mymoneystatement.h
index 8f4467f..b3446be 100644
--- a/kmymoney2/mymoney/mymoneystatement.h
+++ b/kmymoney2/mymoney/mymoneystatement.h
@@ -24,10 +24,6 @@
#ifndef MYMONEYSTATEMENT_H
#define MYMONEYSTATEMENT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneysubject.cpp b/kmymoney2/mymoney/mymoneysubject.cpp
index d7a4c40..3dc76b5 100644
--- a/kmymoney2/mymoney/mymoneysubject.cpp
+++ b/kmymoney2/mymoney/mymoneysubject.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneysubject.h"
#include "mymoneyobserver.h"
#include <tqptrvector.h>
diff --git a/kmymoney2/mymoney/mymoneytransaction.cpp b/kmymoney2/mymoney/mymoneytransaction.cpp
index cc0f6d2..25a306a 100644
--- a/kmymoney2/mymoney/mymoneytransaction.cpp
+++ b/kmymoney2/mymoney/mymoneytransaction.cpp
@@ -17,6 +17,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneytransaction.h b/kmymoney2/mymoney/mymoneytransaction.h
index 6787c1d..5ba06c4 100644
--- a/kmymoney2/mymoney/mymoneytransaction.h
+++ b/kmymoney2/mymoney/mymoneytransaction.h
@@ -19,10 +19,6 @@
#ifndef MYMONEYTRANSACTION_H
#define MYMONEYTRANSACTION_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
@@ -34,11 +30,11 @@
// ----------------------------------------------------------------------------
// Project Includes
-#include "mymoneyutils.h"
-#include "mymoneymoney.h"
-#include "mymoneykeyvaluecontainer.h"
-#include "mymoneysplit.h"
#include <kmymoney/export.h>
+#include <kmymoney/mymoneykeyvaluecontainer.h>
+#include <kmymoney/mymoneymoney.h>
+#include <kmymoney/mymoneysplit.h>
+#include <kmymoney/mymoneyutils.h>
/**
* This class represents a transaction within the MyMoneyEngine. A transaction
diff --git a/kmymoney2/mymoney/mymoneytransactionfilter.cpp b/kmymoney2/mymoney/mymoneytransactionfilter.cpp
index 823ccfc..fa4fd91 100644
--- a/kmymoney2/mymoney/mymoneytransactionfilter.cpp
+++ b/kmymoney2/mymoney/mymoneytransactionfilter.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneytransactionfilter.h b/kmymoney2/mymoney/mymoneytransactionfilter.h
index 50226cf..1a028e6 100644
--- a/kmymoney2/mymoney/mymoneytransactionfilter.h
+++ b/kmymoney2/mymoney/mymoneytransactionfilter.h
@@ -23,10 +23,6 @@
#ifndef MYMONEYTRANSACTIONFILTER_H
#define MYMONEYTRANSACTIONFILTER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/mymoneytransactiontest.cpp b/kmymoney2/mymoney/mymoneytransactiontest.cpp
index b69ade8..a2c9340 100644
--- a/kmymoney2/mymoney/mymoneytransactiontest.cpp
+++ b/kmymoney2/mymoney/mymoneytransactiontest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneytransactiontest.h"
MyMoneyTransactionTest::MyMoneyTransactionTest ()
diff --git a/kmymoney2/mymoney/mymoneyutils.cpp b/kmymoney2/mymoney/mymoneyutils.cpp
index 8012200..49d5cac 100644
--- a/kmymoney2/mymoney/mymoneyutils.cpp
+++ b/kmymoney2/mymoney/mymoneyutils.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <iostream>
#include "mymoneyutils.h"
diff --git a/kmymoney2/mymoney/mymoneyutils.h b/kmymoney2/mymoney/mymoneyutils.h
index 9e111d6..e2e2ea1 100644
--- a/kmymoney2/mymoney/mymoneyutils.h
+++ b/kmymoney2/mymoney/mymoneyutils.h
@@ -23,10 +23,6 @@
#ifndef _MYMONEYUTILS_H_
#define _MYMONEYUTILS_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <tqstring.h>
#include <tqdatetime.h>
#include <tqvaluelist.h>
diff --git a/kmymoney2/mymoney/storage/Makefile.am b/kmymoney2/mymoney/storage/Makefile.am
index 85d4664..ce8dcd8 100644
--- a/kmymoney2/mymoney/storage/Makefile.am
+++ b/kmymoney2/mymoney/storage/Makefile.am
@@ -8,9 +8,9 @@ libstorage_a_METASOURCES = AUTO
libstorage_a_SOURCES = imymoneystorageformat.cpp mymoneystoragexml.cpp mymoneystoragedump.cpp mymoneyseqaccessmgr.cpp mymoneydatabasemgr.cpp imymoneystorage.cpp imymoneyserialize.cpp mymoneystorageanon.cpp mymoneystoragesql.cpp
instdir=$(includedir)/kmymoney
-inst_HEADERS = imymoneystorage.h imymoneyserialize.h imymoneystorageformat.h
+inst_HEADERS = imymoneystorage.h imymoneyserialize.h imymoneystorageformat.h mymoneystoragesql.h
-noinst_HEADERS = mymoneyseqaccessmgr.h mymoneydatabasemgr.h mymoneystorageanon.h mymoneystoragedump.h mymoneystoragexml.h mymoneyseqaccessmgrtest.h mymoneydatabasemgrtest.h mymoneystoragesql.h mymoneystoragebin.h mymoneymap.h mymoneymaptest.h
+noinst_HEADERS = mymoneyseqaccessmgr.h mymoneydatabasemgr.h mymoneystorageanon.h mymoneystoragedump.h mymoneystoragexml.h mymoneyseqaccessmgrtest.h mymoneydatabasemgrtest.h mymoneystoragebin.h mymoneymap.h mymoneymaptest.h
check_LIBRARIES = libstoragetest.a
diff --git a/kmymoney2/mymoney/storage/imymoneyserialize.cpp b/kmymoney2/mymoney/storage/imymoneyserialize.cpp
index 14b76dd..1ac496f 100644
--- a/kmymoney2/mymoney/storage/imymoneyserialize.cpp
+++ b/kmymoney2/mymoney/storage/imymoneyserialize.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "imymoneyserialize.h"
IMyMoneySerialize::IMyMoneySerialize()
diff --git a/kmymoney2/mymoney/storage/imymoneyserialize.h b/kmymoney2/mymoney/storage/imymoneyserialize.h
index 086f040..3132747 100644
--- a/kmymoney2/mymoney/storage/imymoneyserialize.h
+++ b/kmymoney2/mymoney/storage/imymoneyserialize.h
@@ -32,18 +32,18 @@
// ----------------------------------------------------------------------------
// Project Includes
-#include <kmymoney/mymoneyutils.h>
-#include <kmymoney/mymoneyinstitution.h>
#include <kmymoney/mymoneyaccount.h>
-#include <kmymoney/mymoneytransaction.h>
+#include <kmymoney/mymoneybudget.h>
+#include <kmymoney/mymoneyinstitution.h>
#include <kmymoney/mymoneypayee.h>
-#include <kmymoney/mymoneyscheduled.h>
-#include <kmymoney/mymoneytransactionfilter.h>
-#include <kmymoney/mymoneysecurity.h>
#include <kmymoney/mymoneyprice.h>
#include <kmymoney/mymoneyreport.h>
-#include <kmymoney/mymoneybudget.h>
-#include "mymoneystoragesql.h"
+#include <kmymoney/mymoneyscheduled.h>
+#include <kmymoney/mymoneysecurity.h>
+#include <kmymoney/mymoneystoragesql.h>
+#include <kmymoney/mymoneytransaction.h>
+#include <kmymoney/mymoneytransactionfilter.h>
+#include <kmymoney/mymoneyutils.h>
/**
* @author Thomas Baumgart
diff --git a/kmymoney2/mymoney/storage/imymoneystorage.cpp b/kmymoney2/mymoney/storage/imymoneystorage.cpp
index f70de9c..75608e1 100644
--- a/kmymoney2/mymoney/storage/imymoneystorage.cpp
+++ b/kmymoney2/mymoney/storage/imymoneystorage.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "imymoneystorage.h"
bool MyMoneyFileBitArray::testBit(uint index) const
diff --git a/kmymoney2/mymoney/storage/imymoneystorageformat.cpp b/kmymoney2/mymoney/storage/imymoneystorageformat.cpp
index bc3bbb2..011c921 100644
--- a/kmymoney2/mymoney/storage/imymoneystorageformat.cpp
+++ b/kmymoney2/mymoney/storage/imymoneystorageformat.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "imymoneystorageformat.h"
IMyMoneyStorageFormat::IMyMoneyStorageFormat()
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
index 555ce4d..4386f63 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
@@ -14,6 +14,11 @@
* (at your option) any later version. *
* *
***************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <typeinfo>
#include <algorithm>
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
index 82b2cd1..dd8c6e8 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneydatabasemgrtest.h"
#include <pwd.h>
#include <iostream>
diff --git a/kmymoney2/mymoney/storage/mymoneymaptest.cpp b/kmymoney2/mymoney/storage/mymoneymaptest.cpp
index 123fcc8..3e90376 100644
--- a/kmymoney2/mymoney/storage/mymoneymaptest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneymaptest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneymaptest.h"
#include <iostream>
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
index fce4af1..92db207 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
@@ -17,6 +17,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <typeinfo>
#include "mymoneyseqaccessmgr.h"
#include "../mymoneytransactionfilter.h"
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
index e64e0b5..c2f48cf 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
@@ -14,6 +14,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "mymoneyseqaccessmgrtest.h"
#include <iostream>
diff --git a/kmymoney2/mymoney/storage/mymoneystorageanon.cpp b/kmymoney2/mymoney/storage/mymoneystorageanon.cpp
index bcfedcb..a639bda 100644
--- a/kmymoney2/mymoney/storage/mymoneystorageanon.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystorageanon.cpp
@@ -21,7 +21,9 @@
* *
***************************************************************************/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
// ----------------------------------------------------------------------------
// QT Includes
@@ -33,8 +35,6 @@
// ----------------------------------------------------------------------------
// KDE Includes
-#include "kdecompat.h"
-
// ----------------------------------------------------------------------------
// Project Includes
diff --git a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
index 6dd8beb..f9c6b43 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
@@ -20,6 +20,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
// ----------------------------------------------------------------------------
// QT Includes
diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
index fd4abe6..5a9dc95 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
@@ -16,6 +16,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <algorithm>
#include <numeric>
diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.h b/kmymoney2/mymoney/storage/mymoneystoragesql.h
index 6bf7289..ba4f279 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragesql.h
+++ b/kmymoney2/mymoney/storage/mymoneystoragesql.h
@@ -28,22 +28,21 @@ class TQIODevice;
// ----------------------------------------------------------------------------
// Project Includes
-#include "imymoneystorageformat.h"
-#include "../mymoneyinstitution.h"
-#include "../mymoneypayee.h"
-#include "../mymoneyaccount.h"
-#include "../mymoneytransaction.h"
-#include "../mymoneysplit.h"
-#include "../mymoneyscheduled.h"
-#include "../mymoneysecurity.h"
-#include "../mymoneyprice.h"
-#include "../mymoneyreport.h"
-#include "../mymoneybudget.h"
-#include "../mymoneyfile.h"
-#include "../mymoneykeyvaluecontainer.h"
-#include "mymoneymap.h"
-#include "../mymoneymoney.h"
-#include "../mymoneytransactionfilter.h"
+#include <kmymoney/imymoneystorageformat.h>
+#include <kmymoney/mymoneyaccount.h>
+#include <kmymoney/mymoneybudget.h>
+#include <kmymoney/mymoneyfile.h>
+#include <kmymoney/mymoneyinstitution.h>
+#include <kmymoney/mymoneykeyvaluecontainer.h>
+#include <kmymoney/mymoneymoney.h>
+#include <kmymoney/mymoneypayee.h>
+#include <kmymoney/mymoneyprice.h>
+#include <kmymoney/mymoneyreport.h>
+#include <kmymoney/mymoneysplit.h>
+#include <kmymoney/mymoneyscheduled.h>
+#include <kmymoney/mymoneysecurity.h>
+#include <kmymoney/mymoneytransaction.h>
+#include <kmymoney/mymoneytransactionfilter.h>
// This is a convenience functor to make it easier to use STL algorithms
// It will return false if the MyMoneyTransaction DOES match the filter.
diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
index 2f1d67e..3ec9cfd 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
@@ -17,7 +17,9 @@
* *
***************************************************************************/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
// ----------------------------------------------------------------------------
// QT Includes
@@ -30,7 +32,6 @@
// ----------------------------------------------------------------------------
// KDE Includes
-#include "kdecompat.h"
#include <tdelocale.h>
#include <kdebug.h>