[Gnucash-changes] Remove references to internal QOF headers

Neil Williams codehelp at cvs.gnucash.org
Sat Oct 1 14:01:36 EDT 2005


Log Message:
-----------
Remove references to internal QOF headers

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash/src/app-utils:
        gnc-helpers.c
    gnucash/src/backend/file:
        gnc-freqspec-xml-v2.c
        gnc-transaction-xml-v2.c
        io-utils.c
    gnucash/src/backend/file/test:
        test-dom-converters1.c
        test-file-stuff.c
        test-load-example-account.c
    gnucash/src/business/business-core:
        gncAddressP.h
        gncBillTerm.h
        gncBillTermP.h
        gncCustomer.h
        gncCustomerP.h
        gncEmployee.h
        gncEntry.h
        gncEntryP.h
        gncInvoice.h
        gncInvoiceP.h
        gncJob.h
        gncJobP.h
        gncOrder.h
        gncOrderP.h
        gncOwner.c
        gncOwner.h
        gncOwnerP.h
        gncTaxTable.h
        gncVendor.h
        gncVendorP.h
    gnucash/src/business/business-core/test:
        test-address.c
        test-business.c
        test-employee.c
        test-job.c
        test-vendor.c
    gnucash/src/engine:
        Account.h
        AccountP.h
        FreqSpec.h
        FreqSpecP.h
        Group.h
        GroupP.h
        Query.h
        SX-book.h
        SX-ttinfo.h
        SchedXaction.h
        SchedXactionP.h
        TransLog.c
        gnc-lot-p.h
        gnc-lot.h
        gnc-pricedb-p.h
    gnucash/src/engine/test:
        test-numeric.c
        test-transaction-reversal.c
        test-transaction-voiding.c
    gnucash/src/gnome-utils:
        gnc-dense-cal.c
        search-param.c
    gnucash/src/register/register-gnome:
        gnucash-item-list.c
        gnucash-style.c

Revision Data
-------------
Index: gnc-helpers.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/gnc-helpers.c,v
retrieving revision 1.7.4.3
retrieving revision 1.7.4.4
diff -Lsrc/app-utils/gnc-helpers.c -Lsrc/app-utils/gnc-helpers.c -u -r1.7.4.3 -r1.7.4.4
--- src/app-utils/gnc-helpers.c
+++ src/app-utils/gnc-helpers.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <g-wrap-wct.h>
 
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
 #include "engine-helpers.h"
 #include "gnc-helpers.h"
 #include "gnc-ui-util.h"
Index: gnc-freqspec-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-freqspec-xml-v2.c,v
retrieving revision 1.6.4.4
retrieving revision 1.6.4.5
diff -Lsrc/backend/file/gnc-freqspec-xml-v2.c -Lsrc/backend/file/gnc-freqspec-xml-v2.c -u -r1.6.4.4 -r1.6.4.5
--- src/backend/file/gnc-freqspec-xml-v2.c
+++ src/backend/file/gnc-freqspec-xml-v2.c
@@ -29,7 +29,7 @@
 #include <string.h>
 
 #include "gnc-xml-helper.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 
 #include "sixtp.h"
 #include "sixtp-utils.h"
Index: io-utils.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/io-utils.c,v
retrieving revision 1.5.4.3
retrieving revision 1.5.4.4
diff -Lsrc/backend/file/io-utils.c -Lsrc/backend/file/io-utils.c -u -r1.5.4.3 -r1.5.4.4
--- src/backend/file/io-utils.c
+++ src/backend/file/io-utils.c
@@ -32,7 +32,6 @@
 #include "gnc-xml.h"
 #include "gnc-xml.h"
 #include "io-utils.h"
-#include "qofbook.h"
 
 /*
   <!-- Local variables: -->
Index: gnc-transaction-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-transaction-xml-v2.c,v
retrieving revision 1.9.4.5
retrieving revision 1.9.4.6
diff -Lsrc/backend/file/gnc-transaction-xml-v2.c -Lsrc/backend/file/gnc-transaction-xml-v2.c -u -r1.9.4.5 -r1.9.4.6
--- src/backend/file/gnc-transaction-xml-v2.c
+++ src/backend/file/gnc-transaction-xml-v2.c
@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "gnc-xml-helper.h"
-#include "gnc-engine-util.h"
 
 #include "sixtp.h"
 #include "sixtp-utils.h"
Index: test-dom-converters1.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-dom-converters1.c,v
retrieving revision 1.4.4.5
retrieving revision 1.4.4.6
diff -Lsrc/backend/file/test/test-dom-converters1.c -Lsrc/backend/file/test/test-dom-converters1.c -u -r1.4.4.5 -r1.4.4.6
--- src/backend/file/test/test-dom-converters1.c
+++ src/backend/file/test/test-dom-converters1.c
@@ -10,7 +10,7 @@
 #include "test-file-stuff.h"
 
 #include "gnc-xml-helper.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
 #include "sixtp.h"
 #include "sixtp-parsers.h"
 #include "sixtp-utils.h"
Index: test-load-example-account.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-load-example-account.c,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -Lsrc/backend/file/test/test-load-example-account.c -Lsrc/backend/file/test/test-load-example-account.c -u -r1.6.4.2 -r1.6.4.3
--- src/backend/file/test/test-load-example-account.c
+++ src/backend/file/test/test-load-example-account.c
@@ -1,3 +1,25 @@
+/***************************************************************************
+ *            test-load-example-account.c
+ *
+ *  Thu Sep 29 22:52:32 2005
+ *  Copyright  2005  GnuCash team
+ ****************************************************************************/
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+ 
 #include <glib.h>
 #include <libguile.h>
 #include <string.h>
@@ -9,10 +31,8 @@
 #include <dirent.h>
 
 #include "gnc-module.h"
-#include "gnc-engine-util.h"
-#include "io-gncxml-v2.h"
 #include "gnc-engine.h"
-#include "gnc-book.h"
+#include "io-gncxml-v2.h"
 
 #include "io-example-account.h"
 
@@ -23,7 +43,7 @@
 static const gchar *da_ending = ".gnucash-xea";
 
 static void
-test_load_file(GNCBook *book, const char *filename)
+test_load_file(QofBook *book, const char *filename)
 {
     GncExampleAccount *gea;
 
@@ -47,7 +67,7 @@
     const char *location = getenv("GNC_ACCOUNT_PATH");
     GSList *list = NULL;
     DIR *ea_dir;
-    GNCBook *book;
+    QofBook *book;
 
     if (!location)
     {
@@ -57,7 +77,7 @@
     gnc_module_system_init();
     gnc_module_load("gnucash/engine", 0);
 
-    book = gnc_book_new ();
+    book = qof_book_new ();
 
     if((ea_dir = opendir(location)) == NULL)
     {
Index: test-file-stuff.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-file-stuff.c,v
retrieving revision 1.7.4.4
retrieving revision 1.7.4.5
diff -Lsrc/backend/file/test/test-file-stuff.c -Lsrc/backend/file/test/test-file-stuff.c -u -r1.7.4.4 -r1.7.4.5
--- src/backend/file/test/test-file-stuff.c
+++ src/backend/file/test/test-file-stuff.c
@@ -1,3 +1,25 @@
+/***************************************************************************
+ *            test-file-stuff.c
+ *
+ *  Thu Sep 29 22:50:50 2005
+ *  Copyright  2005  GnuCash team
+ ****************************************************************************/
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+ 
 #include "config.h"
 
 #include <unistd.h>
@@ -10,7 +32,7 @@
 #include <string.h>
 #include <glib.h>
 
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
 #include "sixtp-dom-parsers.h"
 #include "sixtp-parsers.h"
 #include "test-file-stuff.h"
Index: gncBillTerm.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncBillTerm.h,v
retrieving revision 1.3.4.7
retrieving revision 1.3.4.8
diff -Lsrc/business/business-core/gncBillTerm.h -Lsrc/business/business-core/gncBillTerm.h -u -r1.3.4.7 -r1.3.4.8
--- src/business/business-core/gncBillTerm.h
+++ src/business/business-core/gncBillTerm.h
@@ -33,12 +33,7 @@
 
 typedef struct _gncBillTerm GncBillTerm;
 
-#include "gnc-date.h"
-#include "gnc-numeric.h"
-#include "qofbook.h"
-#include "qofid.h"
-#include "qofinstance.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #ifdef GNUCASH_MAJOR_VERSION
 #include "gncBusiness.h"
 #endif
Index: gncEntryP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncEntryP.h,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -Lsrc/business/business-core/gncEntryP.h -Lsrc/business/business-core/gncEntryP.h -u -r1.3.4.1 -r1.3.4.2
--- src/business/business-core/gncEntryP.h
+++ src/business/business-core/gncEntryP.h
@@ -30,7 +30,6 @@
 #define GNC_ENTRYP_H_
 
 #include "gncEntry.h"
-#include "qofid-p.h"
 
 gboolean gncEntryRegister (void);
 void gncEntrySetGUID (GncEntry *entry, const GUID *guid);
Index: gncCustomer.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncCustomer.h,v
retrieving revision 1.13.4.8
retrieving revision 1.13.4.9
diff -Lsrc/business/business-core/gncCustomer.h -Lsrc/business/business-core/gncCustomer.h -u -r1.13.4.8 -r1.13.4.9
--- src/business/business-core/gncCustomer.h
+++ src/business/business-core/gncCustomer.h
@@ -56,17 +56,11 @@
 */
 typedef struct _gncCustomer GncCustomer;
 
-#include "qofbook.h"
-#include "qofid.h"
-#include "qofinstance.h"
 #include "gncAddress.h"
 #include "gncBillTerm.h"
 #include "gncTaxTable.h"
 #include "gncJob.h"
 
-#include "gnc-numeric.h"
-#include "kvp_frame.h"
-
 #define GNC_ID_CUSTOMER       "gncCustomer"
 #define GNC_IS_CUSTOMER(obj)  (QOF_CHECK_TYPE((obj), GNC_ID_CUSTOMER))
 #define GNC_CUSTOMER(obj)     (QOF_CHECK_CAST((obj), GNC_ID_CUSTOMER, GncCustomer))
Index: gncOwnerP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncOwnerP.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Lsrc/business/business-core/gncOwnerP.h -Lsrc/business/business-core/gncOwnerP.h -u -r1.1.4.1 -r1.1.4.2
--- src/business/business-core/gncOwnerP.h
+++ src/business/business-core/gncOwnerP.h
@@ -28,7 +28,6 @@
 #ifndef GNC_OWNERP_H_
 #define GNC_OWNERP_H_
 
-#include "qofbook.h"
 #include "gncOwner.h"
 
 gboolean gncOwnerRegister (void);
Index: gncOrderP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncOrderP.h,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -Lsrc/business/business-core/gncOrderP.h -Lsrc/business/business-core/gncOrderP.h -u -r1.3.4.2 -r1.3.4.3
--- src/business/business-core/gncOrderP.h
+++ src/business/business-core/gncOrderP.h
@@ -30,7 +30,6 @@
 #define GNC_ORDERP_H_
 
 #include "gncOrder.h"
-#include "qofid-p.h"
 
 gboolean gncOrderRegister (void);
 gint64 gncOrderNextID (QofBook *book);
Index: gncEmployee.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncEmployee.h,v
retrieving revision 1.8.4.8
retrieving revision 1.8.4.9
diff -Lsrc/business/business-core/gncEmployee.h -Lsrc/business/business-core/gncEmployee.h -u -r1.8.4.8 -r1.8.4.9
--- src/business/business-core/gncEmployee.h
+++ src/business/business-core/gncEmployee.h
@@ -33,9 +33,6 @@
 
 typedef struct _gncEmployee GncEmployee;
 
-#include "qofbook.h"
-#include "qofid.h"
-
 #include "gncAddress.h"
 #include "Account.h"
 
Index: gncVendor.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncVendor.h,v
retrieving revision 1.14.4.5
retrieving revision 1.14.4.6
diff -Lsrc/business/business-core/gncVendor.h -Lsrc/business/business-core/gncVendor.h -u -r1.14.4.5 -r1.14.4.6
--- src/business/business-core/gncVendor.h
+++ src/business/business-core/gncVendor.h
@@ -37,9 +37,6 @@
 #include "gncBillTerm.h"
 #include "gncTaxTable.h"
 #include "gncJob.h"
-#include "qofbook.h"
-#include "qofid.h"
-#include "qofinstance.h"
 
 #define GNC_ID_VENDOR       "gncVendor"
 #define GNC_IS_VENDOR(obj)  (QOF_CHECK_TYPE((obj), GNC_ID_VENDOR))
Index: gncOrder.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncOrder.h,v
retrieving revision 1.13.4.3
retrieving revision 1.13.4.4
diff -Lsrc/business/business-core/gncOrder.h -Lsrc/business/business-core/gncOrder.h -u -r1.13.4.3 -r1.13.4.4
--- src/business/business-core/gncOrder.h
+++ src/business/business-core/gncOrder.h
@@ -38,9 +38,7 @@
 
 #include "gncEntry.h"
 #include "gncOwner.h"
-#include "qofbook.h"
-#include "qofid.h"
-#include "qofinstance.h"
+#include "qof.h"
 
 #define GNC_ID_ORDER "gncOrder"
 #define GNC_IS_ORDER(obj)  (QOF_CHECK_TYPE((obj), GNC_ID_ORDER))
Index: gncVendorP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncVendorP.h,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -Lsrc/business/business-core/gncVendorP.h -Lsrc/business/business-core/gncVendorP.h -u -r1.3.4.2 -r1.3.4.3
--- src/business/business-core/gncVendorP.h
+++ src/business/business-core/gncVendorP.h
@@ -29,7 +29,6 @@
 #define GNC_VENDORP_H_
 
 #include "gncVendor.h"
-#include "qofid-p.h"
 
 gboolean gncVendorRegister (void);
 gint64 gncVendorNextID (QofBook *book);
Index: gncInvoice.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncInvoice.h,v
retrieving revision 1.29.4.8
retrieving revision 1.29.4.9
diff -Lsrc/business/business-core/gncInvoice.h -Lsrc/business/business-core/gncInvoice.h -u -r1.29.4.8 -r1.29.4.9
--- src/business/business-core/gncInvoice.h
+++ src/business/business-core/gncInvoice.h
@@ -44,9 +44,6 @@
 #include "gncOwner.h"
 #include "gnc-lot.h"
 
-#include "qofid.h"
-#include "qofinstance.h"
-
 #define GNC_ID_INVOICE    "gncInvoice"
 #define GNC_IS_INVOICE(obj)  (QOF_CHECK_TYPE((obj), GNC_ID_INVOICE))
 #define GNC_INVOICE(obj)     (QOF_CHECK_CAST((obj), GNC_ID_INVOICE, GncInvoice))
Index: gncOwner.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncOwner.h,v
retrieving revision 1.12.4.6
retrieving revision 1.12.4.7
diff -Lsrc/business/business-core/gncOwner.h -Lsrc/business/business-core/gncOwner.h -u -r1.12.4.6 -r1.12.4.7
--- src/business/business-core/gncOwner.h
+++ src/business/business-core/gncOwner.h
@@ -36,13 +36,12 @@
 
 #define GNC_ID_OWNER   "gncOwner"
 
-#include "qofinstance-p.h"
+#include "qof.h"
 #include "gncCustomer.h"
 #include "gncJob.h"
 #include "gncVendor.h"
 #include "gncEmployee.h"
 #include "gnc-lot.h" 
-#include "gnc-engine-util.h"
 
 typedef enum { 
 	GNC_OWNER_NONE , 
Index: gncJobP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncJobP.h,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -Lsrc/business/business-core/gncJobP.h -Lsrc/business/business-core/gncJobP.h -u -r1.3.4.2 -r1.3.4.3
--- src/business/business-core/gncJobP.h
+++ src/business/business-core/gncJobP.h
@@ -30,7 +30,6 @@
 #define GNC_JOBP_H_
 
 #include "gncJob.h"
-#include "qofid-p.h"
 
 gboolean gncJobRegister (void);
 gint64 gncJobNextID (QofBook *book);
Index: gncTaxTable.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncTaxTable.h,v
retrieving revision 1.7.4.8
retrieving revision 1.7.4.9
diff -Lsrc/business/business-core/gncTaxTable.h -Lsrc/business/business-core/gncTaxTable.h -u -r1.7.4.8 -r1.7.4.9
--- src/business/business-core/gncTaxTable.h
+++ src/business/business-core/gncTaxTable.h
@@ -64,11 +64,7 @@
 typedef struct _gncAccountValue GncAccountValue;
 
 #include "Account.h"
-#include "gnc-date.h"
-#include "gnc-numeric.h"
-
-#include "qofbook.h"
-#include "qofinstance.h"
+#include "qof.h"
 #ifdef GNUCASH_MAJOR_VERSION
 #include "gncBusiness.h"
 #endif
Index: gncOwner.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncOwner.c,v
retrieving revision 1.15.4.8
retrieving revision 1.15.4.9
diff -Lsrc/business/business-core/gncOwner.c -Lsrc/business/business-core/gncOwner.c -u -r1.15.4.8 -r1.15.4.9
--- src/business/business-core/gncOwner.c
+++ src/business/business-core/gncOwner.c
@@ -32,11 +32,6 @@
 #include <glib.h>
 #include <string.h>		/* for memcpy() */
 
-#include "qofbook.h"
-#include "qofclass.h"
-#include "qofquerycore.h"
-#include "qofquery.h"
-
 #include "gncCustomerP.h"
 #include "gncEmployeeP.h"
 #include "gncJobP.h"
Index: gncJob.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncJob.h,v
retrieving revision 1.9.4.6
retrieving revision 1.9.4.7
diff -Lsrc/business/business-core/gncJob.h -Lsrc/business/business-core/gncJob.h -u -r1.9.4.6 -r1.9.4.7
--- src/business/business-core/gncJob.h
+++ src/business/business-core/gncJob.h
@@ -33,8 +33,6 @@
 
 typedef struct _gncJob GncJob;
 
-#include "qofid.h"
-#include "qofinstance.h"
 #include "gncAddress.h"
 #include "gncOwner.h"
 
Index: gncEntry.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncEntry.h,v
retrieving revision 1.22.4.7
retrieving revision 1.22.4.8
diff -Lsrc/business/business-core/gncEntry.h -Lsrc/business/business-core/gncEntry.h -u -r1.22.4.7 -r1.22.4.8
--- src/business/business-core/gncEntry.h
+++ src/business/business-core/gncEntry.h
@@ -44,10 +44,6 @@
   GNC_DISC_POSTTAX
 } GncDiscountHow;
 
-#include "qofbook.h"
-#include "qofinstance.h"
-
-#include "gnc-date.h"
 #ifdef GNUCASH_MAJOR_VERSION
 #include "gncBusiness.h"
 #endif
Index: gncBillTermP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncBillTermP.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Lsrc/business/business-core/gncBillTermP.h -Lsrc/business/business-core/gncBillTermP.h -u -r1.1.4.1 -r1.1.4.2
--- src/business/business-core/gncBillTermP.h
+++ src/business/business-core/gncBillTermP.h
@@ -29,7 +29,6 @@
 #ifndef GNC_BILLTERMP_H_
 #define GNC_BILLTERMP_H_
 
-#include "qofid-p.h"
 #include "gncBillTerm.h"
 
 gboolean gncBillTermRegister (void);
Index: gncInvoiceP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncInvoiceP.h,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -Lsrc/business/business-core/gncInvoiceP.h -Lsrc/business/business-core/gncInvoiceP.h -u -r1.6.4.2 -r1.6.4.3
--- src/business/business-core/gncInvoiceP.h
+++ src/business/business-core/gncInvoiceP.h
@@ -32,7 +32,6 @@
 #include "Account.h"
 #include "Transaction.h"
 #include "gnc-lot.h"
-#include "qofid-p.h"
 
 gboolean gncInvoiceRegister (void);
 gint64 gncInvoiceNextID (QofBook *book);
Index: gncAddressP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncAddressP.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Lsrc/business/business-core/gncAddressP.h -Lsrc/business/business-core/gncAddressP.h -u -r1.1.4.1 -r1.1.4.2
--- src/business/business-core/gncAddressP.h
+++ src/business/business-core/gncAddressP.h
@@ -29,7 +29,6 @@
 #define GNC_ADDRESSP_H_
 
 #include "gncAddress.h"
-#include "qofid.h"
 
 gboolean gncAddressRegister (void);
 
Index: gncCustomerP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncCustomerP.h,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -Lsrc/business/business-core/gncCustomerP.h -Lsrc/business/business-core/gncCustomerP.h -u -r1.3.4.2 -r1.3.4.3
--- src/business/business-core/gncCustomerP.h
+++ src/business/business-core/gncCustomerP.h
@@ -30,7 +30,6 @@
 #define GNC_CUSTOMERP_H_
 
 #include "gncCustomer.h"
-#include "qofid-p.h"
 
 gboolean gncCustomerRegister (void);
 gint64 gncCustomerNextID (QofBook *book);
Index: test-business.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/test/test-business.c,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -Lsrc/business/business-core/test/test-business.c -Lsrc/business/business-core/test/test-business.c -u -r1.5.4.2 -r1.5.4.3
--- src/business/business-core/test/test-business.c
+++ src/business/business-core/test/test-business.c
@@ -26,9 +26,8 @@
 #include <glib.h>
 #include <libguile.h>
 
-#include "guid.h"
+#include "qof.h"
 #include "gnc-module.h"
-#include "gnc-engine-util.h"
 #include "messages.h"
 
 #include "gncBusiness.h"
Index: test-employee.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/test/test-employee.c,v
retrieving revision 1.6.4.4
retrieving revision 1.6.4.5
diff -Lsrc/business/business-core/test/test-employee.c -Lsrc/business/business-core/test/test-employee.c -u -r1.6.4.4 -r1.6.4.5
--- src/business/business-core/test/test-employee.c
+++ src/business/business-core/test/test-employee.c
@@ -25,12 +25,7 @@
  *********************************************************************/
 
 #include <glib.h>
-#include "guid.h"
-#include "gnc-engine-util.h"
-#include "qofinstance.h"
-#include "qofobject.h"
-#include "qofsession.h"
-#include "qofquery.h"
+#include "qof.h"
 #include "gncEmployeeP.h"
 #include "gncCustomerP.h"
 #include "gncJobP.h"
Index: test-address.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/test/test-address.c,v
retrieving revision 1.5.4.3
retrieving revision 1.5.4.4
diff -Lsrc/business/business-core/test/test-address.c -Lsrc/business/business-core/test/test-address.c -u -r1.5.4.3 -r1.5.4.4
--- src/business/business-core/test/test-address.c
+++ src/business/business-core/test/test-address.c
@@ -25,7 +25,6 @@
  *********************************************************************/
 
 #include <glib.h>
-#include <qof.h>
 #include "cashobjects.h"
 #include "gncAddressP.h"
 #include "test-stuff.h"
Index: test-job.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/test/test-job.c,v
retrieving revision 1.8.4.4
retrieving revision 1.8.4.5
diff -Lsrc/business/business-core/test/test-job.c -Lsrc/business/business-core/test/test-job.c -u -r1.8.4.4 -r1.8.4.5
--- src/business/business-core/test/test-job.c
+++ src/business/business-core/test/test-job.c
@@ -25,12 +25,7 @@
  *********************************************************************/
 
 #include <glib.h>
-#include "guid.h"
-#include "gnc-engine-util.h"
-#include "qofobject.h"
-#include "qofsession.h"
-#include "qofbackend.h"
-#include "qofquery.h"
+#include "qof.h"
 #include "gncJobP.h"
 #include "gncInvoiceP.h"
 #include "gncCustomerP.h"
Index: test-vendor.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/test/test-vendor.c,v
retrieving revision 1.10.4.4
retrieving revision 1.10.4.5
diff -Lsrc/business/business-core/test/test-vendor.c -Lsrc/business/business-core/test/test-vendor.c -u -r1.10.4.4 -r1.10.4.5
--- src/business/business-core/test/test-vendor.c
+++ src/business/business-core/test/test-vendor.c
@@ -25,7 +25,6 @@
  *********************************************************************/
 
 #include <glib.h>
-#include <qof.h>
 #include "gncInvoiceP.h"
 #include "gncCustomerP.h"
 #include "gncJobP.h"
Index: search-param.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/search-param.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -Lsrc/gnome-utils/search-param.c -Lsrc/gnome-utils/search-param.c -u -r1.1.2.7 -r1.1.2.8
--- src/gnome-utils/search-param.c
+++ src/gnome-utils/search-param.c
@@ -28,7 +28,7 @@
 #include <stdarg.h>
 #include <gnome.h>
 
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
 #include "GNCId.h"
 #include "QueryCore.h"
 #include "QueryObject.h"
Index: gnc-dense-cal.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-dense-cal.c,v
retrieving revision 1.11.4.13
retrieving revision 1.11.4.14
diff -Lsrc/gnome-utils/gnc-dense-cal.c -Lsrc/gnome-utils/gnc-dense-cal.c -u -r1.11.4.13 -r1.11.4.14
--- src/gnome-utils/gnc-dense-cal.c
+++ src/gnome-utils/gnc-dense-cal.c
@@ -31,7 +31,7 @@
 #include "gnc-dense-cal.h"
 
 /* For PERR, only... */
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
 
 /**
  * Todo:
@@ -96,7 +96,7 @@
 
 static guint gnc_dense_cal_signals[LAST_SIGNAL] = { 0 };
 
-static short module = MOD_SX;
+static QofLogModule log_module = GNC_MOD_SX;
 
 static void gnc_dense_cal_class_init (GncDenseCalClass *class);
 static void gnc_dense_cal_init (GncDenseCal *dcal);
Index: TransLog.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/TransLog.c,v
retrieving revision 1.30.6.3
retrieving revision 1.30.6.4
diff -Lsrc/engine/TransLog.c -Lsrc/engine/TransLog.c -u -r1.30.6.3 -r1.30.6.4
--- src/engine/TransLog.c
+++ src/engine/TransLog.c
@@ -34,7 +34,6 @@
 #include "Transaction.h"
 #include "TransactionP.h"
 #include "TransLog.h"
-#include "gnc-date.h"
 #include "gnc-engine-util.h"
 
 /* 
Index: SchedXaction.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/SchedXaction.h,v
retrieving revision 1.24.4.5
retrieving revision 1.24.4.6
diff -Lsrc/engine/SchedXaction.h -Lsrc/engine/SchedXaction.h -u -r1.24.4.5 -r1.24.4.6
--- src/engine/SchedXaction.h
+++ src/engine/SchedXaction.h
@@ -38,13 +38,9 @@
 
 #include <time.h>
 #include <glib.h>
-
+#include "qof.h"
 #include "FreqSpec.h"
-#include "gnc-date.h"
 #include "gnc-engine.h"
-#include "guid.h"
-#include "kvp_frame.h"
-#include "qofbook.h"
 
 /**
  * The SchedXaction data.
Index: gnc-pricedb-p.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-pricedb-p.h,v
retrieving revision 1.18.4.4
retrieving revision 1.18.4.5
diff -Lsrc/engine/gnc-pricedb-p.h -Lsrc/engine/gnc-pricedb-p.h -u -r1.18.4.4 -r1.18.4.5
--- src/engine/gnc-pricedb-p.h
+++ src/engine/gnc-pricedb-p.h
@@ -26,15 +26,9 @@
 #define GNC_PRICEDB_P_H
 
 #include <glib.h>
-
+#include "qof.h"
 #include "gnc-engine.h"
 #include "gnc-pricedb.h"
-#include "qofbackend.h"
-#include "qofbook.h"
-#include "qofid.h"
-#include "qofid-p.h"
-#include "qofinstance.h"
-#include "qofinstance-p.h"
 
 struct gnc_price_s
 {
Index: SX-ttinfo.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/SX-ttinfo.h,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -Lsrc/engine/SX-ttinfo.h -Lsrc/engine/SX-ttinfo.h -u -r1.4 -r1.4.4.1
--- src/engine/SX-ttinfo.h
+++ src/engine/SX-ttinfo.h
@@ -28,10 +28,9 @@
 #include "config.h"
 
 #include <glib.h>
-
+#include "qof.h"
 #include "SchedXaction.h"
 #include "Account.h"
-#include "gnc-numeric.h"
 #include "gnc-commodity.h"
 
 typedef struct TTInfo_s TTInfo;
Index: SX-book.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/SX-book.h,v
retrieving revision 1.4.16.2
retrieving revision 1.4.16.3
diff -Lsrc/engine/SX-book.h -Lsrc/engine/SX-book.h -u -r1.4.16.2 -r1.4.16.3
--- src/engine/SX-book.h
+++ src/engine/SX-book.h
@@ -41,10 +41,7 @@
 #include "config.h"
 
 #include <glib.h>
-
-#include "gnc-engine.h"
-#include "qofbook.h"
-#include "qofid.h"
+#include "qof.h"
 
 typedef struct xaccSchedXactionsDef SchedXactions;
 
Index: Group.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Group.h,v
retrieving revision 1.64.4.6
retrieving revision 1.64.4.7
diff -Lsrc/engine/Group.h -Lsrc/engine/Group.h -u -r1.64.4.6 -r1.64.4.7
--- src/engine/Group.h
+++ src/engine/Group.h
@@ -36,12 +36,8 @@
 #define XACC_ACCOUNT_GROUP_H
 
 #include <glib.h>
-
+#include "qof.h"
 #include "Account.h"
-#include "gnc-engine.h"
-#include "guid.h"
-#include "qofbook.h"
-
 
 /* PROTOTYPES ******************************************************/
 /** @name Constructors, Destructors 
Index: FreqSpecP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/FreqSpecP.h,v
retrieving revision 1.5.6.3
retrieving revision 1.5.6.4
diff -Lsrc/engine/FreqSpecP.h -Lsrc/engine/FreqSpecP.h -u -r1.5.6.3 -r1.5.6.4
--- src/engine/FreqSpecP.h
+++ src/engine/FreqSpecP.h
@@ -34,7 +34,6 @@
 #define XACC_FREQSPECP_H
 
 #include "FreqSpec.h"
-#include "qofid.h"
 
 struct gncp_freq_spec 
 {
Index: SchedXactionP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/SchedXactionP.h,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -Lsrc/engine/SchedXactionP.h -Lsrc/engine/SchedXactionP.h -u -r1.3.4.2 -r1.3.4.3
--- src/engine/SchedXactionP.h
+++ src/engine/SchedXactionP.h
@@ -25,9 +25,6 @@
 #define XACC_SCHEDXACTION_P_H
 
 #include "SchedXaction.h"
-#include "qofid.h"
-#include "qofid-p.h"
-#include "qofinstance-p.h"
 
 /**
  * A single scheduled transaction.
Index: Query.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Query.h,v
retrieving revision 1.70.4.3
retrieving revision 1.70.4.4
diff -Lsrc/engine/Query.h -Lsrc/engine/Query.h -u -r1.70.4.3 -r1.70.4.4
--- src/engine/Query.h
+++ src/engine/Query.h
@@ -27,14 +27,8 @@
 #include <sys/types.h>
 #include <time.h>
 #include <glib.h>
-
-#include "gnc-date.h" 
-#include "gnc-engine.h" 
-#include "guid.h" 
-#include "kvp_frame.h" 
-
-#include "qofquery.h"
-#include "qofquerycore.h"
+#include "qof.h"
+#include "Account.h"
 
 /*
  * This function defines a compatibility API from the old Query API to
Index: AccountP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/AccountP.h,v
retrieving revision 1.54.4.3
retrieving revision 1.54.4.4
diff -Lsrc/engine/AccountP.h -Lsrc/engine/AccountP.h -u -r1.54.4.3 -r1.54.4.4
--- src/engine/AccountP.h
+++ src/engine/AccountP.h
@@ -40,21 +40,11 @@
 #define XACC_ACCOUNT_P_H
 
 #include "config.h"
-
 #include "Account.h"
 #include "gnc-commodity.h"
 #include "gnc-engine.h"
-#include "gnc-numeric.h"
-#include "kvp_frame.h"
 #include "policy.h"
 
-#include "qofbackend.h"
-#include "qofbook.h"
-#include "qofid.h"
-#include "qofinstance.h"
-#include "qofinstance-p.h"
-
-
 /** STRUCTS *********************************************************/
 
 /** This is the data that describes an account. 
Index: gnc-lot-p.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-lot-p.h,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -Lsrc/engine/gnc-lot-p.h -Lsrc/engine/gnc-lot-p.h -u -r1.5.2.4 -r1.5.2.5
--- src/engine/gnc-lot-p.h
+++ src/engine/gnc-lot-p.h
@@ -37,10 +37,8 @@
 #ifndef GNC_LOT_P_H
 #define GNC_LOT_P_H
 
-#include "gnc-engine.h"
-#include "kvp_frame.h"
-#include "qofbook.h"
-#include "qofid.h"
+#include "gnc-lot.h"
+#include "Account.h"
 
 struct gnc_lot_struct
 {
Index: gnc-lot.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-lot.h,v
retrieving revision 1.8.4.7
retrieving revision 1.8.4.8
diff -Lsrc/engine/gnc-lot.h -Lsrc/engine/gnc-lot.h -u -r1.8.4.7 -r1.8.4.8
--- src/engine/gnc-lot.h
+++ src/engine/gnc-lot.h
@@ -59,11 +59,8 @@
 #ifndef GNC_LOT_H
 #define GNC_LOT_H
 
-#include "gnc-engine.h"
-#include "gnc-numeric.h"
-#include "qofbook.h"
-#include "qofid.h"
-#include "qofobject.h"
+#include "qof.h"
+#include "gnc-lot-p.h"
 
 GNCLot * gnc_lot_new (QofBook *);
 void gnc_lot_destroy (GNCLot *);
Index: GroupP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/GroupP.h,v
retrieving revision 1.22.4.2
retrieving revision 1.22.4.3
diff -Lsrc/engine/GroupP.h -Lsrc/engine/GroupP.h -u -r1.22.4.2 -r1.22.4.3
--- src/engine/GroupP.h
+++ src/engine/GroupP.h
@@ -37,13 +37,8 @@
 #define XACC_GROUP_P_H
 
 #include "config.h"
-
+#include "Group.h"
 #include "Transaction.h"
-#include "gnc-numeric.h"
-#include "qofbackend.h"
-#include "qofbook.h"
-#include "qofid.h"
-
 
 /** STRUCTS *********************************************************/
 struct account_group_s
Index: Account.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Account.h,v
retrieving revision 1.110.4.13
retrieving revision 1.110.4.14
diff -Lsrc/engine/Account.h -Lsrc/engine/Account.h -u -r1.110.4.13 -r1.110.4.14
--- src/engine/Account.h
+++ src/engine/Account.h
@@ -45,14 +45,8 @@
 
 #ifndef XACC_ACCOUNT_H
 #define XACC_ACCOUNT_H
-
+#include "qof.h"
 #include "gnc-engine.h"
-#include "guid.h"
-#include "kvp_frame.h"
-#include "qofbook.h"
-#include "qofid.h"
-#include "qofinstance.h"
-
 
 typedef gnc_numeric (*xaccGetBalanceFn)( Account *account );
 typedef gnc_numeric (*xaccGetBalanceInCurrencyFn) (Account *account,
Index: FreqSpec.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/FreqSpec.h,v
retrieving revision 1.10.4.6
retrieving revision 1.10.4.7
diff -Lsrc/engine/FreqSpec.h -Lsrc/engine/FreqSpec.h -u -r1.10.4.6 -r1.10.4.7
--- src/engine/FreqSpec.h
+++ src/engine/FreqSpec.h
@@ -60,16 +60,9 @@
 #define XACC_FREQSPEC_H
 
 #include "config.h"
-
+#include "gnc-engine.h"
 #include <glib.h>
-
-#include "qofid.h"
-#include "guid.h"
-#include "qofbook.h"
-#include "qofobject.h"
-#include "qofclass.h"
-#include "qofquery.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 
 #define ENUM_LIST_TYPE(_) \
         _(INVALID,) \
Index: test-transaction-voiding.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/test/test-transaction-voiding.c,v
retrieving revision 1.9.4.2
retrieving revision 1.9.4.3
diff -Lsrc/engine/test/test-transaction-voiding.c -Lsrc/engine/test/test-transaction-voiding.c -u -r1.9.4.2 -r1.9.4.3
--- src/engine/test/test-transaction-voiding.c
+++ src/engine/test/test-transaction-voiding.c
@@ -23,7 +23,6 @@
  
 #include <glib.h>
 #include <string.h>
-#include <qof.h>
 #include "cashobjects.h"
 #include "Account.h"
 #include "TransLog.h"
Index: test-numeric.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/test/test-numeric.c,v
retrieving revision 1.18.2.5
retrieving revision 1.18.2.6
diff -Lsrc/engine/test/test-numeric.c -Lsrc/engine/test/test-numeric.c -u -r1.18.2.5 -r1.18.2.6
--- src/engine/test/test-numeric.c
+++ src/engine/test/test-numeric.c
@@ -24,7 +24,6 @@
 
 #include <ctype.h>
 #include <glib.h>
-#include <qof.h>
 #include "cashobjects.h"
 #include "test-stuff.h"
 #include "test-engine-stuff.h"
Index: test-transaction-reversal.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/test/test-transaction-reversal.c,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -Lsrc/engine/test/test-transaction-reversal.c -Lsrc/engine/test/test-transaction-reversal.c -u -r1.3.4.5 -r1.3.4.6
--- src/engine/test/test-transaction-reversal.c
+++ src/engine/test/test-transaction-reversal.c
@@ -23,7 +23,6 @@
  
 #include <glib.h>
 #include <string.h>
-#include <qof.h>
 #include "cashobjects.h"
 #include "Transaction.h"
 #include "Account.h"
Index: gnucash-style.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-gnome/gnucash-style.c,v
retrieving revision 1.10.4.5
retrieving revision 1.10.4.6
diff -Lsrc/register/register-gnome/gnucash-style.c -Lsrc/register/register-gnome/gnucash-style.c -u -r1.10.4.5 -r1.10.4.6
--- src/register/register-gnome/gnucash-style.c
+++ src/register/register-gnome/gnucash-style.c
@@ -32,7 +32,7 @@
 #include "gnucash-style.h"
 #include "messages.h"
 #include "gnc-gconf-utils.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
 
 /** GLOBALS *********************************************************/
 /* This static indicates the debugging module that this .o belongs to.  */
Index: gnucash-item-list.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-gnome/gnucash-item-list.c,v
retrieving revision 1.2.6.7
retrieving revision 1.2.6.8
diff -Lsrc/register/register-gnome/gnucash-item-list.c -Lsrc/register/register-gnome/gnucash-item-list.c -u -r1.2.6.7 -r1.2.6.8
--- src/register/register-gnome/gnucash-item-list.c
+++ src/register/register-gnome/gnucash-item-list.c
@@ -28,7 +28,7 @@
 
 #include <gnome.h>
 
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
 #include "gnucash-item-list.h"
 #include "gnucash-scrolled-window.h"
 


More information about the gnucash-changes mailing list