15 files changed, 72 insertions, 31 deletions
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>