modernize loops

8 files changed, 156 insertions, 161 deletions

diff --git a/src/livarot/Path.cpp b/src/livarot/Path.cpp
index c046a1af1..b0f19fddb 100644
--- a/src/livarot/Path.cpp
+++ b/src/livarot/Path.cpp
@@ -32,8 +32,8 @@ Path::Path()
 
 Path::~Path()
 {
-    for (std::vector<PathDescr*>::iterator i = descr_cmd.begin(); i != descr_cmd.end(); ++i) {
-        delete *i;
+    for (auto & i : descr_cmd) {
+        delete i;
     }
 }
 
@@ -51,8 +51,8 @@ void Path::Affiche()
 
 void Path::Reset()
 {
-    for (std::vector<PathDescr*>::iterator i = descr_cmd.begin(); i != descr_cmd.end(); ++i) {
-        delete *i;
+    for (auto & i : descr_cmd) {
+        delete i;
     }
     
     descr_cmd.clear();
@@ -65,8 +65,8 @@ void Path::Copy(Path * who)
 {
     ResetPoints();
     
-    for (std::vector<PathDescr*>::iterator i = descr_cmd.begin(); i != descr_cmd.end(); ++i) {
-        delete *i;
+    for (auto & i : descr_cmd) {
+        delete i;
     }
         
     descr_cmd.clear();
@@ -699,8 +699,8 @@ void Path::PointAndTangentAt(int piece, double at, Geom::Point &pos, Geom::Point
 
 void Path::Transform(const Geom::Affine &trans)
 {
-    for (std::vector<PathDescr*>::iterator i = descr_cmd.begin(); i != descr_cmd.end(); ++i) {
-        (*i)->transform(trans);
+    for (auto & i : descr_cmd) {
+        i->transform(trans);
     }
 }
 
@@ -710,12 +710,12 @@ void Path::FastBBox(double &l,double &t,double &r,double &b)
     bool empty = true;
     Geom::Point lastP(0, 0);
     
-    for (int i = 0; i < int(descr_cmd.size()); i++) {
-	int const typ = descr_cmd[i]->getType();
+    for (auto & i : descr_cmd) {
+	int const typ = i->getType();
 	switch ( typ ) {
 	case descr_lineto:
 	{
-	    PathDescrLineTo *nData = dynamic_cast<PathDescrLineTo *>(descr_cmd[i]);
+	    PathDescrLineTo *nData = dynamic_cast<PathDescrLineTo *>(i);
 	    if ( empty ) {
 		l = r = nData->p[Geom::X];
 		t = b = nData->p[Geom::Y];
@@ -740,7 +740,7 @@ void Path::FastBBox(double &l,double &t,double &r,double &b)
 	
 	case descr_moveto:
 	{
-	    PathDescrMoveTo *nData = dynamic_cast<PathDescrMoveTo *>(descr_cmd[i]);
+	    PathDescrMoveTo *nData = dynamic_cast<PathDescrMoveTo *>(i);
 	    if ( empty ) {
 		l = r = nData->p[Geom::X];
 		t = b = nData->p[Geom::Y];
@@ -765,7 +765,7 @@ void Path::FastBBox(double &l,double &t,double &r,double &b)
 	
 	case descr_arcto:
 	{
-	    PathDescrArcTo *nData  =  dynamic_cast<PathDescrArcTo *>(descr_cmd[i]);
+	    PathDescrArcTo *nData  =  dynamic_cast<PathDescrArcTo *>(i);
 	    if ( empty ) {
 		l = r = nData->p[Geom::X];
 		t = b = nData->p[Geom::Y];
@@ -790,7 +790,7 @@ void Path::FastBBox(double &l,double &t,double &r,double &b)
 	
 	case descr_cubicto:
 	{
-	    PathDescrCubicTo *nData  =  dynamic_cast<PathDescrCubicTo *>(descr_cmd[i]);
+	    PathDescrCubicTo *nData  =  dynamic_cast<PathDescrCubicTo *>(i);
 	    if ( empty ) {
 		l = r = nData->p[Geom::X];
 		t = b = nData->p[Geom::Y];
@@ -853,7 +853,7 @@ bezier-paths used by True-Type fonts."
 	
 	case descr_bezierto:
 	{
-	    PathDescrBezierTo *nData  =  dynamic_cast<PathDescrBezierTo *>(descr_cmd[i]);
+	    PathDescrBezierTo *nData  =  dynamic_cast<PathDescrBezierTo *>(i);
 	    if ( empty ) {
 		l = r = nData->p[Geom::X];
 		t = b = nData->p[Geom::Y];
@@ -878,7 +878,7 @@ bezier-paths used by True-Type fonts."
 	
 	case descr_interm_bezier:
 	{
-	    PathDescrIntermBezierTo *nData  =  dynamic_cast<PathDescrIntermBezierTo *>(descr_cmd[i]);
+	    PathDescrIntermBezierTo *nData  =  dynamic_cast<PathDescrIntermBezierTo *>(i);
 	    if ( empty ) {
 		l = r = nData->p[Geom::X];
 		t = b = nData->p[Geom::Y];
diff --git a/src/livarot/PathConversion.cpp b/src/livarot/PathConversion.cpp
index 88a8c5660..dfea8755d 100644
--- a/src/livarot/PathConversion.cpp
+++ b/src/livarot/PathConversion.cpp
@@ -1297,8 +1297,8 @@ void Path::Fill(Shape* dest, int pathID, bool justAdd, bool closeIfNeeded, bool
         if ( back ) {
             {
                 // invert && back && !weighted
-                for (int i = 0; i < int(pts.size()); i++) {
-                    dest->AddPoint(pts[i].p);
+                for (auto & pt : pts) {
+                    dest->AddPoint(pt.p);
                 }
                 int lastM = 0;
                 int curP = 1;
@@ -1381,8 +1381,8 @@ void Path::Fill(Shape* dest, int pathID, bool justAdd, bool closeIfNeeded, bool
 
             {
                 // invert && !back && !weighted
-                for (int i = 0; i < int(pts.size()); i++) {
-                    dest->AddPoint(pts[i].p);
+                for (auto & pt : pts) {
+                    dest->AddPoint(pt.p);
                 }
                 int lastM = 0;
                 int curP = 1;
@@ -1437,8 +1437,8 @@ void Path::Fill(Shape* dest, int pathID, bool justAdd, bool closeIfNeeded, bool
         if ( back ) {
             {
                 // !invert && back && !weighted
-                for (int i = 0; i < int(pts.size()); i++) {
-                    dest->AddPoint(pts[i].p);
+                for (auto & pt : pts) {
+                    dest->AddPoint(pt.p);
                 }
 
                 int lastM = 0;
@@ -1512,8 +1512,8 @@ void Path::Fill(Shape* dest, int pathID, bool justAdd, bool closeIfNeeded, bool
         } else {
             {
                 // !invert && !back && !weighted
-                for (int i = 0;i < int(pts.size()); i++) {
-                    dest->AddPoint(pts[i].p);
+                for (auto & pt : pts) {
+                    dest->AddPoint(pt.p);
                 }
 
                 int lastM = 0;
diff --git a/src/livarot/PathCutting.cpp b/src/livarot/PathCutting.cpp
index baf9bd71d..34263bc58 100644
--- a/src/livarot/PathCutting.cpp
+++ b/src/livarot/PathCutting.cpp
@@ -63,8 +63,8 @@ void  Path::DashPolylineFromStyle(SPStyle *style, float scale, float min_len)
 
         double dlen = 0.0;
         // Find total length
-        for (unsigned i = 0; i < style->stroke_dasharray.values.size(); i++) {
-            dlen += style->stroke_dasharray.values[i].value * scale;
+        for (auto & value : style->stroke_dasharray.values) {
+            dlen += value.value * scale;
         }
         if (dlen >= min_len) {
             // Extract out dash pattern (relative positions)
@@ -411,8 +411,8 @@ void  Path::AddCurve(Geom::Curve const &c)
         Geom::Path sbasis_path = Geom::cubicbezierpath_from_sbasis(c.toSBasis(), 0.1);
 
         //recurse to convert the new path resulting from the sbasis to svgd
-        for(Geom::Path::iterator iter = sbasis_path.begin(); iter != sbasis_path.end(); ++iter) {
-            AddCurve(*iter);
+        for(const auto & iter : sbasis_path) {
+            AddCurve(iter);
         }
     }
 }
@@ -435,8 +435,8 @@ void  Path::LoadPath(Geom::Path const &path, Geom::Affine const &tr, bool doTran
 
     MoveTo( pathtr.initialPoint() );
 
-    for(Geom::Path::const_iterator cit = pathtr.begin(); cit != pathtr.end(); ++cit) {
-        AddCurve(*cit);
+    for(const auto & cit : pathtr) {
+        AddCurve(cit);
     }
 
     if (pathtr.closed()) {
@@ -463,8 +463,8 @@ void  Path::LoadPathVector(Geom::PathVector const &pv, Geom::Affine const &tr, b
             LoadPath(*it, tr, doTransformation, true);
         }
     } else {
-        for(Geom::PathVector::const_iterator it = pv.begin(); it != pv.end(); ++it) {
-            LoadPath(*it, tr, doTransformation, true);
+        for(const auto & it : pv) {
+            LoadPath(it, tr, doTransformation, true);
         }
     }
 }
@@ -527,8 +527,8 @@ Path**      Path::SubPaths(int &outNb,bool killNoSurf)
   Path**   res=nullptr;
   Path*    curAdd=nullptr;
   
-  for (int i=0;i<int(descr_cmd.size());i++) {
-    int const typ = descr_cmd[i]->getType();
+  for (auto & i : descr_cmd) {
+    int const typ = i->getType();
     switch ( typ ) {
       case descr_moveto:
         if ( curAdd ) {
@@ -549,7 +549,7 @@ Path**      Path::SubPaths(int &outNb,bool killNoSurf)
         curAdd=new Path;
         curAdd->SetBackData(false);
         {
-          PathDescrMoveTo *nData = dynamic_cast<PathDescrMoveTo *>(descr_cmd[i]);
+          PathDescrMoveTo *nData = dynamic_cast<PathDescrMoveTo *>(i);
           curAdd->MoveTo(nData->p);
         }
           break;
@@ -560,31 +560,31 @@ Path**      Path::SubPaths(int &outNb,bool killNoSurf)
         break;        
       case descr_lineto:
       {
-        PathDescrLineTo *nData = dynamic_cast<PathDescrLineTo *>(descr_cmd[i]);
+        PathDescrLineTo *nData = dynamic_cast<PathDescrLineTo *>(i);
         curAdd->LineTo(nData->p);
       }
         break;
       case descr_cubicto:
       {
-        PathDescrCubicTo *nData = dynamic_cast<PathDescrCubicTo *>(descr_cmd[i]);
+        PathDescrCubicTo *nData = dynamic_cast<PathDescrCubicTo *>(i);
         curAdd->CubicTo(nData->p,nData->start,nData->end);
       }
         break;
       case descr_arcto:
       {
-        PathDescrArcTo *nData = dynamic_cast<PathDescrArcTo *>(descr_cmd[i]);
+        PathDescrArcTo *nData = dynamic_cast<PathDescrArcTo *>(i);
         curAdd->ArcTo(nData->p,nData->rx,nData->ry,nData->angle,nData->large,nData->clockwise);
       }
         break;
       case descr_bezierto:
       {
-        PathDescrBezierTo *nData = dynamic_cast<PathDescrBezierTo *>(descr_cmd[i]);
+        PathDescrBezierTo *nData = dynamic_cast<PathDescrBezierTo *>(i);
         curAdd->BezierTo(nData->p);
       }
         break;
       case descr_interm_bezier:
       {
-        PathDescrIntermBezierTo *nData = dynamic_cast<PathDescrIntermBezierTo *>(descr_cmd[i]);
+        PathDescrIntermBezierTo *nData = dynamic_cast<PathDescrIntermBezierTo *>(i);
         curAdd->IntermBezierTo(nData->p);
       }
         break;
diff --git a/src/livarot/ShapeRaster.cpp b/src/livarot/ShapeRaster.cpp
index 292b0a7f1..7aa300ed0 100644
--- a/src/livarot/ShapeRaster.cpp
+++ b/src/livarot/ShapeRaster.cpp
@@ -1978,8 +1978,7 @@ void Shape::_countUpDownTotalDegree2(int P,
     *upEdge = -1;
     *downEdge = -1;
     
-    for (int i = 0; i < 2; i++) {
-        int const j = getPoint(P).incidentEdge[i];
+    for (int j : getPoint(P).incidentEdge) {
         Shape::dg_arete const &e = getEdge(j);
         if ( P == std::max(e.st, e.en) ) {
             *upEdge = j;
diff --git a/src/livarot/ShapeSweep.cpp b/src/livarot/ShapeSweep.cpp
index df78195cc..3b5ed72ec 100644
--- a/src/livarot/ShapeSweep.cpp
+++ b/src/livarot/ShapeSweep.cpp
@@ -277,35 +277,35 @@ Shape::ConvertToShape (Shape * a, FillRule directed, bool invert)
 	      curSh = neSh;
 	    }
 
-	  for (unsigned int i = 0; i < chgts.size(); i++)
+	  for (auto & chgt : chgts)
 	    {
-	      chgts[i].ptNo = pData[chgts[i].ptNo].newInd;
-	      if (chgts[i].type == 0)
+	      chgt.ptNo = pData[chgt.ptNo].newInd;
+	      if (chgt.type == 0)
 		{
-		  if (chgts[i].src->getEdge(chgts[i].bord).st <
-		      chgts[i].src->getEdge(chgts[i].bord).en)
+		  if (chgt.src->getEdge(chgt.bord).st <
+		      chgt.src->getEdge(chgt.bord).en)
 		    {
-		      chgts[i].src->swsData[chgts[i].bord].stPt =
-			chgts[i].ptNo;
+		      chgt.src->swsData[chgt.bord].stPt =
+			chgt.ptNo;
 		    }
 		  else
 		    {
-		      chgts[i].src->swsData[chgts[i].bord].enPt =
-			chgts[i].ptNo;
+		      chgt.src->swsData[chgt.bord].enPt =
+			chgt.ptNo;
 		    }
 		}
-	      else if (chgts[i].type == 1)
+	      else if (chgt.type == 1)
 		{
-		  if (chgts[i].src->getEdge(chgts[i].bord).st >
-		      chgts[i].src->getEdge(chgts[i].bord).en)
+		  if (chgt.src->getEdge(chgt.bord).st >
+		      chgt.src->getEdge(chgt.bord).en)
 		    {
-		      chgts[i].src->swsData[chgts[i].bord].stPt =
-			chgts[i].ptNo;
+		      chgt.src->swsData[chgt.bord].stPt =
+			chgt.ptNo;
 		    }
 		  else
 		    {
-		      chgts[i].src->swsData[chgts[i].bord].enPt =
-			chgts[i].ptNo;
+		      chgt.src->swsData[chgt.bord].enPt =
+			chgt.ptNo;
 		    }
 		}
 	    }
@@ -590,31 +590,31 @@ Shape::ConvertToShape (Shape * a, FillRule directed, bool invert)
 	curSh = neSh;
       }
 
-    for (unsigned int i = 0; i < chgts.size(); i++)
+    for (auto & chgt : chgts)
       {
-	chgts[i].ptNo = pData[chgts[i].ptNo].newInd;
-	if (chgts[i].type == 0)
+	chgt.ptNo = pData[chgt.ptNo].newInd;
+	if (chgt.type == 0)
 	  {
-	    if (chgts[i].src->getEdge(chgts[i].bord).st <
-		chgts[i].src->getEdge(chgts[i].bord).en)
+	    if (chgt.src->getEdge(chgt.bord).st <
+		chgt.src->getEdge(chgt.bord).en)
 	      {
-		chgts[i].src->swsData[chgts[i].bord].stPt = chgts[i].ptNo;
+		chgt.src->swsData[chgt.bord].stPt = chgt.ptNo;
 	      }
 	    else
 	      {
-		chgts[i].src->swsData[chgts[i].bord].enPt = chgts[i].ptNo;
+		chgt.src->swsData[chgt.bord].enPt = chgt.ptNo;
 	      }
 	  }
-	else if (chgts[i].type == 1)
+	else if (chgt.type == 1)
 	  {
-	    if (chgts[i].src->getEdge(chgts[i].bord).st >
-		chgts[i].src->getEdge(chgts[i].bord).en)
+	    if (chgt.src->getEdge(chgt.bord).st >
+		chgt.src->getEdge(chgt.bord).en)
 	      {
-		chgts[i].src->swsData[chgts[i].bord].stPt = chgts[i].ptNo;
+		chgt.src->swsData[chgt.bord].stPt = chgt.ptNo;
 	      }
 	    else
 	      {
-		chgts[i].src->swsData[chgts[i].bord].enPt = chgts[i].ptNo;
+		chgt.src->swsData[chgt.bord].enPt = chgt.ptNo;
 	      }
 	  }
       }
@@ -1078,35 +1078,35 @@ Shape::Booleen (Shape * a, Shape * b, BooleanOp mod,int cutPathID)
 	      curSh = neSh;
 	    }
 
-	  for (unsigned int i = 0; i < chgts.size(); i++)
+	  for (auto & chgt : chgts)
 	    {
-	      chgts[i].ptNo = pData[chgts[i].ptNo].newInd;
-	      if (chgts[i].type == 0)
+	      chgt.ptNo = pData[chgt.ptNo].newInd;
+	      if (chgt.type == 0)
 		{
-		  if (chgts[i].src->getEdge(chgts[i].bord).st <
-		      chgts[i].src->getEdge(chgts[i].bord).en)
+		  if (chgt.src->getEdge(chgt.bord).st <
+		      chgt.src->getEdge(chgt.bord).en)
 		    {
-		      chgts[i].src->swsData[chgts[i].bord].stPt =
-			chgts[i].ptNo;
+		      chgt.src->swsData[chgt.bord].stPt =
+			chgt.ptNo;
 		    }
 		  else
 		    {
-		      chgts[i].src->swsData[chgts[i].bord].enPt =
-			chgts[i].ptNo;
+		      chgt.src->swsData[chgt.bord].enPt =
+			chgt.ptNo;
 		    }
 		}
-	      else if (chgts[i].type == 1)
+	      else if (chgt.type == 1)
 		{
-		  if (chgts[i].src->getEdge(chgts[i].bord).st >
-		      chgts[i].src->getEdge(chgts[i].bord).en)
+		  if (chgt.src->getEdge(chgt.bord).st >
+		      chgt.src->getEdge(chgt.bord).en)
 		    {
-		      chgts[i].src->swsData[chgts[i].bord].stPt =
-			chgts[i].ptNo;
+		      chgt.src->swsData[chgt.bord].stPt =
+			chgt.ptNo;
 		    }
 		  else
 		    {
-		      chgts[i].src->swsData[chgts[i].bord].enPt =
-			chgts[i].ptNo;
+		      chgt.src->swsData[chgt.bord].enPt =
+			chgt.ptNo;
 		    }
 		}
 	    }
@@ -1408,31 +1408,31 @@ Shape::Booleen (Shape * a, Shape * b, BooleanOp mod,int cutPathID)
       }
 
     /* FIXME: this kind of code seems to appear frequently */
-    for (unsigned int i = 0; i < chgts.size(); i++)
+    for (auto & chgt : chgts)
       {
-	chgts[i].ptNo = pData[chgts[i].ptNo].newInd;
-	if (chgts[i].type == 0)
+	chgt.ptNo = pData[chgt.ptNo].newInd;
+	if (chgt.type == 0)
 	  {
-	    if (chgts[i].src->getEdge(chgts[i].bord).st <
-		chgts[i].src->getEdge(chgts[i].bord).en)
+	    if (chgt.src->getEdge(chgt.bord).st <
+		chgt.src->getEdge(chgt.bord).en)
 	      {
-		chgts[i].src->swsData[chgts[i].bord].stPt = chgts[i].ptNo;
+		chgt.src->swsData[chgt.bord].stPt = chgt.ptNo;
 	      }
 	    else
 	      {
-		chgts[i].src->swsData[chgts[i].bord].enPt = chgts[i].ptNo;
+		chgt.src->swsData[chgt.bord].enPt = chgt.ptNo;
 	      }
 	  }
-	else if (chgts[i].type == 1)
+	else if (chgt.type == 1)
 	  {
-	    if (chgts[i].src->getEdge(chgts[i].bord).st >
-		chgts[i].src->getEdge(chgts[i].bord).en)
+	    if (chgt.src->getEdge(chgt.bord).st >
+		chgt.src->getEdge(chgt.bord).en)
 	      {
-		chgts[i].src->swsData[chgts[i].bord].stPt = chgts[i].ptNo;
+		chgt.src->swsData[chgt.bord].stPt = chgt.ptNo;
 	      }
 	    else
 	      {
-		chgts[i].src->swsData[chgts[i].bord].enPt = chgts[i].ptNo;
+		chgt.src->swsData[chgt.bord].enPt = chgt.ptNo;
 	      }
 	  }
       }
@@ -2724,14 +2724,14 @@ void
 Shape::CheckAdjacencies (int lastPointNo, int lastChgtPt, Shape * /*shapeHead*/,
 			 int /*edgeHead*/)
 {
-  for (unsigned int cCh = 0; cCh < chgts.size(); cCh++)
+  for (auto & chgt : chgts)
     {
-      int chLeN = chgts[cCh].ptNo;
-      int chRiN = chgts[cCh].ptNo;
-      if (chgts[cCh].src)
+      int chLeN = chgt.ptNo;
+      int chRiN = chgt.ptNo;
+      if (chgt.src)
 	{
-	  Shape *lS = chgts[cCh].src;
-	  int lB = chgts[cCh].bord;
+	  Shape *lS = chgt.src;
+	  int lB = chgt.bord;
 	  int lftN = lS->swsData[lB].leftRnd;
 	  int rgtN = lS->swsData[lB].rightRnd;
 	  if (lftN < chLeN)
@@ -2754,10 +2754,10 @@ Shape::CheckAdjacencies (int lastPointNo, int lastChgtPt, Shape * /*shapeHead*/,
 	      lS->swsData[lB].rightRnd = n;
 	    }
 	}
-      if (chgts[cCh].osrc)
+      if (chgt.osrc)
 	{
-	  Shape *rS = chgts[cCh].osrc;
-	  int rB = chgts[cCh].obord;
+	  Shape *rS = chgt.osrc;
+	  int rB = chgt.obord;
 	  int lftN = rS->swsData[rB].leftRnd;
 	  int rgtN = rS->swsData[rB].rightRnd;
 	  if (lftN < chLeN)
@@ -2780,12 +2780,12 @@ Shape::CheckAdjacencies (int lastPointNo, int lastChgtPt, Shape * /*shapeHead*/,
 	      rS->swsData[rB].rightRnd = n;
 	    }
 	}
-      if (chgts[cCh].lSrc)
+      if (chgt.lSrc)
 	{
-	  if (chgts[cCh].lSrc->swsData[chgts[cCh].lBrd].leftRnd < lastChgtPt)
+	  if (chgt.lSrc->swsData[chgt.lBrd].leftRnd < lastChgtPt)
 	    {
-	      Shape *nSrc = chgts[cCh].lSrc;
-	      int nBrd = chgts[cCh].lBrd /*,nNo=chgts[cCh].ptNo */ ;
+	      Shape *nSrc = chgt.lSrc;
+	      int nBrd = chgt.lBrd /*,nNo=chgts[cCh].ptNo */ ;
 	      bool hit;
 
 	      do
@@ -2849,12 +2849,12 @@ Shape::CheckAdjacencies (int lastPointNo, int lastChgtPt, Shape * /*shapeHead*/,
 
 	    }
 	}
-      if (chgts[cCh].rSrc)
+      if (chgt.rSrc)
 	{
-	  if (chgts[cCh].rSrc->swsData[chgts[cCh].rBrd].leftRnd < lastChgtPt)
+	  if (chgt.rSrc->swsData[chgt.rBrd].leftRnd < lastChgtPt)
 	    {
-	      Shape *nSrc = chgts[cCh].rSrc;
-	      int nBrd = chgts[cCh].rBrd /*,nNo=chgts[cCh].ptNo */ ;
+	      Shape *nSrc = chgt.rSrc;
+	      int nBrd = chgt.rBrd /*,nNo=chgts[cCh].ptNo */ ;
 	      bool hit;
 	      do
 		{
@@ -3043,35 +3043,35 @@ Shape::CheckEdges (int lastPointNo, int lastChgtPt, Shape * a, Shape * b,
 		   BooleanOp mod)
 {
 
-  for (unsigned int cCh = 0; cCh < chgts.size(); cCh++)
+  for (auto & chgt : chgts)
     {
-      if (chgts[cCh].type == 0)
+      if (chgt.type == 0)
 	{
-	  Shape *lS = chgts[cCh].src;
-	  int lB = chgts[cCh].bord;
-	  lS->swsData[lB].curPoint = chgts[cCh].ptNo;
+	  Shape *lS = chgt.src;
+	  int lB = chgt.bord;
+	  lS->swsData[lB].curPoint = chgt.ptNo;
 	}
     }
-  for (unsigned int cCh = 0; cCh < chgts.size(); cCh++)
+  for (auto & chgt : chgts)
     {
 //              int   chLeN=chgts[cCh].ptNo;
 //              int   chRiN=chgts[cCh].ptNo;
-      if (chgts[cCh].src)
+      if (chgt.src)
 	{
-	  Shape *lS = chgts[cCh].src;
-	  int lB = chgts[cCh].bord;
+	  Shape *lS = chgt.src;
+	  int lB = chgt.bord;
 	  Avance (lastPointNo, lastChgtPt, lS, lB, a, b, mod);
 	}
-      if (chgts[cCh].osrc)
+      if (chgt.osrc)
 	{
-	  Shape *rS = chgts[cCh].osrc;
-	  int rB = chgts[cCh].obord;
+	  Shape *rS = chgt.osrc;
+	  int rB = chgt.obord;
 	  Avance (lastPointNo, lastChgtPt, rS, rB, a, b, mod);
 	}
-      if (chgts[cCh].lSrc)
+      if (chgt.lSrc)
 	{
-	  Shape *nSrc = chgts[cCh].lSrc;
-	  int nBrd = chgts[cCh].lBrd;
+	  Shape *nSrc = chgt.lSrc;
+	  int nBrd = chgt.lBrd;
 	  while (nSrc->swsData[nBrd].leftRnd >=
 		 lastChgtPt /*&& nSrc->swsData[nBrd].doneTo < lastChgtPt */ )
 	    {
@@ -3088,10 +3088,10 @@ Shape::CheckEdges (int lastPointNo, int lastChgtPt, Shape * a, Shape * b,
 	      nBrd = node->bord;
 	    }
 	}
-      if (chgts[cCh].rSrc)
+      if (chgt.rSrc)
 	{
-	  Shape *nSrc = chgts[cCh].rSrc;
-	  int nBrd = chgts[cCh].rBrd;
+	  Shape *nSrc = chgt.rSrc;
+	  int nBrd = chgt.rBrd;
 	  while (nSrc->swsData[nBrd].rightRnd >=
 		 lastChgtPt /*&& nSrc->swsData[nBrd].doneTo < lastChgtPt */ )
 	    {
diff --git a/src/livarot/float-line.cpp b/src/livarot/float-line.cpp
index 6a5e4f931..9a19729cf 100644
--- a/src/livarot/float-line.cpp
+++ b/src/livarot/float-line.cpp
@@ -546,16 +546,16 @@ void FloatLigne::Flatten()
 void FloatLigne::Affiche()
 {
     printf("%lu : \n", (long unsigned int) bords.size());
-    for (int i = 0; i < int(bords.size()); i++) {
-        printf("(%f %f %f %i) ",bords[i].pos,bords[i].val,bords[i].pente,(bords[i].start?1:0)); // localization ok
+    for (auto & bord : bords) {
+        printf("(%f %f %f %i) ",bord.pos,bord.val,bord.pente,(bord.start?1:0)); // localization ok
     }
     
     printf("\n");
     printf("%lu : \n", (long unsigned int) runs.size());
     
-    for (int i = 0; i < int(runs.size()); i++) {
+    for (auto & run : runs) {
         printf("(%f %f -> %f %f / %f)",
-               runs[i].st, runs[i].vst, runs[i].en, runs[i].ven, runs[i].pente); // localization ok
+               run.st, run.vst, run.en, run.ven, run.pente); // localization ok
     }
     
     printf("\n");
@@ -627,8 +627,7 @@ void FloatLigne::Min(FloatLigne *a, float tresh, bool addIt)
     float lastStart=0;
     float lastEnd = 0;
     
-    for (int i = 0; i < int(a->runs.size()); i++) {
-        float_ligne_run runA = a->runs[i];
+    for (auto runA : a->runs) {
         if ( runA.vst <= tresh ) {
             if ( runA.ven <= tresh ) {
                 if ( startExists ) {
@@ -717,8 +716,7 @@ void FloatLigne::Split(FloatLigne *a, float tresh, FloatLigne *over)
         return;
     }
 
-    for (int i = 0; i < int(a->runs.size()); i++) {
-        float_ligne_run runA = a->runs[i];
+    for (auto runA : a->runs) {
         if ( runA.vst >= tresh ) {
             if ( runA.ven >= tresh ) {
                 if ( over ) {
@@ -761,8 +759,7 @@ void FloatLigne::Max(FloatLigne *a, float tresh, bool addIt)
     bool startExists = false;
     float lastStart = 0;
     float lastEnd = 0;
-    for (int i = 0; i < int(a->runs.size()); i++) {
-        float_ligne_run runA = a->runs[i];
+    for (auto runA : a->runs) {
         if ( runA.vst >= tresh ) {
             if ( runA.ven >= tresh ) {
                 if ( startExists ) {
@@ -850,8 +847,7 @@ void FloatLigne::Over(FloatLigne *a, float tresh)
     float lastStart = 0;
     float lastEnd = 0;
     
-    for (int i = 0; i < int(a->runs.size()); i++) {
-        float_ligne_run runA = a->runs[i];
+    for (auto runA : a->runs) {
         if ( runA.vst >= tresh ) {
             if ( runA.ven >= tresh ) {
                 if ( startExists ) {
diff --git a/src/livarot/int-line.cpp b/src/livarot/int-line.cpp
index c37e28cfd..ff874752d 100644
--- a/src/livarot/int-line.cpp
+++ b/src/livarot/int-line.cpp
@@ -830,8 +830,8 @@ void IntLigne::Copy(FloatLigne* a)
     // since the float_ligne_runs are non-overlapping, when a single-pixel run intersects with another runs, 
     // it must intersect with the single-pixel run created for the end of that run. so instead of creating a new
     // int_ligne_run, we just add the coverage to that run.
-    for (int i = 0; i < int(a->runs.size()); i++) {
-	float_ligne_run runA = a->runs[i];
+    for (auto & run : a->runs) {
+	float_ligne_run runA = run;
 	float curStF = floor(runA.st);
 	float curEnF = floor(runA.en);
 	int   curSt  = (int) curStF;
@@ -886,42 +886,42 @@ void IntLigne::Copy(FloatLigne* a)
 		if ( pixExists ) {
 		    if ( curPos < curSt ) {
 			AddRun(curPos,curPos+1,lastSurf,lastSurf);
-			lastSurf=0.5*(msv+a->runs[i].vst)*(miStF-a->runs[i].st);
+			lastSurf=0.5*(msv+run.vst)*(miStF-run.st);
 			AddRun(curSt,curSt+1,lastSurf,lastSurf);
 		    } else {
-			lastSurf+=0.5*(msv+a->runs[i].vst)*(miStF-a->runs[i].st);
+			lastSurf+=0.5*(msv+run.vst)*(miStF-run.st);
 			AddRun(curSt,curSt+1,lastSurf,lastSurf);
 		    }
 		    pixExists=false;
 		} else {
-		    lastSurf=0.5*(msv+a->runs[i].vst)*(miStF-a->runs[i].st);
+		    lastSurf=0.5*(msv+run.vst)*(miStF-run.st);
 		    AddRun(curSt,curSt+1,lastSurf,lastSurf);						
 		}
 	    } else if ( pixExists ) {
 		if ( curPos < curSt ) {
 		    AddRun(curPos,curPos+1,lastSurf,lastSurf);
-		    lastSurf=0.5*(a->runs[i].ven+a->runs[i].vst)*(a->runs[i].en-a->runs[i].st);
+		    lastSurf=0.5*(run.ven+run.vst)*(run.en-run.st);
 		    curPos=curSt;
 		} else {
-		    lastSurf += 0.5 * (a->runs[i].ven+a->runs[i].vst)*(a->runs[i].en-a->runs[i].st);
+		    lastSurf += 0.5 * (run.ven+run.vst)*(run.en-run.st);
 		}
 	    } else {
-		lastSurf=0.5*(a->runs[i].ven+a->runs[i].vst)*(a->runs[i].en-a->runs[i].st);
+		lastSurf=0.5*(run.ven+run.vst)*(run.en-run.st);
 		curPos=curSt;
 		pixExists=true;
 	    }
 	} else if ( pixExists ) {
 	    if ( curPos < curSt ) {
 		AddRun(curPos,curPos+1,lastSurf,lastSurf);
-		lastSurf = 0.5 * (msv+a->runs[i].vst) * (miStF-a->runs[i].st);
+		lastSurf = 0.5 * (msv+run.vst) * (miStF-run.st);
 		AddRun(curSt,curSt+1,lastSurf,lastSurf);
 	    } else {
-		lastSurf += 0.5 * (msv+a->runs[i].vst) * (miStF-a->runs[i].st);
+		lastSurf += 0.5 * (msv+run.vst) * (miStF-run.st);
 		AddRun(curSt,curSt+1,lastSurf,lastSurf);
 	    }
 	    pixExists=false;
 	} else {
-	    lastSurf = 0.5 * (msv+a->runs[i].vst) * (miStF-a->runs[i].st);
+	    lastSurf = 0.5 * (msv+run.vst) * (miStF-run.st);
 	    AddRun(curSt,curSt+1,lastSurf,lastSurf);
 	}
 	if ( miEx ) {
@@ -933,14 +933,14 @@ void IntLigne::Copy(FloatLigne* a)
 	}
 	if ( enEx ) {
 	    if ( curEn > curSt ) {
-		lastSurf=0.5*(mev+a->runs[i].ven)*(a->runs[i].en-curEnF);
+		lastSurf=0.5*(mev+run.ven)*(run.en-curEnF);
 		pixExists=true;
 		curPos=curEn;
 	    } else if ( ! stEx ) {
 		if ( pixExists ) {
 		    AddRun(curPos,curPos+1,lastSurf,lastSurf);
 		}
-		lastSurf=0.5*(mev+a->runs[i].ven)*(a->runs[i].en-curEnF);
+		lastSurf=0.5*(mev+run.ven)*(run.en-curEnF);
 		pixExists=true;
 		curPos=curEn;					
 	    }
diff --git a/src/livarot/sweep-event.cpp b/src/livarot/sweep-event.cpp
index db08bb2fa..bb9e4e7fc 100644
--- a/src/livarot/sweep-event.cpp
+++ b/src/livarot/sweep-event.cpp
@@ -38,9 +38,9 @@ SweepEvent *SweepEventQueue::add(SweepTree *iLeft, SweepTree *iRight, Geom::Poin
     events[n].MakeNew (iLeft, iRight, px, itl, itr);
 
     SweepTree *t[2] = { iLeft, iRight };
-    for (int i = 0; i < 2; i++) {
-        Shape *s = t[i]->src;
-	Shape::dg_arete const &e = s->getEdge(t[i]->bord);
+    for (auto & i : t) {
+        Shape *s = i->src;
+	Shape::dg_arete const &e = s->getEdge(i->bord);
 	int const n = std::max(e.st, e.en);
 	s->pData[n].pending++;;
     }