quick3d: eradicate Q_FOREACH loops [low-risk]

... by replacing them with C++11 range-for loops.

This is the batch with low-risk changes. They operate
on local containers or the loop body clearly does not
cause the container to change.

Sprinkled in a reserve() or two.

Change-Id: I5a3da485213791ae58c82f4a81829cfba558a3d6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

13 files changed, 45 insertions, 27 deletions

diff --git a/src/quick3d/quick3drender/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp
index eb8a7f8f1..9d4ce934a 100644
--- a/src/quick3d/quick3drender/items/quick3deffect.cpp
+++ b/src/quick3d/quick3drender/items/quick3deffect.cpp
@@ -99,7 +99,8 @@ void Quick3DEffect::clearTechniqueList(QQmlListProperty<QTechnique> *list)
     if (eff) {
         // Ownership of techniques is handled by the QmlEngine so we shouldn't class clearTechniques
         // which deletes techniques
-        Q_FOREACH (QTechnique *tech, eff->parentEffect()->techniques())
+        const auto techniques = eff->parentEffect()->techniques();
+        for (QTechnique *tech : techniques)
             eff->parentEffect()->removeTechnique(tech);
     }
 }
@@ -125,7 +126,8 @@ int Quick3DEffect::parametersCount(QQmlListProperty<QParameter> *list)
 void Quick3DEffect::clearParameterList(QQmlListProperty<QParameter> *list)
 {
     Quick3DEffect *effect = qobject_cast<Quick3DEffect *>(list->object);
-    Q_FOREACH (QParameter *p, qobject_cast<QEffect *>(effect->parentEffect())->parameters())
+    const auto parameters = qobject_cast<QEffect *>(effect->parentEffect())->parameters();
+    for (QParameter *p : parameters)
         qobject_cast<QEffect *>(effect->parentEffect())->removeParameter(p);
 }
 
diff --git a/src/quick3d/quick3drender/items/quick3dgeometry.cpp b/src/quick3d/quick3drender/items/quick3dgeometry.cpp
index ef0021648..84c02d7c9 100644
--- a/src/quick3d/quick3drender/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3drender/items/quick3dgeometry.cpp
@@ -81,10 +81,9 @@ int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3DRender::QAttribute> *l
 void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3DRender::QAttribute> *list)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
-    QVector<Qt3DRender::QAttribute *> &managedAttributes = geometry->m_managedAttributes;
-    Q_FOREACH (Qt3DRender::QAttribute *attribute, managedAttributes)
+    for (Qt3DRender::QAttribute *attribute : qAsConst(geometry->m_managedAttributes))
         geometry->parentGeometry()->removeAttribute(attribute);
-    managedAttributes.clear();
+    geometry->m_managedAttributes.clear();
 }
 
 } // namespace Quick
diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
index 754f420d5..6f7efcd23 100644
--- a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
@@ -92,9 +92,9 @@ void Quick3DLayerFilter::clearLayers(QQmlListProperty<QLayer> *list)
 {
     Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object);
     if (filter) {
-        Q_FOREACH (QLayer *layer, filter->parentFilter()->layers()) {
+        const auto layers = filter->parentFilter()->layers();
+        for (QLayer *layer : layers)
             filter->parentFilter()->removeLayer(layer);
-        }
     }
 }
 
diff --git a/src/quick3d/quick3drender/items/quick3dmaterial.cpp b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
index 764307b15..50b064bc2 100644
--- a/src/quick3d/quick3drender/items/quick3dmaterial.cpp
+++ b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
@@ -91,9 +91,9 @@ void Quick3DMaterial::clearParameters(QQmlListProperty<QParameter> *list)
 {
     Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object);
     if (mat) {
-        Q_FOREACH (QParameter *p, mat->parentMaterial()->parameters()) {
+        const auto parameters = mat->parentMaterial()->parameters();
+        for (QParameter *p : parameters)
             mat->parentMaterial()->removeParameter(p);
-        }
     }
 }
 
diff --git a/src/quick3d/quick3drender/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
index 048648467..d5f16fab6 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
@@ -99,7 +99,8 @@ int Quick3DRenderPass::filterKeysCount(QQmlListProperty<QFilterKey> *list)
 void Quick3DRenderPass::clearFilterKey(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    Q_FOREACH (QFilterKey *c, rPass->parentRenderPass()->filterKeys())
+    const auto keys = rPass->parentRenderPass()->filterKeys();
+    for (QFilterKey *c : keys)
         rPass->parentRenderPass()->removeFilterKey(c);
 }
 
@@ -124,7 +125,8 @@ int Quick3DRenderPass::renderStateCount(QQmlListProperty<QRenderState> *list)
 void Quick3DRenderPass::clearRenderStates(QQmlListProperty<QRenderState> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    Q_FOREACH (QRenderState *s, rPass->parentRenderPass()->renderStates())
+    const auto states = rPass->parentRenderPass()->renderStates();
+    for (QRenderState *s : states)
         rPass->parentRenderPass()->removeRenderState(s);
 }
 
@@ -149,7 +151,8 @@ int Quick3DRenderPass::parametersCount(QQmlListProperty<QParameter> *list)
 void Quick3DRenderPass::clearParameterList(QQmlListProperty<QParameter> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    Q_FOREACH (QParameter *p, rPass->parentRenderPass()->parameters())
+    const auto parameters = rPass->parentRenderPass()->parameters();
+    for (QParameter *p : parameters)
         rPass->parentRenderPass()->removeParameter(p);
 }
 
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
index bbc91d605..8b51a79ef 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
@@ -98,7 +98,8 @@ void Quick3DRenderPassFilter::clearIncludes(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter) {
-        Q_FOREACH (QFilterKey *criterion, filter->parentRenderPassFilter()->matchAny())
+        const auto criteria = filter->parentRenderPassFilter()->matchAny();
+        for (QFilterKey *criterion : criteria)
             filter->parentRenderPassFilter()->removeMatch(criterion);
     }
 }
@@ -124,7 +125,8 @@ int Quick3DRenderPassFilter::parametersCount(QQmlListProperty<QParameter> *list)
 void Quick3DRenderPassFilter::clearParameterList(QQmlListProperty<QParameter> *list)
 {
     Quick3DRenderPassFilter *rPassFilter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
-    Q_FOREACH (QParameter *p, rPassFilter->parentRenderPassFilter()->parameters())
+    const auto parameters = rPassFilter->parentRenderPassFilter()->parameters();
+    for (QParameter *p : parameters)
         rPassFilter->parentRenderPassFilter()->removeParameter(p);
 }
 
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
index 2444bef4e..e3b40243a 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
@@ -86,7 +86,8 @@ void Quick3DRenderTargetOutput::clearRenderAttachments(QQmlListProperty<QRenderT
 {
     Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
     if (rT) {
-        Q_FOREACH (QRenderTargetOutput *output, rT->parentRenderTarget()->outputs())
+        const auto outputs = rT->parentRenderTarget()->outputs();
+        for (QRenderTargetOutput *output : outputs)
             rT->parentRenderTarget()->removeOutput(output);
     }
 }
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
index 7a8ac9b49..b61c7ed12 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
@@ -58,7 +58,9 @@ QVariantList Quick3DRenderTargetSelector::drawBuffers() const
 {
     // Converts RenderAttachmentType to int
     QVariantList l;
-    Q_FOREACH (const QRenderTargetOutput::AttachmentPoint &b, parentRenderTargetSelector()->outputs())
+    const auto outputs = parentRenderTargetSelector()->outputs();
+    l.reserve(outputs.size());
+    for (const QRenderTargetOutput::AttachmentPoint &b : outputs)
         l.append(static_cast<int>(b));
     return l;
 }
@@ -69,7 +71,8 @@ void Quick3DRenderTargetSelector::setDrawBuffers(const QVariantList &buffers)
 
         // Converts int to RenderAttachmentType
         QVector<QRenderTargetOutput::AttachmentPoint> drawBuffersList;
-        Q_FOREACH (const QVariant &buf, buffers)
+        drawBuffersList.reserve(buffers.size());
+        for (const QVariant &buf : buffers)
             drawBuffersList.append(static_cast<QRenderTargetOutput::AttachmentPoint>(buf.toInt()));
 
         parentRenderTargetSelector()->setOutputs(drawBuffersList);
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
index 26067ba2f..e5901e8fb 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
@@ -77,7 +77,8 @@ public:
             Quick3DShaderDataArray *array = v.value<Quick3DShaderDataArray *>();
             QVariantList innerValues;
             if (array) {
-                Q_FOREACH (QShaderData *d, array->values()) {
+                const auto values = array->values();
+                for (QShaderData *d : values) {
                     if (d)
                         innerValues.append(QVariant::fromValue(d->id()));
                 }
diff --git a/src/quick3d/quick3drender/items/quick3dstateset.cpp b/src/quick3d/quick3drender/items/quick3dstateset.cpp
index 44dd01ec5..d7d74e5ad 100644
--- a/src/quick3d/quick3drender/items/quick3dstateset.cpp
+++ b/src/quick3d/quick3drender/items/quick3dstateset.cpp
@@ -85,7 +85,8 @@ int Quick3DStateSet::renderStateCount(QQmlListProperty<QRenderState> *list)
 void Quick3DStateSet::clearRenderStates(QQmlListProperty<QRenderState> *list)
 {
     Quick3DStateSet *stateSet = qobject_cast<Quick3DStateSet *>(list->object);
-    Q_FOREACH (QRenderState *s, stateSet->parentStateSet()->renderStates())
+    const auto states = stateSet->parentStateSet()->renderStates();
+    for (QRenderState *s : states)
         stateSet->parentStateSet()->removeRenderState(s);
 }
 
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
index 06b9114bd..123050645 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
@@ -89,7 +89,8 @@ int Quick3DTechnique::parametersCount(QQmlListProperty<QParameter> *list)
 void Quick3DTechnique::clearParameterList(QQmlListProperty<QParameter> *list)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
-    Q_FOREACH (QParameter *p, technique->parentTechnique()->parameters())
+    const auto parameters = technique->parentTechnique()->parameters();
+    for (QParameter *p : parameters)
         technique->parentTechnique()->removeParameter(p);
 }
 
@@ -121,7 +122,8 @@ void Quick3DTechnique::clearRenderPasses(QQmlListProperty<QRenderPass> *list)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique) {
-        Q_FOREACH (QRenderPass *pass, technique->parentTechnique()->renderPasses())
+        const auto passes = technique->parentTechnique()->renderPasses();
+        for (QRenderPass *pass : passes)
             technique->parentTechnique()->removeRenderPass(pass);
     }
 }
@@ -165,7 +167,8 @@ void Quick3DTechnique::clearFilterKeyList(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique) {
-        Q_FOREACH (QFilterKey *a, technique->parentTechnique()->filterKeys())
+        const auto keys = technique->parentTechnique()->filterKeys();
+        for (QFilterKey *a : keys)
             technique->parentTechnique()->removeFilterKey(a);
     }
 }
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
index 8eb505470..b27d46c31 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
@@ -97,7 +97,8 @@ void Quick3DTechniqueFilter::clearRequires(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter) {
-        Q_FOREACH (QFilterKey *criterion, filter->parentTechniqueFilter()->matchAll())
+        const auto criteria = filter->parentTechniqueFilter()->matchAll();
+        for (QFilterKey *criterion : criteria)
             filter->parentTechniqueFilter()->removeMatch(criterion);
     }
 }
@@ -123,7 +124,8 @@ int Quick3DTechniqueFilter::parametersCount(QQmlListProperty<QParameter> *list)
 void Quick3DTechniqueFilter::clearParameterList(QQmlListProperty<QParameter> *list)
 {
     Quick3DTechniqueFilter *techniqueFilter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
-    Q_FOREACH (QParameter *p, techniqueFilter->parentTechniqueFilter()->parameters())
+    const auto parameters = techniqueFilter->parentTechniqueFilter()->parameters();
+    for (QParameter *p : parameters)
         techniqueFilter->parentTechniqueFilter()->removeParameter(p);
 }
 
diff --git a/src/quick3d/quick3drender/items/quick3dtexture.cpp b/src/quick3d/quick3drender/items/quick3dtexture.cpp
index ea0ac3f41..9c528996c 100644
--- a/src/quick3d/quick3drender/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp
@@ -85,10 +85,11 @@ int Quick3DTextureExtension::textureImageCount(QQmlListProperty<QAbstractTexture
 
 void Quick3DTextureExtension::clearTextureImageList(QQmlListProperty<QAbstractTextureImage> *list)
 {
-    Quick3DTextureExtension *self = qobject_cast<Quick3DTextureExtension *>(list->object);
-    if (self)
-        Q_FOREACH (QAbstractTextureImage *img, self->parentTexture()->textureImages())
+    if (Quick3DTextureExtension *self = qobject_cast<Quick3DTextureExtension *>(list->object)) {
+        const auto images = self->parentTexture()->textureImages();
+        for (QAbstractTextureImage *img : images)
             self->parentTexture()->removeTextureImage(img);
+    }
 }
 
 } // namespace Quick