From e1f224493e30de3792f8dc1ce5c2d4be516d9924 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sat, 16 Oct 2010 10:23:37 +0000 Subject: [PATCH] Replace all occurrences of the old gnc_book_get_pricedb with the newer gnc_pricedb_get_db git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19664 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/backend/sql/gnc-price-sql.c | 4 ++-- src/backend/xml/gnc-book-xml-v2.c | 2 +- src/backend/xml/gnc-pricedb-xml-v2.c | 2 +- src/backend/xml/io-gncxml-v1.c | 2 +- src/backend/xml/io-gncxml-v2.c | 2 +- src/engine/Account.c | 2 +- src/engine/gnc-pricedb.h | 5 +---- src/gnome-utils/dialog-transfer.c | 2 +- src/gnome/druid-stock-split.c | 4 ++-- src/gnome/gnc-split-reg.c | 4 ++-- src/import-export/binary-import/druid-commodity.c | 2 +- 11 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/backend/sql/gnc-price-sql.c b/src/backend/sql/gnc-price-sql.c index 911e7f8d56..e4ab5768ef 100644 --- a/src/backend/sql/gnc-price-sql.c +++ b/src/backend/sql/gnc-price-sql.c @@ -95,7 +95,7 @@ load_all_prices( GncSqlBackend* be ) g_return_if_fail( be != NULL ); pBook = be->primary_book; - pPriceDB = gnc_book_get_pricedb( pBook ); + pPriceDB = gnc_pricedb_get_db( pBook ); stmt = gnc_sql_create_select_statement( be, TABLE_NAME ); if ( stmt != NULL ) { @@ -217,7 +217,7 @@ write_prices( GncSqlBackend* be ) g_return_val_if_fail( be != NULL, FALSE ); - priceDB = gnc_book_get_pricedb( be->primary_book ); + priceDB = gnc_pricedb_get_db( be->primary_book ); data.be = be; data.is_ok = TRUE; diff --git a/src/backend/xml/gnc-book-xml-v2.c b/src/backend/xml/gnc-book-xml-v2.c index 52dea5cdc1..04788be95e 100644 --- a/src/backend/xml/gnc-book-xml-v2.c +++ b/src/backend/xml/gnc-book-xml-v2.c @@ -125,7 +125,7 @@ gnc_book_dom_tree_create(QofBook *book) */ xmlAddChild(ret, gnc_commodity_dom_tree_create( gnc_book_get_commodity_table(book))); - xmlAddChild(ret, gnc_pricedb_dom_tree_create(gnc_book_get_pricedb(book))); + xmlAddChild(ret, gnc_pricedb_dom_tree_create(gnc_pricedb_get_db(book))); if (allow_incompat) { accnode = gnc_account_dom_tree_create(account, FALSE); diff --git a/src/backend/xml/gnc-pricedb-xml-v2.c b/src/backend/xml/gnc-pricedb-xml-v2.c index 55db9448fb..8b9acab803 100644 --- a/src/backend/xml/gnc-pricedb-xml-v2.c +++ b/src/backend/xml/gnc-pricedb-xml-v2.c @@ -264,7 +264,7 @@ pricedb_start_handler(GSList* sibling_data, { gxpf_data *gdata = global_data; QofBook *book = gdata->bookdata; - GNCPriceDB *db = gnc_book_get_pricedb(book); + GNCPriceDB *db = gnc_pricedb_get_db(book); g_return_val_if_fail(db, FALSE); gnc_pricedb_set_bulk_update(db, TRUE); *result = db; diff --git a/src/backend/xml/io-gncxml-v1.c b/src/backend/xml/io-gncxml-v1.c index 4e1dc3a892..8c5312ae90 100644 --- a/src/backend/xml/io-gncxml-v1.c +++ b/src/backend/xml/io-gncxml-v1.c @@ -3803,7 +3803,7 @@ pricedb_start_handler(GSList* sibling_data, gchar **attrs) { GNCParseStatus *pstatus = (GNCParseStatus *) global_data; - GNCPriceDB *db = gnc_book_get_pricedb(pstatus->book); + GNCPriceDB *db = gnc_pricedb_get_db(pstatus->book); g_return_val_if_fail(db, FALSE); *result = db; return(TRUE); diff --git a/src/backend/xml/io-gncxml-v2.c b/src/backend/xml/io-gncxml-v2.c index f0e6199933..9fc0839227 100644 --- a/src/backend/xml/io-gncxml-v2.c +++ b/src/backend/xml/io-gncxml-v2.c @@ -1073,7 +1073,7 @@ write_pricedb(FILE *out, QofBook *book, sixtp_gdv2 *gd) { xmlNodePtr node; - node = gnc_pricedb_dom_tree_create(gnc_book_get_pricedb(book)); + node = gnc_pricedb_dom_tree_create(gnc_pricedb_get_db(book)); if (!node) { diff --git a/src/engine/Account.c b/src/engine/Account.c index 2b76c8e861..01a8ffbe7d 100644 --- a/src/engine/Account.c +++ b/src/engine/Account.c @@ -3293,7 +3293,7 @@ xaccAccountConvertBalanceToCurrencyAsOfDate(const Account *acc, /* for book */ return balance; book = gnc_account_get_book (acc); - pdb = gnc_book_get_pricedb (book); + pdb = gnc_pricedb_get_db (book); ts.tv_sec = date; ts.tv_nsec = 0; diff --git a/src/engine/gnc-pricedb.h b/src/engine/gnc-pricedb.h index 5fdeddfabc..9256656c98 100644 --- a/src/engine/gnc-pricedb.h +++ b/src/engine/gnc-pricedb.h @@ -83,7 +83,7 @@ GType gnc_pricedb_get_type(void); they're really needed. Every QofBook contains a GNCPriceDB, accessible via - gnc_book_get_pricedb. + gnc_pricedb_get_db. \warning The PriceDB does not currently use the object system used elsewhere in the GnuCash Engine, i.e. it does @@ -280,9 +280,6 @@ gboolean gnc_price_list_equal(PriceList *prices1, PriceList *prices2); /** Data type */ typedef struct gnc_price_db_s GNCPriceDB; -/* XXX backwards-compat defines, remove these someday */ -#define gnc_book_get_pricedb gnc_pricedb_get_db - /** return the pricedb associated with the book */ /*@ dependent @*/ GNCPriceDB * gnc_pricedb_get_db(QofBook *book); GNCPriceDB * gnc_collection_get_pricedb(QofCollection *col); diff --git a/src/gnome-utils/dialog-transfer.c b/src/gnome-utils/dialog-transfer.c index b1eb55cb7f..f572611976 100644 --- a/src/gnome-utils/dialog-transfer.c +++ b/src/gnome-utils/dialog-transfer.c @@ -1904,7 +1904,7 @@ gnc_xfer_dialog (GtkWidget * parent, Account * initial) } xferData->book = book; - xferData->pricedb = gnc_book_get_pricedb (book); + xferData->pricedb = gnc_pricedb_get_db (book); gnc_xfer_dialog_create(parent, xferData); diff --git a/src/gnome/druid-stock-split.c b/src/gnome/druid-stock-split.c index 2d19a1e9af..45fc855997 100644 --- a/src/gnome/druid-stock-split.c +++ b/src/gnome/druid-stock-split.c @@ -229,7 +229,7 @@ refresh_details_page (StockSplitInfo *info) commodity = xaccAccountGetCommodity (account); book = gnc_account_get_book (account); - db = gnc_book_get_pricedb(book); + db = gnc_pricedb_get_db(book); prices = gnc_pricedb_lookup_latest_any_currency(db, commodity); if (prices) @@ -486,7 +486,7 @@ gnc_stock_split_druid_finish (GnomeDruidPage *druidpage, gnc_price_commit_edit (price); book = gnc_get_current_book (); - pdb = gnc_book_get_pricedb (book); + pdb = gnc_pricedb_get_db (book); if (!gnc_pricedb_add_price (pdb, price)) gnc_error_dialog (info->window, "%s", _("Error adding price.")); diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c index 30237ce3fa..2b4cbd14ba 100644 --- a/src/gnome/gnc-split-reg.c +++ b/src/gnome/gnc-split-reg.c @@ -505,7 +505,7 @@ account_latest_price (Account *account) currency = gnc_default_currency (); book = gnc_account_get_book (account); - pdb = gnc_book_get_pricedb (book); + pdb = gnc_pricedb_get_db (book); return gnc_pricedb_lookup_latest (pdb, commodity, currency); } @@ -523,7 +523,7 @@ account_latest_price_any_currency (Account *account) commodity = xaccAccountGetCommodity (account); book = gnc_account_get_book (account); - pdb = gnc_book_get_pricedb (book); + pdb = gnc_pricedb_get_db (book); price_list = gnc_pricedb_lookup_latest_any_currency (pdb, commodity); if (!price_list) return NULL; diff --git a/src/import-export/binary-import/druid-commodity.c b/src/import-export/binary-import/druid-commodity.c index 898e62b9a0..da309d548e 100644 --- a/src/import-export/binary-import/druid-commodity.c +++ b/src/import-export/binary-import/druid-commodity.c @@ -462,7 +462,7 @@ finish_helper(gpointer key, gpointer value, gpointer data) comm = gnc_commodity_table_insert(gnc_get_current_commodities(), comm); /* s/old commodity/new commodity/g in the pricedb */ - gnc_pricedb_substitute_commodity(gnc_book_get_pricedb(book), + gnc_pricedb_substitute_commodity(gnc_pricedb_get_db(book), old_comm, comm);