1 files changed, 11 insertions, 11 deletions

diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index 6b491a433c..25a4433a9b 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -358,7 +358,7 @@ QPainterPath QQuickPath::createPath(const QPointF &startPoint, const QPointF &en
 
     bool usesPercent = false;
     int index = 0;
-    foreach (QQuickPathElement *pathElement, d->_pathElements) {
+    for (QQuickPathElement *pathElement : qAsConst(d->_pathElements)) {
         if (QQuickCurve *curve = qobject_cast<QQuickCurve *>(pathElement)) {
             QQuickPathData data;
             data.index = index;
@@ -382,7 +382,7 @@ QPainterPath QQuickPath::createPath(const QPointF &startPoint, const QPointF &en
     }
 
     // Fixup end points
-    const AttributePoint &last = attributePoints.last();
+    const AttributePoint &last = attributePoints.constLast();
     for (int ii = 0; ii < attributes.count(); ++ii) {
         if (!last.values.contains(attributes.at(ii)))
             endpoint(attributePoints, attributes.at(ii));
@@ -407,11 +407,11 @@ QPainterPath QQuickPath::createPath(const QPointF &startPoint, const QPointF &en
             }
             attributePoints[ii].origpercent /= length;
             attributePoints[ii].percent = point.values.value(percentString);
-            prevorigpercent = attributePoints[ii].origpercent;
-            prevpercent = attributePoints[ii].percent;
+            prevorigpercent = attributePoints.at(ii).origpercent;
+            prevpercent = attributePoints.at(ii).percent;
         } else {
             attributePoints[ii].origpercent /= length;
-            attributePoints[ii].percent = attributePoints[ii].origpercent;
+            attributePoints[ii].percent = attributePoints.at(ii).origpercent;
         }
     }
 
@@ -432,17 +432,17 @@ void QQuickPath::classBegin()
 
 void QQuickPath::disconnectPathElements()
 {
-    Q_D(QQuickPath);
+    Q_D(const QQuickPath);
 
-    foreach (QQuickPathElement *pathElement, d->_pathElements)
+    for (QQuickPathElement *pathElement : d->_pathElements)
         disconnect(pathElement, SIGNAL(changed()), this, SLOT(processPath()));
 }
 
 void QQuickPath::connectPathElements()
 {
-    Q_D(QQuickPath);
+    Q_D(const QQuickPath);
 
-    foreach (QQuickPathElement *pathElement, d->_pathElements)
+    for (QQuickPathElement *pathElement : d->_pathElements)
         connect(pathElement, SIGNAL(changed()), this, SLOT(processPath()));
 }
 
@@ -453,7 +453,7 @@ void QQuickPath::gatherAttributes()
     QSet<QString> attributes;
 
     // First gather up all the attributes
-    foreach (QQuickPathElement *pathElement, d->_pathElements) {
+    for (QQuickPathElement *pathElement : qAsConst(d->_pathElements)) {
         if (QQuickCurve *curve = qobject_cast<QQuickCurve *>(pathElement))
             d->_pathCurves.append(curve);
         else if (QQuickPathAttribute *attribute = qobject_cast<QQuickPathAttribute *>(pathElement))
@@ -488,7 +488,7 @@ QStringList QQuickPath::attributes() const
         QSet<QString> attrs;
 
         // First gather up all the attributes
-        foreach (QQuickPathElement *pathElement, d->_pathElements) {
+        for (QQuickPathElement *pathElement : d->_pathElements) {
             if (QQuickPathAttribute *attribute =
                 qobject_cast<QQuickPathAttribute *>(pathElement))
                 attrs.insert(attribute->name());