From 27e2102f96a5554bcd5310ec11435d155773b279 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 7 Apr 2013 18:28:22 +0200 Subject: Merge Object and subclasses. Merging of SP- and C-classes complete. (bzr r11608.1.86) --- src/live_effects/lpeobject.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/live_effects/lpeobject.cpp') diff --git a/src/live_effects/lpeobject.cpp b/src/live_effects/lpeobject.cpp index 012bf6612..b708a36cd 100644 --- a/src/live_effects/lpeobject.cpp +++ b/src/live_effects/lpeobject.cpp @@ -41,14 +41,11 @@ static Inkscape::XML::NodeEventVector const livepatheffect_repr_events = { }; -LivePathEffectObject::LivePathEffectObject() : SPObject(), CObject(this) { +LivePathEffectObject::LivePathEffectObject() : SPObject() { #ifdef LIVEPATHEFFECT_VERBOSE g_message("Init livepatheffectobject"); #endif - delete this->cobject; - this->cobject = this; - this->effecttype = Inkscape::LivePathEffect::INVALID_LPE; this->lpe = NULL; @@ -67,7 +64,7 @@ void LivePathEffectObject::build(SPDocument *document, Inkscape::XML::Node *repr g_assert(object != NULL); g_assert(SP_IS_OBJECT(object)); - CObject::build(document, repr); + SPObject::build(document, repr); object->readAttr( "effect" ); @@ -113,7 +110,7 @@ void LivePathEffectObject::release() { } lpeobj->effecttype = Inkscape::LivePathEffect::INVALID_LPE; - CObject::release(); + SPObject::release(); } /** @@ -145,7 +142,7 @@ void LivePathEffectObject::set(unsigned key, gchar const *value) { break; } - CObject::set(key, value); + SPObject::set(key, value); } /** @@ -166,7 +163,7 @@ Inkscape::XML::Node* LivePathEffectObject::write(Inkscape::XML::Document *xml_do lpeobj->lpe->writeParamsToSVG(); } - CObject::write(xml_doc, repr, flags); + SPObject::write(xml_doc, repr, flags); return repr; } -- cgit v1.2.3