Merge trunk

(bzr r14950.1.20)

1 files changed, 6 insertions, 13 deletions

diff --git a/src/filter-chemistry.cpp b/src/filter-chemistry.cpp
index 9298a1ffc..560e73322 100644
--- a/src/filter-chemistry.cpp
+++ b/src/filter-chemistry.cpp
@@ -26,11 +26,6 @@
 
 #include "filters/blend.h"
 #include "filters/gaussian-blur.h"
-#include "sp-filter.h"
-#include "sp-filter-reference.h"
-#include "svg/css-ostringstream.h"
-
-#include "xml/repr.h"
 
 /**
  * Count how many times the filter is used by the styles of o and its
@@ -51,8 +46,8 @@ static guint count_filter_hrefs(SPObject *o, SPFilter *filter)
         i ++;
     }
 
-    for ( SPObject *child = o->firstChild(); child; child = child->getNext() ) {
-        i += count_filter_hrefs(child, filter);
+    for (auto& child: o->children) {
+        i += count_filter_hrefs(&child, filter);
     }
 
     return i;
@@ -491,16 +486,14 @@ void remove_filter_gaussian_blur (SPObject *item)
 
 bool filter_is_single_gaussian_blur(SPFilter *filter)
 {
-    return (filter->firstChild() && 
-            (filter->firstChild() == filter->lastChild()) &&
-            SP_IS_GAUSSIANBLUR(filter->firstChild()));
+    return (filter->children.size() == 1 &&
+            SP_IS_GAUSSIANBLUR(&filter->children.front()));
 }
 
 double get_single_gaussian_blur_radius(SPFilter *filter)
 {
-    if (filter->firstChild() && 
-        (filter->firstChild() == filter->lastChild()) &&
-        SP_IS_GAUSSIANBLUR(filter->firstChild())) {
+    if (filter->children.size() == 1 &&
+        SP_IS_GAUSSIANBLUR(&filter->children.front())) {
 
         SPGaussianBlur *gb = SP_GAUSSIANBLUR(filter->firstChild());
         double x = gb->stdDeviation.getNumber();