From 3bc9f5680027fad58c211331ce6647f3d95d98b5 Mon Sep 17 00:00:00 2001 From: Phil Longstaff Date: Mon, 13 Jul 2009 16:43:39 +0000 Subject: [PATCH] Replace GNCBook with QofBook git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18203 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/import-export/csv/gnc-csv-model.c | 4 ++-- src/import-export/import-match-map.c | 6 +++--- src/import-export/import-match-map.h | 2 +- src/import-export/log-replay/gnc-log-replay.c | 2 +- src/import-export/ofx/gnc-ofx-import.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/import-export/csv/gnc-csv-model.c b/src/import-export/csv/gnc-csv-model.c index ef734a8824..cc1424ded9 100644 --- a/src/import-export/csv/gnc-csv-model.c +++ b/src/import-export/csv/gnc-csv-model.c @@ -732,7 +732,7 @@ static void trans_property_list_add(TransProperty* property) * @param book The book where the split should be stored * @param amount The amount of the split */ -static void trans_add_split(Transaction* trans, Account* account, GNCBook* book, +static void trans_add_split(Transaction* trans, Account* account, QofBook* book, gnc_numeric amount) { Split* split = xaccMallocSplit(book); @@ -842,7 +842,7 @@ static GncCsvTransLine* trans_property_list_to_trans(TransPropertyList* list, gc { GncCsvTransLine* trans_line = g_new(GncCsvTransLine, 1); GList* properties_begin = list->properties; - GNCBook* book = gnc_account_get_book(list->account); + QofBook* book = gnc_account_get_book(list->account); gnc_commodity* currency = xaccAccountGetCommodity(list->account); gnc_numeric amount = double_to_gnc_numeric(0.0, xaccAccountGetCommoditySCU(list->account), GNC_RND_ROUND); diff --git a/src/import-export/import-match-map.c b/src/import-export/import-match-map.c index a8bf29ab90..635c8edb0e 100644 --- a/src/import-export/import-match-map.c +++ b/src/import-export/import-match-map.c @@ -44,14 +44,14 @@ static QofLogModule log_module = GNC_MOD_IMPORT; struct _GncImportMatchMap { kvp_frame * frame; Account * acc; - GNCBook * book; + QofBook * book; }; #define IMAP_FRAME "import-map" #define IMAP_FRAME_BAYES "import-map-bayes" static GncImportMatchMap * -gnc_imap_create_from_frame (kvp_frame *frame, Account *acc, GNCBook *book) +gnc_imap_create_from_frame (kvp_frame *frame, Account *acc, QofBook *book) { GncImportMatchMap *imap; @@ -84,7 +84,7 @@ GncImportMatchMap * gnc_imap_create_from_account (Account *acc) return gnc_imap_create_from_frame (frame, acc, NULL); } -GncImportMatchMap * gnc_imap_create_from_book (GNCBook *book) +GncImportMatchMap * gnc_imap_create_from_book (QofBook *book) { kvp_frame * frame; diff --git a/src/import-export/import-match-map.h b/src/import-export/import-match-map.h index a824a49df8..18225dc389 100644 --- a/src/import-export/import-match-map.h +++ b/src/import-export/import-match-map.h @@ -37,7 +37,7 @@ typedef struct _GncImportMatchMap GncImportMatchMap; /** @{ Obtain an ImportMatchMap object from an Account or a Book */ GncImportMatchMap * gnc_imap_create_from_account (Account *acc); -GncImportMatchMap * gnc_imap_create_from_book (GNCBook *book); +GncImportMatchMap * gnc_imap_create_from_book (QofBook *book); /*@}*/ /** Destroy an import map. But all stored entries will still continue diff --git a/src/import-export/log-replay/gnc-log-replay.c b/src/import-export/log-replay/gnc-log-replay.c index 0809f46c8b..3b41a3a7c6 100644 --- a/src/import-export/log-replay/gnc-log-replay.c +++ b/src/import-export/log-replay/gnc-log-replay.c @@ -360,7 +360,7 @@ static void process_trans_record( FILE *log_file) Transaction * trans = NULL; Split * split = NULL; Account * acct = NULL; - GNCBook * book = gnc_get_current_book(); + QofBook * book = gnc_get_current_book(); DEBUG("process_trans_record(): Begin...\n"); diff --git a/src/import-export/ofx/gnc-ofx-import.c b/src/import-export/ofx/gnc-ofx-import.c index 356274fc5c..e1c0e03695 100644 --- a/src/import-export/ofx/gnc-ofx-import.c +++ b/src/import-export/ofx/gnc-ofx-import.c @@ -112,7 +112,7 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void * transaction_u gnc_commodity *currency=NULL; gnc_commodity *investment_commodity=NULL; gnc_numeric gnc_amount, gnc_units; - GNCBook *book; + QofBook *book; Transaction *transaction; Split *split; gchar *notes, *tmp;