modernize loops

5 files changed, 31 insertions, 33 deletions

diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp
index 8182b0d9c..1b826c888 100644
--- a/src/live_effects/parameter/originalitemarray.cpp
+++ b/src/live_effects/parameter/originalitemarray.cpp
@@ -293,8 +293,7 @@ OriginalItemArrayParam::on_link_button_click()
         }
         os << (*iter)->href << "," << ((*iter)->actived ? "1" : "0");
     }
-    for (auto i=itemsid.begin();i!=itemsid.end();++i) {
-        Glib::ustring itemid = *i;
+    for (auto itemid : itemsid) {
         // add '#' at start to make it an uri.
         itemid.insert(itemid.begin(), '#');
 
@@ -423,13 +422,13 @@ gchar * OriginalItemArrayParam::param_getSVGValue() const
 {
     Inkscape::SVGOStringStream os;
     bool foundOne = false;
-    for (std::vector<ItemAndActive*>::const_iterator iter = _vector.begin(); iter != _vector.end(); ++iter) {
+    for (auto iter : _vector) {
         if (foundOne) {
             os << "|";
         } else {
             foundOne = true;
         }
-        os << (*iter)->href << "," << ((*iter)->actived ? "1" : "0");
+        os << iter->href << "," << (iter->actived ? "1" : "0");
     }
     return g_strdup(os.str().c_str());
 }
@@ -441,9 +440,9 @@ gchar * OriginalItemArrayParam::param_getDefaultSVGValue() const
 
 void OriginalItemArrayParam::update()
 {
-    for (std::vector<ItemAndActive*>::iterator iter = _vector.begin(); iter != _vector.end(); ++iter) {
-        SPObject *linked_obj = (*iter)->ref.getObject();
-        linked_modified(linked_obj, SP_OBJECT_MODIFIED_FLAG, *iter);
+    for (auto & iter : _vector) {
+        SPObject *linked_obj = iter->ref.getObject();
+        linked_modified(linked_obj, SP_OBJECT_MODIFIED_FLAG, iter);
     }
 }
 
diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp
index 21b02cc7c..0f62ed5f9 100644
--- a/src/live_effects/parameter/originalpatharray.cpp
+++ b/src/live_effects/parameter/originalpatharray.cpp
@@ -333,8 +333,7 @@ OriginalPathArrayParam::on_link_button_click()
         }
         os << (*iter)->href << "," << ((*iter)->reversed ? "1" : "0") << "," << ((*iter)->visibled ? "1" : "0");
     }
-    for (auto i=pathsid.begin();i!=pathsid.end();++i) {
-        Glib::ustring pathid = *i;
+    for (auto pathid : pathsid) {
         // add '#' at start to make it an uri.
         pathid.insert(pathid.begin(), '#');
 
@@ -512,13 +511,13 @@ gchar * OriginalPathArrayParam::param_getSVGValue() const
 {
     Inkscape::SVGOStringStream os;
     bool foundOne = false;
-    for (std::vector<PathAndDirectionAndVisible*>::const_iterator iter = _vector.begin(); iter != _vector.end(); ++iter) {
+    for (auto iter : _vector) {
         if (foundOne) {
             os << "|";
         } else {
             foundOne = true;
         }
-        os << (*iter)->href << "," << ((*iter)->reversed ? "1" : "0") << "," << ((*iter)->visibled ? "1" : "0");
+        os << iter->href << "," << (iter->reversed ? "1" : "0") << "," << (iter->visibled ? "1" : "0");
     }
     return g_strdup(os.str().c_str());
 }
@@ -530,9 +529,9 @@ gchar * OriginalPathArrayParam::param_getDefaultSVGValue() const
 
 void OriginalPathArrayParam::update()
 {
-    for (std::vector<PathAndDirectionAndVisible*>::iterator iter = _vector.begin(); iter != _vector.end(); ++iter) {
-        SPObject *linked_obj = (*iter)->ref.getObject();
-        linked_modified(linked_obj, SP_OBJECT_MODIFIED_FLAG, *iter);
+    for (auto & iter : _vector) {
+        SPObject *linked_obj = iter->ref.getObject();
+        linked_modified(linked_obj, SP_OBJECT_MODIFIED_FLAG, iter);
     }
 }
 
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 788c8b288..b8d2f4476 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -385,8 +385,8 @@ PathParam::ensure_pwd2()
 {
     if (must_recalculate_pwd2) {
         _pwd2.clear();
-        for (unsigned int i=0; i < _pathvector.size(); i++) {
-            _pwd2.concat( _pathvector[i].toPwSb() );
+        for (const auto & i : _pathvector) {
+            _pwd2.concat( i.toPwSb() );
         }
 
         must_recalculate_pwd2 = false;
diff --git a/src/live_effects/parameter/powerstrokepointarray.cpp b/src/live_effects/parameter/powerstrokepointarray.cpp
index 08e17ed93..a39c872cd 100644
--- a/src/live_effects/parameter/powerstrokepointarray.cpp
+++ b/src/live_effects/parameter/powerstrokepointarray.cpp
@@ -69,19 +69,19 @@ PowerStrokePointArrayParam::recalculate_controlpoints_for_new_pwd2(Geom::Piecewi
         if (last_pwd2.size() > pwd2_in.size()) {
             // Path has become shorter: rescale offsets
             double factor = (double)pwd2_in.size() / (double)last_pwd2.size();
-            for (unsigned int i = 0; i < _vector.size(); ++i) {
-                _vector[i][Geom::X] *= factor;
+            for (auto & i : _vector) {
+                i[Geom::X] *= factor;
             }
         } else if (last_pwd2.size() < pwd2_in.size()) {
             // Path has become longer: probably node added, maintain position of knots
             Geom::Piecewise<Geom::D2<Geom::SBasis> > normal = rot90(unitVector(derivative(pwd2_in)));
-            for (unsigned int i = 0; i < _vector.size(); ++i) {
-                Geom::Point pt = _vector[i];
+            for (auto & i : _vector) {
+                Geom::Point pt = i;
                 Geom::Point position = last_pwd2.valueAt(pt[Geom::X]) + pt[Geom::Y] * last_pwd2_normal.valueAt(pt[Geom::X]);
                 
                 double t = nearest_time(position, pwd2_in);
                 double offset = dot(position - pwd2_in.valueAt(t), normal.valueAt(t));
-                _vector[i] = Geom::Point(t, offset);
+                i = Geom::Point(t, offset);
             }
         }
 
@@ -96,11 +96,11 @@ PowerStrokePointArrayParam::reverse_controlpoints(bool write)
     std::vector<Geom::Point> controlpoints;
     if (!last_pwd2.empty()) {
         Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in_reverse = reverse(last_pwd2);
-        for (unsigned int i = 0; i < _vector.size(); ++i) {
-            Geom::Point control_pos = last_pwd2.valueAt(_vector[i][Geom::X]);
+        for (auto & i : _vector) {
+            Geom::Point control_pos = last_pwd2.valueAt(i[Geom::X]);
             double new_pos = Geom::nearest_time(control_pos, pwd2_in_reverse);
-            controlpoints.emplace_back(new_pos,_vector[i][Geom::Y]);
-            _vector[i][Geom::X] = new_pos;
+            controlpoints.emplace_back(new_pos,i[Geom::Y]);
+            i[Geom::X] = new_pos;
         }
         if (write) {
             write_to_SVG();
@@ -235,8 +235,8 @@ PowerStrokePointArrayParamKnotHolderEntity::knot_click(guint state)
                 vec.erase(vec.begin() + _index);
                 _pparam->param_set_and_write_new_value(vec);
                 // shift knots down one index
-                for(std::list<KnotHolderEntity *>::iterator ent = parent_holder->entity.begin(); ent != parent_holder->entity.end(); ++ent) {
-                    PowerStrokePointArrayParamKnotHolderEntity *pspa_ent = dynamic_cast<PowerStrokePointArrayParamKnotHolderEntity *>(*ent);
+                for(auto & ent : parent_holder->entity) {
+                    PowerStrokePointArrayParamKnotHolderEntity *pspa_ent = dynamic_cast<PowerStrokePointArrayParamKnotHolderEntity *>(ent);
                     if ( pspa_ent && pspa_ent->_pparam == this->_pparam ) {  // check if the knotentity belongs to this powerstrokepointarray parameter
                         if (pspa_ent->_index > this->_index) {
                             --pspa_ent->_index;
@@ -254,8 +254,8 @@ PowerStrokePointArrayParamKnotHolderEntity::knot_click(guint state)
             _pparam->param_set_and_write_new_value(vec);
 
             // shift knots up one index
-            for(std::list<KnotHolderEntity *>::iterator ent = parent_holder->entity.begin(); ent != parent_holder->entity.end(); ++ent) {
-                PowerStrokePointArrayParamKnotHolderEntity *pspa_ent = dynamic_cast<PowerStrokePointArrayParamKnotHolderEntity *>(*ent);
+            for(auto & ent : parent_holder->entity) {
+                PowerStrokePointArrayParamKnotHolderEntity *pspa_ent = dynamic_cast<PowerStrokePointArrayParamKnotHolderEntity *>(ent);
                 if ( pspa_ent && pspa_ent->_pparam == this->_pparam ) {  // check if the knotentity belongs to this powerstrokepointarray parameter
                     if (pspa_ent->_index > this->_index) {
                         ++pspa_ent->_index;
diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp
index aa1644597..a82df2d27 100644
--- a/src/live_effects/parameter/satellitesarray.cpp
+++ b/src/live_effects/parameter/satellitesarray.cpp
@@ -158,10 +158,10 @@ void SatellitesArrayParam::param_transform_multiply(Geom::Affine const &postmul,
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     if (prefs->getBool("/options/transform/rectcorners", true)) {
-        for (size_t i = 0; i < _vector.size(); ++i) {
-            for (size_t j = 0; j < _vector[i].size(); ++j) {
-                if (!_vector[i][j].is_time && _vector[i][j].amount > 0) {
-                    _vector[i][j].amount = _vector[i][j].amount * ((postmul.expansionX() + postmul.expansionY()) / 2);
+        for (auto & i : _vector) {
+            for (size_t j = 0; j < i.size(); ++j) {
+                if (!i[j].is_time && i[j].amount > 0) {
+                    i[j].amount = i[j].amount * ((postmul.expansionX() + postmul.expansionY()) / 2);
                 }
             }
         }