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-offset.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'src/sp-offset.cpp') diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp index 511a0c4b1..3a8bf5a10 100644 --- a/src/sp-offset.cpp +++ b/src/sp-offset.cpp @@ -87,7 +87,7 @@ static void sp_offset_source_modified (SPObject *iSource, guint flags, SPItem *i // reappearing in offset when the radius becomes too large static bool use_slow_but_correct_offset_method=false; -G_DEFINE_TYPE(SPOffset, sp_offset, SP_TYPE_SHAPE); +G_DEFINE_TYPE(SPOffset, sp_offset, G_TYPE_OBJECT); /** * SPOffset vtable initialization. @@ -106,12 +106,9 @@ COffset::COffset(SPOffset* offset) : CShape(offset) { COffset::~COffset() { } -/** - * Callback for SPOffset object initialization. - */ -static void -sp_offset_init(SPOffset *offset) -{ +SPOffset::SPOffset() : SPShape() { + SPOffset* offset = this; + offset->coffset = new COffset(offset); offset->typeHierarchy.insert(typeid(SPOffset)); @@ -140,6 +137,15 @@ sp_offset_init(SPOffset *offset) offset->_changed_connection = offset->sourceRef->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_offset_href_changed), offset)); } +/** + * Callback for SPOffset object initialization. + */ +static void +sp_offset_init(SPOffset *offset) +{ + new (offset) SPOffset(); +} + /** * Callback for SPOffset finalization. */ -- cgit v1.2.3