r15823 - gnucash/branches/gobject-engine-dev-warlord - convert GncOrder to gobject initialization.

[Derek Atkins]

Author: warlord
Date: 2007-04-04 22:44:17 -0400 (Wed, 04 Apr 2007)
New Revision: 15823
Trac: http://svn.gnucash.org/trac/changeset/15823

Modified:
   gnucash/branches/gobject-engine-dev-warlord/
   gnucash/branches/gobject-engine-dev-warlord/src/business/business-core/gncOrder.c
   gnucash/branches/gobject-engine-dev-warlord/src/business/business-core/gncOrder.h
Log:
convert GncOrder to gobject initialization.



Property changes on: gnucash/branches/gobject-engine-dev-warlord
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:1037
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/gobject-engine-dev-warlord:14369
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/gobject-engine-dev-warlord1:14427
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:14282
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:1037
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/gobject-engine-dev-warlord:14369
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/gobject-engine-dev-warlord1:14428
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:14282
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366

Modified: gnucash/branches/gobject-engine-dev-warlord/src/business/business-core/gncOrder.c
===================================================================
--- gnucash/branches/gobject-engine-dev-warlord/src/business/business-core/gncOrder.c	2007-04-05 02:44:08 UTC (rev 15822)
+++ gnucash/branches/gobject-engine-dev-warlord/src/business/business-core/gncOrder.c	2007-04-05 02:44:17 UTC (rev 15823)
@@ -53,6 +53,11 @@
   Timespec 	closed;
 };
 
+struct _gncOrderClass
+{
+  QofInstanceClass parent_class;
+};
+
 static QofLogModule log_module = GNC_MOD_BUSINESS;
 
 #define _GNC_MOD_NAME	GNC_ID_ORDER
@@ -75,16 +80,28 @@
 }
 
 /* =============================================================== */
+/* GObject Initialization */
+QOF_GOBJECT_IMPL(gnc_order, GncOrder, QOF_TYPE_INSTANCE);
+
+static void
+gnc_order_init(GncOrder* order)
+{
+}
+
+static void
+gnc_order_finalize_real(GObject* orderp)
+{
+}
+
 /* Create/Destroy Functions */
-
 GncOrder *gncOrderCreate (QofBook *book)
 {
   GncOrder *order;
 
   if (!book) return NULL;
 
-  order = g_new0 (GncOrder, 1);
-  qof_instance_init (&order->inst, _GNC_MOD_NAME, book);
+  order = g_object_new (GNC_TYPE_ORDER, NULL);
+  qof_instance_init_data (&order->inst, _GNC_MOD_NAME, book);
 
   order->id = CACHE_INSERT ("");
   order->notes = CACHE_INSERT ("");
@@ -117,8 +134,8 @@
 
   if (order->printname) g_free (order->printname);
 
-  qof_instance_release (&order->inst);
-  g_free (order);
+  /* qof_instance_release (&order->inst); */
+  g_object_unref (order);
 }
 
 GncOrder *
@@ -129,8 +146,8 @@
 
   if (!book) return NULL;
 
-  order = g_new0 (GncOrder, 1);
-  qof_instance_init (&order->inst, _GNC_MOD_NAME, book);
+  order = g_object_new (GNC_TYPE_ORDER, NULL);
+  qof_instance_init_data (&order->inst, _GNC_MOD_NAME, book);
   qof_instance_gemini (&order->inst, &from->inst);
 
   order->id = CACHE_INSERT (from->id);

Modified: gnucash/branches/gobject-engine-dev-warlord/src/business/business-core/gncOrder.h
===================================================================
--- gnucash/branches/gobject-engine-dev-warlord/src/business/business-core/gncOrder.h	2007-04-05 02:44:08 UTC (rev 15822)
+++ gnucash/branches/gobject-engine-dev-warlord/src/business/business-core/gncOrder.h	2007-04-05 02:44:17 UTC (rev 15823)
@@ -35,15 +35,28 @@
 #define GNC_ORDER_H_
 
 typedef struct _gncOrder GncOrder;
+typedef struct _gncOrderClass GncOrderClass;
 
 #include "gncEntry.h"
 #include "gncOwner.h"
 #include "qof.h"
 
 #define GNC_ID_ORDER "gncOrder"
-#define GNC_IS_ORDER(obj)  (QOF_CHECK_TYPE((obj), GNC_ID_ORDER))
-#define GNC_ORDER(obj)     (QOF_CHECK_CAST((obj), GNC_ID_ORDER, GncOrder))
 
+/* --- type macros --- */
+#define GNC_TYPE_ORDER            (gnc_order_get_type ())
+#define GNC_ORDER(o)              \
+     (G_TYPE_CHECK_INSTANCE_CAST ((o), GNC_TYPE_ORDER, GncOrder))
+#define GNC_ORDER_CLASS(k)        \
+     (G_TYPE_CHECK_CLASS_CAST((k), GNC_TYPE_ORDER, GncOrderClass))
+#define GNC_IS_ORDER(o)           \
+     (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNC_TYPE_ORDER))
+#define GNC_IS_ORDER_CLASS(k)     \
+     (G_TYPE_CHECK_CLASS_TYPE ((k), GNC_TYPE_ORDER))
+#define GNC_ORDER_GET_CLASS(o)    \
+     (G_TYPE_INSTANCE_GET_CLASS ((o), GNC_TYPE_ORDER, GncOrderClass))
+GType gnc_order_get_type(void);
+
 /* Create/Destroy Functions */
 
 GncOrder *gncOrderCreate (QofBook *book);