Renamed children list in SPObject

(bzr r14954.1.21)

10 files changed, 39 insertions, 39 deletions

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 11af02e3c..1e8ca4405 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -2042,7 +2042,7 @@ void CloneTiler::clonetiler_trace_hide_tiled_clones_recursively(SPObject *from)
     if (!trace_drawing)
         return;
 
-    for (auto& o: from->_children) {
+    for (auto& o: from->children) {
         SPItem *item = dynamic_cast<SPItem *>(&o);
         if (item && clonetiler_is_a_clone_of(&o, NULL)) {
             item->invoke_hide(trace_visionkey); // FIXME: hide each tiled clone's original too!
@@ -2123,7 +2123,7 @@ void CloneTiler::clonetiler_unclump(GtkWidget */*widget*/, void *)
 
     std::vector<SPItem*> to_unclump; // not including the original
 
-    for (auto& child: parent->_children) {
+    for (auto& child: parent->children) {
         if (clonetiler_is_a_clone_of (&child, obj)) {
             to_unclump.push_back((SPItem*)&child);
         }
@@ -2143,7 +2143,7 @@ guint CloneTiler::clonetiler_number_of_clones(SPObject *obj)
 
     guint n = 0;
 
-    for (auto& child: parent->_children) {
+    for (auto& child: parent->children) {
         if (clonetiler_is_a_clone_of (&child, obj)) {
             n ++;
         }
@@ -2172,7 +2172,7 @@ void CloneTiler::clonetiler_remove(GtkWidget */*widget*/, GtkWidget *dlg, bool d
 
 // remove old tiling
     GSList *to_delete = NULL;
-    for (auto& child: parent->_children) {
+    for (auto& child: parent->children) {
         if (clonetiler_is_a_clone_of (&child, obj)) {
             to_delete = g_slist_prepend (to_delete, &child);
         }
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index df37eb005..6f5f14d80 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -1315,7 +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 = (int) obj->_children.size();
+            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);
@@ -1359,7 +1359,7 @@ void DocumentProperties::editEmbeddedScript(){
             //XML Tree being used directly here while it shouldn't be.
             Inkscape::XML::Node *repr = obj->getRepr();
             if (repr){
-                auto tmp = obj->_children | boost::adaptors::transformed([](SPObject& o) { return &o; });
+                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();
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 1be5d540a..3e3ede019 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -103,7 +103,7 @@ static int input_count(const SPFilterPrimitive* prim)
         return 2;
     else if(SP_IS_FEMERGE(prim)) {
         // Return the number of feMergeNode connections plus an extra
-        return (int) (prim->_children.size() + 1);
+        return (int) (prim->children.size() + 1);
     }
     else
         return 1;
@@ -1060,7 +1060,7 @@ public:
     {
         SPFeFuncNode* funcNode = NULL;
         bool found = false;
-        for(auto& node: ct->_children) {
+        for(auto& node: ct->children) {
             funcNode = SP_FEFUNCNODE(&node);
             if( funcNode->channel == _channel ) {
                 found = true;
@@ -1868,7 +1868,7 @@ void FilterEffectsDialog::PrimitiveList::update()
         bool active_found = false;
         _dialog._primitive_box->set_sensitive(true);
         _dialog.update_filter_general_settings_view();
-        for(auto& prim_obj: f->_children) {
+        for(auto& prim_obj: f->children) {
             SPFilterPrimitive *prim = SP_FILTER_PRIMITIVE(&prim_obj);
             if(!prim) {
                 break;
@@ -2339,7 +2339,7 @@ const Gtk::TreeIter FilterEffectsDialog::PrimitiveList::find_result(const Gtk::T
     if(SP_IS_FEMERGE(prim)) {
         int c = 0;
         bool found = false;
-        for (auto& o: prim->_children) {
+        for (auto& o: prim->children) {
             if(c == attr && SP_IS_FEMERGENODE(&o)) {
                 image = SP_FEMERGENODE(&o)->input;
                 found = true;
@@ -2531,7 +2531,7 @@ bool FilterEffectsDialog::PrimitiveList::on_button_release_event(GdkEventButton*
             if(SP_IS_FEMERGE(prim)) {
                 int c = 1;
                 bool handled = false;
-                for (auto& o: prim->_children) {
+                for (auto& o: prim->children) {
                     if(c == _in_drag && SP_IS_FEMERGENODE(&o)) {
                         // If input is null, delete it
                         if(!in_val) {
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index e156dfa13..b09ce6078 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -747,7 +747,7 @@ std::vector<SPItem*> &Find::all_items (SPObject *r, std::vector<SPItem*> &l, boo
         return l; // we're not interested in metadata
     }
 
-    for (auto& child: r->_children) {
+    for (auto& child: r->children) {
         SPItem *item = dynamic_cast<SPItem *>(&child);
         if (item && !child.cloned && !desktop->isLayer(item)) {
             if ((hidden || !desktop->itemIsHidden(item)) && (locked || !item->isLocked())) {
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index eafe5566a..b927096ab 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -182,7 +182,7 @@ std::vector<SPItem*> FontSubstitution::getFontReplacedItems(SPDocument* doc, Gli
                  family = SP_TEXT(parent_text)->layout.getFontFamily(0);
                  // Add all the spans fonts to the set
                  gint ii = 0;
-                 for (auto& child: parent_text->_children) {
+                 for (auto& child: parent_text->children) {
                      family = SP_TEXT(parent_text)->layout.getFontFamily(ii);
                      setFontSpans.insert(family);
                      ii++;
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index e4639745f..f4d3a3f70 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -340,7 +340,7 @@ void ObjectsPanel::_objectsChanged(SPObject */*obj*/)
 void ObjectsPanel::_addObject(SPObject* obj, Gtk::TreeModel::Row* parentRow)
 {
     if ( _desktop && obj ) {
-        for(auto& child: obj->_children) {
+        for(auto& child: obj->children) {
             if (SP_IS_ITEM(&child))
             {
                 SPItem * item = SP_ITEM(&child);
@@ -398,7 +398,7 @@ void ObjectsPanel::_updateObject( SPObject *obj, bool recurse ) {
     //end mark
     if (recurse)
     {
-        for (auto& iter: obj->_children) {
+        for (auto& iter: obj->children) {
             _updateObject(&iter, recurse);
         }
     }
@@ -518,7 +518,7 @@ void ObjectsPanel::_setCompositingValues(SPItem *item)
     SPGaussianBlur *spblur = NULL;
     if (item->style->getFilter())
     {
-        for (auto& primitive_obj: item->style->getFilter()->_children) {
+        for (auto& primitive_obj: item->style->getFilter()->children) {
             if (!SP_IS_FILTER_PRIMITIVE(&primitive_obj)) {
                 break;
             }
@@ -1293,7 +1293,7 @@ bool ObjectsPanel::_executeAction()
             break;
             case BUTTON_COLLAPSE_ALL:
             {
-                for (auto& obj: _document->getRoot()->_children) {
+                for (auto& obj: _document->getRoot()->children) {
                     if (SP_IS_GROUP(&obj)) {
                         _setCollapsed(SP_GROUP(&obj));
                     }
@@ -1405,7 +1405,7 @@ void ObjectsPanel::_setCollapsed(SPGroup * group)
 {
     group->setExpanded(false);
     group->updateRepr(SP_OBJECT_WRITE_NO_CHILDREN | SP_OBJECT_WRITE_EXT);
-    for (auto& iter: group->_children) {
+    for (auto& iter: group->children) {
         if (SP_IS_GROUP(&iter)) {
             _setCollapsed(SP_GROUP(&iter));
         }
@@ -1523,7 +1523,7 @@ void ObjectsPanel::_blendChangedIter(const Gtk::TreeIter& iter, Glib::ustring bl
         if (blendmode != "normal") {
             gdouble radius = 0;
             if (item->style->getFilter()) {
-                for (auto& primitive: item->style->getFilter()->_children) {
+                for (auto& primitive: item->style->getFilter()->children) {
                     if (!SP_IS_FILTER_PRIMITIVE(&primitive)) {
                         break;
                     }
@@ -1538,7 +1538,7 @@ 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 (auto& primitive: item->style->getFilter()->_children) {
+            for (auto& primitive: item->style->getFilter()->children) {
                 if (!SP_IS_FILTER_PRIMITIVE(&primitive)) {
                     break;
                 }
@@ -1598,7 +1598,7 @@ 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 (auto& primitive: item->style->getFilter()->_children) {
+                for (auto& primitive: item->style->getFilter()->children) {
                     if (!SP_IS_FILTER_PRIMITIVE(&primitive)) {
                         break;
                     }
diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp
index 9338a4e8c..ac8ef5c15 100644
--- a/src/ui/dialog/spellcheck.cpp
+++ b/src/ui/dialog/spellcheck.cpp
@@ -234,7 +234,7 @@ GSList *SpellCheck::allTextItems (SPObject *r, GSList *l, bool hidden, bool lock
         return l; // we're not interested in metadata
     }
 
-    for (auto& child: r->_children) {
+    for (auto& child: r->children) {
         if (SP_IS_ITEM (&child) && !child.cloned && !desktop->isLayer(SP_ITEM(&child))) {
                 if ((hidden || !desktop->itemIsHidden(SP_ITEM(&child))) && (locked || !SP_ITEM(&child)->isLocked())) {
                     if (SP_IS_TEXT(&child) || SP_IS_FLOWTEXT(&child))
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 93bd67a3d..a723c86d8 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -115,7 +115,7 @@ void SvgFontsDialog::AttrEntry::set_text(char* t){
 void SvgFontsDialog::AttrEntry::on_attr_changed(){
 
     SPObject* o = NULL;
-    for (auto& node: dialog->get_selected_spfont()->_children) {
+    for (auto& node: dialog->get_selected_spfont()->children) {
         switch(this->attr){
             case SP_PROP_FONT_FAMILY:
                 if (SP_IS_FONTFACE(&node)){
@@ -170,7 +170,7 @@ void GlyphComboBox::update(SPFont* spfont){
     this->append(""); //Gtk is refusing to clear the combobox when I comment out this line
     this->remove_all();
 
-    for (auto& node: spfont->_children) {
+    for (auto& node: spfont->children) {
         if (SP_IS_GLYPH(&node)){
             this->append((static_cast<SPGlyph*>(&node))->unicode);
         }
@@ -308,7 +308,7 @@ void SvgFontsDialog::update_global_settings_tab(){
     SPFont* font = get_selected_spfont();
     if (!font) return;
 
-    for (auto& obj: font->_children) {
+    for (auto& obj: font->children) {
         if (SP_IS_FONTFACE(&obj)){
             _familyname_entry->set_text((SP_FONTFACE(&obj))->font_family);
         }
@@ -413,7 +413,7 @@ SvgFontsDialog::populate_glyphs_box()
     SPFont* spfont = this->get_selected_spfont();
     _glyphs_observer.set(spfont);
 
-    for (auto& node: spfont->_children) {
+    for (auto& node: spfont->children) {
         if (SP_IS_GLYPH(&node)){
             Gtk::TreeModel::Row row = *(_GlyphsListStore->append());
             row[_GlyphsListColumns.glyph_node] = static_cast<SPGlyph*>(&node);
@@ -431,7 +431,7 @@ SvgFontsDialog::populate_kerning_pairs_box()
 
     SPFont* spfont = this->get_selected_spfont();
 
-    for (auto& node: spfont->_children) {
+    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();
@@ -492,7 +492,7 @@ void SvgFontsDialog::add_glyph(){
 Geom::PathVector
 SvgFontsDialog::flip_coordinate_system(Geom::PathVector pathv){
     double units_per_em = 1000;
-    for (auto& obj: get_selected_spfont()->_children) {
+    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);
@@ -574,7 +574,7 @@ void SvgFontsDialog::missing_glyph_description_from_selected_path(){
 
     Geom::PathVector pathv = sp_svg_read_pathv(node->attribute("d"));
 
-    for (auto& obj: get_selected_spfont()->_children) {
+    for (auto& obj: get_selected_spfont()->children) {
         if (SP_IS_MISSING_GLYPH(&obj)){
 
             //XML Tree being directly used here while it shouldn't be.
@@ -596,7 +596,7 @@ void SvgFontsDialog::reset_missing_glyph_description(){
     }
 
     SPDocument* doc = desktop->getDocument();
-    for (auto& obj: get_selected_spfont()->_children) {
+    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");
@@ -734,7 +734,7 @@ void SvgFontsDialog::add_kerning_pair(){
 
     //look for this kerning pair on the currently selected font
     this->kerning_pair = NULL;
-    for (auto& node: get_selected_spfont()->_children) {
+    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])
@@ -848,7 +848,7 @@ SPFont *new_font(SPDocument *document)
 
 void set_font_family(SPFont* font, char* str){
     if (!font) return;
-    for (auto& obj: font->_children) {
+    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);
@@ -868,7 +868,7 @@ void SvgFontsDialog::add_font(){
     font->setLabel(os.str().c_str());
 
     os2 << "SVGFont " << count;
-    for (auto& obj: font->_children) {
+    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());
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 1fdce34a5..84088052e 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -658,7 +658,7 @@ GSList* SymbolsDialog::symbols_in_doc_recursive (SPObject *r, GSList *l)
     l = g_slist_prepend (l, r);
   }
 
-  for (auto& child: r->_children) {
+  for (auto& child: r->children) {
     l = symbols_in_doc_recursive( &child, l );
   }
 
@@ -680,7 +680,7 @@ GSList* SymbolsDialog::use_in_doc_recursive (SPObject *r, GSList *l)
     l = g_slist_prepend (l, r);
   }
 
-  for (auto& child: r->_children) {
+  for (auto& child: r->children) {
     l = use_in_doc_recursive( &child, l );
   }
 
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index 61c8b5d37..fcc9b804c 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -399,7 +399,7 @@ void TagsPanel::_objectsChanged(SPObject* root)
 void TagsPanel::_addObject( SPDocument* doc, SPObject* obj, Gtk::TreeModel::Row* parentRow )
 {
     if ( _desktop && obj ) {
-        for (auto& child: obj->_children) {
+        for (auto& child: obj->children) {
             if (SP_IS_TAG(&child))
             {
                 Gtk::TreeModel::iterator iter = parentRow ? _store->prepend(parentRow->children()) : _store->prepend();
@@ -430,7 +430,7 @@ void TagsPanel::_addObject( SPDocument* doc, SPObject* obj, Gtk::TreeModel::Row*
             
             _tree.expand_to_path( _store->get_path(iteritems) );
 
-            for (auto& child: obj->_children) {
+            for (auto& child: obj->children) {
                 if (SP_IS_TAG_USE(&child))
                 {
                     SPItem *item = SP_TAG_USE(&child)->ref->getObject();
@@ -459,7 +459,7 @@ void TagsPanel::_addObject( SPDocument* doc, SPObject* obj, Gtk::TreeModel::Row*
 
 void TagsPanel::_select_tag( SPTag * tag )
 {
-    for (auto& child: tag->_children) {
+    for (auto& child: tag->children) {
         if (SP_IS_TAG(&child)) {
             _select_tag(SP_TAG(&child));
         } else if (SP_IS_TAG_USE(&child)) {
@@ -649,7 +649,7 @@ bool TagsPanel::_handleButtonEvent(GdkEventButton* event)
                         	for(auto i=items.begin();i!=items.end();++i){
                                 SPObject *newobj = *i;
                                 bool addchild = true;
-                                for (auto& child: obj->_children) {
+                                for (auto& child: obj->children) {
                                     if (SP_IS_TAG_USE(&child) && SP_TAG_USE(&child)->ref->getObject() == newobj) {
                                         addchild = false;
                                     }