modernize loops

8 files changed, 41 insertions, 49 deletions

diff --git a/src/ui/toolbar/calligraphy-toolbar.cpp b/src/ui/toolbar/calligraphy-toolbar.cpp
index 85afa9872..2a9d7b0d9 100644
--- a/src/ui/toolbar/calligraphy-toolbar.cpp
+++ b/src/ui/toolbar/calligraphy-toolbar.cpp
@@ -74,8 +74,8 @@ void update_presets_list(GObject *tbl)
         bool match = true;
 
         std::vector<Inkscape::Preferences::Entry> preset = prefs->getAllEntries(*i);
-        for (std::vector<Inkscape::Preferences::Entry>::iterator j = preset.begin(); j != preset.end(); ++j) {
-            Glib::ustring entry_name = j->getEntryName();
+        for (auto & j : preset) {
+            Glib::ustring entry_name = j.getEntryName();
             if (entry_name == "id" || entry_name == "name") {
                 continue;
             }
@@ -83,7 +83,7 @@ void update_presets_list(GObject *tbl)
             void *widget = g_object_get_data(tbl, entry_name.data());
             if (widget) {
                 if (GTK_IS_ADJUSTMENT(widget)) {
-                    double v = j->getDouble();
+                    double v = j.getDouble();
                     GtkAdjustment* adj = static_cast<GtkAdjustment *>(widget);
                     //std::cout << "compared adj " << attr_name << gtk_adjustment_get_value(adj) << " to " << v << "\n";
                     if (fabs(gtk_adjustment_get_value(adj) - v) > 1e-6) {
@@ -91,7 +91,7 @@ void update_presets_list(GObject *tbl)
                         break;
                     }
                 } else if (GTK_IS_TOGGLE_ACTION(widget)) {
-                    bool v = j->getBool();
+                    bool v = j.getBool();
                     GtkToggleAction* toggle = static_cast<GtkToggleAction *>(widget);
                     //std::cout << "compared toggle " << attr_name << gtk_toggle_action_get_active(toggle) << " to " << v << "\n";
                     if ( static_cast<bool>(gtk_toggle_action_get_active(toggle)) != v ) {
@@ -218,9 +218,9 @@ static void sp_dcc_build_presets_list(GObject *tbl)
     std::vector<Glib::ustring> presets = get_presets_list();
     int ii=1;
 
-    for (std::vector<Glib::ustring>::iterator i = presets.begin(); i != presets.end(); ++i) {
+    for (auto & preset : presets) {
         GtkTreeIter iter;
-        Glib::ustring preset_name = prefs->getString(*i + "/name");
+        Glib::ustring preset_name = prefs->getString(preset + "/name");
 
         if (!preset_name.empty()) {
             row = *(store->append());
@@ -303,8 +303,7 @@ static void sp_dcc_save_profile(GtkWidget * /*widget*/, GObject *tbl)
         g_free(profile_id);
     }
 
-    for (unsigned i = 0; i < G_N_ELEMENTS(widget_names); ++i) {
-        gchar const *const widget_name = widget_names[i];
+    for (auto widget_name : widget_names) {
         void *widget = g_object_get_data(tbl, widget_name);
         if (widget) {
             if (GTK_IS_ADJUSTMENT(widget)) {
@@ -351,8 +350,8 @@ static void sp_ddc_change_profile(GObject* tbl, int mode)
         std::vector<Inkscape::Preferences::Entry> preset = prefs->getAllEntries(preset_path);
 
         // Shouldn't this be std::map?
-        for (std::vector<Inkscape::Preferences::Entry>::iterator i = preset.begin(); i != preset.end(); ++i) {
-            Glib::ustring entry_name = i->getEntryName();
+        for (auto & i : preset) {
+            Glib::ustring entry_name = i.getEntryName();
             if (entry_name == "id" || entry_name == "name") {
                 continue;
             }
@@ -360,11 +359,11 @@ static void sp_ddc_change_profile(GObject* tbl, int mode)
             if (widget) {
                 if (GTK_IS_ADJUSTMENT(widget)) {
                     GtkAdjustment* adj = static_cast<GtkAdjustment *>(widget);
-                    gtk_adjustment_set_value(adj, i->getDouble());
+                    gtk_adjustment_set_value(adj, i.getDouble());
                     //std::cout << "set adj " << attr_name << " to " << v << "\n";
                 } else if (GTK_IS_TOGGLE_ACTION(widget)) {
                     GtkToggleAction* toggle = static_cast<GtkToggleAction *>(widget);
-                    gtk_toggle_action_set_active(toggle, i->getBool());
+                    gtk_toggle_action_set_active(toggle, i.getBool());
                     //std::cout << "set toggle " << attr_name << " to " << v << "\n";
                 } else {
                     g_warning("Unknown widget type for preset: %s\n", entry_name.data());
diff --git a/src/ui/toolbar/gradient-toolbar.cpp b/src/ui/toolbar/gradient-toolbar.cpp
index be23d9e98..cf14be7c3 100644
--- a/src/ui/toolbar/gradient-toolbar.cpp
+++ b/src/ui/toolbar/gradient-toolbar.cpp
@@ -608,14 +608,10 @@ static void select_stop_by_draggers(SPGradient *gradient, ToolBase *ev, GObject
     int selected = -1;
 
     // For all selected draggers
-    for(auto i = drag->selected.begin(); i != drag->selected.end(); ++i) {
-
-        GrDragger *dragger = *i;
+    for(auto dragger : drag->selected) {
 
         // For all draggables of dragger
-         for(auto j = dragger->draggables.begin(); j != dragger->draggables.end(); ++j) {
-
-            GrDraggable *draggable = *j; 
+         for(auto draggable : dragger->draggables) {
 
             if (draggable->point_type != POINT_RG_FOCUS) {
                 n++;
diff --git a/src/ui/toolbar/mesh-toolbar.cpp b/src/ui/toolbar/mesh-toolbar.cpp
index af0e1e5ea..6dad5a189 100644
--- a/src/ui/toolbar/mesh-toolbar.cpp
+++ b/src/ui/toolbar/mesh-toolbar.cpp
@@ -117,16 +117,16 @@ void ms_read_selection( Inkscape::Selection *selection,
 
     // Read desktop selection, taking into account fill/stroke toggles
     std::vector<SPMeshGradient *> meshes = ms_get_dt_selected_gradients( selection );
-    for (auto i = meshes.begin(); i != meshes.end(); ++i) {
+    for (auto & meshe : meshes) {
         if (first) {
-            ms_selected = (*i);
-            ms_type = (*i)->type;
+            ms_selected = meshe;
+            ms_type = meshe->type;
             first = false;
         } else {
-            if (ms_selected != (*i)) {
+            if (ms_selected != meshe) {
                 ms_selected_multi = true;
             }
-            if (ms_type != (*i)->type) {
+            if (ms_type != meshe->type) {
                 ms_type_multi = true;
             }
         }
@@ -261,10 +261,10 @@ static void ms_type_changed( GObject *tbl, int mode )
     std::vector<SPMeshGradient *> meshes = ms_get_dt_selected_gradients(selection);
 
     SPMeshType type = (SPMeshType) mode;
-    for (auto i = meshes.begin(); i != meshes.end(); ++i) {
-        (*i)->type = type;
-        (*i)->type_set = true;
-        (*i)->updateRepr();
+    for (auto & meshe : meshes) {
+        meshe->type = type;
+        meshe->type_set = true;
+        meshe->updateRepr();
     }
     if (!meshes.empty() ) {
         DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MESH,_("Set mesh type"));
diff --git a/src/ui/toolbar/paintbucket-toolbar.cpp b/src/ui/toolbar/paintbucket-toolbar.cpp
index b23c9561a..81a240262 100644
--- a/src/ui/toolbar/paintbucket-toolbar.cpp
+++ b/src/ui/toolbar/paintbucket-toolbar.cpp
@@ -95,8 +95,7 @@ static void paintbucket_defaults(GtkWidget *, GObject *tbl)
         {"offset", 0.0}
     };
 
-    for (unsigned i = 0; i < G_N_ELEMENTS(key_values); ++i) {
-        KeyValue const &kv = key_values[i];
+    for (auto kv : key_values) {
         GtkAdjustment* adj = static_cast<GtkAdjustment *>(g_object_get_data(tbl, kv.key));
         if ( adj ) {
             gtk_adjustment_set_value(adj, kv.value);
diff --git a/src/ui/toolbar/pencil-toolbar.cpp b/src/ui/toolbar/pencil-toolbar.cpp
index 8002969ee..52cc32637 100644
--- a/src/ui/toolbar/pencil-toolbar.cpp
+++ b/src/ui/toolbar/pencil-toolbar.cpp
@@ -442,8 +442,8 @@ static void sp_pencil_tb_tolerance_value_changed(GtkAdjustment *adj, GObject *tb
                                 guint curve_length = sp_shape->getCurve()->get_segment_count();
                                 std::vector<Geom::Point> ts = lpe_powerstroke->offset_points.data();
                                 double factor = (double)curve_length/ (double)previous_curve_length;
-                                for (size_t i = 0; i < ts.size(); i++) {
-                                    ts[i][Geom::X] = ts[i][Geom::X] * factor;
+                                for (auto & t : ts) {
+                                    t[Geom::X] = t[Geom::X] * factor;
                                 }
                                 lpe_powerstroke->offset_points.param_setValue(ts);
                             }
diff --git a/src/ui/toolbar/select-toolbar.cpp b/src/ui/toolbar/select-toolbar.cpp
index 9da07b43d..0e1ad9c1b 100644
--- a/src/ui/toolbar/select-toolbar.cpp
+++ b/src/ui/toolbar/select-toolbar.cpp
@@ -84,15 +84,15 @@ sp_selection_layout_widget_update(SPWidget *spw, Inkscape::Selection *sel)
 
             if (unit->type == Inkscape::Util::UNIT_TYPE_DIMENSIONLESS) {
                 double const val = unit->factor * 100;
-                for (unsigned i = 0; i < G_N_ELEMENTS(keyval); ++i) {
-                    GtkAdjustment *a = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(spw), keyval[i].key));
+                for (auto i : keyval) {
+                    GtkAdjustment *a = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(spw), i.key));
                     gtk_adjustment_set_value(a, val);
-                    tracker->setFullVal( a, keyval[i].val );
+                    tracker->setFullVal( a, i.val );
                 }
             } else {
-                for (unsigned i = 0; i < G_N_ELEMENTS(keyval); ++i) {
-                    GtkAdjustment *a = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(spw), keyval[i].key));
-                    gtk_adjustment_set_value(a, Quantity::convert(keyval[i].val, "px", unit));
+                for (auto i : keyval) {
+                    GtkAdjustment *a = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(spw), i.key));
+                    gtk_adjustment_set_value(a, Quantity::convert(i.val, "px", unit));
                 }
             }
         }
@@ -123,10 +123,9 @@ sp_selection_layout_widget_change_selection(SPWidget *spw, Inkscape::Selection *
         gboolean setActive = (selection && !selection->isEmpty());
         std::vector<GtkAction*> *contextActions = reinterpret_cast<std::vector<GtkAction*> *>(g_object_get_data(G_OBJECT(spw), "contextActions"));
         if ( contextActions ) {
-            for ( std::vector<GtkAction*>::iterator iter = contextActions->begin();
-                  iter != contextActions->end(); ++iter) {
-                if ( setActive != gtk_action_is_sensitive(*iter) ) {
-                    gtk_action_set_sensitive( *iter, setActive );
+            for (auto & contextAction : *contextActions) {
+                if ( setActive != gtk_action_is_sensitive(contextAction) ) {
+                    gtk_action_set_sensitive( contextAction, setActive );
                 }
             }
         }
@@ -536,10 +535,9 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
     // Update now.
     sp_selection_layout_widget_update(SP_WIDGET(spw), SP_ACTIVE_DESKTOP ? SP_ACTIVE_DESKTOP->getSelection() : nullptr);
 
-    for ( std::vector<GtkAction*>::iterator iter = contextActions->begin();
-          iter != contextActions->end(); ++iter) {
-        if ( gtk_action_is_sensitive(*iter) ) {
-            gtk_action_set_sensitive( *iter, FALSE );
+    for (auto & contextAction : *contextActions) {
+        if ( gtk_action_is_sensitive(contextAction) ) {
+            gtk_action_set_sensitive( contextAction, FALSE );
         }
     }
 
diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index 341188fb2..fc3e8cd7d 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -1416,9 +1416,9 @@ static void sp_text_set_sizes(GtkListStore* model_size, int unit)
     // Array must be same length as SPCSSUnit in style.h
     float ratios[] = {1, 1, 1, 10, 4, 40, 100, 16, 8, 0.16};
 
-    for( unsigned int i = 0; i < G_N_ELEMENTS(sizes); ++i ) {
+    for(int i : sizes) {
         GtkTreeIter iter;
-        Glib::ustring size = Glib::ustring::format(sizes[i] / (float)ratios[unit]);
+        Glib::ustring size = Glib::ustring::format(i / (float)ratios[unit]);
         gtk_list_store_append( model_size, &iter );
         gtk_list_store_set( model_size, &iter, 0, size.c_str(), -1 );
     }
diff --git a/src/ui/toolbar/tweak-toolbar.cpp b/src/ui/toolbar/tweak-toolbar.cpp
index 3b275601e..47a90910a 100644
--- a/src/ui/toolbar/tweak-toolbar.cpp
+++ b/src/ui/toolbar/tweak-toolbar.cpp
@@ -80,8 +80,8 @@ static void sp_tweak_mode_changed( GObject *tbl, int mode )
     static gchar const* names[] = {"tweak_doh", "tweak_dos", "tweak_dol", "tweak_doo", "tweak_channels_label"};
     bool flag = ((mode == Inkscape::UI::Tools::TWEAK_MODE_COLORPAINT) ||
                  (mode == Inkscape::UI::Tools::TWEAK_MODE_COLORJITTER));
-    for (size_t i = 0; i < G_N_ELEMENTS(names); ++i) {
-        GtkAction *act = GTK_ACTION(g_object_get_data( tbl, names[i] ));
+    for (auto & name : names) {
+        GtkAction *act = GTK_ACTION(g_object_get_data( tbl, name ));
         if (act) {
             gtk_action_set_visible(act, flag);
         }