summaryrefslogtreecommitdiffstats
path: root/src/sp-object-group.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-08-03 01:03:43 +0000
committerMarkus Engel <markus.engel@tum.de>2013-08-03 01:03:43 +0000
commitbf4a1d2d49850170b936c30cfe2b30e798716406 (patch)
tree2632b534325df2eb92933f428979eeb8f5c52225 /src/sp-object-group.cpp
parentreordered SPDesktop::set_event_context2; fixed last mismatched-tags (diff)
downloadinkscape-bf4a1d2d49850170b936c30cfe2b30e798716406.tar.gz
inkscape-bf4a1d2d49850170b936c30cfe2b30e798716406.zip
Cleaned up.
(bzr r11608.1.117)
Diffstat (limited to 'src/sp-object-group.cpp')
-rw-r--r--src/sp-object-group.cpp21
1 files changed, 8 insertions, 13 deletions
diff --git a/src/sp-object-group.cpp b/src/sp-object-group.cpp
index 19b813236..c3967461e 100644
--- a/src/sp-object-group.cpp
+++ b/src/sp-object-group.cpp
@@ -23,53 +23,48 @@ SPObjectGroup::~SPObjectGroup() {
}
void SPObjectGroup::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) {
- SPObjectGroup* object = this;
-
SPObject::child_added(child, ref);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ this->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
void SPObjectGroup::remove_child(Inkscape::XML::Node *child) {
- SPObjectGroup* object = this;
-
SPObject::remove_child(child);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ this->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
void SPObjectGroup::order_changed(Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref) {
- SPObjectGroup* object = this;
-
SPObject::order_changed(child, old_ref, new_ref);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ this->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
Inkscape::XML::Node *SPObjectGroup::write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) {
- SPObjectGroup* object = this;
-
if (flags & SP_OBJECT_WRITE_BUILD) {
if (!repr) {
repr = xml_doc->createElement("svg:g");
}
+
GSList *l = 0;
- for ( SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
+ for ( SPObject *child = this->firstChild() ; child ; child = child->getNext() ) {
Inkscape::XML::Node *crepr = child->updateRepr(xml_doc, NULL, flags);
+
if (crepr) {
l = g_slist_prepend(l, crepr);
}
}
+
while (l) {
repr->addChild(static_cast<Inkscape::XML::Node *>(l->data), NULL);
Inkscape::GC::release(static_cast<Inkscape::XML::Node *>(l->data));
l = g_slist_remove(l, l->data);
}
} else {
- for ( SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
+ for ( SPObject *child = this->firstChild() ; child ; child = child->getNext() ) {
child->updateRepr(flags);
}
}