From 058e95a59ccb2ab1748392acdfdbbffd516c9c81 Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Mon, 11 Jul 2016 14:24:52 +0200
Subject: First part of new SPObject children list

(bzr r14954.1.17)
---
 src/object-set.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/object-set.cpp')

diff --git a/src/object-set.cpp b/src/object-set.cpp
index 07f9ea0c8..b7b84e163 100644
--- a/src/object-set.cpp
+++ b/src/object-set.cpp
@@ -93,14 +93,14 @@ bool ObjectSet::_anyAncestorIsInSet(SPObject *object) {
 }
 
 void ObjectSet::_removeDescendantsFromSet(SPObject *object) {
-    for (auto& child: object->childList(false)) {
-        if (includes(child)) {
-            _remove(child);
+    for (auto& child: object->_children) {
+        if (includes(&child)) {
+            _remove(&child);
             // there is certainly no children of this child in the set
             continue;
         }
 
-        _removeDescendantsFromSet(child);
+        _removeDescendantsFromSet(&child);
     }
 }
 
@@ -130,8 +130,8 @@ SPObject *ObjectSet::_getMutualAncestor(SPObject *object) {
 
     bool flag = true;
     while (o->parent != nullptr) {
-        for (auto &child: o->parent->childList(false)) {
-            if(child != o && !includes(child)) {
+        for (auto &child: o->parent->_children) {
+            if(&child != o && !includes(&child)) {
                 flag = false;
                 break;
             }
@@ -147,9 +147,9 @@ SPObject *ObjectSet::_getMutualAncestor(SPObject *object) {
 void ObjectSet::_removeAncestorsFromSet(SPObject *object) {
     SPObject* o = object;
     while (o->parent != nullptr) {
-        for (auto &child: o->parent->childList(false)) {
-            if (child != o) {
-                _add(child);
+        for (auto &child: o->parent->_children) {
+            if (&child != o) {
+                _add(&child);
             }
         }
         if (includes(o->parent)) {
-- 
cgit v1.2.3