From 169dff19d4da8d76e69b8e896aa25b0013639c03 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Wed, 2 Jan 2019 10:41:30 +0100 Subject: modernize loops --- src/ui/tools/spray-tool.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/ui/tools/spray-tool.cpp') diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp index 91dedd742..907b04a9a 100644 --- a/src/ui/tools/spray-tool.cpp +++ b/src/ui/tools/spray-tool.cpp @@ -584,8 +584,7 @@ static bool fit_item(SPDesktop *desktop, double bbox_top = bbox_down->top(); gchar const * item_down_sharp = g_strdup_printf("#%s", item_down->getId()); items_down_erased.push_back(item_down); - for (std::vector::const_iterator j=items_selected.begin(); j!=items_selected.end(); ++j) { - SPItem *item_selected = *j; + for (auto item_selected : items_selected) { gchar const * spray_origin; if(!item_selected->getAttribute("inkscape:spray-origin")){ spray_origin = g_strdup_printf("#%s", item_selected->getId()); @@ -1143,14 +1142,12 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point { std::vector const items(set->items().begin(), set->items().end()); - for(std::vector::const_iterator i=items.begin();i!=items.end(); ++i){ - SPItem *item = *i; + for(auto item : items){ g_assert(item != nullptr); sp_object_ref(item); } - for(std::vector::const_iterator i=items.begin();i!=items.end(); ++i){ - SPItem *item = *i; + for(auto item : items){ g_assert(item != nullptr); if (sp_spray_recursive(desktop , set @@ -1193,8 +1190,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point } } - for(std::vector::const_iterator i=items.begin();i!=items.end(); ++i){ - SPItem *item = *i; + for(auto item : items){ g_assert(item != nullptr); sp_object_unref(item); } -- cgit v1.2.3