r19664 - gnucash/trunk/src - Replace all occurrences of the old gnc_book_get_pricedb with the newer gnc_pricedb_get_db

Geert Janssens gjanssens at code.gnucash.org
Sat Oct 16 06:23:38 EDT 2010


Author: gjanssens
Date: 2010-10-16 06:23:37 -0400 (Sat, 16 Oct 2010)
New Revision: 19664
Trac: http://svn.gnucash.org/trac/changeset/19664

Modified:
   gnucash/trunk/src/backend/sql/gnc-price-sql.c
   gnucash/trunk/src/backend/xml/gnc-book-xml-v2.c
   gnucash/trunk/src/backend/xml/gnc-pricedb-xml-v2.c
   gnucash/trunk/src/backend/xml/io-gncxml-v1.c
   gnucash/trunk/src/backend/xml/io-gncxml-v2.c
   gnucash/trunk/src/engine/Account.c
   gnucash/trunk/src/engine/gnc-pricedb.h
   gnucash/trunk/src/gnome-utils/dialog-transfer.c
   gnucash/trunk/src/gnome/druid-stock-split.c
   gnucash/trunk/src/gnome/gnc-split-reg.c
   gnucash/trunk/src/import-export/binary-import/druid-commodity.c
Log:
Replace all occurrences of the old gnc_book_get_pricedb with the newer gnc_pricedb_get_db

Modified: gnucash/trunk/src/backend/sql/gnc-price-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-price-sql.c	2010-10-16 02:23:41 UTC (rev 19663)
+++ gnucash/trunk/src/backend/sql/gnc-price-sql.c	2010-10-16 10:23:37 UTC (rev 19664)
@@ -95,7 +95,7 @@
     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 @@
 
     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;

Modified: gnucash/trunk/src/backend/xml/gnc-book-xml-v2.c
===================================================================
--- gnucash/trunk/src/backend/xml/gnc-book-xml-v2.c	2010-10-16 02:23:41 UTC (rev 19663)
+++ gnucash/trunk/src/backend/xml/gnc-book-xml-v2.c	2010-10-16 10:23:37 UTC (rev 19664)
@@ -125,7 +125,7 @@
      */
     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);

Modified: gnucash/trunk/src/backend/xml/gnc-pricedb-xml-v2.c
===================================================================
--- gnucash/trunk/src/backend/xml/gnc-pricedb-xml-v2.c	2010-10-16 02:23:41 UTC (rev 19663)
+++ gnucash/trunk/src/backend/xml/gnc-pricedb-xml-v2.c	2010-10-16 10:23:37 UTC (rev 19664)
@@ -264,7 +264,7 @@
 {
     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;

Modified: gnucash/trunk/src/backend/xml/io-gncxml-v1.c
===================================================================
--- gnucash/trunk/src/backend/xml/io-gncxml-v1.c	2010-10-16 02:23:41 UTC (rev 19663)
+++ gnucash/trunk/src/backend/xml/io-gncxml-v1.c	2010-10-16 10:23:37 UTC (rev 19664)
@@ -3803,7 +3803,7 @@
                       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);

Modified: gnucash/trunk/src/backend/xml/io-gncxml-v2.c
===================================================================
--- gnucash/trunk/src/backend/xml/io-gncxml-v2.c	2010-10-16 02:23:41 UTC (rev 19663)
+++ gnucash/trunk/src/backend/xml/io-gncxml-v2.c	2010-10-16 10:23:37 UTC (rev 19664)
@@ -1073,7 +1073,7 @@
 {
     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)
     {

Modified: gnucash/trunk/src/engine/Account.c
===================================================================
--- gnucash/trunk/src/engine/Account.c	2010-10-16 02:23:41 UTC (rev 19663)
+++ gnucash/trunk/src/engine/Account.c	2010-10-16 10:23:37 UTC (rev 19664)
@@ -3293,7 +3293,7 @@
         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;

Modified: gnucash/trunk/src/engine/gnc-pricedb.h
===================================================================
--- gnucash/trunk/src/engine/gnc-pricedb.h	2010-10-16 02:23:41 UTC (rev 19663)
+++ gnucash/trunk/src/engine/gnc-pricedb.h	2010-10-16 10:23:37 UTC (rev 19664)
@@ -83,7 +83,7 @@
     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 @@
 /** 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);

Modified: gnucash/trunk/src/gnome/druid-stock-split.c
===================================================================
--- gnucash/trunk/src/gnome/druid-stock-split.c	2010-10-16 02:23:41 UTC (rev 19663)
+++ gnucash/trunk/src/gnome/druid-stock-split.c	2010-10-16 10:23:37 UTC (rev 19664)
@@ -229,7 +229,7 @@
 
     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_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."));

Modified: gnucash/trunk/src/gnome/gnc-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-split-reg.c	2010-10-16 02:23:41 UTC (rev 19663)
+++ gnucash/trunk/src/gnome/gnc-split-reg.c	2010-10-16 10:23:37 UTC (rev 19664)
@@ -505,7 +505,7 @@
     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 @@
     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;

Modified: gnucash/trunk/src/gnome-utils/dialog-transfer.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-transfer.c	2010-10-16 02:23:41 UTC (rev 19663)
+++ gnucash/trunk/src/gnome-utils/dialog-transfer.c	2010-10-16 10:23:37 UTC (rev 19664)
@@ -1904,7 +1904,7 @@
     }
 
     xferData->book = book;
-    xferData->pricedb = gnc_book_get_pricedb (book);
+    xferData->pricedb = gnc_pricedb_get_db (book);
 
     gnc_xfer_dialog_create(parent, xferData);
 

Modified: gnucash/trunk/src/import-export/binary-import/druid-commodity.c
===================================================================
--- gnucash/trunk/src/import-export/binary-import/druid-commodity.c	2010-10-16 02:23:41 UTC (rev 19663)
+++ gnucash/trunk/src/import-export/binary-import/druid-commodity.c	2010-10-16 10:23:37 UTC (rev 19664)
@@ -462,7 +462,7 @@
     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);
 



More information about the gnucash-changes mailing list