updated to latest trunk

(bzr r14876.2.4)

1 files changed, 23 insertions, 26 deletions

diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index c17c67fc5..052fa7fe2 100644
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
@@ -14,29 +14,29 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
 #endif
 
+#include "sp-filter.h"
+
 #include <map>
 #include <string.h>
-using std::map;
-using std::pair;
 
 #include <glibmm.h>
+
+#include "bad-uri-exception.h"
 #include "attributes.h"
 #include "display/nr-filter.h"
 #include "document.h"
-#include "sp-filter.h"
 #include "sp-filter-reference.h"
 #include "sp-filter-primitive.h"
-#include "sp-item.h"
 #include "uri.h"
 #include "xml/repr.h"
-#include <cstring>
-#include <string>
+
+using std::map;
+using std::pair;
 
 #define SP_MACROS_SILENT
-#include "macros.h"
 
 static void filter_ref_changed(SPObject *old_ref, SPObject *ref, SPFilter *filter);
 static void filter_ref_modified(SPObject *href, guint flags, SPFilter *filter);
@@ -268,8 +268,8 @@ Inkscape::XML::Node* SPFilter::write(Inkscape::XML::Document *doc, Inkscape::XML
         }
 
         GSList *l = NULL;
-        for ( SPObject *child = this->firstChild(); child; child = child->getNext() ) {
-            Inkscape::XML::Node *crepr = child->updateRepr(doc, NULL, flags);
+        for (auto& child: children) {
+            Inkscape::XML::Node *crepr = child.updateRepr(doc, NULL, flags);
 
             if (crepr) {
                 l = g_slist_prepend (l, crepr);
@@ -282,8 +282,8 @@ Inkscape::XML::Node* SPFilter::write(Inkscape::XML::Document *doc, Inkscape::XML
             l = g_slist_remove (l, l->data);
         }
     } else {
-        for ( SPObject *child = this->firstChild() ; child; child = child->getNext() ) {
-            child->updateRepr(flags);
+        for (auto& child: children) {
+            child.updateRepr(flags);
         }
     }
 
@@ -420,10 +420,9 @@ void sp_filter_build_renderer(SPFilter *sp_filter, Inkscape::Filters::Filter *nr
     }
 
     nr_filter->clear_primitives();
-    SPObject *primitive_obj = sp_filter->children;
-    while (primitive_obj) {
-        if (SP_IS_FILTER_PRIMITIVE(primitive_obj)) {
-            SPFilterPrimitive *primitive = SP_FILTER_PRIMITIVE(primitive_obj);
+    for(auto& primitive_obj: sp_filter->children) {
+        if (SP_IS_FILTER_PRIMITIVE(&primitive_obj)) {
+            SPFilterPrimitive *primitive = SP_FILTER_PRIMITIVE(&primitive_obj);
             g_assert(primitive != NULL);
 
 //            if (((SPFilterPrimitiveClass*) G_OBJECT_GET_CLASS(primitive))->build_renderer) {
@@ -433,7 +432,6 @@ void sp_filter_build_renderer(SPFilter *sp_filter, Inkscape::Filters::Filter *nr
 //            }  // CPPIFY: => FilterPrimitive should be abstract.
             primitive->build_renderer(nr_filter);
         }
-        primitive_obj = primitive_obj->next;
     }
 }
 
@@ -441,11 +439,12 @@ int sp_filter_primitive_count(SPFilter *filter) {
     g_assert(filter != NULL);
     int count = 0;
 
-    SPObject *primitive_obj = filter->children;
-    while (primitive_obj) {
-        if (SP_IS_FILTER_PRIMITIVE(primitive_obj)) count++;
-        primitive_obj = primitive_obj->next;
+    for(auto& primitive_obj: filter->children) {
+        if (SP_IS_FILTER_PRIMITIVE(&primitive_obj)) {
+            count++;
+        }
     }
+
     return count;
 }
 
@@ -513,10 +512,9 @@ Glib::ustring sp_filter_get_new_result_name(SPFilter *filter) {
     g_assert(filter != NULL);
     int largest = 0;
 
-    SPObject *primitive_obj = filter->children;
-    while (primitive_obj) {
-        if (SP_IS_FILTER_PRIMITIVE(primitive_obj)) {
-            Inkscape::XML::Node *repr = primitive_obj->getRepr();
+    for(auto& primitive_obj: filter->children) {
+        if (SP_IS_FILTER_PRIMITIVE(&primitive_obj)) {
+            Inkscape::XML::Node *repr = primitive_obj.getRepr();
             char const *result = repr->attribute("result");
             int index;
             if (result)
@@ -530,7 +528,6 @@ Glib::ustring sp_filter_get_new_result_name(SPFilter *filter) {
                 }
             }
         }
-        primitive_obj = primitive_obj->next;
     }
 
     return "result" + Glib::Ascii::dtostr(largest + 1);