[Gnucash-changes] convert book to use qof instance

[Linas Vepstas]

Log Message:
-----------
convert book to use qof instance

Tags:
----
backend-work-1

Modified Files:
--------------
    gnucash/src/engine:
        Period.c

Revision Data
-------------
Index: Period.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Period.c,v
retrieving revision 1.59.4.1
retrieving revision 1.59.4.2
diff -Lsrc/engine/Period.c -Lsrc/engine/Period.c -u -r1.59.4.1 -r1.59.4.2
--- src/engine/Period.c
+++ src/engine/Period.c
@@ -546,8 +546,8 @@
    /* hack alert -- FIXME -- this should really be a merge, not a
     * clobber copy, but I am too lazy to write a kvp merge routine,
     * and it is not needed for the current usage. */
-   kvp_frame_delete (dest_book->kvp_data);
-   dest_book->kvp_data = kvp_frame_copy (src_book->kvp_data);
+   kvp_frame_delete (dest_book->inst.kvp_data);
+   dest_book->inst.kvp_data = kvp_frame_copy (src_book->inst.kvp_data);
 
    /* Next, copy the commodity tables */
    src_tbl = gnc_commodity_table_get_table (src_book);
@@ -598,11 +598,11 @@
 
    /* Make note of the sibling books */
    now = time(0);
-   gnc_kvp_bag_add (src_book->kvp_data, "gemini", now, 
-                          "book_guid", &dest_book->entity.guid, 
+   gnc_kvp_bag_add (src_book->inst.kvp_data, "gemini", now, 
+                          "book_guid", &dest_book->inst.entity.guid, 
                            NULL);
-   gnc_kvp_bag_add (dest_book->kvp_data, "gemini", now, 
-                          "book_guid", &src_book->entity.guid, 
+   gnc_kvp_bag_add (dest_book->inst.kvp_data, "gemini", now, 
+                          "book_guid", &src_book->inst.entity.guid, 
                            NULL);
    LEAVE (" ");
 }
@@ -693,7 +693,7 @@
       xaccAccountBeginEdit (twin);
       cwd = xaccAccountGetSlots (twin);
       kvp_frame_set_guid (cwd, "/book/prev-acct", xaccAccountGetGUID (candidate));
-      kvp_frame_set_guid (cwd, "/book/prev-book", &closed_book->entity.guid);
+      kvp_frame_set_guid (cwd, "/book/prev-book", &closed_book->inst.entity.guid);
 
       xaccAccountSetSlots_nc (twin, twin->inst.kvp_data);
       
@@ -702,7 +702,7 @@
        * the next book is. */
       xaccAccountBeginEdit (candidate);
       cwd = xaccAccountGetSlots (candidate);
-      kvp_frame_set_guid (cwd, "/book/next-book", &open_book->entity.guid);
+      kvp_frame_set_guid (cwd, "/book/next-book", &open_book->inst.entity.guid);
       kvp_frame_set_guid (cwd, "/book/next-acct", xaccAccountGetGUID (twin));
 
       xaccAccountSetSlots_nc (candidate, candidate->inst.kvp_data);
@@ -760,7 +760,7 @@
             /* Add KVP data showing where the balancing 
              * transaction came from */
             cwd = xaccTransGetSlots (trans);
-            kvp_frame_set_guid (cwd, "/book/closed-book", &closed_book->entity.guid);
+            kvp_frame_set_guid (cwd, "/book/closed-book", &closed_book->inst.entity.guid);
             kvp_frame_set_guid (cwd, "/book/closed-acct", xaccAccountGetGUID(candidate));
             
             xaccTransCommitEdit (trans);
@@ -870,8 +870,8 @@
 
    /* Now add the various identifying kvp's */
    /* cwd == 'current working directory' */
-   exist_cwd = existing_book->kvp_data;
-   partn_cwd = closing_book->kvp_data;
+   exist_cwd = existing_book->inst.kvp_data;
+   partn_cwd = closing_book->inst.kvp_data;
    
    /* Mark the boundary date between the books */
    kvp_frame_set_timespec (exist_cwd, "/book/open-date", calve_date);
@@ -883,8 +883,8 @@
    kvp_frame_set_timespec (partn_cwd, "/book/log-date", ts);
 
    /* Set up pointers to each book from the other. */
-   kvp_frame_set_guid (partn_cwd, "/book/next-book", &existing_book->entity.guid);
-   kvp_frame_set_guid (exist_cwd, "/book/prev-book", &closing_book->entity.guid);
+   kvp_frame_set_guid (partn_cwd, "/book/next-book", &existing_book->inst.entity.guid);
+   kvp_frame_set_guid (exist_cwd, "/book/prev-book", &closing_book->inst.entity.guid);
 
    /* add in transactions to equity accounts that will
     * hold the colsing balances */