Last part of new SPObject children list

(bzr r14954.1.20)

33 files changed, 325 insertions, 390 deletions

diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index a52ab3d76..e4b7c6a83 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -1810,9 +1810,8 @@ objects_query_blur (const std::vector<SPItem*> &objects, SPStyle *style_res)
         //if object has a filter
         if (style->filter.set && style->getFilter()) {
             //cycle through filter primitives
-            SPObject *primitive_obj = style->getFilter()->children;
-            while (primitive_obj) {
-                SPFilterPrimitive *primitive = dynamic_cast<SPFilterPrimitive *>(primitive_obj);
+            for(auto& primitive_obj: style->getFilter()->_children) {
+                SPFilterPrimitive *primitive = dynamic_cast<SPFilterPrimitive *>(&primitive_obj);
                 if (primitive) {
 
                     //if primitive is gaussianblur
@@ -1830,7 +1829,6 @@ objects_query_blur (const std::vector<SPItem*> &objects, SPStyle *style_res)
                         }
                     }
                 }
-                primitive_obj = primitive_obj->next;
             }
         }
     }
diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp
index 011f51977..927093ef4 100644
--- a/src/display/nr-svgfonts.cpp
+++ b/src/display/nr-svgfonts.cpp
@@ -203,14 +203,19 @@ SvgFont::scaled_font_text_to_glyphs (cairo_scaled_font_t  */*scaled_font*/,
             //check whether is there a glyph declared on the SVG document
             // that matches with the text string in its current position
             if ( (len = size_of_substring(this->glyphs[i]->unicode.c_str(), _utf8)) ){
-                for(SPObject* node = this->font->children;previous_unicode && node;node=node->next){
+                for(auto& node: font->_children) {
+                    if (!previous_unicode) {
+                        break;
+                    }
                     //apply glyph kerning if appropriate
-                    SPHkern *hkern = dynamic_cast<SPHkern *>(node);
-                    if (hkern && is_horizontal_text && MatchHKerningRule(hkern, this->glyphs[i], previous_unicode, previous_glyph_name) ){
+                    SPHkern *hkern = dynamic_cast<SPHkern *>(&node);
+                    if (hkern && is_horizontal_text &&
+                        MatchHKerningRule(hkern, this->glyphs[i], previous_unicode, previous_glyph_name)) {
                         x -= (hkern->k / 1000.0);//TODO: use here the height of the font
                     }
-                    SPVkern *vkern = dynamic_cast<SPVkern *>(node);
-                    if (vkern && !is_horizontal_text && MatchVKerningRule(vkern, this->glyphs[i], previous_unicode, previous_glyph_name) ){
+                    SPVkern *vkern = dynamic_cast<SPVkern *>(&node);
+                    if (vkern && !is_horizontal_text &&
+                        MatchVKerningRule(vkern, this->glyphs[i], previous_unicode, previous_glyph_name)) {
                         y -= (vkern->k / 1000.0);//TODO: use here the "height" of the font
                     }
                 }
@@ -271,10 +276,10 @@ SvgFont::glyph_modified(SPObject* /* blah */, unsigned int /* bleh */){
 Geom::PathVector
 SvgFont::flip_coordinate_system(SPFont* spfont, Geom::PathVector pathv){
     double units_per_em = 1000;
-    for (SPObject *obj = spfont->children; obj; obj = obj->next){
-        if (dynamic_cast<SPFontFace *>(obj)) {
+    for(auto& obj: spfont->_children) {
+        if (dynamic_cast<SPFontFace *>(&obj)) {
             //XML Tree being directly used here while it shouldn't be.
-            sp_repr_get_double(obj->getRepr(), "units_per_em", &units_per_em);
+            sp_repr_get_double(obj.getRepr(), "units_per_em", &units_per_em);
         }
     }
 
@@ -339,19 +344,19 @@ SvgFont::scaled_font_render_glyph (cairo_scaled_font_t  */*scaled_font*/,
 
     if (node->hasChildren()){
         //render the SVG described on this glyph's child nodes.
-        for(node = node->children; node; node=node->next){
+        for(auto& child: node->_children) {
             {
-                SPPath *path = dynamic_cast<SPPath *>(node);
+                SPPath *path = dynamic_cast<SPPath *>(&child);
                 if (path) {
                     pathv = path->_curve->get_pathvector();
                     pathv = flip_coordinate_system(spfont, pathv);
                     render_glyph_path(cr, &pathv);
                 }
             }
-            if (dynamic_cast<SPObjectGroup *>(node)) {
+            if (dynamic_cast<SPObjectGroup *>(&child)) {
                 g_warning("TODO: svgfonts: render OBJECTGROUP");
             }
-            SPUse *use = dynamic_cast<SPUse *>(node);
+            SPUse *use = dynamic_cast<SPUse *>(&child);
             if (use) {
                 SPItem* item = use->ref->getObject();
                 SPPath *path = dynamic_cast<SPPath *>(item);
@@ -374,12 +379,12 @@ SvgFont::scaled_font_render_glyph (cairo_scaled_font_t  */*scaled_font*/,
 cairo_font_face_t*
 SvgFont::get_font_face(){
     if (!this->userfont) {
-        for(SPObject* node = this->font->children;node;node=node->next){
-            SPGlyph *glyph = dynamic_cast<SPGlyph *>(node);
+        for(auto& node: font->_children) {
+            SPGlyph *glyph = dynamic_cast<SPGlyph *>(&node);
             if (glyph) {
                 glyphs.push_back(glyph);
             }
-            SPMissingGlyph *missing = dynamic_cast<SPMissingGlyph *>(node);
+            SPMissingGlyph *missing = dynamic_cast<SPMissingGlyph *>(&node);
             if (missing) {
                 missingglyph = missing;
             }
diff --git a/src/extension/internal/metafile-print.cpp b/src/extension/internal/metafile-print.cpp
index 47ba5971c..5c10f7dd9 100644
--- a/src/extension/internal/metafile-print.cpp
+++ b/src/extension/internal/metafile-print.cpp
@@ -293,20 +293,22 @@ void PrintMetafile::brush_classify(SPObject *parent, int depth, Inkscape::Pixbuf
             }
 
             // still looking?  Look at this pattern's children, if there are any
-            SPObject *child = pat_i->firstChild();
-            while (child && !(*epixbuf) && (*hatchType == -1)) {
-                brush_classify(child, depth, epixbuf, hatchType, hatchColor, bkColor);
-                child = child->getNext();
+            for (auto& child: pat_i->_children) {
+                if (*epixbuf || *hatchType != -1) {
+                    break;
+                }
+                brush_classify(&child, depth, epixbuf, hatchType, hatchColor, bkColor);
             }
         }
     } else if (SP_IS_IMAGE(parent)) {
         *epixbuf = ((SPImage *)parent)->pixbuf;
         return;
     } else { // some inkscape rearrangements pass through nodes between pattern and image which are not classified as either.
-        SPObject *child = parent->firstChild();
-        while (child && !(*epixbuf) && (*hatchType == -1)) {
-            brush_classify(child, depth, epixbuf, hatchType, hatchColor, bkColor);
-            child = child->getNext();
+        for (auto& child: parent->_children) {
+            if (*epixbuf || *hatchType != -1) {
+                break;
+            }
+            brush_classify(&child, depth, epixbuf, hatchType, hatchColor, bkColor);
         }
     }
 }
diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index 6e92ef50f..d3f031257 100644
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
@@ -199,11 +199,11 @@ Inkscape::XML::Node* SPFeBlend::write(Inkscape::XML::Document *doc, Inkscape::XM
     if( !in2_name ) {
 
         // This code is very similar to sp_filter_primtive_name_previous_out()
-        SPObject *i = parent->children;
+        SPObject *i = parent->firstChild();
 
         // Find previous filter primitive
-        while (i && i->next != this) {
-        	i = i->next;
+        while (i && i->getNext() != this) {
+        	i = i->getNext();
         }
 
         if( i ) {
diff --git a/src/filters/componenttransfer.cpp b/src/filters/componenttransfer.cpp
index 3d0264390..e52f6d478 100644
--- a/src/filters/componenttransfer.cpp
+++ b/src/filters/componenttransfer.cpp
@@ -49,11 +49,10 @@ static void sp_feComponentTransfer_children_modified(SPFeComponentTransfer *sp_c
 {
     if (sp_componenttransfer->renderer) {
         bool set[4] = {false, false, false, false};
-        SPObject* node = sp_componenttransfer->children;
-        for(;node;node=node->next){
+        for(auto& node: sp_componenttransfer->_children) {
             int i = 4;
 
-            SPFeFuncNode *funcNode = SP_FEFUNCNODE(node);
+            SPFeFuncNode *funcNode = SP_FEFUNCNODE(&node);
 
             switch (funcNode->channel) {
             case SPFeFuncNode::R:
@@ -74,13 +73,13 @@ static void sp_feComponentTransfer_children_modified(SPFeComponentTransfer *sp_c
                 g_warning("Unrecognized channel for component transfer.");
                 break;
             }
-            sp_componenttransfer->renderer->type[i] = ((SPFeFuncNode *) node)->type;
-            sp_componenttransfer->renderer->tableValues[i] = ((SPFeFuncNode *) node)->tableValues;
-            sp_componenttransfer->renderer->slope[i] = ((SPFeFuncNode *) node)->slope;
-            sp_componenttransfer->renderer->intercept[i] = ((SPFeFuncNode *) node)->intercept;
-            sp_componenttransfer->renderer->amplitude[i] = ((SPFeFuncNode *) node)->amplitude;
-            sp_componenttransfer->renderer->exponent[i] = ((SPFeFuncNode *) node)->exponent;
-            sp_componenttransfer->renderer->offset[i] = ((SPFeFuncNode *) node)->offset;
+            sp_componenttransfer->renderer->type[i] = ((SPFeFuncNode *) &node)->type;
+            sp_componenttransfer->renderer->tableValues[i] = ((SPFeFuncNode *) &node)->tableValues;
+            sp_componenttransfer->renderer->slope[i] = ((SPFeFuncNode *) &node)->slope;
+            sp_componenttransfer->renderer->intercept[i] = ((SPFeFuncNode *) &node)->intercept;
+            sp_componenttransfer->renderer->amplitude[i] = ((SPFeFuncNode *) &node)->amplitude;
+            sp_componenttransfer->renderer->exponent[i] = ((SPFeFuncNode *) &node)->exponent;
+            sp_componenttransfer->renderer->offset[i] = ((SPFeFuncNode *) &node)->offset;
             set[i] = true;
         }
         // Set any types not explicitly set to the identity transform
diff --git a/src/filters/composite.cpp b/src/filters/composite.cpp
index 3e651a778..42f06915f 100644
--- a/src/filters/composite.cpp
+++ b/src/filters/composite.cpp
@@ -221,11 +221,11 @@ Inkscape::XML::Node* SPFeComposite::write(Inkscape::XML::Document *doc, Inkscape
     if( !in2_name ) {
 
         // This code is very similar to sp_filter_primitive_name_previous_out()
-        SPObject *i = parent->children;
+        SPObject *i = parent->firstChild();
 
         // Find previous filter primitive
-        while (i && i->next != this) {
-        	i = i->next;
+        while (i && i->getNext() != this) {
+        	i = i->getNext();
         }
 
         if( i ) {
diff --git a/src/filters/diffuselighting.cpp b/src/filters/diffuselighting.cpp
index 120c058d2..a46b367ec 100644
--- a/src/filters/diffuselighting.cpp
+++ b/src/filters/diffuselighting.cpp
@@ -258,17 +258,17 @@ static void sp_feDiffuseLighting_children_modified(SPFeDiffuseLighting *sp_diffu
 {
    if (sp_diffuselighting->renderer) {
         sp_diffuselighting->renderer->light_type = Inkscape::Filters::NO_LIGHT;
-        if (SP_IS_FEDISTANTLIGHT(sp_diffuselighting->children)) {
+        if (SP_IS_FEDISTANTLIGHT(sp_diffuselighting->firstChild())) {
             sp_diffuselighting->renderer->light_type = Inkscape::Filters::DISTANT_LIGHT;
-            sp_diffuselighting->renderer->light.distant = SP_FEDISTANTLIGHT(sp_diffuselighting->children);
+            sp_diffuselighting->renderer->light.distant = SP_FEDISTANTLIGHT(sp_diffuselighting->firstChild());
         }
-        if (SP_IS_FEPOINTLIGHT(sp_diffuselighting->children)) {
+        if (SP_IS_FEPOINTLIGHT(sp_diffuselighting->firstChild())) {
             sp_diffuselighting->renderer->light_type = Inkscape::Filters::POINT_LIGHT;
-            sp_diffuselighting->renderer->light.point = SP_FEPOINTLIGHT(sp_diffuselighting->children);
+            sp_diffuselighting->renderer->light.point = SP_FEPOINTLIGHT(sp_diffuselighting->firstChild());
         }
-        if (SP_IS_FESPOTLIGHT(sp_diffuselighting->children)) {
+        if (SP_IS_FESPOTLIGHT(sp_diffuselighting->firstChild())) {
             sp_diffuselighting->renderer->light_type = Inkscape::Filters::SPOT_LIGHT;
-            sp_diffuselighting->renderer->light.spot = SP_FESPOTLIGHT(sp_diffuselighting->children);
+            sp_diffuselighting->renderer->light.spot = SP_FESPOTLIGHT(sp_diffuselighting->firstChild());
         }
    }
 }
@@ -293,19 +293,19 @@ void SPFeDiffuseLighting::build_renderer(Inkscape::Filters::Filter* filter) {
     //We assume there is at most one child
     nr_diffuselighting->light_type = Inkscape::Filters::NO_LIGHT;
 
-    if (SP_IS_FEDISTANTLIGHT(this->children)) {
+    if (SP_IS_FEDISTANTLIGHT(this->firstChild())) {
         nr_diffuselighting->light_type = Inkscape::Filters::DISTANT_LIGHT;
-        nr_diffuselighting->light.distant = SP_FEDISTANTLIGHT(this->children);
+        nr_diffuselighting->light.distant = SP_FEDISTANTLIGHT(this->firstChild());
     }
 
-    if (SP_IS_FEPOINTLIGHT(this->children)) {
+    if (SP_IS_FEPOINTLIGHT(this->firstChild())) {
         nr_diffuselighting->light_type = Inkscape::Filters::POINT_LIGHT;
-        nr_diffuselighting->light.point = SP_FEPOINTLIGHT(this->children);
+        nr_diffuselighting->light.point = SP_FEPOINTLIGHT(this->firstChild());
     }
 
-    if (SP_IS_FESPOTLIGHT(this->children)) {
+    if (SP_IS_FESPOTLIGHT(this->firstChild())) {
         nr_diffuselighting->light_type = Inkscape::Filters::SPOT_LIGHT;
-        nr_diffuselighting->light.spot = SP_FESPOTLIGHT(this->children);
+        nr_diffuselighting->light.spot = SP_FESPOTLIGHT(this->firstChild());
     }
         
     //nr_offset->set_dx(sp_offset->dx);
diff --git a/src/filters/displacementmap.cpp b/src/filters/displacementmap.cpp
index 1dbea67ff..f0ca36079 100644
--- a/src/filters/displacementmap.cpp
+++ b/src/filters/displacementmap.cpp
@@ -193,11 +193,11 @@ Inkscape::XML::Node* SPFeDisplacementMap::write(Inkscape::XML::Document *doc, In
     if( !in2_name ) {
 
         // This code is very similar to sp_filter_primtive_name_previous_out()
-        SPObject *i = parent->children;
+        SPObject *i = parent->firstChild();
 
         // Find previous filter primitive
-        while (i && i->next != this) {
-        	i = i->next;
+        while (i && i->getNext() != this) {
+        	i = i->getNext();
         }
 
         if( i ) {
diff --git a/src/filters/merge.cpp b/src/filters/merge.cpp
index 68f671b11..6af1e8115 100644
--- a/src/filters/merge.cpp
+++ b/src/filters/merge.cpp
@@ -92,17 +92,14 @@ void SPFeMerge::build_renderer(Inkscape::Filters::Filter* filter) {
 
     sp_filter_primitive_renderer_common(this, nr_primitive);
 
-    SPObject *input = this->children;
     int in_nr = 0;
 
-    while (input) {
-        if (SP_IS_FEMERGENODE(input)) {
-            SPFeMergeNode *node = SP_FEMERGENODE(input);
+    for(auto& input: _children) {
+        if (SP_IS_FEMERGENODE(&input)) {
+            SPFeMergeNode *node = SP_FEMERGENODE(&input);
             nr_merge->set_input(in_nr, node->input);
             in_nr++;
         }
-
-        input = input->next;
     }
 }
 
diff --git a/src/filters/specularlighting.cpp b/src/filters/specularlighting.cpp
index bda1a0f30..ac7253ad9 100644
--- a/src/filters/specularlighting.cpp
+++ b/src/filters/specularlighting.cpp
@@ -266,19 +266,19 @@ static void sp_feSpecularLighting_children_modified(SPFeSpecularLighting *sp_spe
 	if (sp_specularlighting->renderer) {
         sp_specularlighting->renderer->light_type = Inkscape::Filters::NO_LIGHT;
         
-        if (SP_IS_FEDISTANTLIGHT(sp_specularlighting->children)) {
+        if (SP_IS_FEDISTANTLIGHT(sp_specularlighting->firstChild())) {
             sp_specularlighting->renderer->light_type = Inkscape::Filters::DISTANT_LIGHT;
-            sp_specularlighting->renderer->light.distant = SP_FEDISTANTLIGHT(sp_specularlighting->children);
+            sp_specularlighting->renderer->light.distant = SP_FEDISTANTLIGHT(sp_specularlighting->firstChild());
         }
         
-        if (SP_IS_FEPOINTLIGHT(sp_specularlighting->children)) {
+        if (SP_IS_FEPOINTLIGHT(sp_specularlighting->firstChild())) {
             sp_specularlighting->renderer->light_type = Inkscape::Filters::POINT_LIGHT;
-            sp_specularlighting->renderer->light.point = SP_FEPOINTLIGHT(sp_specularlighting->children);
+            sp_specularlighting->renderer->light.point = SP_FEPOINTLIGHT(sp_specularlighting->firstChild());
         }
         
-        if (SP_IS_FESPOTLIGHT(sp_specularlighting->children)) {
+        if (SP_IS_FESPOTLIGHT(sp_specularlighting->firstChild())) {
             sp_specularlighting->renderer->light_type = Inkscape::Filters::SPOT_LIGHT;
-            sp_specularlighting->renderer->light.spot = SP_FESPOTLIGHT(sp_specularlighting->children);
+            sp_specularlighting->renderer->light.spot = SP_FESPOTLIGHT(sp_specularlighting->firstChild());
         }
 	}
 }
@@ -304,19 +304,19 @@ void SPFeSpecularLighting::build_renderer(Inkscape::Filters::Filter* filter) {
     //We assume there is at most one child
     nr_specularlighting->light_type = Inkscape::Filters::NO_LIGHT;
 
-    if (SP_IS_FEDISTANTLIGHT(this->children)) {
+    if (SP_IS_FEDISTANTLIGHT(this->firstChild())) {
         nr_specularlighting->light_type = Inkscape::Filters::DISTANT_LIGHT;
-        nr_specularlighting->light.distant = SP_FEDISTANTLIGHT(this->children);
+        nr_specularlighting->light.distant = SP_FEDISTANTLIGHT(this->firstChild());
     }
 
-    if (SP_IS_FEPOINTLIGHT(this->children)) {
+    if (SP_IS_FEPOINTLIGHT(this->firstChild())) {
         nr_specularlighting->light_type = Inkscape::Filters::POINT_LIGHT;
-        nr_specularlighting->light.point = SP_FEPOINTLIGHT(this->children);
+        nr_specularlighting->light.point = SP_FEPOINTLIGHT(this->firstChild());
     }
 
-    if (SP_IS_FESPOTLIGHT(this->children)) {
+    if (SP_IS_FESPOTLIGHT(this->firstChild())) {
         nr_specularlighting->light_type = Inkscape::Filters::SPOT_LIGHT;
-        nr_specularlighting->light.spot = SP_FESPOTLIGHT(this->children);
+        nr_specularlighting->light.spot = SP_FESPOTLIGHT(this->firstChild());
     }
         
     //nr_offset->set_dx(sp_offset->dx);
diff --git a/src/main.cpp b/src/main.cpp
index db908f640..7ab27dcb2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1483,10 +1483,8 @@ do_query_all_recurse (SPObject *o)
         }
     }
 
-    SPObject *child = o->children;
-    while (child) {
-        do_query_all_recurse (child);
-        child = child->next;
+    for(auto& child: o->_children) {
+        do_query_all_recurse (&child);
     }
 }
 
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 55f4118b0..28bcadef5 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -1010,7 +1010,7 @@ sp_selection_raise(Inkscape::Selection *selection, SPDesktop *desktop)
         for (std::vector<SPItem*>::const_iterator item=rev.begin();item!=rev.end();++item) {
             SPObject *child = *item;
             // for each selected object, find the next sibling
-            for (SPObject *newref = child->next; newref; newref = newref->next) {
+            for (SPObject *newref = child->getNext(); newref; newref = newref->getNext()) {
                 // if the sibling is an item AND overlaps our selection,
                 SPItem *newItem = dynamic_cast<SPItem *>(newref);
                 if (newItem) {
@@ -1138,15 +1138,16 @@ void sp_selection_lower_to_bottom(Inkscape::Selection *selection, SPDesktop *des
 
     for (std::vector<Inkscape::XML::Node*>::const_reverse_iterator l=rl.rbegin();l!=rl.rend();++l) {
         gint minpos;
-        SPObject *pp, *pc;
+        SPObject *pp;
         Inkscape::XML::Node *repr = (*l);
         pp = document->getObjectByRepr(repr->parent());
         minpos = 0;
         g_assert(dynamic_cast<SPGroup *>(pp));
-        pc = pp->firstChild();
-        while (!dynamic_cast<SPItem *>(pc)) {
+        for (auto& pc: pp->_children) {
+            if(dynamic_cast<SPItem *>(&pc)) {
+                break;
+            }
             minpos += 1;
-            pc = pc->next;
         }
         repr->setPosition(minpos);
     }
@@ -1197,8 +1198,8 @@ take_style_from_item(SPObject *object)
     if (css == NULL)
         return NULL;
 
-    if ((dynamic_cast<SPGroup *>(object) && object->children) ||
-        (dynamic_cast<SPText *>(object) && object->children && object->children->next == NULL)) {
+    if ((dynamic_cast<SPGroup *>(object) && object->firstChild()) ||
+        (dynamic_cast<SPText *>(object) && object->firstChild() && object->firstChild()->getNext() == NULL)) {
         // if this is a text with exactly one tspan child, merge the style of that tspan as well
         // If this is a group, merge the style of its topmost (last) child with style
         auto list = object->_children | boost::adaptors::reversed;
@@ -2330,10 +2331,10 @@ typedef struct ListReverse {
     typedef GSList *Iterator;
 
     static Iterator children(SPObject *o) {
-        return make_list(o->firstChild(), NULL);
+        return make_list(o, NULL);
     }
     static Iterator siblings_after(SPObject *o) {
-        return make_list(o->parent->firstChild(), o);
+        return make_list(o->parent, o);
     }
     static void dispose(Iterator i) {
         g_slist_free(i);
@@ -2347,13 +2348,12 @@ typedef struct ListReverse {
 private:
     static GSList *make_list(SPObject *object, SPObject *limit) {
         GSList *list = NULL;
-        while ( object != limit ) {
-            if (!object) { // TODO check if this happens in practice
-                g_warning("Unexpected list overrun");
+        for (auto &child: object->_children) {
+            if (&child == limit) {
                 break;
             }
-            list = g_slist_prepend(list, object);
-            object = object->getNext();
+            list = g_slist_prepend(list, &child);
+
         }
         return list;
     }
diff --git a/src/sp-filter-primitive.cpp b/src/sp-filter-primitive.cpp
index b18850914..09df234cc 100644
--- a/src/sp-filter-primitive.cpp
+++ b/src/sp-filter-primitive.cpp
@@ -246,8 +246,10 @@ int sp_filter_primitive_read_result(SPFilterPrimitive *prim, gchar const *name)
  */
 int sp_filter_primitive_name_previous_out(SPFilterPrimitive *prim) {
     SPFilter *parent = SP_FILTER(prim->parent);
-    SPObject *i = parent->children;
-    while (i && i->next != prim) i = i->next;
+    SPObject *i = parent->firstChild();
+    while (i && i->getNext() != prim) {
+        i = i->getNext();
+    }
     if (i) {
         SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i);
         if (i_prim->image_out < 0) {
diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index da3f12f5f..170847c0b 100644
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
@@ -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);
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index eed882800..83fa5a1b4 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -440,9 +440,9 @@ Shape* SPFlowtext::_buildExclusionShape() const
     Shape *shape = new Shape();
     Shape *shape_temp = new Shape();
 
-    for (SPObject *child = children ; child ; child = child->getNext() ) {
+    for (auto& child: _children) {
         // RH: is it right that this shouldn't be recursive?
-        SPFlowregionExclude *c_child = dynamic_cast<SPFlowregionExclude *>(child);
+        SPFlowregionExclude *c_child = dynamic_cast<SPFlowregionExclude *>(const_cast<SPObject*>(&child));
         if ( c_child && c_child->computed && c_child->computed->hasEdges() ) {
             if (shape->hasEdges()) {
                 shape_temp->Booleen(shape, c_child->computed, bool_op_union);
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 7915b0453..8d482d9b1 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -583,7 +583,7 @@ sp_item_group_ungroup (SPGroup *group, std::vector<SPItem*> &children, bool do_d
             if (text) {
                 //this causes a change in text-on-path appearance when there is a non-conformal transform, see bug #1594565
                 double scale = (ctrans.expansionX() + ctrans.expansionY()) / 2.0;
-                SPTextPath * text_path = dynamic_cast<SPTextPath *>(text->children);
+                SPTextPath * text_path = dynamic_cast<SPTextPath *>(text->firstChild());
                 if (!text_path) {
                     nrepr->setAttribute("transform", affinestr);
                 } else {
diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index ba57cec8b..53b4c0879 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -351,8 +351,8 @@ void SPItem::moveTo(SPItem *target, bool intoafter) {
         // Assume move to the "first" in the top node, find the top node
         intoafter = false;
         SPObject* bottom = this->document->getObjectByRepr(our_ref->root())->firstChild();
-        while(!dynamic_cast<SPItem*>(bottom->next)){
-        	bottom=bottom->next;
+        while(!dynamic_cast<SPItem*>(bottom->getNext())){
+        	bottom = bottom->getNext();
         }
         target_ref = bottom->getRepr();
     }
@@ -974,8 +974,8 @@ void SPItem::getSnappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscap
     for (std::list<SPObject const *>::const_iterator o = clips_and_masks.begin(); o != clips_and_masks.end(); ++o) {
         if (*o) {
             // obj is a group object, the children are the actual clippers
-            for (SPObject *child = (*o)->children ; child ; child = child->next) {
-                SPItem *item = dynamic_cast<SPItem *>(child);
+            for(auto& child: (*o)->_children) {
+                SPItem *item = dynamic_cast<SPItem *>(const_cast<SPObject*>(&child));
                 if (item) {
                     std::vector<Inkscape::SnapCandidatePoint> p_clip_or_mask;
                     // Please note the recursive call here!
@@ -1302,8 +1302,8 @@ void SPItem::adjust_stroke_width_recursive(double expansion)
 
 // A clone's child is the ghost of its original - we must not touch it, skip recursion
     if ( !dynamic_cast<SPUse *>(this) ) {
-        for ( SPObject *o = children; o; o = o->getNext() ) {
-            SPItem *item = dynamic_cast<SPItem *>(o);
+        for (auto& o: _children) {
+            SPItem *item = dynamic_cast<SPItem *>(&o);
             if (item) {
                 item->adjust_stroke_width_recursive(expansion);
             }
@@ -1317,8 +1317,8 @@ void SPItem::freeze_stroke_width_recursive(bool freeze)
 
 // A clone's child is the ghost of its original - we must not touch it, skip recursion
     if ( !dynamic_cast<SPUse *>(this) ) {
-        for ( SPObject *o = children; o; o = o->getNext() ) {
-            SPItem *item = dynamic_cast<SPItem *>(o);
+        for (auto& o: _children) {
+            SPItem *item = dynamic_cast<SPItem *>(&o);
             if (item) {
                 item->freeze_stroke_width_recursive(freeze);
             }
@@ -1337,10 +1337,10 @@ sp_item_adjust_rects_recursive(SPItem *item, Geom::Affine advertized_transform)
     	rect->compensateRxRy(advertized_transform);
     }
 
-    for (SPObject *o = item->children; o != NULL; o = o->next) {
-        SPItem *item = dynamic_cast<SPItem *>(o);
-        if (item) {
-            sp_item_adjust_rects_recursive(item, advertized_transform);
+    for(auto& o: item->_children) {
+        SPItem *itm = dynamic_cast<SPItem *>(&o);
+        if (itm) {
+            sp_item_adjust_rects_recursive(itm, advertized_transform);
         }
     }
 }
@@ -1357,8 +1357,8 @@ void SPItem::adjust_paint_recursive (Geom::Affine advertized_transform, Geom::Af
 // also we do not recurse into clones, because a clone's child is the ghost of its original -
 // we must not touch it
     if (!(this && (dynamic_cast<SPText *>(this) || dynamic_cast<SPUse *>(this)))) {
-        for (SPObject *o = children; o != NULL; o = o->next) {
-            SPItem *item = dynamic_cast<SPItem *>(o);
+        for (auto& o: _children) {
+            SPItem *item = dynamic_cast<SPItem *>(&o);
             if (item) {
 // At the level of the transformed item, t_ancestors is identity;
 // below it, it is the accmmulated chain of transforms from this level to the top level
diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index 2babf0441..587efd4f6 100644
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -118,8 +118,7 @@ static gchar *sp_object_get_unique_id(SPObject    *object,
  */
 SPObject::SPObject()
     : cloned(0), uflags(0), mflags(0), hrefcount(0), _total_hrefcount(0),
-      document(NULL), parent(NULL), children(NULL),
-      next(NULL), id(NULL), repr(NULL), refCount(1),hrefList(std::list<SPObject*>()),
+      document(NULL), parent(NULL), id(NULL), repr(NULL), refCount(1), hrefList(std::list<SPObject*>()),
       _successor(NULL), _collection_policy(SPObject::COLLECT_WITH_PARENT),
       _label(NULL), _default_label(NULL)
 {
@@ -532,15 +531,6 @@ void SPObject::attach(SPObject *object, SPObject *prev)
     }
     _children.insert(it, *object);
 
-    SPObject *next;
-    if (prev) {
-        next = prev->next;
-        prev->next = object;
-    } else {
-        next = this->children;
-        this->children = object;
-    }
-    object->next = next;
     if (!object->xml_space.set)
         object->xml_space.value = this->xml_space.value;
 }
@@ -558,29 +548,6 @@ void SPObject::reorder(SPObject* obj, SPObject* prev) {
     }
 
     _children.splice(it, _children, _children.iterator_to(*obj));
-
-
-    SPObject *old_prev=NULL;
-    for ( SPObject *child = children ; child && child != obj ;
-          child = child->next )
-    {
-        old_prev = child;
-    }
-
-    SPObject *next=obj->next;
-    if (old_prev) {
-        old_prev->next = next;
-    } else {
-        children = next;
-    }
-    if (prev) {
-        next = prev->next;
-        prev->next = obj;
-    } else {
-        next = children;
-        children = obj;
-    }
-    obj->next = next;
 }
 
 void SPObject::detach(SPObject *object)
@@ -594,21 +561,6 @@ void SPObject::detach(SPObject *object)
     _children.erase(_children.iterator_to(*object));
     object->releaseReferences();
 
-    SPObject *prev=NULL;
-    for ( SPObject *child = this->children ; child && child != object ;
-          child = child->next )
-    {
-        prev = child;
-    }
-
-    SPObject *next=object->next;
-    if (prev) {
-        prev->next = next;
-    } else {
-        this->children = next;
-    }
-
-    object->next = NULL;
     object->parent = NULL;
 
     this->_updateTotalHRefCount(-object->_total_hrefcount);
@@ -851,6 +803,15 @@ SPObject *SPObject::getPrev()
     return prev;
 }
 
+SPObject* SPObject::getNext()
+{
+    SPObject *next = nullptr;
+    if (parent && !parent->_children.empty() && &parent->_children.back() != this) {
+        next = &*(++parent->_children.iterator_to(*this));
+    }
+    return next;
+}
+
 void SPObject::repr_child_added(Inkscape::XML::Node * /*repr*/, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, gpointer data)
 {
     SPObject *object = SP_OBJECT(data);
@@ -1514,8 +1475,11 @@ bool SPObject::setTitleOrDesc(gchar const *value, gchar const *svg_tagname, bool
     }
     else {
         // remove the current content of the 'text' or 'desc' element
-        SPObject *child;
-        while (NULL != (child = elem->firstChild())) child->deleteObject();
+        auto tmp = elem->_children | boost::adaptors::transformed([](SPObject& obj) { return &obj; });
+        std::vector<SPObject*> vec(tmp.begin(), tmp.end());
+        for (auto &child: vec) {
+            child->deleteObject();
+        }
     }
 
     // add the new content
diff --git a/src/sp-object.h b/src/sp-object.h
index 2534b2268..94c9d5629 100644
--- a/src/sp-object.h
+++ b/src/sp-object.h
@@ -208,8 +208,6 @@ public:
     unsigned int _total_hrefcount; /* our hrefcount + total descendants */
     SPDocument *document; /* Document we are part of */
     SPObject *parent; /* Our parent (only one allowed) */
-    SPObject *children; /* Our children */
-    SPObject *next; /* Next object in linked list */
 
 private:
     SPObject(const SPObject&);
@@ -300,11 +298,8 @@ public:
      */
     SPObject const *nearestCommonAncestor(SPObject const *object) const;
 
-    /* A non-const version can be similarly constructed if you want one.
-     * (Don't just cast away the constness, which would be ill-formed.) */
-    SPObject *getNext() {return next;}
-
-    SPObject const *getNext() const {return next;}
+    /* Returns next object in sibling list or NULL. */
+    SPObject *getNext();
 
     /**
      * Returns previous object in sibling list or NULL.
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 5126ae094..193289c2b 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -676,9 +676,9 @@ void SPText::_adjustFontsizeRecursive(SPItem *item, double ex, bool is_root)
         item->updateRepr();
     }
 
-    for (SPObject *o = item->children; o != NULL; o = o->next) {
-        if (SP_IS_ITEM(o))
-            _adjustFontsizeRecursive(SP_ITEM(o), ex, false);
+    for(auto& o: item->_children) {
+        if (SP_IS_ITEM(&o))
+            _adjustFontsizeRecursive(SP_ITEM(&o), ex, false);
     }
 }
 
@@ -695,9 +695,9 @@ void SPText::_adjustCoordsRecursive(SPItem *item, Geom::Affine const &m, double
         SP_TREF(item)->attributes.transform(m, ex, ex, is_root);
     }
 
-    for (SPObject *o = item->children; o != NULL; o = o->next) {
-        if (SP_IS_ITEM(o))
-            _adjustCoordsRecursive(SP_ITEM(o), m, ex, false);
+    for(auto& o: item->_children) {
+        if (SP_IS_ITEM(&o))
+            _adjustCoordsRecursive(SP_ITEM(&o), m, ex, false);
     }
 }
 
diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index c8a0830c1..cef967c90 100644
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -436,27 +436,23 @@ void SPUse::move_compensate(Geom::Affine const *mp) {
     	//BUT move clippaths accordingly.
         //if clone has a clippath, move it accordingly
         if(clip_ref->getObject()){
-            SPObject *clip = clip_ref->getObject()->firstChild() ;
-            while(clip){
-            	SPItem *item = (SPItem*) clip;
+            for(auto& clip: clip_ref->getObject()->_children){
+            	SPItem *item = (SPItem*) &clip;
             	if(item){
                     item->transform *= m;
                     Geom::Affine identity;
-                    item->doWriteTransform(clip->getRepr(),item->transform, &identity);
+                    item->doWriteTransform(clip.getRepr(),item->transform, &identity);
             	}
-                clip = clip->getNext();
             }
         }
         if(mask_ref->getObject()){
-            SPObject *mask = mask_ref->getObject()->firstChild() ;
-            while(mask){
-            	SPItem *item = (SPItem*) mask;
+            for(auto& mask: mask_ref->getObject()->_children){
+            	SPItem *item = (SPItem*) &mask;
             	if(item){
                     item->transform *= m;
                     Geom::Affine identity;
-                    item->doWriteTransform(mask->getRepr(),item->transform, &identity);
+                    item->doWriteTransform(mask.getRepr(),item->transform, &identity);
             	}
-                mask = mask->getNext();
             }
         }
         return;
@@ -480,27 +476,23 @@ void SPUse::move_compensate(Geom::Affine const *mp) {
 
     //if clone has a clippath, move it accordingly
     if(clip_ref->getObject()){
-        SPObject *clip = clip_ref->getObject()->firstChild() ;
-        while(clip){
-        	SPItem *item = (SPItem*) clip;
+        for(auto& clip: clip_ref->getObject()->_children){
+        	SPItem *item = (SPItem*) &clip;
         	if(item){
                 item->transform *= clone_move.inverse();
                 Geom::Affine identity;
-                item->doWriteTransform(clip->getRepr(),item->transform, &identity);
+                item->doWriteTransform(clip.getRepr(),item->transform, &identity);
         	}
-            clip = clip->getNext();
         }
     }
     if(mask_ref->getObject()){
-        SPObject *mask = mask_ref->getObject()->firstChild() ;
-        while(mask){
-        	SPItem *item = (SPItem*) mask;
+        for(auto& mask: mask_ref->getObject()->_children){
+        	SPItem *item = (SPItem*) &mask;
         	if(item){
                 item->transform *= clone_move.inverse();
                 Geom::Affine identity;
-                item->doWriteTransform(mask->getRepr(),item->transform, &identity);
+                item->doWriteTransform(mask.getRepr(),item->transform, &identity);
         	}
-            mask = mask->getNext();
         }
     }
 
diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp
index f539652c0..56048d1f7 100644
--- a/src/text-chemistry.cpp
+++ b/src/text-chemistry.cpp
@@ -142,8 +142,8 @@ text_put_on_path()
 
     // make a list of text children
     GSList *text_reprs = NULL;
-    for (SPObject *o = text->children; o != NULL; o = o->next) {
-        text_reprs = g_slist_prepend(text_reprs, o->getRepr());
+    for(auto& o: text->_children) {
+        text_reprs = g_slist_prepend(text_reprs, o.getRepr());
     }
 
     // create textPath and put it into the text
@@ -353,9 +353,9 @@ text_flow_into_shape()
         Inkscape::GC::release(text_repr);
 
     } else { // reflow an already flowed text, preserving paras
-        for (SPObject *o = text->children; o != NULL; o = o->next) {
-            if (SP_IS_FLOWPARA(o)) {
-                Inkscape::XML::Node *para_repr = o->getRepr()->duplicate(xml_doc);
+        for(auto& o: text->_children) {
+            if (SP_IS_FLOWPARA(&o)) {
+                Inkscape::XML::Node *para_repr = o.getRepr()->duplicate(xml_doc);
                 root_repr->appendChild(para_repr);
                 object = doc->getObjectByRepr(para_repr);
                 g_return_if_fail(SP_IS_FLOWPARA(object));
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index b03be792b..6ca2fe948 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -944,13 +944,10 @@ sp_te_set_repr_text_multiline(SPItem *text, gchar const *str)
     gchar *content = g_strdup (str);
 
     repr->setContent("");
-    SPObject *child = object->firstChild();
-    while (child) {
-        SPObject *next = child->getNext();
-        if (!SP_IS_FLOWREGION(child) && !SP_IS_FLOWREGIONEXCLUDE(child)) {
-            repr->removeChild(child->getRepr());
+    for (auto& child: object->_children) {
+        if (!SP_IS_FLOWREGION(&child) && !SP_IS_FLOWREGIONEXCLUDE(&child)) {
+            repr->removeChild(child.getRepr());
         }
-        child = next;
     }
 
     gchar *p = content;
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 75c6c5bcc..48d53857b 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -839,8 +839,8 @@ void ClipboardManagerImpl::_copyUsedDefs(SPItem *item)
             SPObject *mask = item->mask_ref->getObject();
             _copyNode(mask->getRepr(), _doc, _defs);
             // recurse into the mask for its gradients etc.
-            for (SPObject *o = mask->children ; o != NULL ; o = o->next) {
-                SPItem *childItem = dynamic_cast<SPItem *>(o);
+            for(auto& o: mask->_children) {
+                SPItem *childItem = dynamic_cast<SPItem *>(&o);
                 if (childItem) {
                     _copyUsedDefs(childItem);
                 }
@@ -857,8 +857,8 @@ void ClipboardManagerImpl::_copyUsedDefs(SPItem *item)
     }
 
     // recurse
-    for (SPObject *o = item->children ; o != NULL ; o = o->next) {
-        SPItem *childItem = dynamic_cast<SPItem *>(o);
+    for(auto& o: item->_children) {
+        SPItem *childItem = dynamic_cast<SPItem *>(&o);
         if (childItem) {
             _copyUsedDefs(childItem);
         }
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 589973162..df37eb005 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -1315,12 +1315,7 @@ void DocumentProperties::changeEmbeddedScript(){
     for (std::vector<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
         SPObject* obj = *it;
         if (id == obj->getId()){
-
-            int count=0;
-            for ( SPObject *child = obj->children ; child; child = child->next )
-            {
-                count++;
-            }
+            int count = (int) obj->_children.size();
 
             if (count>1)
                 g_warning("TODO: Found a script element with multiple (%d) child nodes! We must implement support for that!", count);
@@ -1364,8 +1359,11 @@ void DocumentProperties::editEmbeddedScript(){
             //XML Tree being used directly here while it shouldn't be.
             Inkscape::XML::Node *repr = obj->getRepr();
             if (repr){
-                SPObject *child;
-                while (NULL != (child = obj->firstChild())) child->deleteObject();
+                auto tmp = obj->_children | boost::adaptors::transformed([](SPObject& o) { return &o; });
+                std::vector<SPObject*> vec(tmp.begin(), tmp.end());
+                for (auto &child: vec) {
+                    child->deleteObject();
+                }
                 obj->appendChildRepr(xml_doc->createTextNode(_EmbeddedContent.get_buffer()->get_text().c_str()));
 
                 //TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text());
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index a60d1ddff..1be5d540a 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -1058,11 +1058,10 @@ public:
     // FuncNode can be in any order so we must search to find correct one.
     SPFeFuncNode* find_node(SPFeComponentTransfer* ct)
     {
-        SPObject* node = ct->children;
         SPFeFuncNode* funcNode = NULL;
         bool found = false;
-        for(;node;node=node->next){
-            funcNode = SP_FEFUNCNODE(node);
+        for(auto& node: ct->_children) {
+            funcNode = SP_FEFUNCNODE(&node);
             if( funcNode->channel == _channel ) {
                 found = true;
                 break;
@@ -1226,7 +1225,7 @@ protected:
 
         _locked = true;
 
-        SPObject* child = o->children;
+        SPObject* child = o->firstChild();
 
         if(SP_IS_FEDISTANTLIGHT(child))
             _light_source.set_active(0);
@@ -1251,7 +1250,7 @@ private:
         if(prim) {
             _locked = true;
 
-            SPObject* child = prim->children;
+            SPObject* child = prim->firstChild();
             const int ls = _light_source.get_active_row_number();
             // Check if the light source type has changed
             if(!(ls == -1 && !child) &&
@@ -1285,8 +1284,8 @@ private:
         _light_box.show_all();
 
         SPFilterPrimitive* prim = _dialog._primitive_list.get_selected();
-        if(prim && prim->children)
-            _settings.show_and_update(_light_source.get_active_data()->id, prim->children);
+        if(prim && prim->firstChild())
+            _settings.show_and_update(_light_source.get_active_data()->id, prim->firstChild());
     }
 
     FilterEffectsDialog& _dialog;
@@ -1869,26 +1868,25 @@ void FilterEffectsDialog::PrimitiveList::update()
         bool active_found = false;
         _dialog._primitive_box->set_sensitive(true);
         _dialog.update_filter_general_settings_view();
-        for(SPObject *prim_obj = f->children;
-                prim_obj && SP_IS_FILTER_PRIMITIVE(prim_obj);
-                prim_obj = prim_obj->next) {
-            SPFilterPrimitive *prim = SP_FILTER_PRIMITIVE(prim_obj);
-            if(prim) {
-                Gtk::TreeModel::Row row = *_model->append();
-                row[_columns.primitive] = prim;
-
-                //XML Tree being used directly here while it shouldn't be.
-                row[_columns.type_id] = FPConverter.get_id_from_key(prim->getRepr()->name());
-                row[_columns.type] = _(FPConverter.get_label(row[_columns.type_id]).c_str());
-                
-                if (prim->getId()) {
-                    row[_columns.id] =  Glib::ustring(prim->getId());
-                }
-                
-                if(prim == active_prim) {
-                    get_selection()->select(row);
-                    active_found = true;
-                }
+        for(auto& prim_obj: f->_children) {
+            SPFilterPrimitive *prim = SP_FILTER_PRIMITIVE(&prim_obj);
+            if(!prim) {
+                break;
+            }
+            Gtk::TreeModel::Row row = *_model->append();
+            row[_columns.primitive] = prim;
+
+            //XML Tree being used directly here while it shouldn't be.
+            row[_columns.type_id] = FPConverter.get_id_from_key(prim->getRepr()->name());
+            row[_columns.type] = _(FPConverter.get_label(row[_columns.type_id]).c_str());
+
+            if (prim->getId()) {
+                row[_columns.id] =  Glib::ustring(prim->getId());
+            }
+
+            if(prim == active_prim) {
+                get_selection()->select(row);
+                active_found = true;
             }
         }
 
@@ -3098,7 +3096,7 @@ void FilterEffectsDialog::set_filternode_attr(const AttrWidget* input)
 
 void FilterEffectsDialog::set_child_attr_direct(const AttrWidget* input)
 {
-    set_attr(_primitive_list.get_selected()->children, input->get_attribute(), input->get_as_attribute().c_str());
+    set_attr(_primitive_list.get_selected()->firstChild(), input->get_attribute(), input->get_as_attribute().c_str());
 }
 
 void FilterEffectsDialog::set_attr(SPObject* o, const SPAttributeEnum attr, const gchar* val)
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 00482c573..e4639745f 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -340,12 +340,11 @@ void ObjectsPanel::_objectsChanged(SPObject */*obj*/)
 void ObjectsPanel::_addObject(SPObject* obj, Gtk::TreeModel::Row* parentRow)
 {
     if ( _desktop && obj ) {
-        for ( SPObject *child = obj->children; child != NULL; child = child->next) {
-
-            if (SP_IS_ITEM(child))
+        for(auto& child: obj->_children) {
+            if (SP_IS_ITEM(&child))
             {
-                SPItem * item = SP_ITEM(child);
-                SPGroup * group = SP_IS_GROUP(child) ? SP_GROUP(child) : 0;
+                SPItem * item = SP_ITEM(&child);
+                SPGroup * group = SP_IS_GROUP(&child) ? SP_GROUP(&child) : 0;
                 
                 //Add the item to the tree and set the column information
                 Gtk::TreeModel::iterator iter = parentRow ? _store->prepend(parentRow->children()) : _store->prepend();
@@ -372,14 +371,14 @@ void ObjectsPanel::_addObject(SPObject* obj, Gtk::TreeModel::Row* parentRow)
                 }
 
                 //Add an object watcher to the item
-                ObjectsPanel::ObjectWatcher *w = new ObjectsPanel::ObjectWatcher(this, child);
-                child->getRepr()->addObserver(*w);
+                ObjectsPanel::ObjectWatcher *w = new ObjectsPanel::ObjectWatcher(this, &child);
+                child.getRepr()->addObserver(*w);
                 _objectWatchers.push_back(w);
                 
                 //If the item is a group, recursively add its children
                 if (group)
                 {
-                    _addObject( child, &row );
+                    _addObject( &child, &row );
                 }
             }
         }
@@ -399,9 +398,8 @@ void ObjectsPanel::_updateObject( SPObject *obj, bool recurse ) {
     //end mark
     if (recurse)
     {
-        for (SPObject * iter = obj->children; iter != NULL; iter = iter->next)
-        {
-            _updateObject(iter, recurse);
+        for (auto& iter: obj->_children) {
+            _updateObject(&iter, recurse);
         }
     }
 }
@@ -520,19 +518,22 @@ void ObjectsPanel::_setCompositingValues(SPItem *item)
     SPGaussianBlur *spblur = NULL;
     if (item->style->getFilter())
     {
-        for(SPObject *primitive_obj = item->style->getFilter()->children; primitive_obj && SP_IS_FILTER_PRIMITIVE(primitive_obj); primitive_obj = primitive_obj->next) {
-                if(SP_IS_FEBLEND(primitive_obj) && !spblend) {
-                    //Get the blend mode
-                    spblend = SP_FEBLEND(primitive_obj);
-                }
-                
-                if(SP_IS_GAUSSIANBLUR(primitive_obj) && !spblur) {
-                    //Get the blur value
-                    spblur = SP_GAUSSIANBLUR(primitive_obj);
-                }
+        for (auto& primitive_obj: item->style->getFilter()->_children) {
+            if (!SP_IS_FILTER_PRIMITIVE(&primitive_obj)) {
+                break;
             }
+            if(SP_IS_FEBLEND(&primitive_obj) && !spblend) {
+                //Get the blend mode
+                spblend = SP_FEBLEND(&primitive_obj);
+            }
+
+            if(SP_IS_GAUSSIANBLUR(&primitive_obj) && !spblur) {
+                //Get the blur value
+                spblur = SP_GAUSSIANBLUR(&primitive_obj);
+            }
+        }
     }
-    
+
     //Set the blend mode
     _fe_cb.set_blend_mode(spblend ? spblend->blend_mode : Inkscape::Filters::BLEND_NORMAL);
     
@@ -1404,9 +1405,10 @@ void ObjectsPanel::_setCollapsed(SPGroup * group)
 {
     group->setExpanded(false);
     group->updateRepr(SP_OBJECT_WRITE_NO_CHILDREN | SP_OBJECT_WRITE_EXT);
-    for (SPObject *iter = group->children; iter != NULL; iter = iter->next)
-    {
-        if (SP_IS_GROUP(iter)) _setCollapsed(SP_GROUP(iter));
+    for (auto& iter: group->_children) {
+        if (SP_IS_GROUP(&iter)) {
+            _setCollapsed(SP_GROUP(&iter));
+        }
     }
 }
 
@@ -1521,11 +1523,14 @@ void ObjectsPanel::_blendChangedIter(const Gtk::TreeIter& iter, Glib::ustring bl
         if (blendmode != "normal") {
             gdouble radius = 0;
             if (item->style->getFilter()) {
-                for (SPObject *primitive = item->style->getFilter()->children; primitive && SP_IS_FILTER_PRIMITIVE(primitive); primitive = primitive->next) {
-                    if (SP_IS_GAUSSIANBLUR(primitive)) {
+                for (auto& primitive: item->style->getFilter()->_children) {
+                    if (!SP_IS_FILTER_PRIMITIVE(&primitive)) {
+                        break;
+                    }
+                    if (SP_IS_GAUSSIANBLUR(&primitive)) {
                         Geom::OptRect bbox = item->bounds(SPItem::GEOMETRIC_BBOX);
                         if (bbox) {
-                            radius = SP_GAUSSIANBLUR(primitive)->stdDeviation.getNumber();
+                            radius = SP_GAUSSIANBLUR(&primitive)->stdDeviation.getNumber();
                         }
                     }
                 }
@@ -1533,13 +1538,16 @@ void ObjectsPanel::_blendChangedIter(const Gtk::TreeIter& iter, Glib::ustring bl
             SPFilter *filter = new_filter_simple_from_item(_document, item, blendmode.c_str(), radius);
             sp_style_set_property_url(item, "filter", filter, false);
         } else {
-            for (SPObject *primitive = item->style->getFilter()->children; primitive && SP_IS_FILTER_PRIMITIVE(primitive); primitive = primitive->next) {
-                if (SP_IS_FEBLEND(primitive)) {
-                    primitive->deleteObject();
+            for (auto& primitive: item->style->getFilter()->_children) {
+                if (!SP_IS_FILTER_PRIMITIVE(&primitive)) {
+                    break;
+                }
+                if (SP_IS_FEBLEND(&primitive)) {
+                    primitive.deleteObject();
                     break;
                 }
             }
-            if (!item->style->getFilter()->children) {
+            if (!item->style->getFilter()->firstChild()) {
                 remove_filter(item, false);
             }
         }
@@ -1590,13 +1598,16 @@ void ObjectsPanel::_blurChangedIter(const Gtk::TreeIter& iter, double blur)
                 SPFilter *filter = modify_filter_gaussian_blur_from_item(_document, item, radius);
                 sp_style_set_property_url(item, "filter", filter, false);
             } else if (item->style->filter.set && item->style->getFilter()) {
-                for (SPObject *primitive = item->style->getFilter()->children; primitive && SP_IS_FILTER_PRIMITIVE(primitive); primitive = primitive->next) {
-                    if (SP_IS_GAUSSIANBLUR(primitive)) {
-                        primitive->deleteObject();
+                for (auto& primitive: item->style->getFilter()->_children) {
+                    if (!SP_IS_FILTER_PRIMITIVE(&primitive)) {
+                        break;
+                    }
+                    if (SP_IS_GAUSSIANBLUR(&primitive)) {
+                        primitive.deleteObject();
                         break;
                     }
                 }
-                if (!item->style->getFilter()->children) {
+                if (!item->style->getFilter()->firstChild()) {
                     remove_filter(item, false);
                 }
             }
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 7b256fc8f..93bd67a3d 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -115,11 +115,11 @@ void SvgFontsDialog::AttrEntry::set_text(char* t){
 void SvgFontsDialog::AttrEntry::on_attr_changed(){
 
     SPObject* o = NULL;
-    for(SPObject* node = this->dialog->get_selected_spfont()->children; node; node=node->next){
+    for (auto& node: dialog->get_selected_spfont()->_children) {
         switch(this->attr){
             case SP_PROP_FONT_FAMILY:
-                if (SP_IS_FONTFACE(node)){
-                    o = node;
+                if (SP_IS_FONTFACE(&node)){
+                    o = &node;
                     continue;
                 }
                 break;
@@ -170,9 +170,9 @@ void GlyphComboBox::update(SPFont* spfont){
     this->append(""); //Gtk is refusing to clear the combobox when I comment out this line
     this->remove_all();
 
-    for(SPObject* node = spfont->children; node; node=node->next){
-        if (SP_IS_GLYPH(node)){
-            this->append((static_cast<SPGlyph*>(node))->unicode);
+    for (auto& node: spfont->_children) {
+        if (SP_IS_GLYPH(&node)){
+            this->append((static_cast<SPGlyph*>(&node))->unicode);
         }
     }
 }
@@ -308,10 +308,9 @@ void SvgFontsDialog::update_global_settings_tab(){
     SPFont* font = get_selected_spfont();
     if (!font) return;
 
-    SPObject* obj;
-    for (obj=font->children; obj; obj=obj->next){
-        if (SP_IS_FONTFACE(obj)){
-            _familyname_entry->set_text((SP_FONTFACE(obj))->font_family);
+    for (auto& obj: font->_children) {
+        if (SP_IS_FONTFACE(&obj)){
+            _familyname_entry->set_text((SP_FONTFACE(&obj))->font_family);
         }
     }
 }
@@ -414,12 +413,12 @@ SvgFontsDialog::populate_glyphs_box()
     SPFont* spfont = this->get_selected_spfont();
     _glyphs_observer.set(spfont);
 
-    for(SPObject* node = spfont->children; node; node=node->next){
-        if (SP_IS_GLYPH(node)){
+    for (auto& node: spfont->_children) {
+        if (SP_IS_GLYPH(&node)){
             Gtk::TreeModel::Row row = *(_GlyphsListStore->append());
-            row[_GlyphsListColumns.glyph_node] = static_cast<SPGlyph*>(node);
-            row[_GlyphsListColumns.glyph_name] = (static_cast<SPGlyph*>(node))->glyph_name;
-            row[_GlyphsListColumns.unicode] = (static_cast<SPGlyph*>(node))->unicode;
+            row[_GlyphsListColumns.glyph_node] = static_cast<SPGlyph*>(&node);
+            row[_GlyphsListColumns.glyph_name] = (static_cast<SPGlyph*>(&node))->glyph_name;
+            row[_GlyphsListColumns.unicode] = (static_cast<SPGlyph*>(&node))->unicode;
         }
     }
 }
@@ -432,13 +431,13 @@ SvgFontsDialog::populate_kerning_pairs_box()
 
     SPFont* spfont = this->get_selected_spfont();
 
-    for(SPObject* node = spfont->children; node; node=node->next){
-        if (SP_IS_HKERN(node)){
+    for (auto& node: spfont->_children) {
+        if (SP_IS_HKERN(&node)){
             Gtk::TreeModel::Row row = *(_KerningPairsListStore->append());
-            row[_KerningPairsListColumns.first_glyph] = (static_cast<SPGlyphKerning*>(node))->u1->attribute_string().c_str();
-            row[_KerningPairsListColumns.second_glyph] = (static_cast<SPGlyphKerning*>(node))->u2->attribute_string().c_str();
-            row[_KerningPairsListColumns.kerning_value] = (static_cast<SPGlyphKerning*>(node))->k;
-            row[_KerningPairsListColumns.spnode] = static_cast<SPGlyphKerning*>(node);
+            row[_KerningPairsListColumns.first_glyph] = (static_cast<SPGlyphKerning*>(&node))->u1->attribute_string().c_str();
+            row[_KerningPairsListColumns.second_glyph] = (static_cast<SPGlyphKerning*>(&node))->u2->attribute_string().c_str();
+            row[_KerningPairsListColumns.kerning_value] = (static_cast<SPGlyphKerning*>(&node))->k;
+            row[_KerningPairsListColumns.spnode] = static_cast<SPGlyphKerning*>(&node);
         }
     }
 }
@@ -493,11 +492,10 @@ void SvgFontsDialog::add_glyph(){
 Geom::PathVector
 SvgFontsDialog::flip_coordinate_system(Geom::PathVector pathv){
     double units_per_em = 1000;
-    SPObject* obj;
-    for (obj = get_selected_spfont()->children; obj; obj=obj->next){
-        if (SP_IS_FONTFACE(obj)){
+    for (auto& obj: get_selected_spfont()->_children) {
+        if (SP_IS_FONTFACE(&obj)){
             //XML Tree being directly used here while it shouldn't be.
-            sp_repr_get_double(obj->getRepr(), "units-per-em", &units_per_em);
+            sp_repr_get_double(obj.getRepr(), "units-per-em", &units_per_em);
         }
     }
 
@@ -576,13 +574,12 @@ void SvgFontsDialog::missing_glyph_description_from_selected_path(){
 
     Geom::PathVector pathv = sp_svg_read_pathv(node->attribute("d"));
 
-    SPObject* obj;
-    for (obj = get_selected_spfont()->children; obj; obj=obj->next){
-        if (SP_IS_MISSING_GLYPH(obj)){
+    for (auto& obj: get_selected_spfont()->_children) {
+        if (SP_IS_MISSING_GLYPH(&obj)){
 
             //XML Tree being directly used here while it shouldn't be.
             gchar *str = sp_svg_write_path (flip_coordinate_system(pathv));
-            obj->getRepr()->setAttribute("d", str);
+            obj.getRepr()->setAttribute("d", str);
             g_free(str);
             DocumentUndo::done(doc, SP_VERB_DIALOG_SVG_FONTS, _("Set glyph curves"));
         }
@@ -599,11 +596,10 @@ void SvgFontsDialog::reset_missing_glyph_description(){
     }
 
     SPDocument* doc = desktop->getDocument();
-    SPObject* obj;
-    for (obj = get_selected_spfont()->children; obj; obj=obj->next){
-        if (SP_IS_MISSING_GLYPH(obj)){
+    for (auto& obj: get_selected_spfont()->_children) {
+        if (SP_IS_MISSING_GLYPH(&obj)){
             //XML Tree being directly used here while it shouldn't be.
-            obj->getRepr()->setAttribute("d", (char*) "M0,0h1000v1024h-1000z");
+            obj.getRepr()->setAttribute("d", (char*) "M0,0h1000v1024h-1000z");
             DocumentUndo::done(doc, SP_VERB_DIALOG_SVG_FONTS, _("Reset missing-glyph"));
         }
     }
@@ -738,12 +734,12 @@ void SvgFontsDialog::add_kerning_pair(){
 
     //look for this kerning pair on the currently selected font
     this->kerning_pair = NULL;
-    for(SPObject* node = this->get_selected_spfont()->children; node; node=node->next){
+    for (auto& node: get_selected_spfont()->_children) {
         //TODO: It is not really correct to get only the first byte of each string.
         //TODO: We should also support vertical kerning
-        if (SP_IS_HKERN(node) && (static_cast<SPGlyphKerning*>(node))->u1->contains((gchar) first_glyph.get_active_text().c_str()[0])
-            && (static_cast<SPGlyphKerning*>(node))->u2->contains((gchar) second_glyph.get_active_text().c_str()[0]) ){
-            this->kerning_pair = static_cast<SPGlyphKerning*>(node);
+        if (SP_IS_HKERN(&node) && (static_cast<SPGlyphKerning*>(&node))->u1->contains((gchar) first_glyph.get_active_text().c_str()[0])
+            && (static_cast<SPGlyphKerning*>(&node))->u2->contains((gchar) second_glyph.get_active_text().c_str()[0]) ){
+            this->kerning_pair = static_cast<SPGlyphKerning*>(&node);
             continue;
         }
     }
@@ -852,11 +848,10 @@ SPFont *new_font(SPDocument *document)
 
 void set_font_family(SPFont* font, char* str){
     if (!font) return;
-    SPObject* obj;
-    for (obj=font->children; obj; obj=obj->next){
-        if (SP_IS_FONTFACE(obj)){
+    for (auto& obj: font->_children) {
+        if (SP_IS_FONTFACE(&obj)){
             //XML Tree being directly used here while it shouldn't be.
-            obj->getRepr()->setAttribute("font-family", str);
+            obj.getRepr()->setAttribute("font-family", str);
         }
     }
 
@@ -873,11 +868,10 @@ void SvgFontsDialog::add_font(){
     font->setLabel(os.str().c_str());
 
     os2 << "SVGFont " << count;
-    SPObject* obj;
-    for (obj=font->children; obj; obj=obj->next){
-        if (SP_IS_FONTFACE(obj)){
+    for (auto& obj: font->_children) {
+        if (SP_IS_FONTFACE(&obj)){
             //XML Tree being directly used here while it shouldn't be.
-            obj->getRepr()->setAttribute("font-family", os2.str().c_str());
+            obj.getRepr()->setAttribute("font-family", os2.str().c_str());
         }
     }
 
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index 53641c0de..61c8b5d37 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -399,26 +399,26 @@ void TagsPanel::_objectsChanged(SPObject* root)
 void TagsPanel::_addObject( SPDocument* doc, SPObject* obj, Gtk::TreeModel::Row* parentRow )
 {
     if ( _desktop && obj ) {
-        for ( SPObject *child = obj->children; child != NULL; child = child->next) {
-            if (SP_IS_TAG(child))
+        for (auto& child: obj->_children) {
+            if (SP_IS_TAG(&child))
             {
                 Gtk::TreeModel::iterator iter = parentRow ? _store->prepend(parentRow->children()) : _store->prepend();
                 Gtk::TreeModel::Row row = *iter;
-                row[_model->_colObject] = child;
+                row[_model->_colObject] = &child;
                 row[_model->_colParentObject] = NULL;
-                row[_model->_colLabel] = child->label() ? child->label() : child->getId();
+                row[_model->_colLabel] = child.label() ? child.label() : child.getId();
                 row[_model->_colAddRemove] = true;
                 row[_model->_colAllowAddRemove] = true;
                 
                 _tree.expand_to_path( _store->get_path(iter) );
 
-                TagsPanel::ObjectWatcher *w = new TagsPanel::ObjectWatcher(this, child);
-                child->getRepr()->addObserver(*w);
+                TagsPanel::ObjectWatcher *w = new TagsPanel::ObjectWatcher(this, &child);
+                child.getRepr()->addObserver(*w);
                 _objectWatchers.push_back(w);
-                _addObject( doc, child, &row );
+                _addObject( doc, &child, &row );
             }
         }
-        if (SP_IS_TAG(obj) && obj->children)
+        if (SP_IS_TAG(obj) && obj->firstChild())
         {
             Gtk::TreeModel::iterator iteritems = parentRow ? _store->append(parentRow->children()) : _store->prepend();
             Gtk::TreeModel::Row rowitems = *iteritems;
@@ -429,16 +429,16 @@ void TagsPanel::_addObject( SPDocument* doc, SPObject* obj, Gtk::TreeModel::Row*
             rowitems[_model->_colAllowAddRemove] = false;
             
             _tree.expand_to_path( _store->get_path(iteritems) );
-            
-            for ( SPObject *child = obj->children; child != NULL; child = child->next) {
-                if (SP_IS_TAG_USE(child))
+
+            for (auto& child: obj->_children) {
+                if (SP_IS_TAG_USE(&child))
                 {
-                    SPItem *item = SP_TAG_USE(child)->ref->getObject();
+                    SPItem *item = SP_TAG_USE(&child)->ref->getObject();
                     Gtk::TreeModel::iterator iter = _store->prepend(rowitems->children());
                     Gtk::TreeModel::Row row = *iter;
-                    row[_model->_colObject] = child;
+                    row[_model->_colObject] = &child;
                     row[_model->_colParentObject] = NULL;
-                    row[_model->_colLabel] = item ? (item->label() ? item->label() : item->getId()) : SP_TAG_USE(child)->href;
+                    row[_model->_colLabel] = item ? (item->label() ? item->label() : item->getId()) : SP_TAG_USE(&child)->href;
                     row[_model->_colAddRemove] = false;
                     row[_model->_colAllowAddRemove] = true;
 
@@ -447,7 +447,7 @@ void TagsPanel::_addObject( SPDocument* doc, SPObject* obj, Gtk::TreeModel::Row*
                     }
 
                     if (item) {
-                        TagsPanel::ObjectWatcher *w = new TagsPanel::ObjectWatcher(this, child, item->getRepr());
+                        TagsPanel::ObjectWatcher *w = new TagsPanel::ObjectWatcher(this, &child, item->getRepr());
                         item->getRepr()->addObserver(*w);
                         _objectWatchers.push_back(w);
                     }
@@ -459,12 +459,11 @@ void TagsPanel::_addObject( SPDocument* doc, SPObject* obj, Gtk::TreeModel::Row*
 
 void TagsPanel::_select_tag( SPTag * tag )
 {
-    for (SPObject * child = tag->children; child != NULL; child = child->next)
-    {
-        if (SP_IS_TAG(child)) {
-            _select_tag(SP_TAG(child));
-        } else if (SP_IS_TAG_USE(child)) {
-            SPObject * obj = SP_TAG_USE(child)->ref->getObject();
+    for (auto& child: tag->_children) {
+        if (SP_IS_TAG(&child)) {
+            _select_tag(SP_TAG(&child));
+        } else if (SP_IS_TAG_USE(&child)) {
+            SPObject * obj = SP_TAG_USE(&child)->ref->getObject();
             if (obj) {
                 if (_desktop->selection->isEmpty()) _desktop->setCurrentLayer(obj->parent);
                 _desktop->selection->add(obj);
@@ -650,8 +649,8 @@ bool TagsPanel::_handleButtonEvent(GdkEventButton* event)
                         	for(auto i=items.begin();i!=items.end();++i){
                                 SPObject *newobj = *i;
                                 bool addchild = true;
-                                for ( SPObject *child = obj->children; child != NULL; child = child->next) {
-                                    if (SP_IS_TAG_USE(child) && SP_TAG_USE(child)->ref->getObject() == newobj) {
+                                for (auto& child: obj->_children) {
+                                    if (SP_IS_TAG_USE(&child) && SP_TAG_USE(&child)->ref->getObject() == newobj) {
                                         addchild = false;
                                     }
                                 }
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 736dafa50..3dfac5e3d 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -378,8 +378,8 @@ void gather_items(NodeTool *nt, SPItem *base, SPObject *obj, Inkscape::UI::Shape
         r.role = role;
         s.insert(r);
     } else if (role != SHAPE_ROLE_NORMAL && (SP_IS_GROUP(obj) || SP_IS_OBJECTGROUP(obj))) {
-        for (SPObject *c = obj->children; c; c = c->next) {
-            gather_items(nt, base, c, role, s);
+        for (auto& c: obj->_children) {
+            gather_items(nt, base, &c, role, s);
         }
     } else if (SP_IS_ITEM(obj)) {
         SPItem *item = static_cast<SPItem*>(obj);
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index d048c318b..7da0973d5 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -951,9 +951,8 @@ sp_tweak_color_recursive (guint mode, SPItem *item, SPItem *item_at_point,
                 Geom::Affine i2dt = item->i2dt_affine ();
                 if (style->filter.set && style->getFilter()) {
                     //cycle through filter primitives
-                    SPObject *primitive_obj = style->getFilter()->children;
-                    while (primitive_obj) {
-                        SPFilterPrimitive *primitive = dynamic_cast<SPFilterPrimitive *>(primitive_obj);
+                    for (auto& primitive_obj: style->getFilter()->_children) {
+                        SPFilterPrimitive *primitive = dynamic_cast<SPFilterPrimitive *>(&primitive_obj);
                         if (primitive) {
                             //if primitive is gaussianblur
                             SPGaussianBlur * spblur = dynamic_cast<SPGaussianBlur *>(primitive);
@@ -962,7 +961,6 @@ sp_tweak_color_recursive (guint mode, SPItem *item, SPItem *item_at_point,
                                 blur_now += num * i2dt.descrim(); // sum all blurs in the filter
                             }
                         }
-                        primitive_obj = primitive_obj->next;
                     }
                 }
                 double perimeter = bbox->dimensions()[Geom::X] + bbox->dimensions()[Geom::Y];
diff --git a/src/uri-references.cpp b/src/uri-references.cpp
index 078834131..23802ae65 100644
--- a/src/uri-references.cpp
+++ b/src/uri-references.cpp
@@ -76,10 +76,11 @@ bool URIReference::_acceptObject(SPObject *obj) const
         std::vector<int> positions;
         while (owner->cloned) {
             int position = 0;
-            SPObject *c = owner->parent->firstChild();
-            while (c != owner && dynamic_cast<SPObject *>(c)) {
+            for (auto &child: owner->parent->_children) {
+                if(&child == owner) {
+                    break;
+                }
                 position++;
-                c = c->next;
             }
             positions.push_back(position);
             owner = owner->parent;
diff --git a/testfiles/src/sp-object-test.cpp b/testfiles/src/sp-object-test.cpp
index 6ef9cd54c..a2c31d6d7 100644
--- a/testfiles/src/sp-object-test.cpp
+++ b/testfiles/src/sp-object-test.cpp
@@ -16,6 +16,7 @@
 #include <doc-per-case-test.h>
 #include <src/util/share.h>
 #include <src/xml/simple-document.h>
+#include <boost/range/adaptor/transformed.hpp>
 
 using namespace Inkscape;
 using namespace Inkscape::XML;
@@ -109,24 +110,13 @@ TEST_F(SPObjectTest, Advanced) {
     EXPECT_EQ(c, d->getPrev());
     EXPECT_EQ(b, c->getPrev());
     EXPECT_EQ(nullptr, b->getPrev());
+    EXPECT_EQ(nullptr, e->getNext());
+    EXPECT_EQ(e, d->getNext());
+    EXPECT_EQ(d, c->getNext());
+    EXPECT_EQ(c, b->getNext());
     std::vector<SPObject*> tmp = {b, c, d, e};
     int index = 0;
     for(auto& child: a->_children) {
         EXPECT_EQ(tmp[index++], &child);
     }
 }
-
-TEST_F(SPObjectTest, Tmp) {
-    a->attach(b, a->lastChild());
-    a->attach(c, a->lastChild());
-    a->attach(d, a->lastChild());
-    a->attach(e, a->lastChild());
-    std::vector<SPObject*> tmp;
-    for (SPObject *q = a->firstChild(); q; q = q->getNext()) {
-        tmp.push_back(q);
-    }
-    int index = 0;
-    for(auto& child: a->_children) {
-        EXPECT_EQ(tmp[index++], &child);
-    }
-}
\ No newline at end of file