r18306 - gnucash/trunk/src/engine - Replace some calls to (deprecated) xaccAccountGetGUID() with calls to qof_entity_get_guid()

[Phil Longstaff]

Author: plongstaff
Date: 2009-09-09 21:52:42 -0400 (Wed, 09 Sep 2009)
New Revision: 18306
Trac: http://svn.gnucash.org/trac/changeset/18306

Modified:
   gnucash/trunk/src/engine/Period.c
   gnucash/trunk/src/engine/Query.c
   gnucash/trunk/src/engine/SX-book.c
   gnucash/trunk/src/engine/SchedXaction.c
Log:
Replace some calls to (deprecated) xaccAccountGetGUID() with calls to qof_entity_get_guid()


Modified: gnucash/trunk/src/engine/Period.c
===================================================================
--- gnucash/trunk/src/engine/Period.c	2009-09-10 00:27:13 UTC (rev 18305)
+++ gnucash/trunk/src/engine/Period.c	2009-09-10 01:52:42 UTC (rev 18306)
@@ -670,7 +670,7 @@
        * of this account. */
       xaccAccountBeginEdit (twin);
       cwd = xaccAccountGetSlots (twin);
-      kvp_frame_set_guid (cwd, "/book/prev-acct", xaccAccountGetGUID (candidate));
+      kvp_frame_set_guid (cwd, "/book/prev-acct", qof_entity_get_guid (QOF_INSTANCE(candidate)));
       kvp_frame_set_guid (cwd, "/book/prev-book", qof_book_get_guid(closed_book));
 
       qof_instance_set_slots(QOF_INSTANCE(twin), twin->inst.kvp_data);
@@ -681,7 +681,7 @@
       xaccAccountBeginEdit (candidate);
       cwd = xaccAccountGetSlots (candidate);
       kvp_frame_set_guid (cwd, "/book/next-book", qof_book_get_guid(open_book));
-      kvp_frame_set_guid (cwd, "/book/next-acct", xaccAccountGetGUID (twin));
+      kvp_frame_set_guid (cwd, "/book/next-acct", qof_entity_get_guid (QOF_INSTANCE(twin)));
 
       qof_instance_set_slots(QOF_INSTANCE(candidate), candidate->inst.kvp_data);
 
@@ -740,7 +740,7 @@
              * transaction came from */
             cwd = xaccTransGetSlots (trans);
             kvp_frame_set_guid (cwd, "/book/closed-book", qof_book_get_guid(closed_book));
-            kvp_frame_set_guid (cwd, "/book/closed-acct", xaccAccountGetGUID(candidate));
+            kvp_frame_set_guid (cwd, "/book/closed-acct", qof_entity_get_guid(QOF_INSTANCE(candidate)));
             
             xaccTransCommitEdit (trans);
    

Modified: gnucash/trunk/src/engine/Query.c
===================================================================
--- gnucash/trunk/src/engine/Query.c	2009-09-10 00:27:13 UTC (rev 18305)
+++ gnucash/trunk/src/engine/Query.c	2009-09-10 01:52:42 UTC (rev 18306)
@@ -235,7 +235,7 @@
       continue;
     }
 
-    guid = xaccAccountGetGUID (acc);
+    guid = qof_entity_get_guid (QOF_INSTANCE(acc));
     if (!guid) {
       PWARN ("acct returns NULL GUID");
       continue;
@@ -285,7 +285,7 @@
   if (!q || !acc)
     return;
 
-  guid = xaccAccountGetGUID (acc);
+  guid = qof_entity_get_guid (QOF_INSTANCE(acc));
   g_return_if_fail (guid);
 
   list = g_list_prepend (NULL, (gpointer)guid);

Modified: gnucash/trunk/src/engine/SX-book.c
===================================================================
--- gnucash/trunk/src/engine/SX-book.c	2009-09-10 00:27:13 UTC (rev 18305)
+++ gnucash/trunk/src/engine/SX-book.c	2009-09-10 01:52:42 UTC (rev 18306)
@@ -337,7 +337,7 @@
 gnc_sx_get_sxes_referencing_account(QofBook *book, Account *acct)
 {
   GList *rtn = NULL;
-  const GUID *acct_guid = xaccAccountGetGUID(acct);
+  const GUID *acct_guid = qof_entity_get_guid(QOF_INSTANCE(acct));
   GList *sx_list = gnc_book_get_schedxactions(book)->sx_list;
   for (; sx_list != NULL; sx_list = sx_list->next)
   {

Modified: gnucash/trunk/src/engine/SchedXaction.c
===================================================================
--- gnucash/trunk/src/engine/SchedXaction.c	2009-09-10 00:27:13 UTC (rev 18305)
+++ gnucash/trunk/src/engine/SchedXaction.c	2009-09-10 01:52:42 UTC (rev 18306)
@@ -678,7 +678,7 @@
 
   kvp_value_delete(tmp_value);
 
-  acc_guid = xaccAccountGetGUID(gnc_ttsplitinfo_get_account(s_info));
+  acc_guid = qof_entity_get_guid(QOF_INSTANCE(gnc_ttsplitinfo_get_account(s_info)));
 
   tmp_value = kvp_value_new_guid(acc_guid);