Last part of new SPObject children list

(bzr r14954.1.20)

8 files changed, 148 insertions, 150 deletions

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];