From 7b7e0294b0c06a8d3ec19b73486a91e12cf67adf Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 6 Apr 2013 22:16:05 +0200 Subject: Merged more classes. (bzr r11608.1.84) --- src/sp-desc.cpp | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) (limited to 'src/sp-desc.cpp') diff --git a/src/sp-desc.cpp b/src/sp-desc.cpp index 0fe1f5305..e7530e501 100644 --- a/src/sp-desc.cpp +++ b/src/sp-desc.cpp @@ -26,38 +26,16 @@ namespace { bool descRegistered = SPFactory::instance().registerObject("svg:desc", createDesc); } -G_DEFINE_TYPE(SPDesc, sp_desc, SP_TYPE_OBJECT); - -static void sp_desc_class_init(SPDescClass *klass) -{ - SPObjectClass *sp_object_class = (SPObjectClass *)(klass); - -} - -CDesc::CDesc(SPDesc* desc) : CObject(desc) { - this->spdesc = desc; -} - -CDesc::~CDesc() { -} - -SPDesc::SPDesc() : SPObject() { - SPDesc* desc = this; - - desc->cdesc = new CDesc(desc); - desc->typeHierarchy.insert(typeid(SPDesc)); - - delete desc->cobject; - desc->cobject = desc->cdesc; +SPDesc::SPDesc() : SPObject(), CObject(this) { + delete this->cobject; + this->cobject = this; } -static void sp_desc_init(SPDesc *desc) -{ - new (desc) SPDesc(); +SPDesc::~SPDesc() { } -Inkscape::XML::Node* CDesc::write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) { - SPDesc* object = this->spdesc; +Inkscape::XML::Node* SPDesc::write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) { + SPDesc* object = this; if (!repr) { repr = object->getRepr()->duplicate(doc); -- cgit v1.2.3