Merge trunk

(bzr r14950.1.20)

1 files changed, 4 insertions, 6 deletions

diff --git a/src/id-clash.cpp b/src/id-clash.cpp
index 4bd66e858..c284843b8 100644
--- a/src/id-clash.cpp
+++ b/src/id-clash.cpp
@@ -23,8 +23,6 @@
 #include "sp-object.h"
 #include "style.h"
 #include "sp-paint-server.h"
-#include "xml/node.h"
-#include "xml/repr.h"
 #include "sp-root.h"
 #include "sp-gradient.h"
 
@@ -187,9 +185,9 @@ find_references(SPObject *elem, refmap_type &refmap)
     }
     
     // recurse
-    for (SPObject *child = elem->firstChild(); child; child = child->getNext() )
+    for (auto& child: elem->children)
     {
-        find_references(child, refmap);
+        find_references(&child, refmap);
     }
 }
 
@@ -242,9 +240,9 @@ change_clashing_ids(SPDocument *imported_doc, SPDocument *current_doc,
 
 
     // recurse
-    for (SPObject *child = elem->firstChild(); child; child = child->getNext() )
+    for (auto& child: elem->children)
     {
-        change_clashing_ids(imported_doc, current_doc, child, refmap, id_changes);
+        change_clashing_ids(imported_doc, current_doc, &child, refmap, id_changes);
     }
 }