Cleaned up a bit; fixed struct vs. class forward declarations.

(bzr r11608.1.111)

1 files changed, 4 insertions, 10 deletions

diff --git a/src/sp-defs.cpp b/src/sp-defs.cpp
index b60c830e6..334570076 100644
--- a/src/sp-defs.cpp
+++ b/src/sp-defs.cpp
@@ -41,15 +41,13 @@ void SPDefs::release() {
 }
 
 void SPDefs::update(SPCtx *ctx, guint flags) {
-	SPDefs* object = this;
-
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
     }
 
     flags &= SP_OBJECT_MODIFIED_CASCADE;
 
-    GSList *l = g_slist_reverse(object->childList(true));
+    GSList *l = g_slist_reverse(this->childList(true));
     while (l) {
         SPObject *child = SP_OBJECT(l->data);
         l = g_slist_remove(l, child);
@@ -61,8 +59,6 @@ void SPDefs::update(SPCtx *ctx, guint flags) {
 }
 
 void SPDefs::modified(unsigned int flags) {
-	SPDefs* object = this;
-
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
     }
@@ -70,7 +66,7 @@ void SPDefs::modified(unsigned int flags) {
     flags &= SP_OBJECT_MODIFIED_CASCADE;
 
     GSList *l = NULL;
-    for ( SPObject *child = object->firstChild() ; child; child = child->getNext() ) {
+    for ( SPObject *child = this->firstChild() ; child; child = child->getNext() ) {
         sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
@@ -88,8 +84,6 @@ void SPDefs::modified(unsigned int flags) {
 }
 
 Inkscape::XML::Node* SPDefs::write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) {
-	SPDefs* object = this;
-
     if (flags & SP_OBJECT_WRITE_BUILD) {
 
         if (!repr) {
@@ -97,7 +91,7 @@ Inkscape::XML::Node* SPDefs::write(Inkscape::XML::Document *xml_doc, Inkscape::X
         }
 
         GSList *l = NULL;
-        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);
@@ -111,7 +105,7 @@ Inkscape::XML::Node* SPDefs::write(Inkscape::XML::Document *xml_doc, Inkscape::X
         }
 
     } else {
-        for ( SPObject *child = object->firstChild() ; child; child = child->getNext() ) {
+        for ( SPObject *child = this->firstChild() ; child; child = child->getNext() ) {
             child->updateRepr(flags);
         }
     }