[Gnucash-changes] Remove unneeded include files.

David Hampton hampton at cvs.gnucash.org
Sat Oct 8 19:32:26 EDT 2005


Log Message:
-----------
Remove unneeded include files.  Call function with their current name,
not the backward compatibility name.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash/src/register/ledger-core:
        split-register-control.c
        split-register-load.c
        split-register-model.c
        split-register-util.c
        split-register.c

Revision Data
-------------
Index: split-register-control.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/split-register-control.c,v
retrieving revision 1.43.2.7
retrieving revision 1.43.2.8
diff -Lsrc/register/ledger-core/split-register-control.c -Lsrc/register/ledger-core/split-register-control.c -u -r1.43.2.7 -r1.43.2.8
--- src/register/ledger-core/split-register-control.c
+++ src/register/ledger-core/split-register-control.c
@@ -22,15 +22,11 @@
 
 #include "config.h"
 
-#include "dialog-account.h"
 #include "Group.h"
 #include "Scrub.h"
 #include "combocell.h"
-#include "global-options.h"
 #include "gnc-component-manager.h"
-#include "gnc-engine.h"
 #include "gnc-ui.h"
-#include "gnc-ui-util.h"
 #include "messages.h"
 #include "pricecell.h"
 #include "datecell.h"
@@ -336,7 +332,7 @@
       if (xaccTransIsOpen (old_trans))
         xaccTransCommitEdit (old_trans);
 
-      info->pending_trans_guid = *xaccGUIDNULL ();
+      info->pending_trans_guid = *guid_null ();
       pending_trans = NULL;
       saved = TRUE;
     }
Index: split-register.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/split-register.c,v
retrieving revision 1.40.2.8
retrieving revision 1.40.2.9
diff -Lsrc/register/ledger-core/split-register.c -Lsrc/register/ledger-core/split-register.c -u -r1.40.2.8 -r1.40.2.9
--- src/register/ledger-core/split-register.c
+++ src/register/ledger-core/split-register.c
@@ -28,20 +28,13 @@
 
 #include <glib.h>
 #include <libguile.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
 
-#include "Account.h"
 #include "combocell.h"
 #include "datecell.h"
-#include "global-options.h"
 #include "gnc-component-manager.h"
-#include "gnc-engine.h"
 #include "gnc-gconf-utils.h"
 #include "split-register-p.h"
 #include "gnc-ledger-display.h"
-#include "gnc-ui-util.h"
 #include "gnc-ui.h"
 #include "guile-util.h"
 #include "messages.h"
@@ -592,7 +585,7 @@
         gnc_split_register_save_to_scm (reg, SCM_UNDEFINED, new_item,
                                         use_cut_semantics);
 
-      copied_leader_guid = *xaccGUIDNULL();
+      copied_leader_guid = *guid_null();
     }
   }
   else
@@ -778,7 +771,7 @@
     /* in pasting, the old split is deleted. */
     if (split == blank_split)
     {
-      info->blank_split_guid = *xaccGUIDNULL();
+      info->blank_split_guid = *guid_null();
       blank_split = NULL;
     }
 
@@ -863,7 +856,7 @@
   /* Check pending transaction */
   if (trans == pending_trans)
   {
-    info->pending_trans_guid = *xaccGUIDNULL ();
+    info->pending_trans_guid = *guid_null ();
     pending_trans = NULL;
   }
 
@@ -903,7 +896,7 @@
     /* Make sure we don't commit this later on */
     if (trans == pending_trans)
     {
-      info->pending_trans_guid = *xaccGUIDNULL();
+      info->pending_trans_guid = *guid_null();
       pending_trans = NULL;
     }
 
@@ -913,7 +906,7 @@
     xaccTransDestroy (trans);
     xaccTransCommitEdit (trans);
 
-    info->blank_split_guid = *xaccGUIDNULL();
+    info->blank_split_guid = *guid_null();
     blank_split = NULL;
 
     gnc_resume_gui_refresh ();
@@ -937,7 +930,7 @@
   /* Check pending transaction */
   if (trans == pending_trans)
   {
-    info->pending_trans_guid = *xaccGUIDNULL();
+    info->pending_trans_guid = *guid_null();
     pending_trans = NULL;
   }
 
@@ -986,7 +979,7 @@
   /* Check pending transaction */
   if (trans == pending_trans)
   {
-    info->pending_trans_guid = *xaccGUIDNULL();
+    info->pending_trans_guid = *guid_null();
     pending_trans = NULL;
   }
 
@@ -1035,7 +1028,7 @@
   /* Check pending transaction */
   if (trans == pending_trans)
   {
-    info->pending_trans_guid = *xaccGUIDNULL();
+    info->pending_trans_guid = *guid_null();
     pending_trans = NULL;
   }
 
@@ -1128,7 +1121,7 @@
 
   xaccTransRollbackEdit (pending_trans);
 
-  info->pending_trans_guid = *xaccGUIDNULL ();
+  info->pending_trans_guid = *guid_null ();
 
   gnc_resume_gui_refresh ();
 }
@@ -1368,7 +1361,7 @@
        if (xaccTransIsOpen(trans) || (info->blank_split_edited))
        {
          info->last_date_entered = xaccTransGetDate (trans);
-         info->blank_split_guid = *xaccGUIDNULL ();
+         info->blank_split_guid = *guid_null ();
          info->blank_split_edited = FALSE;
          blank_split = NULL;
        }
@@ -1384,7 +1377,7 @@
      if (pending_trans == trans)
      {
        pending_trans = NULL;
-       info->pending_trans_guid = *xaccGUIDNULL ();
+       info->pending_trans_guid = *guid_null ();
      }
 
      return TRUE;
@@ -1478,7 +1471,7 @@
    {
      if (do_commit)
      {
-       info->blank_split_guid = *xaccGUIDNULL ();
+       info->blank_split_guid = *guid_null ();
        blank_split = NULL;
        info->last_date_entered = xaccTransGetDate (trans);
      }
@@ -1494,7 +1487,7 @@
      if (pending_trans == trans)
      {
        pending_trans = NULL;
-       info->pending_trans_guid = *xaccGUIDNULL ();
+       info->pending_trans_guid = *guid_null ();
      }
    }
 
@@ -2387,7 +2380,7 @@
       /* Make sure we don't commit this below */
       if (trans == pending_trans)
       {
-        info->pending_trans_guid = *xaccGUIDNULL ();
+        info->pending_trans_guid = *guid_null ();
         pending_trans = NULL;
       }
 
@@ -2395,7 +2388,7 @@
       xaccTransDestroy (trans);
       xaccTransCommitEdit (trans);
 
-      info->blank_split_guid = *xaccGUIDNULL ();
+      info->blank_split_guid = *guid_null ();
       blank_split = NULL;
    }
 
@@ -2405,7 +2398,7 @@
       if (xaccTransIsOpen (pending_trans))
         xaccTransCommitEdit (pending_trans);
 
-      info->pending_trans_guid = *xaccGUIDNULL ();
+      info->pending_trans_guid = *guid_null ();
       pending_trans = NULL;
    }
 
Index: split-register-model.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/split-register-model.c,v
retrieving revision 1.50.2.7
retrieving revision 1.50.2.8
diff -Lsrc/register/ledger-core/split-register-model.c -Lsrc/register/ledger-core/split-register-model.c -u -r1.50.2.7 -r1.50.2.8
--- src/register/ledger-core/split-register-model.c
+++ src/register/ledger-core/split-register-model.c
@@ -23,16 +23,13 @@
 #include "config.h"
 
 #include <glib.h>
-#include <time.h>
 
 #include "Group.h"
 #include "datecell.h"
-#include "global-options.h"
 #include "gnc-engine.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-err-popup.h"
 #include "gnc-ui.h"
-#include "gnc-ui-util.h"
 #include "messages.h"
 #include "pricecell.h"
 #include "recncell.h"
@@ -1857,9 +1854,9 @@
 {
   GUID *guid;
 
-  guid = xaccGUIDMalloc ();
+  guid = guid_malloc ();
 
-  *guid = *xaccGUIDNULL ();
+  *guid = *guid_null ();
 
   return guid;
 }
@@ -2047,7 +2044,7 @@
 static void
 gnc_split_register_guid_free (gpointer guid)
 {
-  xaccGUIDFree (guid);
+  guid_free (guid);
 }
 
 static void
@@ -2059,7 +2056,7 @@
   g_return_if_fail (to != NULL);
 
   if (from == NULL)
-    *to = *xaccGUIDNULL ();
+    *to = *guid_null ();
   else
     *to = *from;
 }
Index: split-register-load.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/split-register-load.c,v
retrieving revision 1.23.4.4
retrieving revision 1.23.4.5
diff -Lsrc/register/ledger-core/split-register-load.c -Lsrc/register/ledger-core/split-register-load.c -u -r1.23.4.4 -r1.23.4.5
--- src/register/ledger-core/split-register-load.c
+++ src/register/ledger-core/split-register-load.c
@@ -27,7 +27,6 @@
 #include "Group.h"
 #include "account-quickfill.h"
 #include "combocell.h"
-#include "global-options.h"
 #include "gnc-component-manager.h"
 #include "gnc-engine-util.h"
 #include "gnc-ui-util.h"
@@ -513,7 +512,7 @@
     if (xaccTransIsOpen (pending_trans))
       xaccTransCommitEdit (pending_trans);
 
-    info->pending_trans_guid = *xaccGUIDNULL ();
+    info->pending_trans_guid = *guid_null ();
     pending_trans = NULL;
   }
 
Index: split-register-util.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/split-register-util.c,v
retrieving revision 1.11.4.2
retrieving revision 1.11.4.3
diff -Lsrc/register/ledger-core/split-register-util.c -Lsrc/register/ledger-core/split-register-util.c -u -r1.11.4.2 -r1.11.4.3
--- src/register/ledger-core/split-register-util.c
+++ src/register/ledger-core/split-register-util.c
@@ -23,10 +23,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <string.h>
 
-#include "global-options.h"
-#include "gnc-engine.h"
 #include "pricecell.h"
 #include "split-register-p.h"
 
@@ -49,10 +46,10 @@
 
   info = g_new0 (SRInfo, 1);
 
-  info->blank_split_guid = *xaccGUIDNULL ();
-  info->pending_trans_guid = *xaccGUIDNULL ();
-  info->default_account = *xaccGUIDNULL ();
-  info->template_account = *xaccGUIDNULL ();
+  info->blank_split_guid = *guid_null ();
+  info->pending_trans_guid = *guid_null ();
+  info->default_account = *guid_null ();
+  info->template_account = *guid_null ();
 
   info->last_date_entered = gnc_timet_get_today_start ();
 


More information about the gnucash-changes mailing list