Added constructors to SP classes.

(bzr r11608.1.67)

1 files changed, 20 insertions, 8 deletions

diff --git a/src/sp-flowregion.cpp b/src/sp-flowregion.cpp
index 0c99d6f9a..29ce4e7a9 100644
--- a/src/sp-flowregion.cpp
+++ b/src/sp-flowregion.cpp
@@ -27,7 +27,7 @@
 static void sp_flowregion_init (SPFlowregion *group);
 static void sp_flowregion_dispose (GObject *object);
 
-G_DEFINE_TYPE(SPFlowregion, sp_flowregion, SP_TYPE_ITEM);
+G_DEFINE_TYPE(SPFlowregion, sp_flowregion, G_TYPE_OBJECT);
 
 static void sp_flowregionexclude_init (SPFlowregionExclude *group);
 static void sp_flowregionexclude_dispose (GObject *object);
@@ -50,9 +50,9 @@ CFlowregion::CFlowregion(SPFlowregion* flowregion) : CItem(flowregion) {
 CFlowregion::~CFlowregion() {
 }
 
-static void
-sp_flowregion_init (SPFlowregion *group)
-{
+SPFlowregion::SPFlowregion() : SPItem() {
+	SPFlowregion* group = this;
+
 	group->cflowregion = new CFlowregion(group);
 	group->typeHierarchy.insert(typeid(SPFlowregion));
 
@@ -64,6 +64,12 @@ sp_flowregion_init (SPFlowregion *group)
 }
 
 static void
+sp_flowregion_init (SPFlowregion *group)
+{
+	new (group) SPFlowregion();
+}
+
+static void
 sp_flowregion_dispose(GObject *object)
 {
 	SPFlowregion *group=(SPFlowregion *)object;
@@ -215,7 +221,7 @@ gchar* CFlowregion::description() {
  *
  */
 
-G_DEFINE_TYPE(SPFlowregionExclude, sp_flowregionexclude, SP_TYPE_ITEM);
+G_DEFINE_TYPE(SPFlowregionExclude, sp_flowregionexclude, G_TYPE_OBJECT);
 
 static void
 sp_flowregionexclude_class_init (SPFlowregionExcludeClass *klass)
@@ -232,9 +238,9 @@ CFlowregionExclude::CFlowregionExclude(SPFlowregionExclude* flowregionexclude) :
 CFlowregionExclude::~CFlowregionExclude() {
 }
 
-static void
-sp_flowregionexclude_init (SPFlowregionExclude *group)
-{
+SPFlowregionExclude::SPFlowregionExclude() : SPItem() {
+	SPFlowregionExclude* group = this;
+
 	group->cflowregionexclude = new CFlowregionExclude(group);
 	group->typeHierarchy.insert(typeid(SPFlowregionExclude));
 
@@ -246,6 +252,12 @@ sp_flowregionexclude_init (SPFlowregionExclude *group)
 }
 
 static void
+sp_flowregionexclude_init (SPFlowregionExclude *group)
+{
+	new (group) SPFlowregionExclude();
+}
+
+static void
 sp_flowregionexclude_dispose(GObject *object)
 {
 	SPFlowregionExclude *group=(SPFlowregionExclude *)object;