From 9e210a6d1333c3366681547e3e81593ef69ff73e Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Thu, 14 Jul 2016 12:56:49 +0200
Subject: Last part of new SPObject children list

(bzr r14954.1.20)
---
 src/sp-use.cpp | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

(limited to 'src/sp-use.cpp')

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();
         }
     }
 
-- 
cgit v1.2.3


From 24d3f50003ca3cec6a03a7f5267cc4fe5588c69f Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Thu, 14 Jul 2016 13:17:21 +0200
Subject: Renamed children list in SPObject

(bzr r14954.1.21)
---
 src/sp-use.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/sp-use.cpp')

diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index cef967c90..b24363278 100644
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -436,7 +436,7 @@ void SPUse::move_compensate(Geom::Affine const *mp) {
     	//BUT move clippaths accordingly.
         //if clone has a clippath, move it accordingly
         if(clip_ref->getObject()){
-            for(auto& clip: clip_ref->getObject()->_children){
+            for(auto& clip: clip_ref->getObject()->children){
             	SPItem *item = (SPItem*) &clip;
             	if(item){
                     item->transform *= m;
@@ -446,7 +446,7 @@ void SPUse::move_compensate(Geom::Affine const *mp) {
             }
         }
         if(mask_ref->getObject()){
-            for(auto& mask: mask_ref->getObject()->_children){
+            for(auto& mask: mask_ref->getObject()->children){
             	SPItem *item = (SPItem*) &mask;
             	if(item){
                     item->transform *= m;
@@ -476,7 +476,7 @@ void SPUse::move_compensate(Geom::Affine const *mp) {
 
     //if clone has a clippath, move it accordingly
     if(clip_ref->getObject()){
-        for(auto& clip: clip_ref->getObject()->_children){
+        for(auto& clip: clip_ref->getObject()->children){
         	SPItem *item = (SPItem*) &clip;
         	if(item){
                 item->transform *= clone_move.inverse();
@@ -486,7 +486,7 @@ void SPUse::move_compensate(Geom::Affine const *mp) {
         }
     }
     if(mask_ref->getObject()){
-        for(auto& mask: mask_ref->getObject()->_children){
+        for(auto& mask: mask_ref->getObject()->children){
         	SPItem *item = (SPItem*) &mask;
         	if(item){
                 item->transform *= clone_move.inverse();
-- 
cgit v1.2.3