modernize loops

18 files changed, 66 insertions, 78 deletions

diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 73ae9c3c8..6b95d96a7 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -147,8 +147,8 @@ Extension::~Extension ()
         delete param;
     }
 
-    for (unsigned int i = 0 ; i < _deps.size(); i++) {
-        delete _deps[i];
+    for (auto & _dep : _deps) {
+        delete _dep;
     }
     _deps.clear();
 
@@ -284,11 +284,11 @@ Extension::check ()
         retval = false;
     }
 
-    for (unsigned int i = 0 ; i < _deps.size(); i++) {
-        if (_deps[i]->check() == FALSE) {
+    for (auto & _dep : _deps) {
+        if (_dep->check() == FALSE) {
             // std::cout << "Failed: " << *(_deps[i]) << std::endl;
             printFailure(Glib::ustring(_("a dependency was not met.")));
-            error_file << *_deps[i] << std::endl;
+            error_file << *_dep << std::endl;
             retval = false;
         }
     }
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 82b6b577a..9ff9c0bc2 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -841,8 +841,8 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr
     }
 
     // Unparent (delete)
-    for (unsigned int i = 0; i < delete_list.size(); i++) {
-        sp_repr_unparent(delete_list[i]);
+    for (auto & i : delete_list) {
+        sp_repr_unparent(i);
     }
     attribs.clear();
     oldroot->mergeFrom(newroot, "id", true, true);
diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index 7d4bff11a..7841a6506 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -195,12 +195,12 @@ void XSLT::save(Inkscape::Extension::Output *module, SPDocument *doc, gchar cons
     const char * xslt_params[max_parameters+1] ;
 
     int count = 0;
-    for(std::list<std::string>::iterator t=params.begin(); t != params.end(); ++t) {
-        std::size_t pos = t->find("=");
+    for(auto & param : params) {
+        std::size_t pos = param.find("=");
         std::ostringstream parameter;
         std::ostringstream value;
-        parameter << t->substr(2,pos-2);
-        value << t->substr(pos+1);
+        parameter << param.substr(2,pos-2);
+        value << param.substr(pos+1);
         xslt_params[count++] = g_strdup_printf("%s", parameter.str().c_str());
         xslt_params[count++] = g_strdup_printf("'%s'", value.str().c_str());
     }
diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index 42fb067b6..23a337ff7 100644
--- a/src/extension/internal/bluredge.cpp
+++ b/src/extension/internal/bluredge.cpp
@@ -66,10 +66,7 @@ BlurEdge::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View
     std::vector<SPItem*> items(selection->items().begin(), selection->items().end());
     selection->clear();
 
-    for(std::vector<SPItem*>::iterator item = items.begin();
-            item != items.end(); ++item) {
-        SPItem * spitem = *item;
-
+    for(auto spitem : items) {
         std::vector<Inkscape::XML::Node *> new_items(steps);
         Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
         Inkscape::XML::Node * new_group = xml_doc->createElement("svg:g");
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index ff375dcb9..db0a6867e 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -1229,8 +1229,7 @@ CairoRenderContext::_createHatchPainter(SPPaintServer const *const paintserver,
     std::vector<SPHatchPath *> children(evil->hatchPaths());
 
     for (int i = 0; i < overflow_steps; i++) {
-        for (std::vector<SPHatchPath *>::iterator iter = children.begin(); iter != children.end(); ++iter) {
-            SPHatchPath *path = *iter;
+        for (auto path : children) {
             _renderer->renderHatchPath(pattern_ctx, *path, dkey);
         }
         pattern_ctx->transform(overflow_transform);
@@ -1698,18 +1697,18 @@ unsigned int CairoRenderContext::_showGlyphs(cairo_t *cr, PangoFont * /*font*/,
 
     unsigned int num_invalid_glyphs = 0;
     unsigned int i = 0; // is a counter for indexing the glyphs array, only counts the valid glyphs
-    for (std::vector<CairoGlyphInfo>::const_iterator it_info = glyphtext.begin() ; it_info != glyphtext.end() ; ++it_info) {
+    for (const auto & it_info : glyphtext) {
         // skip glyphs which are PANGO_GLYPH_EMPTY (0x0FFFFFFF)
         // or have the PANGO_GLYPH_UNKNOWN_FLAG (0x10000000) set
-        if (it_info->index == 0x0FFFFFFF || it_info->index & 0x10000000) {
+        if (it_info.index == 0x0FFFFFFF || it_info.index & 0x10000000) {
             TRACE(("INVALID GLYPH found\n"));
             g_message("Invalid glyph found, continuing...");
             num_invalid_glyphs++;
             continue;
         }
-        glyphs[i].index = it_info->index;
-        glyphs[i].x     = it_info->x;
-        glyphs[i].y     = it_info->y;
+        glyphs[i].index = it_info.index;
+        glyphs[i].x     = it_info.x;
+        glyphs[i].y     = it_info.y;
         i++;
     }
 
diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index 41f44e738..1c294fcb7 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -1398,9 +1398,9 @@ unsigned int PrintEmf::fill(
             Dashes converted to line segments will "open" a closed path.
         */
         bool all_closed = true;
-        for (Geom::PathVector::const_iterator pit = pathv.begin(); pit != pathv.end(); ++pit) {
-            for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit) {
-                if (pit->end_default() != pit->end_closed()) {
+        for (const auto & pit : pathv) {
+            for (Geom::Path::const_iterator cit = pit.begin(); cit != pit.end_open(); ++cit) {
+                if (pit.end_default() != pit.end_closed()) {
                     all_closed = false;
                 }
             }
@@ -1447,8 +1447,8 @@ unsigned int PrintEmf::stroke(
         double tlength;                                       // length of tmp_pathpw
         double slength = 0.0;                                 // start of gragment
         double elength;                                       // end of gragment
-        for (unsigned int i = 0; i < pathv.size(); i++) {
-            tmp_pathpw.concat(pathv[i].toPwSb());
+        for (const auto & i : pathv) {
+            tmp_pathpw.concat(i.toPwSb());
         }
         tlength = length(tmp_pathpw, 0.1);
         tmp_pathpw2 = arc_length_parametrization(tmp_pathpw);
@@ -1507,11 +1507,11 @@ bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Aff
     int curves = 0;
     char *rec  = nullptr;
 
-    for (Geom::PathVector::iterator pit = pv.begin(); pit != pv.end(); ++pit) {
+    for (auto & pit : pv) {
         moves++;
         nodes++;
 
-        for (Geom::Path::iterator cit = pit->begin(); cit != pit->end_open(); ++cit) {
+        for (Geom::Path::iterator cit = pit.begin(); cit != pit.end_open(); ++cit) {
             nodes++;
 
             if (is_straight_curve(*cit)) {
@@ -1532,11 +1532,11 @@ bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Aff
     /**
      * For all Subpaths in the <path>
      */
-    for (Geom::PathVector::iterator pit = pv.begin(); pit != pv.end(); ++pit) {
+    for (auto & pit : pv) {
         using Geom::X;
         using Geom::Y;
 
-        Geom::Point p0 = pit->initialPoint();
+        Geom::Point p0 = pit.initialPoint();
 
         p0[X] = (p0[X] * PX2WORLD);
         p0[Y] = (p0[Y] * PX2WORLD);
@@ -1551,7 +1551,7 @@ bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Aff
         /**
          * For all segments in the subpath
          */
-        for (Geom::Path::iterator cit = pit->begin(); cit != pit->end_open(); ++cit) {
+        for (Geom::Path::iterator cit = pit.begin(); cit != pit.end_open(); ++cit) {
             if (is_straight_curve(*cit)) {
                 //Geom::Point p0 = cit->initialPoint();
                 Geom::Point p1 = cit->finalPoint();
diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index 0859bb6ff..cbc93d0ba 100644
--- a/src/extension/internal/filter/filter.cpp
+++ b/src/extension/internal/filter/filter.cpp
@@ -130,10 +130,8 @@ void Filter::effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::Vie
 	Inkscape::XML::Document * xmldoc = document->doc()->getReprDoc();
 	Inkscape::XML::Node * defsrepr = document->doc()->getDefs()->getRepr();
 
-    for(std::vector<SPItem*>::iterator item = items.begin();
-            item != items.end(); ++item) {
-        SPItem * spitem = *item;
-	Inkscape::XML::Node * node = spitem->getRepr();
+    for(auto spitem : items) {
+        	Inkscape::XML::Node * node = spitem->getRepr();
 
 		SPCSSAttr * css = sp_repr_css_attr(node, "style");
 		gchar const * filter = sp_repr_css_property(css, "filter", nullptr);
diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp
index b5a95441c..0ecef60c8 100644
--- a/src/extension/internal/gimpgrad.cpp
+++ b/src/extension/internal/gimpgrad.cpp
@@ -183,7 +183,7 @@ GimpGrad::open (Inkscape::Extension::Input */*module*/, gchar const *filename)
         while (fgets(tempstr, 1024, gradient) != nullptr) {
             double dbls[3 + 4 + 4];
             gchar *p = tempstr;
-            for (unsigned i = 0; i < G_N_ELEMENTS(dbls); ++i) {
+            for (double & dbl : dbls) {
                 gchar *end = nullptr;
                 double const xi = g_ascii_strtod(p, &end);
                 if (!end || end == p || !g_ascii_isspace(*end)) {
@@ -192,7 +192,7 @@ GimpGrad::open (Inkscape::Extension::Input */*module*/, gchar const *filename)
                 if (xi < 0 || 1 < xi) {
                     goto error;
                 }
-                dbls[i] = xi;
+                dbl = xi;
                 p = end + 1;
             }
 
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index 1c592d354..1b0e9150d 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -312,9 +312,8 @@ bool JavaFXOutput::doGradient(SPGradient *grad, const String &id)
             {
             out("            stops:\n");
             out("                [\n");
-            for (unsigned int i = 0 ; i<stops.size() ; i++)
+            for (auto stop : stops)
                 {
-                SPGradientStop stop = stops[i];
                 out("                Stop {\n");
                 out("                    offset: %s\n", DSTR(stop.offset));
                 out("                    color: %s\n",  rgba(stop.color, stop.opacity).c_str());
@@ -342,9 +341,8 @@ bool JavaFXOutput::doGradient(SPGradient *grad, const String &id)
             {
             out("            stops:\n");
             out("            [\n");
-            for (unsigned int i = 0 ; i<stops.size() ; i++)
+            for (auto stop : stops)
                 {
-                SPGradientStop stop = stops[i];
                 out("                Stop {\n");
                 out("                    offset: %s\n", DSTR(stop.offset));
                 out("                    color: %s\n",  rgba(stop.color, stop.opacity).c_str());
diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index e8bee1981..519e0a893 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -304,8 +304,8 @@ PrintLatex::print_2geomcurve(SVGOStringStream &os, Geom::Curve const &c)
         //this case handles sbasis as well as all other curve types
         Geom::Path sbasis_path = Geom::cubicbezierpath_from_sbasis(c.toSBasis(), 0.1);
 
-        for(Geom::Path::iterator iter = sbasis_path.begin(); iter != sbasis_path.end(); ++iter) {
-            print_2geomcurve(os, *iter);
+        for(const auto & iter : sbasis_path) {
+            print_2geomcurve(os, iter);
         }
     }
 }
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 1f609377f..8484984bd 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -853,8 +853,8 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
       }
       _POPPLER_FREE(obj3);
       if ((haveBackdropColor = _POPPLER_CALL_ARGS_DEREF(obj3, obj2.dictLookup, "BC").isArray())) {
-	for (int i = 0; i < gfxColorMaxComps; ++i) {
-	  backdropColor.c[i] = 0;
+	for (int & i : backdropColor.c) {
+	  i = 0;
 	}
 	for (int i = 0; i < obj3.arrayGetLength() && i < gfxColorMaxComps; ++i) {
           _POPPLER_CALL_ARGS(obj4, obj3.arrayGet, i);
@@ -893,8 +893,8 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
 	      blendingColorSpace->getDefaultColor(&backdropColor);
 	    } else {
 	      //~ need to get the parent or default color space (?)
-	      for (int i = 0; i < gfxColorMaxComps; ++i) {
-		backdropColor.c[i] = 0;
+	      for (int & i : backdropColor.c) {
+		i = 0;
 	      }
 	    }
 	  }
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 373df6a39..7247536e9 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -121,9 +121,8 @@ void SvgBuilder::_init() {
     // Fill _availableFontNames (Bug LP #179589) (code cfr. FontLister)
     std::vector<PangoFontFamily *> families;
     font_factory::Default()->GetUIFamilies(families);
-    for ( std::vector<PangoFontFamily *>::iterator iter = families.begin();
-          iter != families.end(); ++iter ) {
-        _availableFontNames.emplace_back(pango_font_family_get_name(*iter));
+    for (auto & familie : families) {
+        _availableFontNames.emplace_back(pango_font_family_get_name(familie));
     }
 
     _transp_group_stack = nullptr;
@@ -956,9 +955,7 @@ std::string SvgBuilder::_BestMatchingFont(std::string PDFname)
     double bestMatch = 0;
     std::string bestFontname = "Arial";
     
-    for (guint i = 0; i < _availableFontNames.size(); i++) {
-        std::string fontname = _availableFontNames[i];
-        
+    for (auto fontname : _availableFontNames) {
         // At least the first word of the font name should match.
         size_t minMatch = fontname.find(" ");
         if (minMatch == std::string::npos) {
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index 7ee8cd235..1b298882b 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -522,12 +522,12 @@ bool PovOutput::doTree(SPDocument *doc)
         out("#end\n");
         out("\n\n");
         out("#declare %s = union {\n", id.c_str());
-        for (unsigned i = 0 ; i < povShapes.size() ; i++)
+        for (auto & povShape : povShapes)
             {
-            out("    object { %s\n", povShapes[i].id.c_str());
+            out("    object { %s\n", povShape.id.c_str());
             out("        texture { \n");
-            if (povShapes[i].color.length()>0)
-                out("            pigment { %s }\n", povShapes[i].color.c_str());
+            if (povShape.color.length()>0)
+                out("            pigment { %s }\n", povShape.color.c_str());
             else
                 out("            pigment { rgb <0,0,0> }\n");
             out("            finish { %s_Finish }\n", pfx);
@@ -551,12 +551,12 @@ bool PovOutput::doTree(SPDocument *doc)
         out("\n\n");
         out("#declare %s_Z = union {\n", pfx);
 
-        for (unsigned i = 0 ; i < povShapes.size() ; i++)
+        for (auto & povShape : povShapes)
             {
-            out("    object { %s\n", povShapes[i].id.c_str());
+            out("    object { %s\n", povShape.id.c_str());
             out("        texture { \n");
-            if (povShapes[i].color.length()>0)
-                out("            pigment { %s }\n", povShapes[i].color.c_str());
+            if (povShape.color.length()>0)
+                out("            pigment { %s }\n", povShape.color.c_str());
             else
                 out("            pigment { rgb <0,0,0> }\n");
             out("            finish { %s_Finish }\n", pfx);
diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp
index 29e5b0e3e..99f893cd3 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -72,8 +72,8 @@ static void pruneExtendedNamespaces( Inkscape::XML::Node *repr )
                 }
             }
             // Can't change the set we're iterating over while we are iterating.
-            for ( std::vector<gchar const*>::iterator it = attrsRemoved.begin(); it != attrsRemoved.end(); ++it ) {
-                repr->setAttribute(*it, nullptr);
+            for (auto & it : attrsRemoved) {
+                repr->setAttribute(it, nullptr);
             }
         }
 
@@ -85,8 +85,8 @@ static void pruneExtendedNamespaces( Inkscape::XML::Node *repr )
                 pruneExtendedNamespaces(child);
             }
         }
-        for ( std::vector<Inkscape::XML::Node *>::iterator it = nodesRemoved.begin(); it != nodesRemoved.end(); ++it ) {
-            repr->removeChild(*it);
+        for (auto & it : nodesRemoved) {
+            repr->removeChild(it);
         }
     }
 }
@@ -108,8 +108,8 @@ static void pruneProprietaryGarbage( Inkscape::XML::Node *repr )
                 pruneProprietaryGarbage(child);
             }
         }
-        for ( std::vector<Inkscape::XML::Node *>::iterator it = nodesRemoved.begin(); it != nodesRemoved.end(); ++it ) { 
-            repr->removeChild(*it);
+        for (auto & it : nodesRemoved) { 
+            repr->removeChild(it);
         }
     }
 }
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp
index 1604a8d48..7d13e218a 100644
--- a/src/extension/internal/wmf-print.cpp
+++ b/src/extension/internal/wmf-print.cpp
@@ -833,9 +833,9 @@ unsigned int PrintWmf::fill(
             Dashes converted to line segments will "open" a closed path.
         */
         bool all_closed = true;
-        for (Geom::PathVector::const_iterator pit = pathv.begin(); pit != pathv.end(); ++pit) {
-            for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit) {
-                if (pit->end_default() != pit->end_closed()) {
+        for (const auto & pit : pathv) {
+            for (Geom::Path::const_iterator cit = pit.begin(); cit != pit.end_open(); ++cit) {
+                if (pit.end_default() != pit.end_closed()) {
                     all_closed = false;
                 }
             }
@@ -881,8 +881,8 @@ unsigned int PrintWmf::stroke(
         double tlength;                                       // length of tmp_pathpw
         double slength = 0.0;                                 // start of gragment
         double elength;                                       // end of gragment
-        for (unsigned int i = 0; i < pathv.size(); i++) {
-            tmp_pathpw.concat(pathv[i].toPwSb());
+        for (const auto & i : pathv) {
+            tmp_pathpw.concat(i.toPwSb());
         }
         tlength = length(tmp_pathpw, 0.1);
         tmp_pathpw2 = arc_length_parametrization(tmp_pathpw);
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index 2886ad792..661c533ca 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -16,7 +16,7 @@
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "preferences.h"
-#include "float.h"
+#include "./float.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index a1afd6b18..1a60ef32e 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -24,15 +24,14 @@
 
 #include "bool.h"
 #include "color.h"
-#include "color.h"
 #include "description.h"
 #include "enum.h"
-#include "float.h"
+#include "./float.h"
 #include "int.h"
 #include "notebook.h"
 #include "parameter.h"
 #include "radiobutton.h"
-#include "string.h"
+#include "./string.h"
 
 #include "extension/extension.h"
 
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 6a3de1d04..c1986cf92 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -15,7 +15,7 @@
 
 #include "xml/node.h"
 #include "extension/extension.h"
-#include "string.h"
+#include "./string.h"
 #include "preferences.h"
 #include <glibmm/i18n.h>