[Gnucash-changes] Change from short int module to QofLogModule
log_module and use new
Neil Williams
codehelp at cvs.gnucash.org
Sat Oct 1 14:09:24 EDT 2005
Log Message:
-----------
Change from short int module to QofLogModule log_module and use new log_module identifiers. (End)
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash/src/app-utils:
file-utils.c
global-options.c
gnc-component-manager.c
gnc-ui-util.c
guile-util.c
option-util.c
gnucash/src/backend/file:
gnc-account-xml-v2.c
gnc-book-xml-v2.c
gnc-commodity-xml-v2.c
gnc-lot-xml-v2.c
gnc-pricedb-xml-v2.c
gnc-schedxaction-xml-v2.c
io-example-account.c
io-gncbin-r.c
io-gncxml-v1.c
io-gncxml-v2.c
sixtp-dom-generators.c
sixtp-dom-parsers.c
sixtp-utils.c
sixtp.c
sixtp.h
gnucash/src/backend/qsf:
qof-backend-qsf.h
qsf-xml.c
gnucash/src/business/business-core:
gncBillTerm.c
gncCustomer.c
gncEmployee.c
gncEntry.c
gncInvoice.c
gncJob.c
gncOrder.c
gncTaxTable.c
gncTaxTableP.h
gncVendor.c
gnucash/src/business/business-core/file:
gnc-address-xml-v2.c
gnc-bill-term-xml-v2.c
gnc-customer-xml-v2.c
gnc-employee-xml-v2.c
gnc-entry-xml-v2.c
gnc-invoice-xml-v2.c
gnc-job-xml-v2.c
gnc-order-xml-v2.c
gnc-owner-xml-v2.c
gnc-tax-table-xml-v2.c
gnc-vendor-xml-v2.c
gnucash/src/business/business-gnome:
gnc-plugin-page-invoice.c
gnucash/src/engine:
FreqSpec.c
Group.c
Query.c
SX-book.c
SchedXaction.c
Scrub.c
Scrub2.c
Scrub3.c
Transaction.c
engine-helpers.c
gnc-associate-account.c
gnc-budget-cat.c
gnc-commodity.c
gnc-date.c
gnc-event.c
gnc-filepath-utils.c
gnc-hooks.c
gnc-lot.c
gnc-pricedb.h
guid.c
kvp_frame.c
policy.c
qofbackend.c
qofclass.c
qofgobj.c
qofid.c
qofinstance.c
qofobject.c
qofquerycore.c
qofsql.c
gnucash/src/gnome:
dialog-fincalc.c
dialog-new-user.c
dialog-price-edit-db.c
dialog-scheduledxaction.c
dialog-sx-from-trans.c
dialog-sxsincelast.c
dialog-totd.c
druid-acct-period.c
druid-hierarchy.c
druid-loan.c
druid-merge.c
gnc-plugin-basic-commands.c
gnc-plugin-page-account-tree.c
gnc-plugin-page-register.c
gnc-plugin-register.c
gnc-split-reg.c
top-level.c
gnucash/src/gnome-utils:
QuickFill.c
account-quickfill.c
dialog-account.c
dialog-commodity.c
dialog-options.c
dialog-preferences.c
dialog-reset-warnings.c
dialog-transfer.c
dialog-utils.c
gnc-budget-list-tree-model.c
gnc-budget-tree-model.c
gnc-embedded-window.c
gnc-file.c
gnc-frequency.c
gnc-gnome-utils.c
gnc-html.c
gnc-main-window.c
gnc-menu-extensions.c
gnc-plugin-file-history.c
gnc-plugin-manager.c
gnc-plugin-menu-additions.c
gnc-tree-model-account.c
gnc-tree-model-commodity.c
gnc-tree-model-price.c
gnc-tree-model.c
gnc-tree-view-account.c
gnc-tree-view-commodity.c
gnc-tree-view-price.c
gnc-tree-view.c
gnc-window.c
gnucash/src/import-export:
import-account-matcher.c
import-backend.c
import-commodity-matcher.c
import-main-matcher.c
import-match-map.c
import-parse.c
gnucash/src/import-export/binary-import:
druid-commodity.c
gnucash/src/import-export/log-replay:
gnc-log-replay.c
gnucash/src/import-export/mt940:
gnc-mt940-import.c
gnucash/src/import-export/ofx:
gnc-ofx-import.c
gnucash/src/import-export/qif:
qif-file.c
qif-objects.c
qif-parse.c
gnucash/src/network-utils:
gnc-http.c
gnucash/src/register/ledger-core:
gnc-ledger-display.c
split-register-control.c
split-register-layout.c
split-register-model-save.c
split-register-model.c
split-register-util.c
split-register.c
gnucash/src/register/register-core:
basiccell.c
cell-factory.c
checkboxcell.c
formulacell.c
numcell.c
pricecell.c
recncell.c
table-allgui.c
gnucash/src/register/register-gnome:
formulacell-gnome.c
gnucash/src/report/report-gnome:
gnc-plugin-page-report.c
gnucash/src/report/stylesheets:
gnc-plugin-stylesheets.c
Revision Data
-------------
Index: gnc-budget-tree-model.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-budget-tree-model.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/gnome-utils/gnc-budget-tree-model.c -Lsrc/gnome-utils/gnc-budget-tree-model.c -u -r1.1.2.2 -r1.1.2.3
--- src/gnome-utils/gnc-budget-tree-model.c
+++ src/gnome-utils/gnc-budget-tree-model.c
@@ -37,12 +37,12 @@
// Includes
#include "config.h"
#include <string.h>
-#include "gnc-trace.h"
+#include "gnc-engine.h"
#include "gnc-budget-tree-model.h"
#include "gnc-budget-cat.h"
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/** Initialize and clean-up functions. */
static void gnc_budget_tree_model_class_init (GncBudgetTreeModelClass *klass);
Index: gnc-tree-model-account.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-model-account.c,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -Lsrc/gnome-utils/gnc-tree-model-account.c -Lsrc/gnome-utils/gnc-tree-model-account.c -u -r1.1.2.19 -r1.1.2.20
--- src/gnome-utils/gnc-tree-model-account.c
+++ src/gnome-utils/gnc-tree-model-account.c
@@ -34,7 +34,7 @@
#include "Group.h"
#include "gnc-commodity.h"
#include "gnc-gconf-utils.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gobject-utils.h"
#include "gnc-ui-util.h"
#include "messages.h"
@@ -42,7 +42,7 @@
#define TREE_MODEL_ACCOUNT_CM_CLASS "tree-model-account"
/** Static Globals *******************************************************/
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/** Declarations *********************************************************/
static void gnc_tree_model_account_class_init (GncTreeModelAccountClass *klass);
Index: gnc-menu-extensions.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-menu-extensions.c,v
retrieving revision 1.9.4.8
retrieving revision 1.9.4.9
diff -Lsrc/gnome-utils/gnc-menu-extensions.c -Lsrc/gnome-utils/gnc-menu-extensions.c -u -r1.9.4.8 -r1.9.4.9
--- src/gnome-utils/gnc-menu-extensions.c
+++ src/gnome-utils/gnc-menu-extensions.c
@@ -26,7 +26,7 @@
#include <gnome.h>
#include "guile-util.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-menu-extensions.h"
#include "gnc-ui.h"
@@ -41,7 +41,7 @@
};
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static GSList *extension_list = NULL;
static Getters getters = {0, 0, 0, 0, 0};
Index: gnc-tree-view-commodity.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-view-commodity.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -Lsrc/gnome-utils/gnc-tree-view-commodity.c -Lsrc/gnome-utils/gnc-tree-view-commodity.c -u -r1.1.2.10 -r1.1.2.11
--- src/gnome-utils/gnc-tree-view-commodity.c
+++ src/gnome-utils/gnc-tree-view-commodity.c
@@ -33,7 +33,7 @@
#include "gnc-commodity.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gconf-utils.h"
#include "gnc-gnome-utils.h"
#include "gnc-icons.h"
@@ -45,7 +45,7 @@
/** Static Globals *******************************************************/
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/** Declarations *********************************************************/
static void gnc_tree_view_commodity_class_init (GncTreeViewCommodityClass *klass);
Index: gnc-tree-view-price.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-view-price.c,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -Lsrc/gnome-utils/gnc-tree-view-price.c -Lsrc/gnome-utils/gnc-tree-view-price.c -u -r1.1.2.8 -r1.1.2.9
--- src/gnome-utils/gnc-tree-view-price.c
+++ src/gnome-utils/gnc-tree-view-price.c
@@ -33,7 +33,7 @@
#include "gnc-pricedb.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gconf-utils.h"
#include "gnc-gnome-utils.h"
#include "gnc-icons.h"
@@ -46,7 +46,7 @@
/** Static Globals *******************************************************/
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/** Declarations *********************************************************/
static void gnc_tree_view_price_class_init (GncTreeViewPriceClass *klass);
Index: gnc-tree-model.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-model.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/gnome-utils/gnc-tree-model.c -Lsrc/gnome-utils/gnc-tree-model.c -u -r1.1.2.1 -r1.1.2.2
--- src/gnome-utils/gnc-tree-model.c
+++ src/gnome-utils/gnc-tree-model.c
@@ -30,11 +30,11 @@
#include "gnc-tree-model.h"
#include "gnc-gobject-utils.h"
-#include "gnc-trace.h"
+#include "gnc-engine.h"
#include "messages.h"
/** Static Globals *******************************************************/
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/** Declarations *********************************************************/
static void gnc_tree_model_class_init (GncTreeModelClass *klass);
Index: gnc-tree-model-price.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-model-price.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -Lsrc/gnome-utils/gnc-tree-model-price.c -Lsrc/gnome-utils/gnc-tree-model-price.c -u -r1.1.2.5 -r1.1.2.6
--- src/gnome-utils/gnc-tree-model-price.c
+++ src/gnome-utils/gnc-tree-model-price.c
@@ -34,7 +34,7 @@
#include <gtk/gtkmain.h>
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gobject-utils.h"
#include "gnc-pricedb.h"
#include "gnc-tree-model-price.h"
@@ -63,7 +63,7 @@
#undef RACE_CONDITION_SOLVED
/** Static Globals *******************************************************/
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/** Declarations *********************************************************/
static void gnc_tree_model_price_class_init (GncTreeModelPriceClass *klass);
Index: gnc-plugin-manager.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-plugin-manager.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/gnome-utils/gnc-plugin-manager.c -Lsrc/gnome-utils/gnc-plugin-manager.c -u -r1.1.2.2 -r1.1.2.3
--- src/gnome-utils/gnc-plugin-manager.c
+++ src/gnome-utils/gnc-plugin-manager.c
@@ -27,10 +27,10 @@
#include "gnc-plugin-manager.h"
#include "messages.h"
-#include "gnc-trace.h"
+#include "gnc-engine.h"
#include "gnc-hooks.h"
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static void gnc_plugin_manager_class_init (GncPluginManagerClass *klass);
static void gnc_plugin_manager_init (GncPluginManager *plugin);
Index: gnc-window.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-window.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lsrc/gnome-utils/gnc-window.c -Lsrc/gnome-utils/gnc-window.c -u -r1.1.2.6 -r1.1.2.7
--- src/gnome-utils/gnc-window.c
+++ src/gnome-utils/gnc-window.c
@@ -29,8 +29,9 @@
#include "gnc-trace.h"
#include "gnc-plugin-page.h"
#include "gnc-window.h"
+#include "gnc-engine.h"
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
GType
gnc_window_get_type (void)
@@ -186,4 +187,3 @@
while (gtk_events_pending ())
gtk_main_iteration ();
}
-
Index: QuickFill.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/QuickFill.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -Lsrc/gnome-utils/QuickFill.c -Lsrc/gnome-utils/QuickFill.c -u -r1.1.4.4 -r1.1.4.5
--- src/gnome-utils/QuickFill.c
+++ src/gnome-utils/QuickFill.c
@@ -30,7 +30,7 @@
#include "QuickFill.h"
#include "dialog-utils.h"
#include "gnc-engine.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-ui-util.h"
@@ -47,7 +47,7 @@
int depth, QuickFillSort sort);
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_REGISTER;
+static QofLogModule log_module = GNC_MOD_REGISTER;
/* A cache for quickfill strings */
static GCache * qf_string_cache = NULL;
Index: dialog-utils.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/dialog-utils.c,v
retrieving revision 1.13.4.17
retrieving revision 1.13.4.18
diff -Lsrc/gnome-utils/dialog-utils.c -Lsrc/gnome-utils/dialog-utils.c -u -r1.13.4.17 -r1.13.4.18
--- src/gnome-utils/dialog-utils.c
+++ src/gnome-utils/dialog-utils.c
@@ -38,13 +38,13 @@
#include "messages.h"
#include "Group.h"
#include "gnc-dir.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-euro.h"
#include "gnc-ui-util.h"
#include "gnc-gconf-utils.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
#define KEY_SAVE_GEOMETRY "save_window_geometry"
#define WINDOW_POSITION "window_position"
Index: account-quickfill.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/account-quickfill.c,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -Lsrc/gnome-utils/account-quickfill.c -Lsrc/gnome-utils/account-quickfill.c -u -r1.2.4.2 -r1.2.4.3
--- src/gnome-utils/account-quickfill.c
+++ src/gnome-utils/account-quickfill.c
@@ -24,13 +24,11 @@
#include "config.h"
#include "account-quickfill.h"
#include "gnc-gconf-utils.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
-#include "gnc-trace.h"
+#include "gnc-engine.h"
#include "gnc-ui-util.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_REGISTER;
+static QofLogModule log_module = GNC_MOD_REGISTER;
static void shared_quickfill_gconf_changed (GConfEntry *entry, gpointer qfb);
Index: gnc-frequency.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-frequency.c,v
retrieving revision 1.14.4.7
retrieving revision 1.14.4.8
diff -Lsrc/gnome-utils/gnc-frequency.c -Lsrc/gnome-utils/gnc-frequency.c -u -r1.14.4.7 -r1.14.4.8
--- src/gnome-utils/gnc-frequency.c
+++ src/gnome-utils/gnc-frequency.c
@@ -31,11 +31,11 @@
#include "FreqSpec.h"
#include "dialog-utils.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-frequency.h"
#include "gnc-ui-util.h"
-static short module = MOD_SX;
+static QofLogModule log_module = GNC_MOD_SX;
/** Private Defs ********************/
Index: gnc-tree-view-account.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-view-account.c,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -Lsrc/gnome-utils/gnc-tree-view-account.c -Lsrc/gnome-utils/gnc-tree-view-account.c -u -r1.1.2.22 -r1.1.2.23
--- src/gnome-utils/gnc-tree-view-account.c
+++ src/gnome-utils/gnc-tree-view-account.c
@@ -35,7 +35,7 @@
#include "Group.h"
#include "gnc-commodity.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-icons.h"
#include "gnc-ui-util.h"
#include "global-options.h"
@@ -47,7 +47,7 @@
/** Static Globals *******************************************************/
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/** Declarations *********************************************************/
static void gnc_tree_view_account_class_init (GncTreeViewAccountClass *klass);
Index: dialog-account.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/dialog-account.c,v
retrieving revision 1.5.4.22
retrieving revision 1.5.4.23
diff -Lsrc/gnome-utils/dialog-account.c -Lsrc/gnome-utils/dialog-account.c -u -r1.5.4.22 -r1.5.4.23
--- src/gnome-utils/dialog-account.c
+++ src/gnome-utils/dialog-account.c
@@ -38,7 +38,6 @@
#include "gnc-commodity.h"
#include "gnc-commodity-edit.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
#include "gnc-engine.h"
#include "gnc-gui-query.h"
#include "gnc-session.h"
@@ -105,7 +104,7 @@
/** Static Globals *******************************************************/
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static int last_used_account_type = BANK;
Index: gnc-tree-view.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-view.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -Lsrc/gnome-utils/gnc-tree-view.c -Lsrc/gnome-utils/gnc-tree-view.c -u -r1.1.2.4 -r1.1.2.5
--- src/gnome-utils/gnc-tree-view.c
+++ src/gnome-utils/gnc-tree-view.c
@@ -38,7 +38,7 @@
#include <string.h>
#include "gnc-tree-view.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gconf-utils.h"
#include "gnc-gnome-utils.h"
#include "gnc-gobject-utils.h"
@@ -87,7 +87,7 @@
/** Static Globals *******************************************************/
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/**** Declarations ******************************************************/
static void gnc_tree_view_class_init (GncTreeViewClass *klass);
Index: gnc-budget-list-tree-model.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-budget-list-tree-model.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/gnome-utils/gnc-budget-list-tree-model.c -Lsrc/gnome-utils/gnc-budget-list-tree-model.c -u -r1.1.2.2 -r1.1.2.3
--- src/gnome-utils/gnc-budget-list-tree-model.c
+++ src/gnome-utils/gnc-budget-list-tree-model.c
@@ -37,15 +37,13 @@
// Includes
#include "config.h"
#include <string.h>
-#include "gnc-trace.h"
+#include "gnc-engine.h"
#include "gnc-budget-list-tree-model.h"
#include "gnc-budget-book.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/** Initialize and clean-up functions. */
static void gnc_budget_list_tree_model_class_init (GncBudgetListTreeModelClass *klass);
Index: dialog-reset-warnings.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/dialog-reset-warnings.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/gnome-utils/dialog-reset-warnings.c -Lsrc/gnome-utils/dialog-reset-warnings.c -u -r1.1.2.1 -r1.1.2.2
--- src/gnome-utils/dialog-reset-warnings.c
+++ src/gnome-utils/dialog-reset-warnings.c
@@ -27,13 +27,13 @@
#include "dialog-utils.h"
#include "gnc-gconf-utils.h"
-#include "gnc-trace.h"
+#include "gnc-engine.h"
#include "gnc-ui.h"
#include "gnc-component-manager.h"
#include "dialog-reset-warnings.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_PREFS;
+static QofLogModule log_module = GNC_MOD_PREFS;
#define GCONF_SECTION "dialogs/reset_warnings"
#define DIALOG_RESET_WARNINGS_CM_CLASS "reset-warnings"
Index: gnc-tree-model-commodity.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-model-commodity.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lsrc/gnome-utils/gnc-tree-model-commodity.c -Lsrc/gnome-utils/gnc-tree-model-commodity.c -u -r1.1.2.6 -r1.1.2.7
--- src/gnome-utils/gnc-tree-model-commodity.c
+++ src/gnome-utils/gnc-tree-model-commodity.c
@@ -36,7 +36,7 @@
#include "gnc-tree-model-commodity.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gobject-utils.h"
#include "gnc-trace.h"
#include "gnc-ui-util.h"
@@ -45,7 +45,7 @@
#define ITER_IS_COMMODITY GINT_TO_POINTER(2)
/** Static Globals *******************************************************/
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/** Declarations *********************************************************/
static void gnc_tree_model_commodity_class_init (GncTreeModelCommodityClass *klass);
Index: gnc-main-window.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-main-window.c,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -Lsrc/gnome-utils/gnc-main-window.c -Lsrc/gnome-utils/gnc-main-window.c -u -r1.1.2.20 -r1.1.2.21
--- src/gnome-utils/gnc-main-window.c
+++ src/gnome-utils/gnc-main-window.c
@@ -48,7 +48,7 @@
#include "dialog-transfer.h"
#include "dialog-utils.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-file.h"
#include "gnc-gnome-utils.h"
#include "gnc-gobject-utils.h"
@@ -77,7 +77,7 @@
#define KEY_SHOW_CLOSE_BUTTON "tab_close_buttons"
/** Static Globals *******************************************************/
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static GList *active_windows = NULL;
/** Declarations *********************************************************/
Index: gnc-embedded-window.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-embedded-window.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -Lsrc/gnome-utils/gnc-embedded-window.c -Lsrc/gnome-utils/gnc-embedded-window.c -u -r1.1.2.4 -r1.1.2.5
--- src/gnome-utils/gnc-embedded-window.c
+++ src/gnome-utils/gnc-embedded-window.c
@@ -30,20 +30,18 @@
#include "gnc-embedded-window.h"
#include "gnc-engine.h"
-#include "gnc-engine-util.h"
#include "gnc-gnome-utils.h"
#include "gnc-dir.h"
#include "gnc-gobject-utils.h"
#include "gnc-gui-query.h"
#include "gnc-plugin.h"
#include "gnc-plugin-manager.h"
-#include "gnc-session.h"
#include "gnc-ui.h"
#include "gnc-window.h"
#include "messages.h"
/** Static Globals *******************************************************/
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/** Declarations *********************************************************/
static void gnc_embedded_window_class_init (GncEmbeddedWindowClass *klass);
Index: dialog-commodity.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/dialog-commodity.c,v
retrieving revision 1.8.4.15
retrieving revision 1.8.4.16
diff -Lsrc/gnome-utils/dialog-commodity.c -Lsrc/gnome-utils/dialog-commodity.c -u -r1.8.4.15 -r1.8.4.16
--- src/gnome-utils/dialog-commodity.c
+++ src/gnome-utils/dialog-commodity.c
@@ -38,13 +38,13 @@
#include "dialog-commodity.h"
#include "dialog-utils.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gui-query.h"
#include "gnc-ui-util.h"
#include "gnc-ui.h"
#include "messages.h"
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
struct select_commodity_window {
GtkWidget * dialog;
Index: dialog-preferences.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/dialog-preferences.c,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -Lsrc/gnome-utils/dialog-preferences.c -Lsrc/gnome-utils/dialog-preferences.c -u -r1.1.2.9 -r1.1.2.10
--- src/gnome-utils/dialog-preferences.c
+++ src/gnome-utils/dialog-preferences.c
@@ -63,7 +63,7 @@
#include "gnc-currency-edit.h"
#include "gnc-gconf-utils.h"
#include "gnc-gobject-utils.h"
-#include "gnc-trace.h"
+#include "gnc-engine.h"
#include "gnc-ui.h"
#include "gnc-ui-util.h"
#include "gnc-component-manager.h"
@@ -77,7 +77,7 @@
#define NOTEBOOK "notebook"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_PREFS;
+static QofLogModule log_module = GNC_MOD_PREFS;
void gnc_preferences_response_cb(GtkDialog *dialog, gint response, GtkDialog *unused);
void gnc_reset_warnings_select_all_cb (GtkButton *button, gpointer user_data);
Index: gnc-file.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-file.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/gnome-utils/gnc-file.c -Lsrc/gnome-utils/gnc-file.c -u -r1.1.2.2 -r1.1.2.3
--- src/gnome-utils/gnc-file.c
+++ src/gnome-utils/gnc-file.c
@@ -30,7 +30,6 @@
#include "global-options.h"
#include "gnc-commodity.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
#include "gnc-engine.h"
#include "gnc-event.h"
#include "gnc-file.h"
@@ -43,9 +42,7 @@
#include "gnc-window.h"
#include "gnc-gconf-utils.h"
#include "gnc-plugin-file-history.h"
-#include "qofbackend.h"
-#include "qofbook.h"
-#include "qofsession.h"
+#include "qof.h"
#include "messages.h"
#include "TransLog.h"
@@ -53,7 +50,7 @@
/** GLOBALS *********************************************************/
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static GNCCanCancelSaveCB can_cancel_cb = NULL;
static GNCShutdownCB shutdown_cb = NULL;
Index: gnc-gnome-utils.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-gnome-utils.c,v
retrieving revision 1.2.4.13
retrieving revision 1.2.4.14
diff -Lsrc/gnome-utils/gnc-gnome-utils.c -Lsrc/gnome-utils/gnc-gnome-utils.c -u -r1.2.4.13 -r1.2.4.14
--- src/gnome-utils/gnc-gnome-utils.c
+++ src/gnome-utils/gnc-gnome-utils.c
@@ -39,13 +39,13 @@
#include "gnc-gconf-utils.h"
#include "gnc-gnome-utils.h"
#include "gnc-html.h"
-#include "gnc-trace.h"
+#include "gnc-engine.h"
#include "gnc-ui.h"
#include <libgnomeui/gnome-window-icon.h>
#include <gnc-dir.h>
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static GnomeProgram *gnucash_program = NULL;
static char**
Index: gnc-plugin-file-history.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-plugin-file-history.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -Lsrc/gnome-utils/gnc-plugin-file-history.c -Lsrc/gnome-utils/gnc-plugin-file-history.c -u -r1.1.2.4 -r1.1.2.5
--- src/gnome-utils/gnc-plugin-file-history.c
+++ src/gnome-utils/gnc-plugin-file-history.c
@@ -40,7 +40,7 @@
#include "gnc-main-window.h"
#include "gnc-plugin-file-history.h"
#include "gnc-window.h"
-#include "gnc-trace.h"
+#include "gnc-engine.h"
#include "messages.h"
#include "gnc-gconf-utils.h"
@@ -55,7 +55,7 @@
static void gnc_plugin_file_history_add_to_window (GncPlugin *plugin, GncMainWindow *window, GQuark type);
static void gnc_plugin_file_history_remove_from_window (GncPlugin *plugin, GncMainWindow *window, GQuark type);
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/* Command callbacks */
static void gnc_plugin_file_history_cmd_open_file (GtkAction *action, GncMainWindowActionData *data);
Index: dialog-options.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/dialog-options.c,v
retrieving revision 1.22.2.21
retrieving revision 1.22.2.22
diff -Lsrc/gnome-utils/dialog-options.c -Lsrc/gnome-utils/dialog-options.c -u -r1.22.2.21 -r1.22.2.22
--- src/gnome-utils/dialog-options.c
+++ src/gnome-utils/dialog-options.c
@@ -51,7 +51,7 @@
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/*
* Point where preferences switch control method from a set of
Index: gnc-html.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-html.c,v
retrieving revision 1.23.4.12
retrieving revision 1.23.4.13
diff -Lsrc/gnome-utils/gnc-html.c -Lsrc/gnome-utils/gnc-html.c -u -r1.23.4.12 -r1.23.4.13
--- src/gnome-utils/gnc-html.c
+++ src/gnome-utils/gnc-html.c
@@ -47,7 +47,7 @@
#include "dialog-utils.h"
#include "print-session.h"
#include "global-options.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gpg.h"
#include "gnc-gui-query.h"
#include "gnc-html.h"
@@ -86,7 +86,7 @@
/* indicates the debugging module that this .o belongs to. */
-static short module = MOD_HTML;
+static QofLogModule log_module = GNC_MOD_HTML;
/* hashes for URLType -> protocol and protocol -> URLType */
static GHashTable * gnc_html_type_to_proto_hash = NULL;
Index: gnc-plugin-menu-additions.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-plugin-menu-additions.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -Lsrc/gnome-utils/gnc-plugin-menu-additions.c -Lsrc/gnome-utils/gnc-plugin-menu-additions.c -u -r1.1.2.5 -r1.1.2.6
--- src/gnome-utils/gnc-plugin-menu-additions.c
+++ src/gnome-utils/gnc-plugin-menu-additions.c
@@ -42,7 +42,7 @@
#include <g-wrap-wct.h>
#include "guile-util.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-main-window.h"
#include "gnc-plugin-menu-additions.h"
#include "gnc-window.h"
@@ -68,7 +68,7 @@
/* Command callbacks */
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
#define PLUGIN_ACTIONS_NAME "gnc-plugin-menu-additions-actions"
Index: dialog-transfer.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/dialog-transfer.c,v
retrieving revision 1.9.4.22
retrieving revision 1.9.4.23
diff -Lsrc/gnome-utils/dialog-transfer.c -Lsrc/gnome-utils/dialog-transfer.c -u -r1.9.4.22 -r1.9.4.23
--- src/gnome-utils/dialog-transfer.c
+++ src/gnome-utils/dialog-transfer.c
@@ -33,7 +33,7 @@
#include "gnc-book.h"
#include "gnc-component-manager.h"
#include "gnc-date-edit.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-euro.h"
#include "gnc-exp-parser.h"
#include "gnc-gconf-utils.h"
@@ -58,7 +58,7 @@
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
struct _xferDialog
{
Index: global-options.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/global-options.c,v
retrieving revision 1.6.4.5
retrieving revision 1.6.4.6
diff -Lsrc/app-utils/global-options.c -Lsrc/app-utils/global-options.c -u -r1.6.4.5 -r1.6.4.6
--- src/app-utils/global-options.c
+++ src/app-utils/global-options.c
@@ -24,13 +24,13 @@
#include "global-options.h"
#include "option-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
#include "gnc-gconf-utils.h"
#include "gnc-ui-util.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static GNCOptionDB *global_options = NULL;
Index: option-util.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/option-util.c,v
retrieving revision 1.19.4.10
retrieving revision 1.19.4.11
diff -Lsrc/app-utils/option-util.c -Lsrc/app-utils/option-util.c -u -r1.19.4.10 -r1.19.4.11
--- src/app-utils/option-util.c
+++ src/app-utils/option-util.c
@@ -30,7 +30,7 @@
#include "engine-helpers.h"
#include "glib-helpers.h"
#include "guile-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
#include "gnc-err-popup.h"
#include "guile-mappings.h"
#include "messages.h"
@@ -116,7 +116,7 @@
0, 0, 0, 0, 0, 0, 0, 0, 0};
/* This static indicates the debugging module this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static GHashTable *option_dbs = NULL;
static int last_db_handle = 0;
Index: gnc-component-manager.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/gnc-component-manager.c,v
retrieving revision 1.13.4.4
retrieving revision 1.13.4.5
diff -Lsrc/app-utils/gnc-component-manager.c -Lsrc/app-utils/gnc-component-manager.c -u -r1.13.4.4 -r1.13.4.5
--- src/app-utils/gnc-component-manager.c
+++ src/app-utils/gnc-component-manager.c
@@ -23,7 +23,7 @@
#include "Group.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
#include "gnc-ui-util.h"
@@ -72,7 +72,7 @@
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/** Prototypes ******************************************************/
Index: guile-util.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/guile-util.c,v
retrieving revision 1.9.4.4
retrieving revision 1.9.4.5
diff -Lsrc/app-utils/guile-util.c -Lsrc/app-utils/guile-util.c -u -r1.9.4.4 -r1.9.4.5
--- src/app-utils/guile-util.c
+++ src/app-utils/guile-util.c
@@ -23,7 +23,7 @@
#include <string.h>
#include "global-options.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
#include "engine-helpers.h"
#include "glib-helpers.h"
#include "gnc-gconf-utils.h"
@@ -35,7 +35,7 @@
#include "guile-mappings.h"
/* This static indicates the debugging module this .o belongs to. */
-static short module = MOD_GUILE;
+static QofLogModule log_module = GNC_MOD_GUILE;
struct _setters
@@ -1153,5 +1153,3 @@
return g_strdup(string);
return NULL;
}
-
-
Index: file-utils.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/file-utils.c,v
retrieving revision 1.1.6.5
retrieving revision 1.1.6.6
diff -Lsrc/app-utils/file-utils.c -Lsrc/app-utils/file-utils.c -u -r1.1.6.5 -r1.1.6.6
--- src/app-utils/file-utils.c
+++ src/app-utils/file-utils.c
@@ -33,10 +33,10 @@
#include "file-utils.h"
#include "messages.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUILE;
+static QofLogModule log_module = GNC_MOD_GUILE;
/********************************************************************\
\********************************************************************/
Index: gnc-ui-util.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/gnc-ui-util.c,v
retrieving revision 1.39.2.10
retrieving revision 1.39.2.11
diff -Lsrc/app-utils/gnc-ui-util.c -Lsrc/app-utils/gnc-ui-util.c -u -r1.39.2.10 -r1.39.2.11
--- src/app-utils/gnc-ui-util.c
+++ src/app-utils/gnc-ui-util.c
@@ -39,12 +39,11 @@
#include "Account.h"
#include "gnc-book.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
#include "gnc-engine.h"
#include "gnc-euro.h"
#include "gnc-gconf-utils.h"
#include "gnc-module.h"
-#include "gnc-session.h"
#include "gnc-ui-util.h"
#include "Group.h"
#include "messages.h"
@@ -52,7 +51,7 @@
#include "guile-mappings.h"
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static gboolean auto_decimal_enabled = FALSE;
static int auto_decimal_places = 2; /* default, can be changed */
Index: sixtp.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/sixtp.c,v
retrieving revision 1.7.4.5
retrieving revision 1.7.4.6
diff -Lsrc/backend/file/sixtp.c -Lsrc/backend/file/sixtp.c -u -r1.7.4.5 -r1.7.4.6
--- src/backend/file/sixtp.c
+++ src/backend/file/sixtp.c
@@ -33,10 +33,7 @@
#include "sixtp-parsers.h"
#include "sixtp-stack.h"
-#include "gnc-engine-util.h"
-
-
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
/************************************************************************/
gboolean
Index: gnc-account-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-account-xml-v2.c,v
retrieving revision 1.13.4.4
retrieving revision 1.13.4.5
diff -Lsrc/backend/file/gnc-account-xml-v2.c -Lsrc/backend/file/gnc-account-xml-v2.c -u -r1.13.4.4 -r1.13.4.5
--- src/backend/file/gnc-account-xml-v2.c
+++ src/backend/file/gnc-account-xml-v2.c
@@ -30,7 +30,6 @@
#include <string.h>
#include "gnc-xml-helper.h"
-
#include "sixtp.h"
#include "sixtp-utils.h"
#include "sixtp-parsers.h"
@@ -45,10 +44,9 @@
#include "sixtp-dom-parsers.h"
#include "AccountP.h"
#include "Account.h"
-#include "gnc-engine-util.h"
#include "Group.h"
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *account_version_string = "2.0.0";
Index: io-gncxml-v1.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/io-gncxml-v1.c,v
retrieving revision 1.20.4.6
retrieving revision 1.20.4.7
diff -Lsrc/backend/file/io-gncxml-v1.c -Lsrc/backend/file/io-gncxml-v1.c -u -r1.20.4.6 -r1.20.4.7
--- src/backend/file/io-gncxml-v1.c
+++ src/backend/file/io-gncxml-v1.c
@@ -45,9 +45,6 @@
#include "TransLog.h"
#include "gnc-pricedb.h"
#include "gnc-pricedb-p.h"
-#include "gnc-engine-util.h"
-#include "qofbook.h"
-
#include "io-gncxml.h"
#include "sixtp.h"
@@ -134,7 +131,7 @@
*/
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
/* ================================================================= */
/* <version> (lineage <gnc>)
Index: io-gncxml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/io-gncxml-v2.c,v
retrieving revision 1.24.4.9
retrieving revision 1.24.4.10
diff -Lsrc/backend/file/io-gncxml-v2.c -Lsrc/backend/file/io-gncxml-v2.c -u -r1.24.4.9 -r1.24.4.10
--- src/backend/file/io-gncxml-v2.c
+++ src/backend/file/io-gncxml-v2.c
@@ -28,7 +28,6 @@
#include <zlib.h>
#include "gnc-engine.h"
-#include "gnc-engine-util.h"
#include "gnc-pricedb-p.h"
#include "Group.h"
#include "GroupP.h"
@@ -38,9 +37,6 @@
#include "Transaction.h"
#include "TransactionP.h"
#include "TransLog.h"
-#include "qofbackend-p.h"
-#include "qofbook.h"
-
#include "sixtp-dom-parsers.h"
#include "io-gncxml-v2.h"
#include "io-gncxml-gen.h"
@@ -51,8 +47,7 @@
#include "gnc-xml.h"
#include "io-utils.h"
-
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
/* Callback structure */
struct file_backend {
Index: sixtp-utils.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/sixtp-utils.c,v
retrieving revision 1.7.4.8
retrieving revision 1.7.4.9
diff -Lsrc/backend/file/sixtp-utils.c -Lsrc/backend/file/sixtp-utils.c -u -r1.7.4.8 -r1.7.4.9
--- src/backend/file/sixtp-utils.c
+++ src/backend/file/sixtp-utils.c
@@ -37,10 +37,8 @@
#include "sixtp-utils.h"
#include <time.h>
#include <errno.h>
-#include "gnc-date.h"
-#include "gnc-engine-util.h"
-#include "gnc-numeric.h"
-#include "guid.h"
+
+#ifdef GNUCASH_MAJOR_VERSION
#ifndef HAVE_SETENV
#include "setenv.h"
#endif
@@ -50,7 +48,9 @@
#ifndef HAVE_LOCALTIME_R
#include "localtime_r.h"
#endif
-static short module = MOD_IO;
+#endif
+
+static QofLogModule log_module = GNC_MOD_IO;
gboolean
isspace_str(const gchar *str, int nomorethan)
Index: sixtp-dom-generators.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/sixtp-dom-generators.c,v
retrieving revision 1.5.4.6
retrieving revision 1.5.4.7
diff -Lsrc/backend/file/sixtp-dom-generators.c -Lsrc/backend/file/sixtp-dom-generators.c -u -r1.5.4.6 -r1.5.4.7
--- src/backend/file/sixtp-dom-generators.c
+++ src/backend/file/sixtp-dom-generators.c
@@ -33,11 +33,7 @@
#include "sixtp-dom-generators.h"
#include "sixtp-utils.h"
-#include "gnc-engine-util.h"
-#include "kvp_frame.h"
-#include "qofid.h"
-
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
xmlNodePtr
text_to_dom_tree(const char *tag, const char *str)
@@ -391,4 +387,3 @@
return ret;
}
-
Index: io-example-account.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/io-example-account.c,v
retrieving revision 1.12.4.2
retrieving revision 1.12.4.3
diff -Lsrc/backend/file/io-example-account.c -Lsrc/backend/file/io-example-account.c -u -r1.12.4.2 -r1.12.4.3
--- src/backend/file/io-example-account.c
+++ src/backend/file/io-example-account.c
@@ -35,7 +35,6 @@
#include "sixtp.h"
#include "gnc-engine.h"
-#include "gnc-engine-util.h"
#include "gnc-xml.h"
#include "io-example-account.h"
#include "io-gncxml-gen.h"
@@ -48,7 +47,7 @@
#include "Scrub.h"
#include "TransLog.h"
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
#define GNC_ACCOUNT_STRING "gnc-account-example"
#define GNC_ACCOUNT_SHORT "gnc-act:short-description"
Index: gnc-pricedb-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-pricedb-xml-v2.c,v
retrieving revision 1.6.4.4
retrieving revision 1.6.4.5
diff -Lsrc/backend/file/gnc-pricedb-xml-v2.c -Lsrc/backend/file/gnc-pricedb-xml-v2.c -u -r1.6.4.4 -r1.6.4.5
--- src/backend/file/gnc-pricedb-xml-v2.c
+++ src/backend/file/gnc-pricedb-xml-v2.c
@@ -25,8 +25,6 @@
#include <string.h>
-#include "gnc-engine-util.h"
-
#include "gnc-xml.h"
#include "sixtp.h"
#include "sixtp-utils.h"
@@ -39,7 +37,7 @@
#include "gnc-pricedb-p.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
/* Read and Write the pricedb as XML -- something like this:
Index: gnc-commodity-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-commodity-xml-v2.c,v
retrieving revision 1.5.4.4
retrieving revision 1.5.4.5
diff -Lsrc/backend/file/gnc-commodity-xml-v2.c -Lsrc/backend/file/gnc-commodity-xml-v2.c -u -r1.5.4.4 -r1.5.4.5
--- src/backend/file/gnc-commodity-xml-v2.c
+++ src/backend/file/gnc-commodity-xml-v2.c
@@ -37,7 +37,6 @@
#include "sixtp-dom-generators.h"
#include "gnc-xml.h"
-#include "gnc-engine-util.h"
#include "io-gncxml-gen.h"
#include "sixtp-dom-parsers.h"
@@ -45,7 +44,7 @@
#include "Account.h"
#include "Group.h"
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *commodity_version_string = "2.0.0";
Index: sixtp-dom-parsers.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/sixtp-dom-parsers.c,v
retrieving revision 1.12.4.8
retrieving revision 1.12.4.9
diff -Lsrc/backend/file/sixtp-dom-parsers.c -Lsrc/backend/file/sixtp-dom-parsers.c -u -r1.12.4.8 -r1.12.4.9
--- src/backend/file/sixtp-dom-parsers.c
+++ src/backend/file/sixtp-dom-parsers.c
@@ -27,15 +27,11 @@
#include <string.h>
#include "gnc-xml-helper.h"
-#include "gnc-engine-util.h"
-#include "gnc-commodity.h"
#include "gnc-engine.h"
-#include "qofid.h"
-
#include "sixtp-utils.h"
#include "sixtp-dom-parsers.h"
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
GUID*
dom_tree_to_guid(xmlNodePtr node)
Index: gnc-book-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-book-xml-v2.c,v
retrieving revision 1.6.4.7
retrieving revision 1.6.4.8
diff -Lsrc/backend/file/gnc-book-xml-v2.c -Lsrc/backend/file/gnc-book-xml-v2.c -u -r1.6.4.7 -r1.6.4.8
--- src/backend/file/gnc-book-xml-v2.c
+++ src/backend/file/gnc-book-xml-v2.c
@@ -46,8 +46,6 @@
#include "sixtp-dom-parsers.h"
#include "gnc-engine-util.h"
#include "Group.h"
-#include "qofbook.h"
-#include "qofid-p.h"
/* non-static because it's used in io-gncxml-v2.c */
const gchar *gnc_v2_book_version_string = "2.0.0";
@@ -57,7 +55,7 @@
#define book_id_string "book:id"
#define book_slots_string "book:slots"
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
/* ================================================================ */
@@ -331,4 +329,3 @@
{
return sixtp_dom_parser_new(gnc_book_slots_end_handler, NULL, NULL);
}
-
Index: sixtp.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/sixtp.h,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -Lsrc/backend/file/sixtp.h -Lsrc/backend/file/sixtp.h -u -r1.6.4.1 -r1.6.4.2
--- src/backend/file/sixtp.h
+++ src/backend/file/sixtp.h
@@ -30,6 +30,7 @@
#include <stdarg.h>
#include "gnc-xml-helper.h"
+#include "gnc-engine.h"
typedef struct _sixtp_child_result sixtp_child_result;
Index: gnc-lot-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-lot-xml-v2.c,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -Lsrc/backend/file/gnc-lot-xml-v2.c -Lsrc/backend/file/gnc-lot-xml-v2.c -u -r1.4.4.3 -r1.4.4.4
--- src/backend/file/gnc-lot-xml-v2.c
+++ src/backend/file/gnc-lot-xml-v2.c
@@ -41,13 +41,11 @@
#include "gnc-xml.h"
#include "io-gncxml-gen.h"
#include "io-gncxml-v2.h"
-#include "qofid-p.h"
#include "sixtp-dom-parsers.h"
#include "gnc-lot.h"
#include "gnc-lot-p.h"
-#include "gnc-engine-util.h"
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *lot_version_string = "2.0.0";
Index: gnc-schedxaction-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-schedxaction-xml-v2.c,v
retrieving revision 1.18.4.5
retrieving revision 1.18.4.6
diff -Lsrc/backend/file/gnc-schedxaction-xml-v2.c -Lsrc/backend/file/gnc-schedxaction-xml-v2.c -u -r1.18.4.5 -r1.18.4.6
--- src/backend/file/gnc-schedxaction-xml-v2.c
+++ src/backend/file/gnc-schedxaction-xml-v2.c
@@ -31,7 +31,6 @@
#include "SX-book.h"
#include "gnc-xml-helper.h"
-#include "gnc-engine-util.h"
#include "sixtp.h"
#include "sixtp-utils.h"
@@ -47,7 +46,7 @@
#include "sixtp-dom-parsers.h"
-static short module = MOD_SX;
+static QofLogModule log_module = GNC_MOD_SX;
/**
* The XML output should look something like:
Index: io-gncbin-r.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/io-gncbin-r.c,v
retrieving revision 1.15.2.8
retrieving revision 1.15.2.9
diff -Lsrc/backend/file/io-gncbin-r.c -Lsrc/backend/file/io-gncbin-r.c -u -r1.15.2.8 -r1.15.2.9
--- src/backend/file/io-gncbin-r.c
+++ src/backend/file/io-gncbin-r.c
@@ -93,7 +93,6 @@
#include "config.h"
-#include "kvp_frame.h"
#include "Account.h"
#include "AccountP.h"
#include "io-gncbin.h"
@@ -103,12 +102,7 @@
#include "Transaction.h"
#include "TransactionP.h"
#include "TransLog.h"
-#include "qofbackend.h"
-#include "qofbook.h"
-#include "gnc-commodity.h"
-#include "gnc-date.h"
#include "gnc-engine.h"
-#include "gnc-engine-util.h"
#include "gnc-pricedb.h"
#include "gnc-pricedb-p.h"
@@ -125,7 +119,7 @@
*/
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
/** GLOBALS *********************************************************/
Index: qsf-xml.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/qsf/Attic/qsf-xml.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -Lsrc/backend/qsf/qsf-xml.c -Lsrc/backend/qsf/qsf-xml.c -u -r1.1.2.7 -r1.1.2.8
--- src/backend/qsf/qsf-xml.c
+++ src/backend/qsf/qsf-xml.c
@@ -24,9 +24,11 @@
#define _GNU_SOURCE
#include <libxml/xmlversion.h>
+#include "qof-backend-qsf.h"
#include "qsf-dir.h"
#include "qsf-xml.h"
-static int module = MOD_BACKEND;
+
+static QofLogModule log_module = QOF_MOD_QSF;
void qsf_free_params(qsf_param *params)
{
Index: qof-backend-qsf.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/qsf/Attic/qof-backend-qsf.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/backend/qsf/qof-backend-qsf.h -Lsrc/backend/qsf/qof-backend-qsf.h -u -r1.1.2.2 -r1.1.2.3
--- src/backend/qsf/qof-backend-qsf.h
+++ src/backend/qsf/qof-backend-qsf.h
@@ -123,13 +123,11 @@
#ifndef _QOF_BACKEND_QSF_H
#define _QOF_BACKEND_QSF_H
+#include "gnc-trace.h"
#include "qofbackend.h"
#include "qof-be-utils.h"
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+#define QOF_MOD_QSF "qof-backend-qsf"
/** \brief Describe this backend to the application.
@@ -146,10 +144,6 @@
*/
QofBackend* qsf_backend_new(void);
-#ifdef __cplusplus
-}
-#endif
-
/** @} */
/** @} */
Index: gncEmployee.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncEmployee.c,v
retrieving revision 1.15.4.6
retrieving revision 1.15.4.7
diff -Lsrc/business/business-core/gncEmployee.c -Lsrc/business/business-core/gncEmployee.c -u -r1.15.4.6 -r1.15.4.7
--- src/business/business-core/gncEmployee.c
+++ src/business/business-core/gncEmployee.c
@@ -31,27 +31,10 @@
#include <glib.h>
#include <string.h>
-#include "guid.h"
-#include "qof-be-utils.h"
-#include "qofbook.h"
-#include "qofclass.h"
-#include "qofid-p.h"
-#include "qofbackend-p.h"
-#include "qofinstance-p.h"
-#include "qofobject.h"
-#include "qofquery.h"
-#include "qofquerycore.h"
-
#include "Account.h"
#include "messages.h"
#include "gnc-commodity.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
-
#include "gncAddressP.h"
-#ifdef GNUCASH_MAJOR_VERSION
-#include "gncBusiness.h"
-#endif
#include "gncEmployee.h"
#include "gncEmployeeP.h"
@@ -72,7 +55,7 @@
Account * ccard_acc;
};
-static short module = MOD_BUSINESS;
+static QofLogModule log_module = GNC_MOD_BUSINESS;
#define _GNC_MOD_NAME GNC_ID_EMPLOYEE
Index: gncInvoice.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncInvoice.c,v
retrieving revision 1.56.4.14
retrieving revision 1.56.4.15
diff -Lsrc/business/business-core/gncInvoice.c -Lsrc/business/business-core/gncInvoice.c -u -r1.56.4.14 -r1.56.4.15
--- src/business/business-core/gncInvoice.c
+++ src/business/business-core/gncInvoice.c
@@ -31,28 +31,9 @@
#include <glib.h>
-#include "qof-be-utils.h"
-#include "qofbook.h"
-#include "qofclass.h"
-#include "qofid-p.h"
-#include "qofinstance-p.h"
-#include "qofobject.h"
-#include "qofquerycore.h"
-#include "qofquery.h"
-
#include "Transaction.h"
#include "Account.h"
#include "messages.h"
-#include "gnc-numeric.h"
-#include "kvp_frame.h"
-#include "gnc-engine-util.h"
-
-#include "gnc-event.h"
-#include "gnc-lot.h"
-#ifdef GNUCASH_MAJOR_VERSION
-#include "gncBusiness.h"
-#endif
-
#include "gncBillTermP.h"
#include "gncEntry.h"
#include "gncEntryP.h"
@@ -88,7 +69,7 @@
GNCLot *posted_lot;
};
-static short module = MOD_BUSINESS;
+static QofLogModule log_module = GNC_MOD_BUSINESS;
#define _GNC_MOD_NAME GNC_ID_INVOICE
Index: gncCustomer.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncCustomer.c,v
retrieving revision 1.20.4.9
retrieving revision 1.20.4.10
diff -Lsrc/business/business-core/gncCustomer.c -Lsrc/business/business-core/gncCustomer.c -u -r1.20.4.9 -r1.20.4.10
--- src/business/business-core/gncCustomer.c
+++ src/business/business-core/gncCustomer.c
@@ -32,19 +32,7 @@
#include <string.h>
#include "messages.h"
-#include "gnc-engine-util.h"
#include "gnc-commodity.h"
-#include "gnc-numeric.h"
-#include "gnc-event.h"
-
-#include "qof-be-utils.h"
-#include "qofbook.h"
-#include "qofclass.h"
-#include "qofid-p.h"
-#include "qofinstance-p.h"
-#include "qofobject.h"
-#include "qofquerycore.h"
-#include "qofquery.h"
#include "gncAddressP.h"
#include "gncBillTermP.h"
@@ -81,7 +69,7 @@
GncAddress * shipaddr;
};
-static short module = MOD_BUSINESS;
+static QofLogModule log_module = GNC_MOD_BUSINESS;
#define _GNC_MOD_NAME GNC_ID_CUSTOMER
Index: gncVendor.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncVendor.c,v
retrieving revision 1.21.4.6
retrieving revision 1.21.4.7
diff -Lsrc/business/business-core/gncVendor.c -Lsrc/business/business-core/gncVendor.c -u -r1.21.4.6 -r1.21.4.7
--- src/business/business-core/gncVendor.c
+++ src/business/business-core/gncVendor.c
@@ -31,28 +31,11 @@
#include <glib.h>
#include <string.h>
-#include "guid.h"
-#include "qof-be-utils.h"
-#include "qofbook.h"
-#include "qofclass.h"
-#include "qofid-p.h"
-#include "qofinstance-p.h"
-#include "qofobject.h"
-#include "qofquery.h"
-#include "qofquerycore.h"
-
#include "messages.h"
#include "gnc-commodity.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
-
#include "gncAddressP.h"
#include "gncBillTermP.h"
#include "gncInvoice.h"
-#ifdef GNUCASH_MAJOR_VERSION
-#include "gncBusiness.h"
-#endif
-
#include "gncJobP.h"
#include "gncTaxTableP.h"
#include "gncVendor.h"
@@ -75,7 +58,7 @@
GList * jobs;
};
-static short module = MOD_BUSINESS;
+static QofLogModule log_module = GNC_MOD_BUSINESS;
#define _GNC_MOD_NAME GNC_ID_VENDOR
Index: gncJob.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncJob.c,v
retrieving revision 1.18.4.8
retrieving revision 1.18.4.9
diff -Lsrc/business/business-core/gncJob.c -Lsrc/business/business-core/gncJob.c -u -r1.18.4.8 -r1.18.4.9
--- src/business/business-core/gncJob.c
+++ src/business/business-core/gncJob.c
@@ -31,26 +31,7 @@
#include <glib.h>
#include <string.h>
-#include "guid.h"
#include "messages.h"
-#include "gnc-engine-util.h"
-#include "gnc-numeric.h"
-#include "gnc-event.h"
-
-#include "qof-be-utils.h"
-#include "qofbook.h"
-#include "qofclass.h"
-#include "qofinstance.h"
-#include "qofinstance-p.h"
-#include "qofid.h"
-#include "qofid-p.h"
-#include "qofobject.h"
-#include "qofquery.h"
-#include "qofquerycore.h"
-#include "qofbackend-p.h"
-#ifdef GNUCASH_MAJOR_VERSION
-#include "gncBusiness.h"
-#endif
#include "gncInvoice.h"
#include "gncJob.h"
#include "gncJobP.h"
@@ -66,7 +47,7 @@
gboolean active;
};
-static short module = MOD_BUSINESS;
+static QofLogModule log_module = GNC_MOD_BUSINESS;
#define _GNC_MOD_NAME GNC_ID_JOB
Index: gncBillTerm.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncBillTerm.c,v
retrieving revision 1.6.4.7
retrieving revision 1.6.4.8
diff -Lsrc/business/business-core/gncBillTerm.c -Lsrc/business/business-core/gncBillTerm.c -u -r1.6.4.7 -r1.6.4.8
--- src/business/business-core/gncBillTerm.c
+++ src/business/business-core/gncBillTerm.c
@@ -31,26 +31,7 @@
#include <glib.h>
#include "messages.h"
-#include "gnc-numeric.h"
#include "gnc-engine.h"
-#include "gnc-engine-util.h"
-#include "qofquerycore.h"
-#include "gnc-event.h"
-#include "kvp_frame.h"
-
-#include "qof-be-utils.h"
-#include "qofbook.h"
-#include "qofclass.h"
-
-#include "qofid-p.h"
-
-#include "qofinstance-p.h"
-#include "qofobject.h"
-#include "qofquery.h"
-/** \todo remove gncBusiness.h to make the object logic library. */
-#ifdef GNUCASH_MAJOR_VERSION
-#include "gncBusiness.h"
-#endif
#include "gncBillTermP.h"
struct _gncBillTerm
@@ -80,7 +61,8 @@
{
GList * terms; /* visible terms */
};
-static short module = MOD_BUSINESS;
+
+static QofLogModule log_module = GNC_MOD_BUSINESS;
#define _GNC_MOD_NAME GNC_ID_BILLTERM
Index: gncEntry.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncEntry.c,v
retrieving revision 1.32.4.7
retrieving revision 1.32.4.8
diff -Lsrc/business/business-core/gncEntry.c -Lsrc/business/business-core/gncEntry.c -u -r1.32.4.7 -r1.32.4.8
--- src/business/business-core/gncEntry.c
+++ src/business/business-core/gncEntry.c
@@ -31,22 +31,6 @@
#include "messages.h"
#include "gnc-commodity.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
-#include "gnc-numeric.h"
-
-#include "qof-be-utils.h"
-#include "qofbook.h"
-#include "qofclass.h"
-#include "qofid.h"
-#include "qofid-p.h"
-#include "qofinstance-p.h"
-#include "qofobject.h"
-#include "qofquery.h"
-#include "qofquerycore.h"
-#ifdef GNUCASH_MAJOR_VERSION
-#include "gncBusiness.h"
-#endif
#include "gncEntry.h"
#include "gncEntryP.h"
@@ -113,7 +97,7 @@
Timespec b_taxtable_modtime;
};
-static short module = MOD_BUSINESS;
+static QofLogModule log_module = GNC_MOD_BUSINESS;
/* You must edit the functions in this block in tandem. KEEP THEM IN
SYNC! */
Index: gncTaxTableP.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncTaxTableP.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Lsrc/business/business-core/gncTaxTableP.h -Lsrc/business/business-core/gncTaxTableP.h -u -r1.1.4.1 -r1.1.4.2
--- src/business/business-core/gncTaxTableP.h
+++ src/business/business-core/gncTaxTableP.h
@@ -30,7 +30,6 @@
#define GNC_TAXTABLEP_H_
#include "gncTaxTable.h"
-#include "qofid-p.h"
gboolean gncTaxTableRegister (void);
Index: gncOrder.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncOrder.c,v
retrieving revision 1.23.4.7
retrieving revision 1.23.4.8
diff -Lsrc/business/business-core/gncOrder.c -Lsrc/business/business-core/gncOrder.c -u -r1.23.4.7 -r1.23.4.8
--- src/business/business-core/gncOrder.c
+++ src/business/business-core/gncOrder.c
@@ -30,23 +30,6 @@
#include <glib.h>
#include "messages.h"
-#include "gnc-numeric.h"
-#include "kvp_frame.h"
-#include "gnc-engine-util.h"
-
-#include "qof-be-utils.h"
-#include "qofbook.h"
-#include "qofclass.h"
-#include "qofid-p.h"
-#include "qofinstance-p.h"
-#include "qofobject.h"
-#include "qofquery.h"
-#include "qofquerycore.h"
-#include "gnc-event.h"
-#ifdef GNUCASH_MAJOR_VERSION
-#include "gncBusiness.h"
-#endif
-
#include "gncEntry.h"
#include "gncEntryP.h"
#include "gncOrder.h"
@@ -70,7 +53,7 @@
Timespec closed;
};
-static short module = MOD_BUSINESS;
+static QofLogModule log_module = GNC_MOD_BUSINESS;
#define _GNC_MOD_NAME GNC_ID_ORDER
Index: gncTaxTable.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncTaxTable.c,v
retrieving revision 1.9.4.7
retrieving revision 1.9.4.8
diff -Lsrc/business/business-core/gncTaxTable.c -Lsrc/business/business-core/gncTaxTable.c -u -r1.9.4.7 -r1.9.4.8
--- src/business/business-core/gncTaxTable.c
+++ src/business/business-core/gncTaxTable.c
@@ -31,24 +31,8 @@
#include <glib.h>
#include "messages.h"
-#include "gnc-numeric.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
-
-#include "qof-be-utils.h"
-#include "qofbook.h"
-#include "qofclass.h"
-#include "qofid-p.h"
-#include "qofinstance-p.h"
-#include "qofobject.h"
-#include "qofquery.h"
-#include "qofquerycore.h"
-#ifdef GNUCASH_MAJOR_VERSION
-#include "gncBusiness.h"
-#endif
#include "gncTaxTableP.h"
-
struct _gncTaxTable
{
QofInstance inst;
@@ -80,7 +64,7 @@
static GncTaxTableEntry * CloneTaxEntry (GncTaxTableEntry*, QofBook *);
-static short module = MOD_BUSINESS;
+static QofLogModule log_module = GNC_MOD_BUSINESS;
/* =============================================================== */
/* You must edit the functions in this block in tandem. KEEP THEM IN
Index: druid-commodity.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/binary-import/druid-commodity.c,v
retrieving revision 1.8.4.7
retrieving revision 1.8.4.8
diff -Lsrc/import-export/binary-import/druid-commodity.c -Lsrc/import-export/binary-import/druid-commodity.c -u -r1.8.4.7 -r1.8.4.8
--- src/import-export/binary-import/druid-commodity.c
+++ src/import-export/binary-import/druid-commodity.c
@@ -35,19 +35,16 @@
#include "dialog-utils.h"
#include "druid-commodity.h"
#include "druid-utils.h"
-#include "gnc-book.h"
#include "gnc-commodity.h"
-#include "gnc-engine-util.h"
#include "gnc-engine.h"
#include "gnc-file.h"
#include "gnc-gui-query.h"
#include "gnc-pricedb-p.h"
-#include "gnc-session.h"
#include "gnc-ui-util.h"
#include "gnc-ui.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
struct _commoditydruid {
GtkWidget * window;
@@ -514,6 +511,6 @@
{
const gchar *book_url;
- book_url = gnc_session_get_url(session);
+ book_url = qof_session_get_url(session);
gnc_import_legacy_commodities(book_url);
}
Index: gnc-log-replay.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/log-replay/gnc-log-replay.c,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -Lsrc/import-export/log-replay/gnc-log-replay.c -Lsrc/import-export/log-replay/gnc-log-replay.c -u -r1.4.2.7 -r1.4.2.8
--- src/import-export/log-replay/gnc-log-replay.c
+++ src/import-export/log-replay/gnc-log-replay.c
@@ -51,8 +51,11 @@
#define GCONF_SECTION "dialogs/log_replay"
-/*static short module = MOD_IMPORT;*/
-static short module = MOD_TEST;
+/* NW: If you want a new log_module, just define
+a unique string either in gnc-engine.h or
+locally.*/
+/*static QofLogModule log_module = GNC_MOD_IMPORT;*/
+static QofLogModule log_module = GNC_MOD_TEST;
/* fprintf (trans_log, "mod guid time_now " \
"date_entered date_posted " \
@@ -502,7 +505,7 @@
char * expected_header = "mod trans_guid split_guid time_now date_entered date_posted acc_guid acc_name num description notes memo action reconciled amount value date_reconciled";
char * record_start_str = "===== START";
- gnc_set_log_level(MOD_IMPORT, GNC_LOG_DEBUG);
+ gnc_set_log_level(GNC_MOD_IMPORT, GNC_LOG_DEBUG);
ENTER(" ");
default_dir = gnc_gconf_get_string(GCONF_SECTION, KEY_LAST_PATH, NULL);
Index: gnc-job-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-job-xml-v2.c,v
retrieving revision 1.4.4.7
retrieving revision 1.4.4.8
diff -Lsrc/business/business-core/file/gnc-job-xml-v2.c -Lsrc/business/business-core/file/gnc-job-xml-v2.c -u -r1.4.4.7 -r1.4.4.8
--- src/business/business-core/file/gnc-job-xml-v2.c
+++ src/business/business-core/file/gnc-job-xml-v2.c
@@ -44,14 +44,11 @@
#include "gncJobP.h"
#include "gnc-job-xml-v2.h"
#include "gnc-owner-xml-v2.h"
-#include "gnc-engine-util.h"
-
-#include "qofobject.h"
#include "xml-helpers.h"
#define _GNC_MOD_NAME GNC_ID_JOB
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *job_version_string = "2.0.0";
Index: gnc-customer-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-customer-xml-v2.c,v
retrieving revision 1.10.4.7
retrieving revision 1.10.4.8
diff -Lsrc/business/business-core/file/gnc-customer-xml-v2.c -Lsrc/business/business-core/file/gnc-customer-xml-v2.c -u -r1.10.4.7 -r1.10.4.8
--- src/business/business-core/file/gnc-customer-xml-v2.c
+++ src/business/business-core/file/gnc-customer-xml-v2.c
@@ -46,16 +46,12 @@
#include "gncTaxTableP.h"
#include "gnc-customer-xml-v2.h"
#include "gnc-address-xml-v2.h"
-#include "gnc-engine-util.h"
-
-#include "qofobject.h"
-#include "qofinstance.h"
#include "xml-helpers.h"
#define _GNC_MOD_NAME GNC_ID_CUSTOMER
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *customer_version_string = "2.0.0";
Index: gnc-address-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-address-xml-v2.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -Lsrc/business/business-core/file/gnc-address-xml-v2.c -Lsrc/business/business-core/file/gnc-address-xml-v2.c -u -r1.1.4.4 -r1.1.4.5
--- src/business/business-core/file/gnc-address-xml-v2.c
+++ src/business/business-core/file/gnc-address-xml-v2.c
@@ -43,9 +43,7 @@
#include "gnc-address-xml-v2.h"
-#include "gnc-engine-util.h"
-
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *address_version_string = "2.0.0";
Index: gnc-owner-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-owner-xml-v2.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -Lsrc/business/business-core/file/gnc-owner-xml-v2.c -Lsrc/business/business-core/file/gnc-owner-xml-v2.c -u -r1.1.4.5 -r1.1.4.6
--- src/business/business-core/file/gnc-owner-xml-v2.c
+++ src/business/business-core/file/gnc-owner-xml-v2.c
@@ -41,17 +41,13 @@
#include "io-gncxml-gen.h"
#include "io-gncxml-v2.h"
-#include "qofinstance.h"
-
#include "gnc-owner-xml-v2.h"
#include "gncCustomerP.h"
#include "gncJobP.h"
#include "gncVendorP.h"
#include "gncEmployeeP.h"
-#include "gnc-engine-util.h"
-
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *owner_version_string = "2.0.0";
Index: gnc-invoice-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-invoice-xml-v2.c,v
retrieving revision 1.12.4.6
retrieving revision 1.12.4.7
diff -Lsrc/business/business-core/file/gnc-invoice-xml-v2.c -Lsrc/business/business-core/file/gnc-invoice-xml-v2.c -u -r1.12.4.6 -r1.12.4.7
--- src/business/business-core/file/gnc-invoice-xml-v2.c
+++ src/business/business-core/file/gnc-invoice-xml-v2.c
@@ -45,14 +45,10 @@
#include "gncInvoiceP.h"
#include "gnc-invoice-xml-v2.h"
#include "gnc-owner-xml-v2.h"
-#include "gnc-engine-util.h"
-
-#include "qofinstance.h"
-#include "qofobject.h"
#define _GNC_MOD_NAME GNC_ID_INVOICE
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *invoice_version_string = "2.0.0";
Index: gnc-vendor-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-vendor-xml-v2.c,v
retrieving revision 1.11.4.6
retrieving revision 1.11.4.7
diff -Lsrc/business/business-core/file/gnc-vendor-xml-v2.c -Lsrc/business/business-core/file/gnc-vendor-xml-v2.c -u -r1.11.4.6 -r1.11.4.7
--- src/business/business-core/file/gnc-vendor-xml-v2.c
+++ src/business/business-core/file/gnc-vendor-xml-v2.c
@@ -46,16 +46,11 @@
#include "gncTaxTableP.h"
#include "gnc-vendor-xml-v2.h"
#include "gnc-address-xml-v2.h"
-#include "gnc-engine-util.h"
-
-#include "qofinstance.h"
-#include "qofobject.h"
-
#include "xml-helpers.h"
#define _GNC_MOD_NAME GNC_ID_VENDOR
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *vendor_version_string = "2.0.0";
Index: gnc-tax-table-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-tax-table-xml-v2.c,v
retrieving revision 1.3.4.8
retrieving revision 1.3.4.9
diff -Lsrc/business/business-core/file/gnc-tax-table-xml-v2.c -Lsrc/business/business-core/file/gnc-tax-table-xml-v2.c -u -r1.3.4.8 -r1.3.4.9
--- src/business/business-core/file/gnc-tax-table-xml-v2.c
+++ src/business/business-core/file/gnc-tax-table-xml-v2.c
@@ -44,14 +44,10 @@
#include "gncEntry.h"
#include "gncTaxTableP.h"
#include "gnc-tax-table-xml-v2.h"
-#include "gnc-engine-util.h"
-
-#include "qofobject.h"
-#include "qofinstance.h"
#define _GNC_MOD_NAME GNC_ID_TAXTABLE
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *taxtable_version_string = "2.0.0";
Index: gnc-bill-term-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-bill-term-xml-v2.c,v
retrieving revision 1.3.4.7
retrieving revision 1.3.4.8
diff -Lsrc/business/business-core/file/gnc-bill-term-xml-v2.c -Lsrc/business/business-core/file/gnc-bill-term-xml-v2.c -u -r1.3.4.7 -r1.3.4.8
--- src/business/business-core/file/gnc-bill-term-xml-v2.c
+++ src/business/business-core/file/gnc-bill-term-xml-v2.c
@@ -46,14 +46,11 @@
#include "gnc-bill-term-xml-v2.h"
#include "gnc-engine-util.h"
-#include "qofinstance.h"
-#include "qofobject.h"
-
#include "xml-helpers.h"
#define _GNC_MOD_NAME GNC_ID_BILLTERM
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *billterm_version_string = "2.0.0";
Index: gnc-entry-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-entry-xml-v2.c,v
retrieving revision 1.11.4.6
retrieving revision 1.11.4.7
diff -Lsrc/business/business-core/file/gnc-entry-xml-v2.c -Lsrc/business/business-core/file/gnc-entry-xml-v2.c -u -r1.11.4.6 -r1.11.4.7
--- src/business/business-core/file/gnc-entry-xml-v2.c
+++ src/business/business-core/file/gnc-entry-xml-v2.c
@@ -47,14 +47,10 @@
#include "gncTaxTableP.h"
#include "gnc-entry-xml-v2.h"
#include "gnc-owner-xml-v2.h"
-#include "gnc-engine-util.h"
-
-#include "qofinstance.h"
-#include "qofobject.h"
#define _GNC_MOD_NAME GNC_ID_ENTRY
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *entry_version_string = "2.0.0";
Index: gnc-employee-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-employee-xml-v2.c,v
retrieving revision 1.6.4.7
retrieving revision 1.6.4.8
diff -Lsrc/business/business-core/file/gnc-employee-xml-v2.c -Lsrc/business/business-core/file/gnc-employee-xml-v2.c -u -r1.6.4.7 -r1.6.4.8
--- src/business/business-core/file/gnc-employee-xml-v2.c
+++ src/business/business-core/file/gnc-employee-xml-v2.c
@@ -44,14 +44,10 @@
#include "gncEmployeeP.h"
#include "gnc-employee-xml-v2.h"
#include "gnc-address-xml-v2.h"
-#include "gnc-engine-util.h"
-
-#include "qofinstance.h"
-#include "qofobject.h"
#define _GNC_MOD_NAME GNC_ID_EMPLOYEE
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *employee_version_string = "2.0.0";
Index: gnc-order-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-order-xml-v2.c,v
retrieving revision 1.4.4.7
retrieving revision 1.4.4.8
diff -Lsrc/business/business-core/file/gnc-order-xml-v2.c -Lsrc/business/business-core/file/gnc-order-xml-v2.c -u -r1.4.4.7 -r1.4.4.8
--- src/business/business-core/file/gnc-order-xml-v2.c
+++ src/business/business-core/file/gnc-order-xml-v2.c
@@ -45,11 +45,10 @@
#include "gnc-order-xml-v2.h"
#include "gnc-owner-xml-v2.h"
-#include "gnc-engine-util.h"
#define _GNC_MOD_NAME GNC_ID_ORDER
-static short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
const gchar *order_version_string = "2.0.0";
Index: gnc-mt940-import.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/mt940/gnc-mt940-import.c,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -Lsrc/import-export/mt940/gnc-mt940-import.c -Lsrc/import-export/mt940/gnc-mt940-import.c -u -r1.2.2.4 -r1.2.2.5
--- src/import-export/mt940/gnc-mt940-import.c
+++ src/import-export/mt940/gnc-mt940-import.c
@@ -44,7 +44,7 @@
#include "Transaction.h"
#include "global-options.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-file.h"
#include "gnc-ui-util.h"
#include "gnc-gconf-utils.h"
@@ -54,7 +54,7 @@
#define GCONF_SECTION "dialogs/import/mt940"
-static short module = MOD_IMPORT;
+static QofLogModule log_module = GNC_MOD_IMPORT;
static void *trans_importer_cb (const HBCI_Transaction *h_trans,
void *user_data);
Index: gnc-plugin-page-invoice.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-gnome/Attic/gnc-plugin-page-invoice.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -Lsrc/business/business-gnome/gnc-plugin-page-invoice.c -Lsrc/business/business-gnome/gnc-plugin-page-invoice.c -u -r1.1.2.4 -r1.1.2.5
--- src/business/business-gnome/gnc-plugin-page-invoice.c
+++ src/business/business-gnome/gnc-plugin-page-invoice.c
@@ -38,7 +38,7 @@
#include "gnc-window.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static void gnc_plugin_page_invoice_class_init (GncPluginPageInvoiceClass *klass);
static void gnc_plugin_page_invoice_init (GncPluginPageInvoice *plugin_page);
Index: gnc-plugin-page-report.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/report-gnome/Attic/gnc-plugin-page-report.c,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -Lsrc/report/report-gnome/gnc-plugin-page-report.c -Lsrc/report/report-gnome/gnc-plugin-page-report.c -u -r1.1.2.18 -r1.1.2.19
--- src/report/report-gnome/gnc-plugin-page-report.c
+++ src/report/report-gnome/gnc-plugin-page-report.c
@@ -35,7 +35,7 @@
#include <sys/stat.h>
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gconf-utils.h"
#include "gnc-gnome-utils.h"
#include "gnc-html-history.h"
@@ -52,7 +52,12 @@
#define WINDOW_REPORT_CM_CLASS "window-report"
-static short module = MOD_GUI; // MOD_GUI; // MOD_REPORT;?
+// MOD_GUI; // MOD_REPORT;?
+/* NW: you can add GNC_MOD_REPORT to gnc-engine.h
+or simply define it locally. Any unique string with
+a gnucash- prefix will do. Then just set a log level
+with gnc_set_log_level().*/
+static QofLogModule log_module = GNC_MOD_GUI;
static GObjectClass *parent_class = NULL;
Index: formulacell.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-core/formulacell.c,v
retrieving revision 1.2.4.3
retrieving revision 1.2.4.4
diff -Lsrc/register/register-core/formulacell.c -Lsrc/register/register-core/formulacell.c -u -r1.2.4.3 -r1.2.4.4
--- src/register/register-core/formulacell.c
+++ src/register/register-core/formulacell.c
@@ -21,13 +21,13 @@
#include "config.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-ui-util.h"
#include "basiccell.h"
#include "formulacell.h"
-static short module = MOD_SX;
+static QofLogModule log_module = GNC_MOD_SX;
static void gnc_formula_cell_init( FormulaCell *fc );
Index: cell-factory.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-core/cell-factory.c,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -Lsrc/register/register-core/cell-factory.c -Lsrc/register/register-core/cell-factory.c -u -r1.2 -r1.2.6.1
--- src/register/register-core/cell-factory.c
+++ src/register/register-core/cell-factory.c
@@ -26,7 +26,7 @@
#include <glib.h>
#include "cell-factory.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
typedef struct cell_record
Index: table-allgui.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-core/table-allgui.c,v
retrieving revision 1.35.4.2
retrieving revision 1.35.4.3
diff -Lsrc/register/register-core/table-allgui.c -Lsrc/register/register-core/table-allgui.c -u -r1.35.4.2 -r1.35.4.3
--- src/register/register-core/table-allgui.c
+++ src/register/register-core/table-allgui.c
@@ -43,7 +43,7 @@
#include "table-allgui.h"
#include "cellblock.h"
#include "dialog-utils.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
/** Static Globals *****************************************************/
@@ -51,7 +51,7 @@
static TableGUIHandlers default_gui_handlers;
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_REGISTER;
+static QofLogModule log_module = GNC_MOD_REGISTER;
/** Prototypes *********************************************************/
Index: recncell.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-core/recncell.c,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -Lsrc/register/register-core/recncell.c -Lsrc/register/register-core/recncell.c -u -r1.7 -r1.7.4.1
--- src/register/register-core/recncell.c
+++ src/register/register-core/recncell.c
@@ -41,7 +41,7 @@
#include <time.h>
#include "basiccell.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "recncell.h"
@@ -204,4 +204,3 @@
cell->flag_order = (char *)flags;
}
-
Index: numcell.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-core/numcell.c,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -Lsrc/register/register-core/numcell.c -Lsrc/register/register-core/numcell.c -u -r1.6.6.1 -r1.6.6.2
--- src/register/register-core/numcell.c
+++ src/register/register-core/numcell.c
@@ -38,7 +38,7 @@
#include <string.h>
#include "numcell.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
/* This static indicates the debugging module that this .o belongs to. */
Index: pricecell.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-core/pricecell.c,v
retrieving revision 1.9.4.2
retrieving revision 1.9.4.3
diff -Lsrc/register/register-core/pricecell.c -Lsrc/register/register-core/pricecell.c -u -r1.9.4.2 -r1.9.4.3
--- src/register/register-core/pricecell.c
+++ src/register/register-core/pricecell.c
@@ -39,8 +39,7 @@
#include <string.h>
#include "gnc-exp-parser.h"
-#include "gnc-engine-util.h"
-#include "gnc-numeric.h"
+#include "gnc-engine.h"
#include "gnc-ui-util.h"
#include "basiccell.h"
Index: checkboxcell.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-core/checkboxcell.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -Lsrc/register/register-core/checkboxcell.c -Lsrc/register/register-core/checkboxcell.c -u -r1.1 -r1.1.4.1
--- src/register/register-core/checkboxcell.c
+++ src/register/register-core/checkboxcell.c
@@ -40,7 +40,7 @@
#include <time.h>
#include "basiccell.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "checkboxcell.h"
Index: basiccell.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-core/basiccell.c,v
retrieving revision 1.10.4.2
retrieving revision 1.10.4.3
diff -Lsrc/register/register-core/basiccell.c -Lsrc/register/register-core/basiccell.c -u -r1.10.4.2 -r1.10.4.3
--- src/register/register-core/basiccell.c
+++ src/register/register-core/basiccell.c
@@ -40,10 +40,10 @@
#include "basiccell.h"
#include "dialog-utils.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
/* Debugging module */
-static short module = MOD_REGISTER;
+static QofLogModule log_module = GNC_MOD_REGISTER;
gboolean
gnc_cell_name_equal (const char * cell_name_1,
Index: Scrub2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Scrub2.c,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -Lsrc/engine/Scrub2.c -Lsrc/engine/Scrub2.c -u -r1.15.2.6 -r1.15.2.7
--- src/engine/Scrub2.c
+++ src/engine/Scrub2.c
@@ -44,15 +44,12 @@
#include "ScrubP.h"
#include "cap-gains.h"
#include "gnc-engine.h"
-#include "gnc-engine-util.h"
#include "gnc-lot.h"
#include "gnc-lot-p.h"
-#include "gnc-trace.h"
-#include "kvp-util-p.h"
#include "messages.h"
#include "policy-p.h"
-static short module = MOD_LOT;
+static QofLogModule log_module = GNC_MOD_LOT;
/* ============================================================== */
/** Loop over all splits, and make sure that every split
Index: gnc-budget-cat.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Attic/gnc-budget-cat.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lsrc/engine/gnc-budget-cat.c -Lsrc/engine/gnc-budget-cat.c -u -r1.1.2.3 -r1.1.2.4
--- src/engine/gnc-budget-cat.c
+++ src/engine/gnc-budget-cat.c
@@ -40,12 +40,11 @@
#include <time.h>
#include "gnc-budget-cat-p.h"
-#include "qofid-p.h"
-#include "gnc-trace.h"
+#include "qof.h"
#include "gnc-budget-period-value.h"
#include "gnc-budget-period.h"
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
GncBudgetCategory *gnc_budget_category_new(QofBook* book, GncBudget* budget)
{
Index: Scrub.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Scrub.c,v
retrieving revision 1.43.4.6
retrieving revision 1.43.4.7
diff -Lsrc/engine/Scrub.c -Lsrc/engine/Scrub.c -u -r1.43.4.6 -r1.43.4.7
--- src/engine/Scrub.c
+++ src/engine/Scrub.c
@@ -49,12 +49,10 @@
#include "ScrubP.h"
#include "Transaction.h"
#include "TransactionP.h"
-#include "gnc-engine-util.h"
#include "messages.h"
#include "gnc-commodity.h"
-#include "gnc-trace.h"
-static short module = MOD_SCRUB;
+static QofLogModule log_module = GNC_MOD_SCRUB;
/* ================================================================ */
Index: Group.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Group.c,v
retrieving revision 1.112.4.9
retrieving revision 1.112.4.10
diff -Lsrc/engine/Group.c -Lsrc/engine/Group.c -u -r1.112.4.9 -r1.112.4.10
--- src/engine/Group.c
+++ src/engine/Group.c
@@ -32,16 +32,8 @@
#include "Group.h"
#include "GroupP.h"
#include "TransactionP.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
-#include "gnc-numeric.h"
-#include "gnc-trace.h"
-#include "qofbackend.h"
-#include "qofbook.h"
-#include "qofid-p.h"
-#include "qofobject.h"
-static short module = MOD_ENGINE;
+static QofLogModule log_module = GNC_MOD_ENGINE;
/********************************************************************\
* Because I can't use C++ for this project, doesn't mean that I *
Index: qofbackend.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofbackend.c,v
retrieving revision 1.2.4.6
retrieving revision 1.2.4.7
diff -Lsrc/engine/qofbackend.c -Lsrc/engine/qofbackend.c -u -r1.2.4.6 -r1.2.4.7
--- src/engine/qofbackend.c
+++ src/engine/qofbackend.c
@@ -33,7 +33,7 @@
#include <errno.h>
#include "qofbackend-p.h"
-static short module = MOD_BACKEND;
+static QofLogModule log_module = QOF_MOD_BACKEND;
#define QOF_CONFIG_DESC "desc"
#define QOF_CONFIG_TIP "tip"
Index: qofquerycore.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofquerycore.c,v
retrieving revision 1.8.2.9
retrieving revision 1.8.2.10
diff -Lsrc/engine/qofquerycore.c -Lsrc/engine/qofquerycore.c -u -r1.8.2.9 -r1.8.2.10
--- src/engine/qofquerycore.c
+++ src/engine/qofquerycore.c
@@ -25,13 +25,13 @@
#include <glib.h>
-#include "gnc-engine-util.h"
#include "gnc-trace.h"
+#include "gnc-engine-util.h"
#include "qofquery.h"
#include "qofquerycore.h"
#include "qofquerycore-p.h"
-static short module = MOD_QUERY;
+static QofLogModule log_module = QOF_MOD_QUERY;
/* A function to destroy a query predicate's pdata */
typedef void (*QueryPredDataFree) (QofQueryPredData *pdata);
Index: qofinstance.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofinstance.c,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -Lsrc/engine/qofinstance.c -Lsrc/engine/qofinstance.c -u -r1.10.2.4 -r1.10.2.5
--- src/engine/qofinstance.c
+++ src/engine/qofinstance.c
@@ -37,7 +37,7 @@
#include "qofinstance.h"
#include "qofinstance-p.h"
-static short module = MOD_ENGINE;
+static QofLogModule log_module = QOF_MOD_ENGINE;
/* ========================================================== */
Index: qofsql.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofsql.c,v
retrieving revision 1.5.2.7
retrieving revision 1.5.2.8
diff -Lsrc/engine/qofsql.c -Lsrc/engine/qofsql.c -u -r1.5.2.7 -r1.5.2.8
--- src/engine/qofsql.c
+++ src/engine/qofsql.c
@@ -51,7 +51,7 @@
#include "qofinstance-p.h"
#include "qofobject.h"
-static short module = MOD_QUERY;
+static QofLogModule log_module = QOF_MOD_QUERY;
/* =================================================================== */
Index: Query.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Query.c,v
retrieving revision 1.118.4.4
retrieving revision 1.118.4.5
diff -Lsrc/engine/Query.c -Lsrc/engine/Query.c -u -r1.118.4.4 -r1.118.4.5
--- src/engine/Query.c
+++ src/engine/Query.c
@@ -33,16 +33,13 @@
#include <sys/time.h>
#include <unistd.h>
-#include "gnc-engine-util.h"
-#include "gnc-numeric.h"
#include "gnc-lot.h"
-#include "gnc-trace.h"
#include "Account.h"
#include "Query.h"
#include "Transaction.h"
#include "TransactionP.h"
-static short module = MOD_QUERY;
+static QofLogModule log_module = GNC_MOD_QUERY;
static GSList *
build_param_list_internal (const char *first, va_list rest)
Index: guid.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/guid.c,v
retrieving revision 1.25.4.9
retrieving revision 1.25.4.10
diff -Lsrc/engine/guid.c -Lsrc/engine/guid.c -u -r1.25.4.9 -r1.25.4.10
--- src/engine/guid.c
+++ src/engine/guid.c
@@ -41,6 +41,7 @@
#include "guid.h"
#include "md5.h"
+#include "qofid.h"
#include "gnc-trace.h"
# ifndef P_tmpdir
@@ -59,7 +60,7 @@
static GMemChunk *guid_memchunk = NULL;
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_ENGINE;
+static QofLogModule log_module = QOF_MOD_ENGINE;
/** Memory management routines ***************************************/
static void
Index: gnc-event.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-event.c,v
retrieving revision 1.7.4.6
retrieving revision 1.7.4.7
diff -Lsrc/engine/gnc-event.c -Lsrc/engine/gnc-event.c -u -r1.7.4.6 -r1.7.4.7
--- src/engine/gnc-event.c
+++ src/engine/gnc-event.c
@@ -23,7 +23,6 @@
#include "config.h"
-#include "gnc-engine-util.h"
#include "gnc-event-p.h"
#include "gnc-trace.h"
@@ -45,7 +44,7 @@
static GList *handlers = NULL;
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_ENGINE;
+static QofLogModule log_module = QOF_MOD_ENGINE;
/** Implementations *************************************************/
Index: gnc-pricedb.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-pricedb.h,v
retrieving revision 1.27.4.5
retrieving revision 1.27.4.6
diff -Lsrc/engine/gnc-pricedb.h -Lsrc/engine/gnc-pricedb.h -u -r1.27.4.5 -r1.27.4.6
--- src/engine/gnc-pricedb.h
+++ src/engine/gnc-pricedb.h
@@ -24,15 +24,9 @@
#define GNC_PRICEDB_H
#include <stdio.h>
-
+#include "qof.h"
#include "gnc-commodity.h"
-#include "gnc-date.h"
#include "gnc-engine.h"
-#include "gnc-numeric.h"
-#include "guid.h"
-#include "qofbook.h"
-#include "qofid.h"
-#include "qofinstance.h"
/** @addtogroup PriceDB
@{ */
Index: Scrub3.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Scrub3.c,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -Lsrc/engine/Scrub3.c -Lsrc/engine/Scrub3.c -u -r1.4.4.3 -r1.4.4.4
--- src/engine/Scrub3.c
+++ src/engine/Scrub3.c
@@ -37,10 +37,6 @@
#include "gnc-commodity.h"
#include "gnc-engine.h"
#include "gnc-lot.h"
-#include "gnc-numeric.h"
-#include "gnc-trace.h"
-#include "kvp_frame.h"
-#include "kvp-util-p.h"
#include "policy-p.h"
#include "Account.h"
#include "AccountP.h"
@@ -50,7 +46,7 @@
#include "Transaction.h"
#include "TransactionP.h"
-static short module = MOD_LOT;
+static QofLogModule log_module = GNC_MOD_LOT;
/* ================================================================= */
/** Cap gains are possible only if the lot commodity is not the same
Index: qofgobj.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofgobj.c,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -Lsrc/engine/qofgobj.c -Lsrc/engine/qofgobj.c -u -r1.2.2.4 -r1.2.2.5
--- src/engine/qofgobj.c
+++ src/engine/qofgobj.c
@@ -20,11 +20,10 @@
* *
\********************************************************************/
-#include "gnc-trace.h"
#include "qof.h"
#include "qofgobj.h"
-static short module = MOD_QUERY;
+static QofLogModule log_module = QOF_MOD_QUERY;
static gboolean initialized = FALSE;
static GSList *paramList = NULL;
Index: qofclass.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofclass.c,v
retrieving revision 1.1.6.6
retrieving revision 1.1.6.7
diff -Lsrc/engine/qofclass.c -Lsrc/engine/qofclass.c -u -r1.1.6.6 -r1.1.6.7
--- src/engine/qofclass.c
+++ src/engine/qofclass.c
@@ -25,13 +25,13 @@
#include <glib.h>
-#include "gnc-engine-util.h"
#include "gnc-trace.h"
+#include "gnc-engine-util.h"
#include "qofclass.h"
#include "qofclass-p.h"
#include "qofquery.h"
-static short module = MOD_QUERY;
+static QofLogModule log_module = QOF_MOD_CLASS;
static GHashTable *classTable = NULL;
static GHashTable *sortTable = NULL;
Index: Transaction.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Transaction.c,v
retrieving revision 1.261.4.14
retrieving revision 1.261.4.15
diff -Lsrc/engine/Transaction.c -Lsrc/engine/Transaction.c -u -r1.261.4.14 -r1.261.4.15
--- src/engine/Transaction.c
+++ src/engine/Transaction.c
@@ -39,23 +39,11 @@
#include "TransLog.h"
#include "cap-gains.h"
#include "gnc-commodity.h"
-#include "gnc-date.h"
-#include "gnc-engine-util.h"
#include "gnc-engine.h"
-#include "gnc-event.h"
#include "gnc-lot-p.h"
#include "gnc-lot.h"
-#include "gnc-trace.h"
#include "messages.h"
-#include "qofbackend-p.h"
-#include "qof-be-utils.h"
-#include "qofbook.h"
-#include "qofquery.h"
-#include "qofclass.h"
-#include "qofid-p.h"
-#include "qofobject.h"
-
/*
* Design notes on event-generation: transaction-modified-events
* should not be generated until transacation commit or rollback
@@ -87,7 +75,7 @@
#define ISO_DATELENGTH 32 /* length of an iso 8601 date string. */
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_ENGINE;
+static QofLogModule log_module = GNC_MOD_ENGINE;
G_INLINE_FUNC void check_open (Transaction *trans);
G_INLINE_FUNC void
Index: gnc-hooks.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Attic/gnc-hooks.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -Lsrc/engine/gnc-hooks.c -Lsrc/engine/gnc-hooks.c -u -r1.1.2.10 -r1.1.2.11
--- src/engine/gnc-hooks.c
+++ src/engine/gnc-hooks.c
@@ -29,9 +29,9 @@
#include <g-wrap-wct.h>
#include "gnc-hooks.h"
#include "gnc-hooks-scm.h"
-#include "gnc-trace.h"
+#include "gnc-engine.h"
-static short module = MOD_ENGINE;
+static QofLogModule log_module = GNC_MOD_ENGINE;
static GHashTable* gnc_hooks_list = NULL;
static gboolean gnc_hooks_initialized = FALSE;
Index: FreqSpec.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/FreqSpec.c,v
retrieving revision 1.28.4.10
retrieving revision 1.28.4.11
diff -Lsrc/engine/FreqSpec.c -Lsrc/engine/FreqSpec.c -u -r1.28.4.10 -r1.28.4.11
--- src/engine/FreqSpec.c
+++ src/engine/FreqSpec.c
@@ -84,16 +84,9 @@
#endif
#include "FreqSpecP.h"
-#include "gnc-date.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
-#include "gnc-trace.h"
#include "messages.h"
-#include "qofbook.h"
-#include "qofid-p.h"
-#include "qofinstance-p.h"
-static short module = MOD_SX;
+static QofLogModule log_module = GNC_MOD_SX;
/*
* FIXME: should be in a header file
*/
Index: gnc-associate-account.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-associate-account.c,v
retrieving revision 1.10.4.4
retrieving revision 1.10.4.5
diff -Lsrc/engine/gnc-associate-account.c -Lsrc/engine/gnc-associate-account.c -u -r1.10.4.4 -r1.10.4.5
--- src/engine/gnc-associate-account.c
+++ src/engine/gnc-associate-account.c
@@ -31,12 +31,9 @@
#include "AccountP.h"
#include "gnc-associate-account.h"
#include "gnc-engine.h"
-#include "gnc-engine-util.h"
-#include "gnc-trace.h"
-#include "qofbook.h"
-#include "qofid.h"
+#include "qof.h"
-static short module = MOD_ENGINE;
+static QofLogModule log_module = GNC_MOD_ENGINE;
/* Maps GNCTrackingIncomeCategory to string keys. If this enum
changes, update */
Index: gnc-filepath-utils.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-filepath-utils.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/engine/gnc-filepath-utils.c -Lsrc/engine/gnc-filepath-utils.c -u -r1.1.2.2 -r1.1.2.3
--- src/engine/gnc-filepath-utils.c
+++ src/engine/gnc-filepath-utils.c
@@ -39,11 +39,10 @@
#include <unistd.h>
#include <glib.h>
-
+#include "gnc-engine.h"
#include "gnc-filepath-utils.h"
-#include "gnc-trace.h"
-static short module = MOD_BACKEND;
+static QofLogModule log_module = GNC_MOD_BACKEND;
/* ====================================================================== */
Index: kvp_frame.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/kvp_frame.c,v
retrieving revision 1.30.4.10
retrieving revision 1.30.4.11
diff -Lsrc/engine/kvp_frame.c -Lsrc/engine/kvp_frame.c -u -r1.30.4.10 -r1.30.4.11
--- src/engine/kvp_frame.c
+++ src/engine/kvp_frame.c
@@ -32,9 +32,9 @@
#include <math.h>
#include "gnc-date.h"
+#include "gnc-trace.h"
#include "gnc-engine-util.h"
#include "gnc-numeric.h"
-#include "gnc-trace.h"
#include "guid.h"
#include "kvp_frame.h"
@@ -72,7 +72,7 @@
};
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_KVP;
+static QofLogModule log_module = QOF_MOD_KVP;
/********************************************************************
* KvpFrame functions
Index: gnc-lot.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-lot.c,v
retrieving revision 1.14.4.8
retrieving revision 1.14.4.9
diff -Lsrc/engine/gnc-lot.c -Lsrc/engine/gnc-lot.c -u -r1.14.4.8 -r1.14.4.9
--- src/engine/gnc-lot.c
+++ src/engine/gnc-lot.c
@@ -39,20 +39,13 @@
*/
#include "Account.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
#include "gnc-lot.h"
#include "gnc-lot-p.h"
-#include "gnc-trace.h"
#include "Transaction.h"
#include "TransactionP.h"
-#include "qofbook.h"
-#include "qofclass.h"
-#include "qofid.h"
-#include "qofquery.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_LOT;
+static QofLogModule log_module = GNC_MOD_LOT;
/* ============================================================= */
Index: SchedXaction.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/SchedXaction.c,v
retrieving revision 1.41.4.6
retrieving revision 1.41.4.7
diff -Lsrc/engine/SchedXaction.c -Lsrc/engine/SchedXaction.c -u -r1.41.4.6 -r1.41.4.7
--- src/engine/SchedXaction.c
+++ src/engine/SchedXaction.c
@@ -33,17 +33,10 @@
#include "SX-ttinfo.h"
#include "SchedXactionP.h"
#include "Transaction.h"
-#include "gnc-date.h"
#include "gnc-engine.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
-#include "gnc-trace.h"
-#include "guid.h"
#include "messages.h"
-#include "qofbook.h"
-#include "qofid-p.h"
-static short module = MOD_SX;
+static QofLogModule log_module = GNC_MOD_SX;
/* Local Prototypes *****/
Index: qofid.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofid.c,v
retrieving revision 1.3.2.8
retrieving revision 1.3.2.9
diff -Lsrc/engine/qofid.c -Lsrc/engine/qofid.c -u -r1.3.2.8 -r1.3.2.9
--- src/engine/qofid.c
+++ src/engine/qofid.c
@@ -29,13 +29,13 @@
#include "qofid.h"
#include "qofid-p.h"
-#include "gnc-engine-util.h"
#include "gnc-trace.h"
+#include "gnc-engine-util.h"
#define CACHE_INSERT(str) g_cache_insert(gnc_engine_get_string_cache(), (gpointer)(str));
#define CACHE_REMOVE(str) g_cache_remove(gnc_engine_get_string_cache(), (gpointer)(str));
-static short module = MOD_ENGINE;
+static QofLogModule log_module = QOF_MOD_ENGINE;
struct QofCollection_s
{
Index: policy.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/policy.c,v
retrieving revision 1.2.4.3
retrieving revision 1.2.4.4
diff -Lsrc/engine/policy.c -Lsrc/engine/policy.c -u -r1.2.4.3 -r1.2.4.4
--- src/engine/policy.c
+++ src/engine/policy.c
@@ -40,11 +40,10 @@
#include "gnc-engine.h"
#include "gnc-lot.h"
#include "gnc-lot-p.h"
-#include "gnc-trace.h"
#include "policy.h"
#include "policy-p.h"
-/* static short module = MOD_LOT; */
+//static QofLogModule log_module = GNC_MOD_LOT;
static Split *
DirectionPolicyGetSplit (GNCPolicy *pcy, GNCLot *lot, short reverse)
Index: SX-book.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/SX-book.c,v
retrieving revision 1.7.4.3
retrieving revision 1.7.4.4
diff -Lsrc/engine/SX-book.c -Lsrc/engine/SX-book.c -u -r1.7.4.3 -r1.7.4.4
--- src/engine/SX-book.c
+++ src/engine/SX-book.c
@@ -39,19 +39,13 @@
#include <glib.h>
#include "gnc-engine.h"
-#include "gnc-trace.h"
#include "Group.h"
#include "GroupP.h"
#include "SchedXaction.h"
#include "SX-book.h"
#include "SX-book-p.h"
-#include "qofbook.h"
-#include "qofinstance.h"
-#include "qofinstance-p.h"
-#include "qofobject.h"
-
-static short module = MOD_SX;
+static QofLogModule log_module = GNC_MOD_SX;
/* XXX this whole file is crufty, it doesn't really use entities
* in the most efficient/best way */
Index: gnc-date.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-date.c,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -Lsrc/engine/gnc-date.c -Lsrc/engine/gnc-date.c -u -r1.6.2.9 -r1.6.2.10
--- src/engine/gnc-date.c
+++ src/engine/gnc-date.c
@@ -42,7 +42,6 @@
#include <glib.h>
#include "gnc-date.h"
-#include "gnc-engine-util.h"
#include "gnc-trace.h"
#ifndef HAVE_STRPTIME
@@ -70,7 +69,7 @@
static QofDateFormat prevQofDateFormat = QOF_DATE_FORMAT_LOCALE;
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_ENGINE;
+static QofLogModule log_module = QOF_MOD_ENGINE;
/********************************************************************\
\********************************************************************/
Index: engine-helpers.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/engine-helpers.c,v
retrieving revision 1.24.4.6
retrieving revision 1.24.4.7
diff -Lsrc/engine/engine-helpers.c -Lsrc/engine/engine-helpers.c -u -r1.24.4.6 -r1.24.4.7
--- src/engine/engine-helpers.c
+++ src/engine/engine-helpers.c
@@ -33,18 +33,16 @@
#include "engine-helpers.h"
#include "glib-helpers.h"
#include "gnc-date.h"
-#include "gnc-engine-util.h"
#include "gnc-engine.h"
-#include "gnc-numeric.h"
-#include "gnc-trace.h"
#include "guile-mappings.h"
-#include "qofbook.h"
-#include "qofquery.h"
+#include "qof.h"
+/** \todo Private query headers
+qofquery-p.h and qofquerycore-p.h
+are not exported from QOF */
#include "qofquery-p.h"
-#include "qofquerycore.h"
#include "qofquerycore-p.h"
-static short module = MOD_ENGINE;
+static QofLogModule log_module = GNC_MOD_ENGINE;
Timespec
gnc_transaction_get_date_posted(Transaction *t)
Index: qofobject.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofobject.c,v
retrieving revision 1.6.4.4
retrieving revision 1.6.4.5
diff -Lsrc/engine/qofobject.c -Lsrc/engine/qofobject.c -u -r1.6.4.4 -r1.6.4.5
--- src/engine/qofobject.c
+++ src/engine/qofobject.c
@@ -28,13 +28,13 @@
#include <glib.h>
-#include "gnc-engine-util.h"
#include "gnc-trace.h"
+#include "gnc-engine-util.h"
#include "qofobject.h"
#include "qofobject-p.h"
#include "qofbook.h"
-static short module = MOD_QUERY;
+static QofLogModule log_module = QOF_MOD_OBJECT;
static gboolean object_is_initialized = FALSE;
static GList *object_modules = NULL;
Index: gnc-commodity.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-commodity.c,v
retrieving revision 1.39.4.14
retrieving revision 1.39.4.15
diff -Lsrc/engine/gnc-commodity.c -Lsrc/engine/gnc-commodity.c -u -r1.39.4.14 -r1.39.4.15
--- src/engine/gnc-commodity.c
+++ src/engine/gnc-commodity.c
@@ -35,17 +35,9 @@
#include <regex.h>
#include "gnc-commodity.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
-#include "gnc-trace.h"
-#include "guid.h"
#include "messages.h"
-#include "qofbook.h"
-#include "qofobject.h"
-#include "qofid-p.h"
-#include "qofinstance-p.h"
-static short module = MOD_COMMODITY;
+static QofLogModule log_module = GNC_MOD_COMMODITY;
/* Parts per unit is nominal, i.e. number of 'partname' units in
* a 'unitname' unit. fraction is transactional, i.e. how many
Index: gnc-split-reg.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/gnc-split-reg.c,v
retrieving revision 1.19.4.24
retrieving revision 1.19.4.25
diff -Lsrc/gnome/gnc-split-reg.c -Lsrc/gnome/gnc-split-reg.c -u -r1.19.4.24 -r1.19.4.25
--- src/gnome/gnc-split-reg.c
+++ src/gnome/gnc-split-reg.c
@@ -41,10 +41,9 @@
#include "dialog-scheduledxaction.h"
#include "dialog-sx-from-trans.h"
#include "global-options.h"
-#include "gnc-book.h"
#include "gnc-component-manager.h"
#include "gnc-date-edit.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-err-popup.h"
#include "gnc-euro.h"
#include "gnc-gconf-utils.h"
@@ -58,10 +57,9 @@
#include "table-allgui.h"
#include <libguile.h>
-#include "gnc-engine-util.h"
#include "dialog-utils.h"
-static short module = MOD_SX;
+static QofLogModule log_module = GNC_MOD_SX;
/**
* TODO list:
@@ -651,7 +649,7 @@
static GNCPrice *
account_latest_price (Account *account)
{
- GNCBook *book;
+ QofBook *book;
GNCPriceDB *pdb;
gnc_commodity *commodity;
gnc_commodity *currency;
@@ -669,7 +667,7 @@
static GNCPrice *
account_latest_price_any_currency (Account *account)
{
- GNCBook *book;
+ QofBook *book;
GNCPriceDB *pdb;
gnc_commodity *commodity;
GList *price_list;
Index: gnc-plugin-basic-commands.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-basic-commands.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lsrc/gnome/gnc-plugin-basic-commands.c -Lsrc/gnome/gnc-plugin-basic-commands.c -u -r1.1.2.6 -r1.1.2.7
--- src/gnome/gnc-plugin-basic-commands.c
+++ src/gnome/gnc-plugin-basic-commands.c
@@ -36,7 +36,7 @@
#include "druid-acct-period.h"
#include "druid-loan.h"
#include "druid-merge.h"
-#include "gnc-event.h"
+#include "gnc-engine.h"
#include "gnc-file.h"
#include "gnc-gui-query.h"
#include "gnc-ui.h"
@@ -44,7 +44,7 @@
#include "messages.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static void gnc_plugin_basic_commands_class_init (GncPluginBasicCommandsClass *klass);
static void gnc_plugin_basic_commands_init (GncPluginBasicCommands *plugin);
Index: top-level.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/top-level.c,v
retrieving revision 1.140.4.28
retrieving revision 1.140.4.29
diff -Lsrc/gnome/top-level.c -Lsrc/gnome/top-level.c -u -r1.140.4.28 -r1.140.4.29
--- src/gnome/top-level.c
+++ src/gnome/top-level.c
@@ -44,8 +44,7 @@
#include "file-utils.h"
#include "global-options.h"
#include "gnc-component-manager.h"
-#include "gnc-date.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gconf-utils.h"
#include "gnc-file.h"
#include "gnc-hooks.h"
@@ -72,8 +71,6 @@
#include "gnucash-sheet.h"
#include "gnucash-style.h"
#include "guile-util.h"
-#include "qofbook.h"
-#include "qofsession.h"
#include "messages.h"
#include "top-level.h"
#include "window-report.h"
@@ -85,7 +82,7 @@
/** GLOBALS *********************************************************/
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static int gnome_is_running = FALSE;
static int splash_is_initialized = FALSE;
Index: gnc-plugin-register.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-register.c,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -Lsrc/gnome/gnc-plugin-register.c -Lsrc/gnome/gnc-plugin-register.c -u -r1.1.2.12 -r1.1.2.13
--- src/gnome/gnc-plugin-register.c
+++ src/gnome/gnc-plugin-register.c
@@ -59,7 +59,7 @@
};
static GObjectClass *parent_class = NULL;
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/************************************************************
* Other Functions *
Index: dialog-price-edit-db.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/dialog-price-edit-db.c,v
retrieving revision 1.5.4.14
retrieving revision 1.5.4.15
diff -Lsrc/gnome/dialog-price-edit-db.c -Lsrc/gnome/dialog-price-edit-db.c -u -r1.5.4.14 -r1.5.4.15
--- src/gnome/dialog-price-edit-db.c
+++ src/gnome/dialog-price-edit-db.c
@@ -36,7 +36,7 @@
#include "gnc-component-manager.h"
#include "gnc-currency-edit.h"
#include "gnc-date-edit.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-pricedb.h"
#include "gnc-tree-view-price.h"
#include "gnc-ui.h"
@@ -50,7 +50,7 @@
#define GCONF_SECTION "dialogs/edit_prices"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
void gnc_prices_dialog_window_destroy_cb (GtkObject *object, gpointer data);
Index: druid-hierarchy.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/druid-hierarchy.c,v
retrieving revision 1.21.4.14
retrieving revision 1.21.4.15
diff -Lsrc/gnome/druid-hierarchy.c -Lsrc/gnome/druid-hierarchy.c -u -r1.21.4.14 -r1.21.4.15
--- src/gnome/druid-hierarchy.c
+++ src/gnome/druid-hierarchy.c
@@ -40,7 +40,6 @@
#include "gnc-gconf-utils.h"
#include "gnc-hooks.h"
#include "gnc-component-manager.h"
-#include "gnc-event-p.h"
#include "../gnome-utils/gnc-dir.h"
#include "gnc-gui-query.h"
#include "gnc-tree-model-example-account.h"
@@ -50,10 +49,9 @@
#include "global-options.h"
#include "io-example-account.h"
#include "top-level.h"
-#include "qofbook.h"
-#include "gnc-trace.h"
-static short module = MOD_IMPORT;
+#include "gnc-engine.h"
+static QofLogModule log_module = GNC_MOD_IMPORT;
#define GCONF_SECTION "dialogs/new_hierarchy"
@@ -219,8 +217,8 @@
balance = gnc_numeric_neg (balance);
set_final_balance (data->balance_hash, account, balance);
- gnc_engine_generate_event (xaccAccountGetGUID(account),
- GNC_ID_ACCOUNT, GNC_EVENT_MODIFY);
+ gnc_engine_gen_event ((QofEntity*)account,
+ GNC_EVENT_MODIFY);
}
}
Index: dialog-scheduledxaction.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/dialog-scheduledxaction.c,v
retrieving revision 1.71.2.16
retrieving revision 1.71.2.17
diff -Lsrc/gnome/dialog-scheduledxaction.c -Lsrc/gnome/dialog-scheduledxaction.c -u -r1.71.2.16 -r1.71.2.17
--- src/gnome/dialog-scheduledxaction.c
+++ src/gnome/dialog-scheduledxaction.c
@@ -40,7 +40,7 @@
#include "gnc-date-edit.h"
#include "gnc-dense-cal.h"
#include "gnc-embedded-window.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-frequency.h"
#include "gnc-gconf-utils.h"
#include "gnc-gui-query.h"
@@ -63,7 +63,7 @@
#include <langinfo.h>
#endif
-static short module = MOD_SX;
+static QofLogModule log_module = GNC_MOD_SX;
#define SX_LIST_GCONF_SECTION "dialogs/scheduled_trans/transaction_list"
#define SX_LIST_WIN_PREFIX "sx_list_win"
Index: dialog-fincalc.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/dialog-fincalc.c,v
retrieving revision 1.26.4.3
retrieving revision 1.26.4.4
diff -Lsrc/gnome/dialog-fincalc.c -Lsrc/gnome/dialog-fincalc.c -u -r1.26.4.3 -r1.26.4.4
--- src/gnome/dialog-fincalc.c
+++ src/gnome/dialog-fincalc.c
@@ -35,7 +35,7 @@
#include "gnc-commodity.h"
#include "gnc-component-manager.h"
#include "gnc-date-edit.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gui-query.h"
#include "messages.h"
@@ -89,7 +89,7 @@
};
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/** Prototypes **********************************************************/
Index: gnc-plugin-page-register.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-page-register.c,v
retrieving revision 1.1.2.38
retrieving revision 1.1.2.39
diff -Lsrc/gnome/gnc-plugin-page-register.c -Lsrc/gnome/gnc-plugin-page-register.c -u -r1.1.2.38 -r1.1.2.39
--- src/gnome/gnc-plugin-page-register.c
+++ src/gnome/gnc-plugin-page-register.c
@@ -58,10 +58,10 @@
#include "window-report.h"
#include "messages.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
#define DEFAULT_LINES_OPTION_SECTION GCONF_GENERAL_REGISTER
#define DEFAULT_LINES_OPTION_NAME KEY_NUMBER_OF_ROWS
Index: dialog-sx-from-trans.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/dialog-sx-from-trans.c,v
retrieving revision 1.26.4.6
retrieving revision 1.26.4.7
diff -Lsrc/gnome/dialog-sx-from-trans.c -Lsrc/gnome/dialog-sx-from-trans.c -u -r1.26.4.6 -r1.26.4.7
--- src/gnome/dialog-sx-from-trans.c
+++ src/gnome/dialog-sx-from-trans.c
@@ -26,6 +26,7 @@
#include <gnome.h>
+#include "gnc-engine.h"
#include "SX-book.h"
#include "SX-book-p.h"
#include "SX-ttinfo.h"
@@ -35,7 +36,6 @@
#include "dialog-sx-from-trans.h"
#include "dialog-utils.h"
#include "global-options.h"
-#include "gnc-book.h"
#include "gnc-date-edit.h"
#include "gnc-engine-util.h"
#include "gnc-gconf-utils.h"
@@ -68,7 +68,7 @@
#define SXFTD_RESPONSE_ADVANCED 100 /* 'Advanced' button response code */
-static short module = MOD_SX;
+static QofLogModule log_module = GNC_MOD_SX;
static void sxftd_freq_option_changed( GtkWidget *w, gpointer user_data );
static void gnc_sx_trans_window_response_cb(GtkDialog *dialog, gint response, gpointer data);
@@ -549,7 +549,7 @@
static void
sxftd_ok_clicked(SXFromTransInfo *sxfti)
{
- GNCBook *book;
+ QofBook *book;
GList *sx_list;
guint sx_error = sxftd_compute_sx(sxfti);
@@ -817,4 +817,3 @@
gtk_widget_show_all(GTK_WIDGET(sxfti->dialog));
}
-
Index: dialog-totd.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/dialog-totd.c,v
retrieving revision 1.13.4.5
retrieving revision 1.13.4.6
diff -Lsrc/gnome/dialog-totd.c -Lsrc/gnome/dialog-totd.c -u -r1.13.4.5 -r1.13.4.6
--- src/gnome/dialog-totd.c
+++ src/gnome/dialog-totd.c
@@ -30,7 +30,7 @@
#include "dialog-utils.h"
#include "gnc-gconf-utils.h"
#include "gnc-gnome-utils.h"
-#include "gnc-trace.h"
+#include "gnc-engine.h"
#include "messages.h"
@@ -51,7 +51,7 @@
static gint current_tip_number = -1;
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/*********************/
Index: dialog-new-user.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/dialog-new-user.c,v
retrieving revision 1.4.4.12
retrieving revision 1.4.4.13
diff -Lsrc/gnome/dialog-new-user.c -Lsrc/gnome/dialog-new-user.c -u -r1.4.4.12 -r1.4.4.13
--- src/gnome/dialog-new-user.c
+++ src/gnome/dialog-new-user.c
@@ -29,7 +29,7 @@
#include "dialog-utils.h"
#include "druid-hierarchy.h"
#include "global-options.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gconf-utils.h"
#include "gnc-hooks.h"
#include "gnc-ui.h"
@@ -38,7 +38,7 @@
#define FIRST_STARTUP "first_startup"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
/* function to open a qif import druid */
static void (*qifImportDruidFcn)(void) = NULL;
Index: druid-merge.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/druid-merge.c,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -Lsrc/gnome/druid-merge.c -Lsrc/gnome/druid-merge.c -u -r1.2.2.5 -r1.2.2.6
--- src/gnome/druid-merge.c
+++ src/gnome/druid-merge.c
@@ -34,12 +34,11 @@
#include "druid-utils.h"
#include "gnc-component-manager.h"
#include "gnc-gui-query.h"
-#include "qof_book_merge.h"
+#include "qof.h"
#include "druid-hierarchy.h"
#include "gnc-ui-util.h"
#include "Account.h"
#include "global-options.h"
-#include "gnc-trace.h"
#include "Group.h"
static GtkWidget *qof_book_merge_window = NULL;
@@ -53,7 +52,7 @@
QofBook *targetBook = NULL;
gchar *buffer = "";
-static short int module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
void collision_rule_loop ( qof_book_mergeData*, qof_book_mergeRule*, guint );
Index: druid-acct-period.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/druid-acct-period.c,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -Lsrc/gnome/druid-acct-period.c -Lsrc/gnome/druid-acct-period.c -u -r1.8.2.5 -r1.8.2.6
--- src/gnome/druid-acct-period.c
+++ src/gnome/druid-acct-period.c
@@ -48,12 +48,12 @@
#include "gnc-ui-util.h"
#include "misc-gnome-utils.h"
#include "messages.h"
-#include "qofbook.h"
+#include "qof.h"
#define DRUID_ACCT_PERIOD_CM_CLASS "druid-acct-period"
-static short module = MOD_DRUID;
+static QofLogModule log_module = GNC_MOD_DRUID;
/** structures *********************************************************/
typedef struct
Index: druid-loan.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/druid-loan.c,v
retrieving revision 1.17.4.8
retrieving revision 1.17.4.9
diff -Lsrc/gnome/druid-loan.c -Lsrc/gnome/druid-loan.c -u -r1.17.4.8 -r1.17.4.9
--- src/gnome/druid-loan.c
+++ src/gnome/druid-loan.c
@@ -53,7 +53,7 @@
#include "gnc-gui-query.h"
#include "gnc-ui-util.h"
#include "gnc-frequency.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#define DIALOG_LOAN_DRUID_CM_CLASS "druid-loan-setup"
@@ -107,7 +107,7 @@
CUSTOM
} REV_RANGE_OPTS;
-static short module = MOD_SX;
+static QofLogModule log_module = GNC_MOD_SX;
/**
* TODO/fixme:
Index: gnc-plugin-page-account-tree.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-page-account-tree.c,v
retrieving revision 1.1.2.50
retrieving revision 1.1.2.51
diff -Lsrc/gnome/gnc-plugin-page-account-tree.c -Lsrc/gnome/gnc-plugin-page-account-tree.c -u -r1.1.2.50 -r1.1.2.51
--- src/gnome/gnc-plugin-page-account-tree.c
+++ src/gnome/gnc-plugin-page-account-tree.c
@@ -36,7 +36,6 @@
#include "dialog-transfer.h"
#include "druid-merge.h"
#include "global-options.h"
-#include "gnc-book.h"
#include "gnc-component-manager.h"
#include "gnc-gnome-utils.h"
#include "gnc-html.h"
@@ -53,10 +52,10 @@
#include "window-main-summarybar.h"
#include "messages.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
#define PLUGIN_PAGE_ACCT_TREE_CM_CLASS "plugin-page-acct-tree"
#define GCONF_SECTION "window/pages/account_tree"
Index: dialog-sxsincelast.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/dialog-sxsincelast.c,v
retrieving revision 1.65.4.12
retrieving revision 1.65.4.13
diff -Lsrc/gnome/dialog-sxsincelast.c -Lsrc/gnome/dialog-sxsincelast.c -u -r1.65.4.12 -r1.65.4.13
--- src/gnome/dialog-sxsincelast.c
+++ src/gnome/dialog-sxsincelast.c
@@ -64,10 +64,9 @@
#include "SX-book-p.h"
#include "dialog-utils.h"
#include "finvar.h"
-#include "gnc-book.h"
#include "gnc-date.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-exp-parser.h"
#include "gnc-embedded-window.h"
#include "gnc-gconf-utils.h"
@@ -139,7 +138,7 @@
#define READY_TEXT "Ready to create"
#define NEEDS_BINDINGS_TEXT "Needs values for variables"
-static short module = MOD_SX;
+static QofLogModule log_module = GNC_MOD_SX;
/**
* Directions for {forward,back}-page determining.
Index: import-match-map.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/import-match-map.c,v
retrieving revision 1.4.4.4
retrieving revision 1.4.4.5
diff -Lsrc/import-export/import-match-map.c -Lsrc/import-export/import-match-map.c -u -r1.4.4.4 -r1.4.4.5
--- src/import-export/import-match-map.c
+++ src/import-export/import-match-map.c
@@ -33,13 +33,13 @@
#include "kvp_frame.h"
#include "Group.h"
#include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
/********************************************************************\
* Constants *
\********************************************************************/
-static short module = MOD_IMPORT;
+static QofLogModule log_module = GNC_MOD_IMPORT;
struct _GncImportMatchMap {
Index: import-account-matcher.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/import-account-matcher.c,v
retrieving revision 1.7.4.8
retrieving revision 1.7.4.9
diff -Lsrc/import-export/import-account-matcher.c -Lsrc/import-export/import-account-matcher.c -u -r1.7.4.8 -r1.7.4.9
--- src/import-export/import-account-matcher.c
+++ src/import-export/import-account-matcher.c
@@ -33,12 +33,12 @@
#include "dialog-utils.h"
#include "gnc-commodity.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-tree-view-account.h"
#include "gnc-ui.h"
-static short module = MOD_IMPORT;
+static QofLogModule log_module = GNC_MOD_IMPORT;
/*-******************************************************************\
* Structs *
Index: import-parse.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/import-parse.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/import-export/import-parse.c -Lsrc/import-export/import-parse.c -u -r1.1.2.1 -r1.1.2.2
--- src/import-export/import-parse.c
+++ src/import-export/import-parse.c
@@ -35,12 +35,12 @@
#include <sys/types.h>
#include <regex.h>
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-ui-util.h"
#include "import-parse.h"
-static short module = MOD_IMPORT;
+static QofLogModule log_module = GNC_MOD_IMPORT;
/* numeric regular expressions */
static regex_t decimal_radix_regex;
Index: import-main-matcher.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/import-main-matcher.c,v
retrieving revision 1.13.2.7
retrieving revision 1.13.2.8
diff -Lsrc/import-export/import-main-matcher.c -Lsrc/import-export/import-main-matcher.c -u -r1.13.2.7 -r1.13.2.8
--- src/import-export/import-main-matcher.c
+++ src/import-export/import-main-matcher.c
@@ -34,7 +34,7 @@
#include "gnc-ui.h"
#include "global-options.h"
#include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-trace.h"
#include "import-settings.h"
#include "import-match-map.h"
@@ -67,7 +67,7 @@
#define DOWNLOADED_CLIST_ACTION_CLEAR 6
#define DOWNLOADED_CLIST_ACTION_EDIT 7
#define DOWNLOADED_CLIST_ACTION_INFO 8
-static short module = MOD_IMPORT;
+static QofLogModule log_module = GNC_MOD_IMPORT;
/* Local prototypes */
static void automatch_clist_transactions(GNCImportMainMatcher *info, GtkCList *clist, int starting_row);
Index: import-backend.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/import-backend.c,v
retrieving revision 1.19.2.6
retrieving revision 1.19.2.7
diff -Lsrc/import-export/import-backend.c -Lsrc/import-export/import-backend.c -u -r1.19.2.6 -r1.19.2.7
--- src/import-export/import-backend.c
+++ src/import-export/import-backend.c
@@ -41,7 +41,7 @@
#include "global-options.h"
#include "Query.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-ui-util.h"
@@ -52,7 +52,7 @@
* Constants *
\********************************************************************/
-static short module = MOD_IMPORT;
+static QofLogModule log_module = GNC_MOD_IMPORT;
/********************************************************************\
* Constants, should idealy be defined a user preference dialog *
Index: import-commodity-matcher.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/import-commodity-matcher.c,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -Lsrc/import-export/import-commodity-matcher.c -Lsrc/import-export/import-commodity-matcher.c -u -r1.2.4.1 -r1.2.4.2
--- src/import-export/import-commodity-matcher.c
+++ src/import-export/import-commodity-matcher.c
@@ -41,7 +41,7 @@
#include "dialog-commodity.h"
#include "dialog-utils.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-ui-util.h"
@@ -54,7 +54,7 @@
* Constants, should ideally be defined a user preference dialog *
\********************************************************************/
-static short module = MOD_IMPORT;
+static QofLogModule log_module = GNC_MOD_IMPORT;
Index: gnc-ofx-import.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/ofx/gnc-ofx-import.c,v
retrieving revision 1.28.4.9
retrieving revision 1.28.4.10
diff -Lsrc/import-export/ofx/gnc-ofx-import.c -Lsrc/import-export/ofx/gnc-ofx-import.c -u -r1.28.4.9 -r1.28.4.10
--- src/import-export/ofx/gnc-ofx-import.c
+++ src/import-export/ofx/gnc-ofx-import.c
@@ -47,7 +47,7 @@
#include "gnc-associate-account.h"
#include "gnc-ofx-import.h"
#include "gnc-file.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-book.h"
#include "gnc-ui-util.h"
#include "gnc-gconf-utils.h"
@@ -56,7 +56,7 @@
#define GCONF_SECTION "dialogs/import/ofx"
-static short module = MOD_IMPORT;
+static QofLogModule log_module = GNC_MOD_IMPORT;
/********************************************************************\
* gnc_file_ofx_import
@@ -616,7 +616,7 @@
ofx_INFO_msg = true;
ofx_STATUS_msg = false;
- gnc_should_log(MOD_IMPORT, GNC_LOG_TRACE);
+ gnc_should_log(GNC_MOD_IMPORT, GNC_LOG_TRACE);
DEBUG("gnc_file_ofx_import(): Begin...\n");
default_dir = gnc_gconf_get_string(GCONF_SECTION, KEY_LAST_PATH, NULL);
Index: qif-objects.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif/qif-objects.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/import-export/qif/qif-objects.c -Lsrc/import-export/qif/qif-objects.c -u -r1.1.2.2 -r1.1.2.3
--- src/import-export/qif/qif-objects.c
+++ src/import-export/qif/qif-objects.c
@@ -30,13 +30,13 @@
#include <string.h>
#include "Account.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "qif-import-p.h"
#include "qif-objects-p.h"
#include "qif-defaults.h"
-static short module = MOD_IMPORT;
+static QofLogModule log_module = GNC_MOD_IMPORT;
/* create a new object of type t, with type-string type and
* destroy function dest. Requires 'obj' to be set.
Index: qif-parse.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif/qif-parse.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lsrc/import-export/qif/qif-parse.c -Lsrc/import-export/qif/qif-parse.c -u -r1.1.2.3 -r1.1.2.4
--- src/import-export/qif/qif-parse.c
+++ src/import-export/qif/qif-parse.c
@@ -36,7 +36,7 @@
#include <stdarg.h>
#include "messages.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-ui-util.h"
#include "qif-import-p.h"
@@ -44,7 +44,7 @@
#include "import-parse.h"
-static short module = MOD_IMPORT;
+static QofLogModule log_module = GNC_MOD_IMPORT;
/* An array of handlers for the various bang-types */
static QifHandler qif_handlers[QIF_TYPE_MAX+1] = { NULL };
Index: qif-file.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif/qif-file.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/import-export/qif/qif-file.c -Lsrc/import-export/qif/qif-file.c -u -r1.1.2.2 -r1.1.2.3
--- src/import-export/qif/qif-file.c
+++ src/import-export/qif/qif-file.c
@@ -31,12 +31,12 @@
#include <stdio.h>
#include <string.h>
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "qif-import-p.h"
#include "qif-objects-p.h"
-static short module = MOD_IMPORT;
+static QofLogModule log_module = GNC_MOD_IMPORT;
static QifLine
@@ -309,4 +309,3 @@
qif_clear_flag(ctx->parse_flags, QIF_F_TXN_NEEDS_ACCT);
qif_clear_flag(ctx->parse_flags, QIF_F_ITXN_NEEDS_ACCT);
}
-
Index: gnc-http.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/network-utils/gnc-http.c,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -Lsrc/network-utils/gnc-http.c -Lsrc/network-utils/gnc-http.c -u -r1.2.4.4 -r1.2.4.5
--- src/network-utils/gnc-http.c
+++ src/network-utils/gnc-http.c
@@ -54,7 +54,7 @@
#endif
#include "gnc-http.h"
-#include "gnc-engine-util.h" /* To allow PERR messages */
+#include "gnc-engine.h" /* To allow PERR messages */
/* ***Warning*** Find a gnome2 replacement for ghttp ***************/
#if 0
@@ -287,7 +287,7 @@
}
#else
-unsigned short module = MOD_IO;
+static QofLogModule log_module = GNC_MOD_IO;
/* ***Warning*** Find a gnome2 replacement for ghttp ***************/
Index: split-register-control.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/split-register-control.c,v
retrieving revision 1.43.2.6
retrieving revision 1.43.2.7
diff -Lsrc/register/ledger-core/split-register-control.c -Lsrc/register/ledger-core/split-register-control.c -u -r1.43.2.6 -r1.43.2.7
--- src/register/ledger-core/split-register-control.c
+++ src/register/ledger-core/split-register-control.c
@@ -28,7 +28,7 @@
#include "combocell.h"
#include "global-options.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-ui.h"
#include "gnc-ui-util.h"
#include "messages.h"
@@ -42,7 +42,7 @@
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_LEDGER;
+static QofLogModule log_module = GNC_MOD_LEDGER;
static gboolean
Index: split-register-model-save.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/split-register-model-save.c,v
retrieving revision 1.29.4.1
retrieving revision 1.29.4.2
diff -Lsrc/register/ledger-core/split-register-model-save.c -Lsrc/register/ledger-core/split-register-model-save.c -u -r1.29.4.1 -r1.29.4.2
--- src/register/ledger-core/split-register-model-save.c
+++ src/register/ledger-core/split-register-model-save.c
@@ -27,7 +27,7 @@
#include "Scrub.h"
#include "SchedXaction.h"
#include "datecell.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "numcell.h"
#include "pricecell.h"
#include "recncell.h"
@@ -46,7 +46,7 @@
};
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_LEDGER;
+static QofLogModule log_module = GNC_MOD_LEDGER;
static void
Index: split-register-layout.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/split-register-layout.c,v
retrieving revision 1.14.4.3
retrieving revision 1.14.4.4
diff -Lsrc/register/ledger-core/split-register-layout.c -Lsrc/register/ledger-core/split-register-layout.c -u -r1.14.4.3 -r1.14.4.4
--- src/register/ledger-core/split-register-layout.c
+++ src/register/ledger-core/split-register-layout.c
@@ -25,13 +25,13 @@
#include <glib.h>
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "messages.h"
#include "split-register-layout.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_REGISTER;
+static QofLogModule log_module = GNC_MOD_REGISTER;
static void
Index: split-register.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/split-register.c,v
retrieving revision 1.40.2.7
retrieving revision 1.40.2.8
diff -Lsrc/register/ledger-core/split-register.c -Lsrc/register/ledger-core/split-register.c -u -r1.40.2.7 -r1.40.2.8
--- src/register/ledger-core/split-register.c
+++ src/register/ledger-core/split-register.c
@@ -37,7 +37,7 @@
#include "datecell.h"
#include "global-options.h"
#include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gconf-utils.h"
#include "split-register-p.h"
#include "gnc-ledger-display.h"
@@ -61,7 +61,7 @@
/** static variables ******************************************************/
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_LEDGER;
+static QofLogModule log_module = GNC_MOD_LEDGER;
/* The copied split or transaction, if any */
static CursorClass copied_class = CURSOR_CLASS_NONE;
Index: gnc-ledger-display.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/gnc-ledger-display.c,v
retrieving revision 1.24.4.5
retrieving revision 1.24.4.6
diff -Lsrc/register/ledger-core/gnc-ledger-display.c -Lsrc/register/ledger-core/gnc-ledger-display.c -u -r1.24.4.5 -r1.24.4.6
--- src/register/ledger-core/gnc-ledger-display.c
+++ src/register/ledger-core/gnc-ledger-display.c
@@ -36,7 +36,7 @@
#include "gnc-component-manager.h"
#include "gnc-book.h"
#include "gnc-date.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gconf-utils.h"
#include "gnc-ledger-display.h"
#include "gnc-ui-util.h"
@@ -73,7 +73,7 @@
/** GLOBALS *********************************************************/
-static short module = MOD_LEDGER;
+static QofLogModule log_module = GNC_MOD_LEDGER;
/** Declarations ****************************************************/
Index: split-register-model.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/split-register-model.c,v
retrieving revision 1.50.2.6
retrieving revision 1.50.2.7
diff -Lsrc/register/ledger-core/split-register-model.c -Lsrc/register/ledger-core/split-register-model.c -u -r1.50.2.6 -r1.50.2.7
--- src/register/ledger-core/split-register-model.c
+++ src/register/ledger-core/split-register-model.c
@@ -28,7 +28,7 @@
#include "Group.h"
#include "datecell.h"
#include "global-options.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-gconf-utils.h"
#include "gnc-err-popup.h"
#include "gnc-ui.h"
@@ -54,7 +54,7 @@
};
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_LEDGER;
+static QofLogModule log_module = GNC_MOD_LEDGER;
/* Flag for determining colorization of negative amounts. */
static gboolean use_red_for_negative = TRUE;
Index: split-register-util.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/split-register-util.c,v
retrieving revision 1.11.4.1
retrieving revision 1.11.4.2
diff -Lsrc/register/ledger-core/split-register-util.c -Lsrc/register/ledger-core/split-register-util.c -u -r1.11.4.1 -r1.11.4.2
--- src/register/ledger-core/split-register-util.c
+++ src/register/ledger-core/split-register-util.c
@@ -26,12 +26,12 @@
#include <string.h>
#include "global-options.h"
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "pricecell.h"
#include "split-register-p.h"
-static short module = MOD_LEDGER;
+static QofLogModule log_module = GNC_MOD_LEDGER;
/* The routines below create, access, and destroy the SRInfo structure
Index: formulacell-gnome.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-gnome/formulacell-gnome.c,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -Lsrc/register/register-gnome/formulacell-gnome.c -Lsrc/register/register-gnome/formulacell-gnome.c -u -r1.2.4.2 -r1.2.4.3
--- src/register/register-gnome/formulacell-gnome.c
+++ src/register/register-gnome/formulacell-gnome.c
@@ -31,7 +31,7 @@
#include <gnome.h>
#include <locale.h>
-#include "gnc-engine-util.h"
+#include "gnc-engine.h"
#include "gnc-exp-parser.h"
#include "gnc-ui-util.h"
@@ -39,7 +39,7 @@
#include "formulacell.h"
#include "formulacell-gnome.h"
-static short module = MOD_REGISTER;
+static QofLogModule log_module = GNC_MOD_REGISTER;
static
gboolean
Index: gnc-plugin-stylesheets.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/stylesheets/Attic/gnc-plugin-stylesheets.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -Lsrc/report/stylesheets/gnc-plugin-stylesheets.c -Lsrc/report/stylesheets/gnc-plugin-stylesheets.c -u -r1.1.2.5 -r1.1.2.6
--- src/report/stylesheets/gnc-plugin-stylesheets.c
+++ src/report/stylesheets/gnc-plugin-stylesheets.c
@@ -28,11 +28,11 @@
#include "gnc-plugin-page-account-tree.h"
#include "gnc-plugin-stylesheets.h"
#include "gnc-plugin-manager.h"
-#include "gnc-trace.h"
+#include "gnc-engine.h"
#include "messages.h"
/* This static indicates the debugging module that this .o belongs to. */
-static short module = MOD_GUI;
+static QofLogModule log_module = GNC_MOD_GUI;
static void gnc_plugin_stylesheets_class_init (GncPluginStylesheetsClass *klass);
static void gnc_plugin_stylesheets_init (GncPluginStylesheets *plugin);
More information about the gnucash-changes
mailing list