diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-04-07 16:28:22 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-04-07 16:28:22 +0000 |
| commit | 27e2102f96a5554bcd5310ec11435d155773b279 (patch) | |
| tree | e5f982c25aed199f9027a6277b17302f97b4c80c /src/sp-object-group.cpp | |
| parent | Merged FilterPrimitive and subclasses. (diff) | |
| download | inkscape-27e2102f96a5554bcd5310ec11435d155773b279.tar.gz inkscape-27e2102f96a5554bcd5310ec11435d155773b279.zip | |
Merge Object and subclasses. Merging of SP- and C-classes complete.
(bzr r11608.1.86)
Diffstat (limited to 'src/sp-object-group.cpp')
| -rw-r--r-- | src/sp-object-group.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/sp-object-group.cpp b/src/sp-object-group.cpp index afe425211..19b813236 100644 --- a/src/sp-object-group.cpp +++ b/src/sp-object-group.cpp @@ -16,9 +16,7 @@ #include "xml/repr.h" #include "document.h" -SPObjectGroup::SPObjectGroup() : SPObject(), CObject(this) { - delete this->cobject; - this->cobject = this; +SPObjectGroup::SPObjectGroup() : SPObject() { } SPObjectGroup::~SPObjectGroup() { @@ -27,7 +25,7 @@ SPObjectGroup::~SPObjectGroup() { void SPObjectGroup::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) { SPObjectGroup* object = this; - CObject::child_added(child, ref); + SPObject::child_added(child, ref); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } @@ -36,7 +34,7 @@ void SPObjectGroup::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node void SPObjectGroup::remove_child(Inkscape::XML::Node *child) { SPObjectGroup* object = this; - CObject::remove_child(child); + SPObject::remove_child(child); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } @@ -45,7 +43,7 @@ void SPObjectGroup::remove_child(Inkscape::XML::Node *child) { void SPObjectGroup::order_changed(Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref) { SPObjectGroup* object = this; - CObject::order_changed(child, old_ref, new_ref); + SPObject::order_changed(child, old_ref, new_ref); object->requestModified(SP_OBJECT_MODIFIED_FLAG); } @@ -76,7 +74,7 @@ Inkscape::XML::Node *SPObjectGroup::write(Inkscape::XML::Document *xml_doc, Inks } } - CObject::write(xml_doc, repr, flags); + SPObject::write(xml_doc, repr, flags); return repr; } |