From 69f3b6f1abb2bb422935d43262e1e99aab359954 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 2 Apr 2013 01:41:30 +0200 Subject: Added constructors to SP classes. (bzr r11608.1.67) --- src/sp-tref.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/sp-tref.cpp') diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index 398304e4c..83b0746d8 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -57,7 +57,7 @@ static void sp_tref_finalize(GObject *obj); static void sp_tref_href_changed(SPObject *old_ref, SPObject *ref, SPTRef *tref); static void sp_tref_delete_self(SPObject *deleted, SPTRef *self); -G_DEFINE_TYPE(SPTRef, sp_tref, SP_TYPE_ITEM); +G_DEFINE_TYPE(SPTRef, sp_tref, G_TYPE_OBJECT); static void sp_tref_class_init(SPTRefClass *tref_class) @@ -73,9 +73,9 @@ CTRef::CTRef(SPTRef* tref) : CItem(tref) { CTRef::~CTRef() { } -static void -sp_tref_init(SPTRef *tref) -{ +SPTRef::SPTRef() : SPItem() { + SPTRef* tref = this; + tref->ctref = new CTRef(tref); tref->typeHierarchy.insert(typeid(SPTRef)); @@ -83,6 +83,8 @@ sp_tref_init(SPTRef *tref) tref->citem = tref->ctref; tref->cobject = tref->ctref; + tref->stringChild = NULL; + new (&tref->attributes) TextTagAttributes; tref->href = NULL; @@ -94,6 +96,12 @@ sp_tref_init(SPTRef *tref) tref->uriOriginalRef->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_tref_href_changed), tref)); } +static void +sp_tref_init(SPTRef *tref) +{ + new (tref) SPTRef(); +} + static void sp_tref_finalize(GObject *obj) { -- cgit v1.2.3