summaryrefslogtreecommitdiffstats
path: root/src/id-clash.cpp
diff options
context:
space:
mode:
authorAdrian Boguszewski <adrbogus1@student.pg.gda.pl>2016-08-09 09:58:51 +0000
committerAdrian Boguszewski <adrbogus1@student.pg.gda.pl>2016-08-09 09:58:51 +0000
commite5143d65bb57d4ce623e6220585b099e6d2ee453 (patch)
tree4ff78f6fa8f0c1b740fd43b0ade2b91dbf9226d0 /src/id-clash.cpp
parentRemove deprecated Autotools and btool files. Please use CMake instead (diff)
parentMerged trunk (diff)
downloadinkscape-e5143d65bb57d4ce623e6220585b099e6d2ee453.tar.gz
inkscape-e5143d65bb57d4ce623e6220585b099e6d2ee453.zip
Merged gsoc work. Created better data structure for selections, replaced SPObject children list, improved spray tool, split tests to separate executables
(bzr r15047)
Diffstat (limited to 'src/id-clash.cpp')
-rw-r--r--src/id-clash.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/id-clash.cpp b/src/id-clash.cpp
index b14526e79..c284843b8 100644
--- a/src/id-clash.cpp
+++ b/src/id-clash.cpp
@@ -185,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);
}
}
@@ -240,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);
}
}