From ab30b4c680ba50ce13477cb4c5654d5c5f7b2fd8 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Sun, 14 Jun 2015 14:52:25 -0700
Subject: [PATCH] Remove #include "kvp_frame.h" from qof.h and add it where
 it's legitimately used.

---
 src/app-utils/test/test-option-util.c         |  1 +
 src/backend/dbi/test/test-backend-dbi-basic.c |  1 +
 src/backend/dbi/test/test-dbi-stuff.c         | 19 +++++++--------
 src/backend/sql/gnc-backend-sql.c             | 23 ++++++++++---------
 src/backend/sql/gnc-slots-sql.cpp             |  5 ++--
 src/backend/xml/io-gncxml-v1.cpp              | 21 +++++++++--------
 src/backend/xml/sixtp-dom-generators.cpp      |  1 +
 src/backend/xml/sixtp-dom-parsers.cpp         |  3 ++-
 src/backend/xml/test/test-file-stuff.h        | 11 +++++----
 src/engine/engine-helpers.c                   |  6 +++--
 src/engine/kvp-scm.c                          |  3 ++-
 src/engine/test-core/test-engine-stuff.c      |  1 +
 src/engine/test-core/test-engine-stuff.h      |  1 +
 src/engine/test/utest-Account.c               |  1 +
 src/engine/test/utest-Split.cpp               |  1 +
 src/engine/test/utest-Transaction.c           |  1 +
 src/libqof/qof/kvp-value.hpp                  |  1 +
 src/libqof/qof/qofbook.cpp                    |  1 +
 src/libqof/qof/qofbook.h                      |  2 +-
 src/libqof/qof/qofinstance.cpp                |  1 +
 src/libqof/qof/qofinstance.h                  |  3 ++-
 src/libqof/qof/test/test-kvp_frame.c          |  7 +++---
 src/libqof/qof/test/test-qofinstance.c        |  1 +
 23 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/src/app-utils/test/test-option-util.c b/src/app-utils/test/test-option-util.c
index f1adf73a21..3a261c21aa 100644
--- a/src/app-utils/test/test-option-util.c
+++ b/src/app-utils/test/test-option-util.c
@@ -26,6 +26,7 @@
 #include <glib.h>
 #include <unittest-support.h>
 #include <qofbookslots.h>
+#include <kvp_frame.h>
 
 #include "../option-util.h"
 
diff --git a/src/backend/dbi/test/test-backend-dbi-basic.c b/src/backend/dbi/test/test-backend-dbi-basic.c
index b3203f0bbe..b692f92cf5 100644
--- a/src/backend/dbi/test/test-backend-dbi-basic.c
+++ b/src/backend/dbi/test/test-backend-dbi-basic.c
@@ -12,6 +12,7 @@
 #include <glib/gstdio.h>
 
 #include <qof.h>
+#include <kvp_frame.h>
 #include <unittest-support.h>
 #include <test-stuff.h>
 #include <test-dbi-stuff.h>
diff --git a/src/backend/dbi/test/test-dbi-stuff.c b/src/backend/dbi/test/test-dbi-stuff.c
index c0e1d1e73a..e6ad4a694a 100644
--- a/src/backend/dbi/test/test-dbi-stuff.c
+++ b/src/backend/dbi/test/test-dbi-stuff.c
@@ -23,17 +23,18 @@
  *  02110-1301, USA.
  */
 
-#include "config.h"
-#include "qof.h"
-#include "qofsession-p.h"
-#include "cashobjects.h"
-#include "test-dbi-stuff.h"
+#include <config.h>
+#include <qof.h>
+#include <kvp_frame.h>
+#include <qofsession-p.h>
+#include <cashobjects.h>
+#include <test-dbi-stuff.h>
 #include <unittest-support.h>
 
-#include "Account.h"
-#include "Split.h"
-#include "Transaction.h"
-#include "gnc-commodity.h"
+#include <Account.h>
+#include <Split.h>
+#include <Transaction.h>
+#include <gnc-commodity.h>
 #include <SX-book.h>
 #include <gnc-lot.h>
 #include "../gnc-backend-dbi-priv.h"
diff --git a/src/backend/sql/gnc-backend-sql.c b/src/backend/sql/gnc-backend-sql.c
index 1e68004df1..7d9f748a96 100644
--- a/src/backend/sql/gnc-backend-sql.c
+++ b/src/backend/sql/gnc-backend-sql.c
@@ -34,17 +34,18 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include "qof.h"
-#include "qofquery-p.h"
-#include "qofquerycore-p.h"
-#include "Account.h"
-#include "TransLog.h"
-#include "gnc-engine.h"
-#include "SX-book.h"
-#include "Recurrence.h"
-#include "gncBillTerm.h"
-#include "gncTaxTable.h"
-#include "gncInvoice.h"
+#include <qof.h>
+#include <qofquery-p.h>
+#include <qofquerycore-p.h>
+#include <kvp_frame.h>
+#include <Account.h>
+#include <TransLog.h>
+#include <gnc-engine.h>
+#include <SX-book.h>
+#include <Recurrence.h>
+#include <gncBillTerm.h>
+#include <gncTaxTable.h>
+#include <gncInvoice.h>
 
 #include "gnc-backend-sql.h"
 
diff --git a/src/backend/sql/gnc-slots-sql.cpp b/src/backend/sql/gnc-slots-sql.cpp
index bff1eab393..1c5f77a19c 100644
--- a/src/backend/sql/gnc-slots-sql.cpp
+++ b/src/backend/sql/gnc-slots-sql.cpp
@@ -31,8 +31,9 @@ extern "C"
 
 #include <glib.h>
 
-#include "qof.h"
-#include "gnc-engine.h"
+#include <qof.h>
+#include <gnc-engine.h>
+#include <kvp_frame.h>
 
 #include "gnc-backend-sql.h"
 
diff --git a/src/backend/xml/io-gncxml-v1.cpp b/src/backend/xml/io-gncxml-v1.cpp
index 23a575b56d..ebfc2f71e4 100644
--- a/src/backend/xml/io-gncxml-v1.cpp
+++ b/src/backend/xml/io-gncxml-v1.cpp
@@ -33,16 +33,17 @@ extern "C"
 
 #include <glib.h>
 
-#include "gnc-xml-helper.h"
-#include "Account.h"
-#include "AccountP.h"
-#include "Query.h"
-#include "Scrub.h"
-#include "Transaction.h"
-#include "TransactionP.h"
-#include "TransLog.h"
-#include "gnc-pricedb.h"
-#include "gnc-pricedb-p.h"
+#include <gnc-xml-helper.h>
+#include <Account.h>
+#include <AccountP.h>
+#include <Query.h>
+#include <Scrub.h>
+#include <Transaction.h>
+#include <TransactionP.h>
+#include <TransLog.h>
+#include <gnc-pricedb.h>
+#include <gnc-pricedb-p.h>
+#include <kvp_frame.h>
 #include "io-gncxml.h"
 
 #include "sixtp.h"
diff --git a/src/backend/xml/sixtp-dom-generators.cpp b/src/backend/xml/sixtp-dom-generators.cpp
index 8160ad4365..7f60c19204 100644
--- a/src/backend/xml/sixtp-dom-generators.cpp
+++ b/src/backend/xml/sixtp-dom-generators.cpp
@@ -29,6 +29,7 @@ extern "C"
 
 #include "gnc-xml-helper.h"
 #include <gnc-date.h>
+#include <kvp_frame.h>
 
 #include "sixtp-dom-generators.h"
 #include "sixtp-utils.h"
diff --git a/src/backend/xml/sixtp-dom-parsers.cpp b/src/backend/xml/sixtp-dom-parsers.cpp
index f95059ee73..115b133818 100644
--- a/src/backend/xml/sixtp-dom-parsers.cpp
+++ b/src/backend/xml/sixtp-dom-parsers.cpp
@@ -28,7 +28,8 @@ extern "C"
 #include <string.h>
 
 #include "gnc-xml-helper.h"
-#include "gnc-engine.h"
+#include <gnc-engine.h>
+#include <kvp_frame.h>
 #include "sixtp-utils.h"
 #include "sixtp-dom-parsers.h"
 }
diff --git a/src/backend/xml/test/test-file-stuff.h b/src/backend/xml/test/test-file-stuff.h
index 08dac546ab..812a0478d1 100644
--- a/src/backend/xml/test/test-file-stuff.h
+++ b/src/backend/xml/test/test-file-stuff.h
@@ -7,11 +7,12 @@
 
 #include <glib.h>
 
-#include "gnc-commodity.h"
-#include "gnc-engine.h"
-#include "gnc-xml-helper.h"
-#include "io-gncxml-gen.h"
-#include "sixtp.h"
+#include <kvp_frame.h>
+#include <gnc-commodity.h>
+#include <gnc-engine.h>
+#include <gnc-xml-helper.h>
+#include <io-gncxml-gen.h>
+#include <sixtp.h>
 
 
 
diff --git a/src/engine/engine-helpers.c b/src/engine/engine-helpers.c
index 81f75bdcc2..58dddbb112 100644
--- a/src/engine/engine-helpers.c
+++ b/src/engine/engine-helpers.c
@@ -37,8 +37,10 @@
 #include "gnc-session.h"
 #include "guile-mappings.h"
 #include "gnc-guile-utils.h"
-#include "qof.h"
-#include "qofbookslots.h"
+#include <qof.h>
+#include <kvp_frame.h>
+#include <qofbookslots.h>
+
 /** \todo Code dependent on the private query headers
 qofquery-p.h and qofquerycore-p.h may need to be modified.
 These files are temporarily exported for QOF 0.6.0 but
diff --git a/src/engine/kvp-scm.c b/src/engine/kvp-scm.c
index 1e51f34268..82d0e73967 100644
--- a/src/engine/kvp-scm.c
+++ b/src/engine/kvp-scm.c
@@ -1,6 +1,7 @@
 #include "config.h"
 
-#include "qof.h"
+#include <qof.h>
+#include <kvp_frame.h>
 #include <libguile.h>
 #include "engine-helpers-guile.h"
 
diff --git a/src/engine/test-core/test-engine-stuff.c b/src/engine/test-core/test-engine-stuff.c
index 89d5cde0bd..0969bfbc3b 100644
--- a/src/engine/test-core/test-engine-stuff.c
+++ b/src/engine/test-core/test-engine-stuff.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <qof.h>
 #include <qofinstance-p.h>
 
 #include "Account.h"
diff --git a/src/engine/test-core/test-engine-stuff.h b/src/engine/test-core/test-engine-stuff.h
index 25b9fba0b7..557bba8aa3 100644
--- a/src/engine/test-core/test-engine-stuff.h
+++ b/src/engine/test-core/test-engine-stuff.h
@@ -10,6 +10,7 @@
 #include <stdint.h>
 
 #include "qof.h"
+#include <kvp_frame.h>
 #include "Query.h"
 #include "gnc-pricedb.h"
 #include "SchedXaction.h"
diff --git a/src/engine/test/utest-Account.c b/src/engine/test/utest-Account.c
index ea7f74df83..f1c69147f8 100644
--- a/src/engine/test/utest-Account.c
+++ b/src/engine/test/utest-Account.c
@@ -25,6 +25,7 @@
 #include <unittest-support.h>
 #include <gnc-event.h>
 #include <gnc-gdate-utils.h>
+#include <kvp_frame.h>
 #include <qofinstance-p.h>
 /* Add specific headers for this class */
 #include "../Account.h"
diff --git a/src/engine/test/utest-Split.cpp b/src/engine/test/utest-Split.cpp
index 6a5000cb8f..5612990f00 100644
--- a/src/engine/test/utest-Split.cpp
+++ b/src/engine/test/utest-Split.cpp
@@ -38,6 +38,7 @@ extern "C"
 #include <TransactionP.h>
 #include <gnc-lot.h>
 #include <gnc-event.h>
+#include <kvp_frame.h>
 #include <qofinstance-p.h>
 
 #ifdef HAVE_GLIB_2_38
diff --git a/src/engine/test/utest-Transaction.c b/src/engine/test/utest-Transaction.c
index 7611c2c117..ec5d6d30fd 100644
--- a/src/engine/test/utest-Transaction.c
+++ b/src/engine/test/utest-Transaction.c
@@ -33,6 +33,7 @@
 #include "../gnc-lot.h"
 #include "../gnc-event.h"
 #include <qof.h>
+#include <kvp_frame.h>
 #include <qofbackend-p.h>
 
 #ifdef HAVE_GLIB_2_38
diff --git a/src/libqof/qof/kvp-value.hpp b/src/libqof/qof/kvp-value.hpp
index bfdfc33895..ebd8cb6202 100644
--- a/src/libqof/qof/kvp-value.hpp
+++ b/src/libqof/qof/kvp-value.hpp
@@ -28,6 +28,7 @@ extern "C"
 {
 #include "config.h"
 #include "qof.h"
+#include "kvp_frame.h"
 }
 #include <boost/version.hpp>
 #if BOOST_VERSION == 105600
diff --git a/src/libqof/qof/qofbook.cpp b/src/libqof/qof/qofbook.cpp
index 2aa09b1b38..ebc769454c 100644
--- a/src/libqof/qof/qofbook.cpp
+++ b/src/libqof/qof/qofbook.cpp
@@ -56,6 +56,7 @@ extern "C"
 #include "qofid-p.h"
 #include "qofobject-p.h"
 #include "qofbookslots.h"
+#include "kvp_frame.h"
 
 static QofLogModule log_module = QOF_MOD_ENGINE;
 #define AB_KEY "hbci"
diff --git a/src/libqof/qof/qofbook.h b/src/libqof/qof/qofbook.h
index a51bad7d02..04448f76ab 100644
--- a/src/libqof/qof/qofbook.h
+++ b/src/libqof/qof/qofbook.h
@@ -49,9 +49,9 @@ extern "C"
 #ifndef SWIG
 
 typedef struct _QofBookClass  QofBookClass;
+typedef struct KvpValueImpl KvpValue;
 
 #include "qofid.h"
-#include "kvp_frame.h"
 #include "qofinstance.h"
 
 /* --- type macros --- */
diff --git a/src/libqof/qof/qofinstance.cpp b/src/libqof/qof/qofinstance.cpp
index a765cae060..1865b48dd7 100644
--- a/src/libqof/qof/qofinstance.cpp
+++ b/src/libqof/qof/qofinstance.cpp
@@ -38,6 +38,7 @@ extern "C"
 #include "qof.h"
 #include "qofbook-p.h"
 #include "qofid-p.h"
+#include "kvp_frame.h"
 #include "qofinstance-p.h"
 
 static QofLogModule log_module = QOF_MOD_ENGINE;
diff --git a/src/libqof/qof/qofinstance.h b/src/libqof/qof/qofinstance.h
index ca485c3b90..98b854f0c3 100644
--- a/src/libqof/qof/qofinstance.h
+++ b/src/libqof/qof/qofinstance.h
@@ -46,7 +46,6 @@ typedef struct _QofBook       QofBook;
 #include "qofid.h"
 #include "guid.h"
 #include "gnc-date.h"
-#include "kvp_frame.h"
 #include "qof-gobject.h"
 
 /* --- type macros --- */
@@ -62,6 +61,8 @@ typedef struct _QofBook       QofBook;
 #define QOF_INSTANCE_GET_CLASS(o)    \
      (G_TYPE_INSTANCE_GET_CLASS ((o), QOF_TYPE_INSTANCE, QofInstanceClass))
 
+typedef struct KvpFrameImpl KvpFrame;
+
 struct QofInstance_s
 {
     GObject object;
diff --git a/src/libqof/qof/test/test-kvp_frame.c b/src/libqof/qof/test/test-kvp_frame.c
index 2dc272c0f0..8717374fdc 100644
--- a/src/libqof/qof/test/test-kvp_frame.c
+++ b/src/libqof/qof/test/test-kvp_frame.c
@@ -27,13 +27,14 @@ extern "C"
 #include "config.h"
 #include <string.h>
 #include <glib.h>
-#include "unittest-support.h"
-
+#include <unittest-support.h>
+#include <qof.h>
+#include <kvp_frame.h>
 #ifdef __cplusplus
 }
 #endif
 
-#include "qof.h"
+
 
 static const gchar *suitename = "/qof/kvp_frame";
 void test_suite_kvp_frame ( void );
diff --git a/src/libqof/qof/test/test-qofinstance.c b/src/libqof/qof/test/test-qofinstance.c
index b6b317f983..ab1e630cfe 100644
--- a/src/libqof/qof/test/test-qofinstance.c
+++ b/src/libqof/qof/test/test-qofinstance.c
@@ -24,6 +24,7 @@
 #include <unittest-support.h>
 #include "../qof.h"
 #include "../qofbackend-p.h"
+#include "../kvp_frame.h"
 
 static const gchar *suitename = "/qof/qofinstance";
 void test_suite_qofinstance ( void );