Renamed children list in SPObject

(bzr r14954.1.21)

6 files changed, 12 insertions, 12 deletions

diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index bedf2fa7f..1310bb343 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -986,7 +986,7 @@ void CairoRenderContext::popState(void)
 
 static bool pattern_hasItemChildren(SPPattern *pat)
 {
-    for (auto& child: pat->_children) {
+    for (auto& child: pat->children) {
         if (SP_IS_ITEM (&child)) {
             return true;
         }
@@ -1086,7 +1086,7 @@ CairoRenderContext::_createPatternPainter(SPPaintServer const *const paintserver
     // show items and render them
     for (SPPattern *pat_i = pat; pat_i != NULL; pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) {
         if (pat_i && SP_IS_OBJECT(pat_i) && pattern_hasItemChildren(pat_i)) { // find the first one with item children
-            for (auto& child: pat_i->_children) {
+            for (auto& child: pat_i->children) {
                 if (SP_IS_ITEM(&child)) {
                     SP_ITEM(&child)->invoke_show(drawing, dkey, SP_ITEM_REFERENCE_FLAGS);
                     _renderer->renderItem(pattern_ctx, SP_ITEM(&child));
@@ -1115,7 +1115,7 @@ CairoRenderContext::_createPatternPainter(SPPaintServer const *const paintserver
     // hide all items
     for (SPPattern *pat_i = pat; pat_i != NULL; pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) {
         if (pat_i && SP_IS_OBJECT(pat_i) && pattern_hasItemChildren(pat_i)) { // find the first one with item children
-            for (auto& child: pat_i->_children) {
+            for (auto& child: pat_i->children) {
                 if (SP_IS_ITEM(&child)) {
                     SP_ITEM(&child)->invoke_hide(dkey);
                 }
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 088eaf11d..cd96a7f58 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -741,7 +741,7 @@ CairoRenderer::applyClipPath(CairoRenderContext *ctx, SPClipPath const *cp)
 
     TRACE(("BEGIN clip\n"));
     SPObject const *co = cp;
-    for (auto& child: co->_children) {
+    for (auto& child: co->children) {
         SPItem const *item = dynamic_cast<SPItem const *>(&child);
         if (item) {
 
@@ -800,7 +800,7 @@ CairoRenderer::applyMask(CairoRenderContext *ctx, SPMask const *mask)
 
     TRACE(("BEGIN mask\n"));
     SPObject const *co = mask;
-    for (auto& child: co->_children) {
+    for (auto& child: co->children) {
         SPItem const *item = dynamic_cast<SPItem const *>(&child);
         if (item) {
             // TODO fix const correctness:
diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index c0c086c7a..d4c5d95a3 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -1042,7 +1042,7 @@ void  PrintEmf::do_clip_if_present(SPStyle const *style){
                 /* find the clipping path */
                 Geom::PathVector combined_pathvector;
                 Geom::Affine tfc;   // clipping transform, generally not the same as item transform
-                for (auto& child: scp->_children) {
+                for (auto& child: scp->children) {
                     item = SP_ITEM(&child);
                     if (!item) {
                         break;
@@ -1085,7 +1085,7 @@ Geom::PathVector PrintEmf::merge_PathVector_with_group(Geom::PathVector const &c
     new_combined_pathvector = combined_pathvector;
     SPGroup *group = SP_GROUP(item);
     Geom::Affine tfc = item->transform * transform;
-    for (auto& child: group->_children) {
+    for (auto& child: group->children) {
         item = SP_ITEM(&child);
         if (!item) {
             break;
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index 51608e4fa..d7ad7e6f7 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -732,7 +732,7 @@ bool JavaFXOutput::doTreeRecursive(SPDocument *doc, SPObject *obj)
     /**
      * Descend into children
      */
-    for (auto &child: obj->_children)
+    for (auto &child: obj->children)
         {
             if (!doTreeRecursive(doc, &child)) {
                 return false;
@@ -804,7 +804,7 @@ bool JavaFXOutput::doBody(SPDocument *doc, SPObject *obj)
     /**
      * Descend into children
      */
-    for (auto &child: obj->_children)
+    for (auto &child: obj->children)
         {
             if (!doBody(doc, &child)) {
                 return false;
diff --git a/src/extension/internal/metafile-print.cpp b/src/extension/internal/metafile-print.cpp
index 5c10f7dd9..061eb634d 100644
--- a/src/extension/internal/metafile-print.cpp
+++ b/src/extension/internal/metafile-print.cpp
@@ -293,7 +293,7 @@ void PrintMetafile::brush_classify(SPObject *parent, int depth, Inkscape::Pixbuf
             }
 
             // still looking?  Look at this pattern's children, if there are any
-            for (auto& child: pat_i->_children) {
+            for (auto& child: pat_i->children) {
                 if (*epixbuf || *hatchType != -1) {
                     break;
                 }
@@ -304,7 +304,7 @@ void PrintMetafile::brush_classify(SPObject *parent, int depth, Inkscape::Pixbuf
         *epixbuf = ((SPImage *)parent)->pixbuf;
         return;
     } else { // some inkscape rearrangements pass through nodes between pattern and image which are not classified as either.
-        for (auto& child: parent->_children) {
+        for (auto& child: parent->children) {
             if (*epixbuf || *hatchType != -1) {
                 break;
             }
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index 08f533010..8df883069 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -479,7 +479,7 @@ bool PovOutput::doTreeRecursive(SPDocument *doc, SPObject *obj)
     /**
      * Descend into children
      */
-    for (auto &child: obj->_children)
+    for (auto &child: obj->children)
         {
             if (!doTreeRecursive(doc, &child))
                 return false;