1 files changed, 14 insertions, 21 deletions

diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index c8a0830c1..648852961 100644
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -19,6 +19,8 @@
 #include <2geom/transforms.h>
 #include <glibmm/i18n.h>
 #include <glibmm/markup.h>
+
+#include "bad-uri-exception.h"
 #include "display/drawing-group.h"
 #include "attributes.h"
 #include "document.h"
@@ -34,7 +36,6 @@
 #include "style.h"
 #include "sp-symbol.h"
 #include "sp-root.h"
-#include "sp-use.h"
 #include "sp-use-reference.h"
 #include "sp-shape.h"
 #include "sp-text.h"
@@ -436,27 +437,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 +477,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();
         }
     }