modernize loops

9 files changed, 25 insertions, 29 deletions

diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index 8d9f4a51c..f55dc5176 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -186,9 +186,9 @@ std::vector<colorspace::Component> colorspace::getColorSpaceInfo(uint32_t space)
         sets[cmsSigCmyData].push_back(Component(_("_M:"), _("Magenta"), 1));
         sets[cmsSigCmyData].push_back(Component(_("_Y:"), _("Yellow"), 1));
 
-        for (std::map<cmsUInt32Number, std::vector<Component> >::iterator it = sets.begin(); it != sets.end(); ++it) {
-            knownColorspaces.insert(it->first);
-            maxColorspaceComponentCount = std::max(maxColorspaceComponentCount, it->second.size());
+        for (auto & set : sets) {
+            knownColorspaces.insert(set.first);
+            maxColorspaceComponentCount = std::max(maxColorspaceComponentCount, set.second.size());
         }
     }
 
@@ -806,10 +806,10 @@ void ColorICCSelectorImpl::_setProfile(SVGICCColor *profile)
         profChanged = true;
     }
 
-    for (size_t i = 0; i < _compUI.size(); i++) {
-        gtk_widget_hide(_compUI[i]._label);
-        _compUI[i]._slider->hide();
-        gtk_widget_hide(_compUI[i]._btn);
+    for (auto & i : _compUI) {
+        gtk_widget_hide(i._label);
+        i._slider->hide();
+        gtk_widget_hide(i._btn);
     }
 
     if (profile) {
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index 88573f137..f635b0665 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -289,8 +289,8 @@ void ColorNotebook::_updateICCButtons()
         if (prof && CMSSystem::isPrintColorSpace(prof)) {
             gtk_widget_show(GTK_WIDGET(_box_toomuchink));
             double ink_sum = 0;
-            for (unsigned int i = 0; i < color.icc->colors.size(); i++) {
-                ink_sum += color.icc->colors[i];
+            for (double i : color.icc->colors) {
+                ink_sum += i;
             }
 
             /* Some literature states that when the sum of paint values exceed 320%, it is considered to be a satured
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index e10b9f6a5..1229801d1 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -266,8 +266,8 @@ void ColorScales::setScaled(GtkAdjustment *a, gfloat v, bool constrained)
 void ColorScales::_setRangeLimit(gdouble upper)
 {
     _rangeLimit = upper;
-    for (gint i = 0; i < static_cast<gint>(G_N_ELEMENTS(_a)); i++) {
-        gtk_adjustment_set_upper(_a[i], upper);
+    for (auto & i : _a) {
+        gtk_adjustment_set_upper(i, upper);
     }
 }
 
diff --git a/src/ui/widget/dash-selector.cpp b/src/ui/widget/dash-selector.cpp
index 59149fb7c..81e7881b6 100644
--- a/src/ui/widget/dash-selector.cpp
+++ b/src/ui/widget/dash-selector.cpp
@@ -114,8 +114,8 @@ void DashSelector::init_dashes() {
             SPStyle style;
             dashes = g_new (double *, dash_prefs.size() + 2); // +1 for custom slot, +1 for terminator slot
             
-            for (std::vector<Glib::ustring>::iterator i = dash_prefs.begin(); i != dash_prefs.end(); ++i) {
-                style.readFromPrefs( *i );
+            for (auto & dash_pref : dash_prefs) {
+                style.readFromPrefs( dash_pref );
                 
                 if (!style.stroke_dasharray.values.empty()) {
                     dashes[pos] = g_new (double, style.stroke_dasharray.values.size() + 1);
diff --git a/src/ui/widget/font-selector.cpp b/src/ui/widget/font-selector.cpp
index 5c1905752..207d508df 100644
--- a/src/ui/widget/font-selector.cpp
+++ b/src/ui/widget/font-selector.cpp
@@ -122,9 +122,9 @@ FontSelector::set_sizes ()
     //                    PX  PT  PC  MM  CM   IN  EM  EX     %
     double 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)
     {
-        double size = sizes[i]/ratios[unit];
+        double size = i/ratios[unit];
         size_combobox.append( Glib::ustring::format(size) );
     }
 }
diff --git a/src/ui/widget/ink-select-one-action.cpp b/src/ui/widget/ink-select-one-action.cpp
index 7cff5f0be..95f38b511 100644
--- a/src/ui/widget/ink-select-one-action.cpp
+++ b/src/ui/widget/ink-select-one-action.cpp
@@ -105,9 +105,7 @@ Gtk::Widget* InkSelectOneAction::create_menu_item_vfunc() {
         Gtk::RadioButton::Group group;
         int index = 0;
         auto children = _store->children();
-        for (auto iter = children.begin(); iter != children.end(); ++iter) {
-            Gtk::TreeModel::Row row = *iter;
-
+        for (auto row : children) {
             InkSelectOneActionColumns columns;
             Glib::ustring label     = row[columns.col_label     ];
             Glib::ustring icon      = row[columns.col_icon      ];
@@ -159,9 +157,7 @@ Gtk::Widget* InkSelectOneAction::create_tool_item_vfunc() {
         Gtk::RadioAction::Group group;
         int index = 0;
         auto children = _store->children();
-        for (auto iter = children.begin(); iter != children.end(); ++iter) {
-            Gtk::TreeModel::Row row = *iter;
-
+        for (auto row : children) {
             InkSelectOneActionColumns columns;
             Glib::ustring label     = row[columns.col_label    ];
             Glib::ustring icon      = row[columns.col_icon     ];
@@ -217,8 +213,8 @@ Gtk::Widget* InkSelectOneAction::create_tool_item_vfunc() {
         }
 
         std::vector<Gtk::CellRenderer*> cells = _combobox->get_cells();
-        for (auto iter = cells.begin(); iter!= cells.end(); ++iter) {
-            _combobox->add_attribute (**iter, "sensitive", columns.col_sensitive);
+        for (auto & cell : cells) {
+            _combobox->add_attribute (*cell, "sensitive", columns.col_sensitive);
         }
 
         _combobox->set_active (_active);
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 92c460c03..149b70f6f 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -1128,8 +1128,8 @@ void SelectedStyle::opacity_1() {_opacity_sb.set_value(100);}
 void SelectedStyle::on_opacity_menu (Gtk::Menu *menu) {
 
     Glib::ListHandle<Gtk::Widget *> children = menu->get_children();
-    for (Glib::ListHandle<Gtk::Widget *>::iterator iter = children.begin(); iter != children.end(); ++iter) {
-        menu->remove(*(*iter));
+    for (auto iter : children) {
+        menu->remove(*iter);
     }
 
     {
diff --git a/src/ui/widget/unit-menu.cpp b/src/ui/widget/unit-menu.cpp
index 7be848aac..938851265 100644
--- a/src/ui/widget/unit-menu.cpp
+++ b/src/ui/widget/unit-menu.cpp
@@ -30,8 +30,8 @@ bool UnitMenu::setUnitType(UnitType unit_type)
     // Expand the unit widget with unit entries from the unit table
     UnitTable::UnitMap m = unit_table.units(unit_type);
 
-    for (UnitTable::UnitMap::iterator i = m.begin(); i != m.end(); ++i) {
-        append(i->first);
+    for (auto & i : m) {
+        append(i.first);
     }
     _type = unit_type;
     set_active_text(unit_table.primary(unit_type));
diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp
index 9a4ff8268..4114ed378 100644
--- a/src/ui/widget/unit-tracker.cpp
+++ b/src/ui/widget/unit-tracker.cpp
@@ -45,9 +45,9 @@ UnitTracker::UnitTracker(UnitType unit_type) :
     _store = Gtk::ListStore::create(columns);
     Gtk::TreeModel::Row row;
 
-    for (UnitTable::UnitMap::iterator m_iter = m.begin(); m_iter != m.end(); ++m_iter) {
+    for (auto & m_iter : m) {
 
-        Glib::ustring unit = m_iter->first;
+        Glib::ustring unit = m_iter.first;
 
         row = *(_store->append());
         row[columns.col_label    ] = unit;