Fix clazy container detach warnings

nyalldawson · nyalldawson · commit 2dbda4f66b64 · 2018-02-02T19:52:01.000+11:00
diff --git a/src/analysis/processing/qgsalgorithmaddincrementalfield.cpp b/src/analysis/processing/qgsalgorithmaddincrementalfield.cpp
@@ -99,7 +99,7 @@ QgsFeature QgsAddIncrementalFieldAlgorithm::processFeature( const QgsFeature &fe
 {
   if ( !mGroupedFieldNames.empty() && mGroupedFields.empty() )
   {
-    for ( const QString &field : mGroupedFieldNames )
+    for ( const QString &field : qgis::as_const( mGroupedFieldNames ) )
     {
       int idx = mFields.lookupField( field );
       if ( idx >= 0 )
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryareacheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryareacheck.cpp
@@ -114,7 +114,8 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( const QString &layerId, QgsFeature
   const QgsAbstractGeometry *geom = featureGeometry.constGet();
 
   // Search for touching neighboring geometries
-  for ( QgsFeatureId testId : featurePool->getIntersects( featureGeometry.boundingBox() ) )
+  const QgsFeatureIds intersects = featurePool->getIntersects( featureGeometry.boundingBox() );
+  for ( QgsFeatureId testId : intersects )
   {
     QgsFeature testFeature;
     if ( !featurePool->get( testId, testFeature ) )
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheck.h b/src/analysis/vector/geometry_checker/qgsgeometrycheck.h
@@ -134,7 +134,8 @@ class ANALYSIS_EXPORT QgsGeometryCheckError
     void setFixed( int method )
     {
       mStatus = StatusFixed;
-      mResolutionMessage = mCheck->getResolutionMethods()[method];
+      const QStringList methods = mCheck->getResolutionMethods();
+      mResolutionMessage = methods[method];
     }
     void setFixFailed( const QString &reason )
     {
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp b/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp
@@ -29,13 +29,13 @@ QgsGeometryChecker::QgsGeometryChecker( const QList<QgsGeometryCheck *> &checks,
   : mChecks( checks )
   , mContext( context )
 {
-  for ( const QgsFeaturePool *featurePool : mContext->featurePools.values() )
+  for ( auto it = mContext->featurePools.constBegin(); it != mContext->featurePools.constEnd(); ++it )
   {
-    if ( featurePool->getLayer() )
+    if ( it.value()->getLayer() )
     {
-      featurePool->getLayer()->setReadOnly( true );
+      it.value()->getLayer()->setReadOnly( true );
       // Enter update mode to defer ogr dataset repacking until the checker has finished
-      featurePool->getLayer()->dataProvider()->enterUpdateMode();
+      it.value()->getLayer()->dataProvider()->enterUpdateMode();
     }
   }
 }
@@ -44,14 +44,14 @@ QgsGeometryChecker::~QgsGeometryChecker()
 {
   qDeleteAll( mCheckErrors );
   qDeleteAll( mChecks );
-  for ( const QgsFeaturePool *featurePool : mContext->featurePools.values() )
+  for ( auto it = mContext->featurePools.constBegin(); it != mContext->featurePools.constEnd(); ++it )
   {
-    if ( featurePool->getLayer() )
+    if ( it.value()->getLayer() )
     {
-      featurePool->getLayer()->dataProvider()->leaveUpdateMode();
-      featurePool->getLayer()->setReadOnly( false );
+      it.value()->getLayer()->dataProvider()->leaveUpdateMode();
+      it.value()->getLayer()->setReadOnly( false );
     }
-    delete featurePool;
+    delete it.value();
   }
   delete mContext;
 }
@@ -61,13 +61,13 @@ QFuture<void> QgsGeometryChecker::execute( int *totalSteps )
   if ( totalSteps )
   {
     *totalSteps = 0;
-    for ( QgsGeometryCheck *check : mChecks )
+    for ( QgsGeometryCheck *check : qgis::as_const( mChecks ) )
     {
-      for ( const QgsFeaturePool *featurePool : mContext->featurePools.values() )
+      for ( auto it = mContext->featurePools.constBegin(); it != mContext->featurePools.constEnd(); ++it )
       {
         if ( check->getCheckType() <= QgsGeometryCheck::FeatureCheck )
         {
-          *totalSteps += check->getCompatibility( featurePool->getLayer()->geometryType() ) ? featurePool->getFeatureIds().size() : 0;
+          *totalSteps += check->getCompatibility( it.value()->getLayer()->geometryType() ) ? it.value()->getFeatureIds().size() : 0;
         }
         else
         {
@@ -140,15 +140,15 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
   // Determine what to recheck
   // - Collect all features which were changed, get affected area
   QMap<QString, QSet<QgsFeatureId>> recheckFeatures;
-  for ( const QString &layerId : changes.keys() )
+  for ( auto it = changes.constBegin(); it != changes.constEnd(); ++it )
   {
-    const QMap<QgsFeatureId, QList<QgsGeometryCheck::Change>> &layerChanges = changes[layerId];
-    QgsFeaturePool *featurePool = mContext->featurePools[layerId];
+    const QMap<QgsFeatureId, QList<QgsGeometryCheck::Change>> &layerChanges = it.value();
+    QgsFeaturePool *featurePool = mContext->featurePools[it.key()];
     QgsCoordinateTransform t( featurePool->getLayer()->crs(), mContext->mapCrs, QgsProject::instance() );
-    for ( QgsFeatureId id : layerChanges.keys() )
+    for ( auto layerChangeIt = layerChanges.constBegin(); layerChangeIt != layerChanges.constEnd(); ++layerChangeIt )
     {
       bool removed = false;
-      for ( const QgsGeometryCheck::Change &change : layerChanges.value( id ) )
+      for ( const QgsGeometryCheck::Change &change : layerChangeIt.value() )
       {
         if ( change.what == QgsGeometryCheck::ChangeFeature && change.type == QgsGeometryCheck::ChangeRemoved )
         {
@@ -159,16 +159,16 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
       if ( !removed )
       {
         QgsFeature f;
-        if ( featurePool->get( id, f ) )
+        if ( featurePool->get( layerChangeIt.key(), f ) )
         {
-          recheckFeatures[layerId].insert( id );
+          recheckFeatures[it.key()].insert( layerChangeIt.key() );
           recheckArea.combineExtentWith( t.transformBoundingBox( f.geometry().boundingBox() ) );
         }
       }
     }
   }
   // - Determine extent to recheck for gaps
-  for ( QgsGeometryCheckError *err : mCheckErrors )
+  for ( QgsGeometryCheckError *err : qgis::as_const( mCheckErrors ) )
   {
     if ( err->check()->getCheckType() == QgsGeometryCheck::LayerCheck )
     {
@@ -189,7 +189,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
 
   // Recheck feature / changed area to detect new errors
   QList<QgsGeometryCheckError *> recheckErrors;
-  for ( const QgsGeometryCheck *check : mChecks )
+  for ( const QgsGeometryCheck *check : qgis::as_const( mChecks ) )
   {
     if ( check->getCheckType() == QgsGeometryCheck::LayerCheck )
     {
@@ -208,7 +208,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
   }
 
   // Go through error list, update other errors of the checked feature
-  for ( QgsGeometryCheckError *err : mCheckErrors )
+  for ( QgsGeometryCheckError *err : qgis::as_const( mCheckErrors ) )
   {
     if ( err == error || err->status() == QgsGeometryCheckError::StatusObsolete )
     {
@@ -222,7 +222,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
     // Check if this error now matches one found when rechecking the feature/area
     QgsGeometryCheckError *matchErr = nullptr;
     int nMatch = 0;
-    for ( QgsGeometryCheckError *recheckErr : recheckErrors )
+    for ( QgsGeometryCheckError *recheckErr : qgis::as_const( recheckErrors ) )
     {
       if ( recheckErr->isEqual( err ) || recheckErr->closeMatch( err ) )
       {
@@ -258,7 +258,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
   }
 
   // Add new errors
-  for ( QgsGeometryCheckError *recheckErr : recheckErrors )
+  for ( QgsGeometryCheckError *recheckErr : qgis::as_const( recheckErrors ) )
   {
     emit errorAdded( recheckErr );
     mCheckErrors.append( recheckErr );
@@ -285,7 +285,7 @@ void QgsGeometryChecker::runCheck( const QgsGeometryCheck *check )
   mCheckErrors.append( errors );
   mMessages.append( messages );
   mErrorListMutex.unlock();
-  for ( QgsGeometryCheckError *error : errors )
+  for ( QgsGeometryCheckError *error : qgis::as_const( errors ) )
   {
     emit errorAdded( error );
   }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp
@@ -22,11 +22,11 @@
 QString QgsGeometryDuplicateCheckError::duplicatesString( const QMap<QString, QgsFeaturePool *> &featurePools, const QMap<QString, QList<QgsFeatureId>> &duplicates )
 {
   QStringList str;
-  for ( const QString &layerId : duplicates.keys() )
+  for ( auto it = duplicates.constBegin(); it != duplicates.constEnd(); ++it )
   {
-    str.append( featurePools[layerId]->getLayer()->name() + ":" );
+    str.append( featurePools[it.key()]->getLayer()->name() + ":" );
     QStringList ids;
-    for ( QgsFeatureId id : duplicates[layerId] )
+    for ( QgsFeatureId id : it.value() )
     {
       ids.append( QString::number( id ) );
     }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.cpp
@@ -59,7 +59,8 @@ void QgsGeometryLineIntersectionCheck::collectErrors( QList<QgsGeometryCheckErro
           {
             continue;
           }
-          for ( const QgsPoint &inter : QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance ) )
+          const QList< QgsPoint > intersections = QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance );
+          for ( const QgsPoint &inter : intersections )
           {
             errors.append( new QgsGeometryCheckError( this, layerFeatureA, inter, QgsVertexId( iPart ), layerFeatureB.id() ) );
           }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.cpp
@@ -45,16 +45,19 @@ void QgsGeometryLineLayerIntersectionCheck::collectErrors( QList<QgsGeometryChec
           const QgsAbstractGeometry *part = QgsGeometryCheckerUtils::getGeomPart( testGeom, jPart );
           if ( const QgsLineString *testLine = dynamic_cast<const QgsLineString *>( part ) )
           {
-            for ( const QgsPoint &inter : QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance ) )
+            const QList< QgsPoint > intersections = QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance );
+            for ( const QgsPoint &inter : intersections )
             {
               errors.append( new QgsGeometryCheckError( this, layerFeature, inter, QgsVertexId( iPart ), checkFeature.id() ) );
             }
           }
           else if ( const QgsPolygon *polygon = dynamic_cast<const QgsPolygon *>( part ) )
           {
-            for ( const QgsLineString *ring : QgsGeometryCheckerUtils::polygonRings( polygon ) )
+            QList< const QgsLineString* > rings = QgsGeometryCheckerUtils::polygonRings( polygon );
+            for ( const QgsLineString *ring : rings )
             {
-              for ( const QgsPoint &inter : QgsGeometryCheckerUtils::lineIntersections( line, ring, mContext->tolerance ) )
+              const QList< QgsPoint > intersections = QgsGeometryCheckerUtils::lineIntersections( line, ring, mContext->tolerance );
+              for ( const QgsPoint &inter : intersections )
               {
                 errors.append( new QgsGeometryCheckError( this, layerFeature, inter, QgsVertexId( iPart ), checkFeature.id() ) );
               }
diff --git a/src/core/layertree/qgslayertree.cpp b/src/core/layertree/qgslayertree.cpp
@@ -81,7 +81,8 @@ QList<QgsMapLayer *> QgsLayerTree::layerOrder() const
   else
   {
     QList<QgsMapLayer *> layers;
-    for ( const auto &treeLayer : findLayers() )
+    const QList< QgsLayerTreeLayer * > foundLayers = findLayers();
+    for ( const auto &treeLayer : foundLayers )
     {
       QgsMapLayer *layer = treeLayer->layer();
       if ( !layer || !layer->isSpatial() )
@@ -212,7 +213,8 @@ void QgsLayerTree::addMissingLayers()
 {
   bool changed = false;
 
-  for ( const auto layer : findLayers() )
+  const QList< QgsLayerTreeLayer * > foundLayers = findLayers();
+  for ( const auto layer : foundLayers )
   {
     if ( !mCustomLayerOrder.contains( layer->layer() ) &&
          layer->layer() && layer->layer()->isSpatial() )
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -303,7 +303,8 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
         if ( !layer->abstract().isEmpty() )
         {
           parts << QStringLiteral();
-          for ( const auto &l : layer->abstract().split( "\n" ) )
+          const QStringList abstractLines = layer->abstract().split( "\n" );
+          for ( const auto &l : abstractLines )
           {
             parts << l.toHtmlEscaped();
           }
diff --git a/src/core/layout/qgslayoutexporter.cpp b/src/core/layout/qgslayoutexporter.cpp
@@ -333,7 +333,7 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToImage( const QString
   }
   else
   {
-    for ( int page : settings.pages )
+    for ( int page : qgis::as_const( settings.pages ) )
     {
       if ( page >= 0 && page < mLayout->pageCollection()->pageCount() )
         pages << page;
diff --git a/src/core/layout/qgslayoutitemgroupundocommand.cpp b/src/core/layout/qgslayoutitemgroupundocommand.cpp
@@ -75,7 +75,7 @@ void QgsLayoutItemGroupUndoCommand::switchState()
       mLayout->addLayoutItemPrivate( group );
     }
 
-    for ( const QString &childUuid : mItemUuids )
+    for ( const QString &childUuid : qgis::as_const( mItemUuids ) )
     {
       QgsLayoutItem *childItem = mLayout->itemByUuid( childUuid );
       group->addItem( childItem );
diff --git a/src/core/layout/qgslayoutitemmapitem.cpp b/src/core/layout/qgslayoutitemmapitem.cpp
@@ -201,7 +201,7 @@ bool QgsLayoutItemMapItemStack::writeXml( QDomElement &elem, QDomDocument &doc,
 
 void QgsLayoutItemMapItemStack::finalizeRestoreFromXml()
 {
-  for ( QgsLayoutItemMapItem *item : mItems )
+  for ( QgsLayoutItemMapItem *item : qgis::as_const( mItems ) )
   {
     item->finalizeRestoreFromXml();
   }
diff --git a/src/core/qgsarchive.cpp b/src/core/qgsarchive.cpp
@@ -141,7 +141,8 @@ QString QgsProjectArchive::auxiliaryStorageFile() const
 {
   const QString extension = QgsAuxiliaryStorage::extension();
 
-  for ( const QString &file : files() )
+  const QStringList fileList = files();
+  for ( const QString &file : fileList )
   {
     const QFileInfo fileInfo( file );
     if ( fileInfo.suffix().compare( extension, Qt::CaseInsensitive ) == 0 )
diff --git a/src/core/qgsauxiliarystorage.cpp b/src/core/qgsauxiliarystorage.cpp
@@ -232,7 +232,8 @@ int QgsAuxiliaryLayer::createProperty( QgsPalLayerSettings::Property property, Q
     {
       const QgsProperty prop = QgsProperty::fromField( fieldName );
 
-      for ( const QString &providerId : layer->labeling()->subProviders() )
+      const QStringList subProviderIds = layer->labeling()->subProviders();
+      for ( const QString &providerId : subProviderIds )
       {
         QgsPalLayerSettings *settings = new QgsPalLayerSettings( layer->labeling()->settings( providerId ) );
 
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -2295,7 +2295,7 @@ QList<QgsMapLayer *> QgsProject::addMapLayers(
   bool addToLegend,
   bool takeOwnership )
 {
-  QList<QgsMapLayer *> myResultList = mLayerStore->addMapLayers( layers, takeOwnership );
+  const QList<QgsMapLayer *> myResultList = mLayerStore->addMapLayers( layers, takeOwnership );
   if ( !myResultList.isEmpty() )
   {
     if ( addToLegend )
diff --git a/src/core/qgsrulebasedlabeling.cpp b/src/core/qgsrulebasedlabeling.cpp
@@ -182,7 +182,7 @@ QgsRuleBasedLabeling::Rule *QgsRuleBasedLabeling::Rule::findRuleByKey( const QSt
   if ( key == mRuleKey )
     return this;
 
-  for ( Rule *rule : mChildren )
+  for ( Rule *rule : qgis::as_const( mChildren ) )
   {
     Rule *r = rule->findRuleByKey( key );
     if ( r )
diff --git a/src/core/qgsvectorlayerutils.cpp b/src/core/qgsvectorlayerutils.cpp
@@ -362,7 +362,8 @@ QgsFeature QgsVectorLayerUtils::duplicateFeature( QgsVectorLayer *layer, const Q
         //set childlayer editable
         relation.referencingLayer()->startEditing();
         //change the fk of the child to the id of the new parent
-        for ( const QgsRelation::FieldPair &fieldPair : relation.fieldPairs() )
+        const auto pairs = relation.fieldPairs();
+        for ( const QgsRelation::FieldPair &fieldPair : pairs )
         {
           childFeature.setAttribute( fieldPair.first, newFeature.attribute( fieldPair.second ) );
         }
diff --git a/src/gui/auth/qgsauthsslerrorsdialog.cpp b/src/gui/auth/qgsauthsslerrorsdialog.cpp
@@ -137,7 +137,8 @@ void QgsAuthSslErrorsDialog::showCertificateChainInfo()
 
 void QgsAuthSslErrorsDialog::showCertificateChainCAsInfo()
 {
-  for ( const auto &cert : mSslConfiguration.caCertificates() )
+  const QList< QSslCertificate > certificates = mSslConfiguration.caCertificates();
+  for ( const auto &cert : certificates )
   {
     qDebug() << cert.subjectInfo( QSslCertificate::SubjectInfo::CommonName );
   }
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -442,7 +442,7 @@ void QgsRelationReferenceWidget::init()
 
     if ( !mFilterFields.isEmpty() )
     {
-      for ( const QString &fieldName : mFilterFields )
+      for ( const QString &fieldName : qgis::as_const( mFilterFields ) )
       {
         int idx = mReferencedLayer->fields().lookupField( fieldName );
 
diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
@@ -272,7 +272,7 @@ void QgsRubberBand::addGeometry( const QgsGeometry &geometry, const QgsCoordinat
   else if ( QgsWkbTypes::geometryType( geomType ) == QgsWkbTypes::PointGeometry && QgsWkbTypes::isMultiType( geomType ) )
   {
     const QgsMultiPointXY mpt = geom.asMultiPoint();
-    for ( QgsPointXY pt : mpt )
+    for ( const QgsPointXY &pt : mpt )
     {
       addPoint( pt, false, idx );
       removeLastPoint( idx, false );
@@ -282,7 +282,7 @@ void QgsRubberBand::addGeometry( const QgsGeometry &geometry, const QgsCoordinat
   else if ( QgsWkbTypes::geometryType( geomType ) == QgsWkbTypes::LineGeometry && !QgsWkbTypes::isMultiType( geomType ) )
   {
     const QgsPolylineXY line = geom.asPolyline();
-    for ( QgsPointXY pt : line )
+    for ( const QgsPointXY &pt : line )
     {
       addPoint( pt, false, idx );
     }
@@ -296,7 +296,7 @@ void QgsRubberBand::addGeometry( const QgsGeometry &geometry, const QgsCoordinat
       {
         continue;
       }
-      for ( QgsPointXY pt : line )
+      for ( const QgsPointXY &pt : line )
       {
         addPoint( pt, false, idx );
       }
@@ -307,7 +307,7 @@ void QgsRubberBand::addGeometry( const QgsGeometry &geometry, const QgsCoordinat
   {
     const QgsPolygonXY poly = geom.asPolygon();
     const QgsPolylineXY line = poly.at( 0 );
-    for ( QgsPointXY pt : line )
+    for ( const QgsPointXY &pt : line )
     {
       addPoint( pt, false, idx );
     }
@@ -321,7 +321,7 @@ void QgsRubberBand::addGeometry( const QgsGeometry &geometry, const QgsCoordinat
         continue;
 
       const QgsPolylineXY line = poly.at( 0 );
-      for ( QgsPointXY pt : line )
+      for ( const QgsPointXY &pt : line )
       {
         addPoint( pt, false, idx );
       }
diff --git a/src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp b/src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp
diff --git a/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp b/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ QgsFeature QgsAddIncrementalFieldAlgorithm::processFeature( const QgsFeature &fe`
`99`	`99`	`{`
`100`	`100`	`if ( !mGroupedFieldNames.empty() && mGroupedFields.empty() )`
`101`	`101`	`{`
`102`		`- for ( const QString &field : mGroupedFieldNames )`
	`102`	`+ for ( const QString &field : qgis::as_const( mGroupedFieldNames ) )`
`103`	`103`	`{`
`104`	`104`	`int idx = mFields.lookupField( field );`
`105`	`105`	`if ( idx >= 0 )`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,8 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( const QString &layerId, QgsFeature`
`114`	`114`	`const QgsAbstractGeometry *geom = featureGeometry.constGet();`
`115`	`115`
`116`	`116`	`// Search for touching neighboring geometries`
`117`		`- for ( QgsFeatureId testId : featurePool->getIntersects( featureGeometry.boundingBox() ) )`
	`117`	`+ const QgsFeatureIds intersects = featurePool->getIntersects( featureGeometry.boundingBox() );`
	`118`	`+ for ( QgsFeatureId testId : intersects )`
`118`	`119`	`{`
`119`	`120`	`QgsFeature testFeature;`
`120`	`121`	`if ( !featurePool->get( testId, testFeature ) )`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,8 @@ class ANALYSIS_EXPORT QgsGeometryCheckError`
`134`	`134`	`void setFixed( int method )`
`135`	`135`	`{`
`136`	`136`	`mStatus = StatusFixed;`
`137`		`- mResolutionMessage = mCheck->getResolutionMethods()[method];`
	`137`	`+ const QStringList methods = mCheck->getResolutionMethods();`
	`138`	`+ mResolutionMessage = methods[method];`
`138`	`139`	`}`
`139`	`140`	`void setFixFailed( const QString &reason )`
`140`	`141`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,13 @@ QgsGeometryChecker::QgsGeometryChecker( const QList<QgsGeometryCheck *> &checks,`
`29`	`29`	`: mChecks( checks )`
`30`	`30`	`, mContext( context )`
`31`	`31`	`{`
`32`		`- for ( const QgsFeaturePool *featurePool : mContext->featurePools.values() )`
	`32`	`+ for ( auto it = mContext->featurePools.constBegin(); it != mContext->featurePools.constEnd(); ++it )`
`33`	`33`	`{`
`34`		`- if ( featurePool->getLayer() )`
	`34`	`+ if ( it.value()->getLayer() )`
`35`	`35`	`{`
`36`		`- featurePool->getLayer()->setReadOnly( true );`
	`36`	`+ it.value()->getLayer()->setReadOnly( true );`
`37`	`37`	`// Enter update mode to defer ogr dataset repacking until the checker has finished`
`38`		`- featurePool->getLayer()->dataProvider()->enterUpdateMode();`
	`38`	`+ it.value()->getLayer()->dataProvider()->enterUpdateMode();`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
`@@ -44,14 +44,14 @@ QgsGeometryChecker::~QgsGeometryChecker()`
`44`	`44`	`{`
`45`	`45`	`qDeleteAll( mCheckErrors );`
`46`	`46`	`qDeleteAll( mChecks );`
`47`		`- for ( const QgsFeaturePool *featurePool : mContext->featurePools.values() )`
	`47`	`+ for ( auto it = mContext->featurePools.constBegin(); it != mContext->featurePools.constEnd(); ++it )`
`48`	`48`	`{`
`49`		`- if ( featurePool->getLayer() )`
	`49`	`+ if ( it.value()->getLayer() )`
`50`	`50`	`{`
`51`		`- featurePool->getLayer()->dataProvider()->leaveUpdateMode();`
`52`		`- featurePool->getLayer()->setReadOnly( false );`
	`51`	`+ it.value()->getLayer()->dataProvider()->leaveUpdateMode();`
	`52`	`+ it.value()->getLayer()->setReadOnly( false );`
`53`	`53`	`}`
`54`		`- delete featurePool;`
	`54`	`+ delete it.value();`
`55`	`55`	`}`
`56`	`56`	`delete mContext;`
`57`	`57`	`}`
`@@ -61,13 +61,13 @@ QFuture<void> QgsGeometryChecker::execute( int *totalSteps )`
`61`	`61`	`if ( totalSteps )`
`62`	`62`	`{`
`63`	`63`	`*totalSteps = 0;`
`64`		`- for ( QgsGeometryCheck *check : mChecks )`
	`64`	`+ for ( QgsGeometryCheck *check : qgis::as_const( mChecks ) )`
`65`	`65`	`{`
`66`		`- for ( const QgsFeaturePool *featurePool : mContext->featurePools.values() )`
	`66`	`+ for ( auto it = mContext->featurePools.constBegin(); it != mContext->featurePools.constEnd(); ++it )`
`67`	`67`	`{`
`68`	`68`	`if ( check->getCheckType() <= QgsGeometryCheck::FeatureCheck )`
`69`	`69`	`{`
`70`		`- *totalSteps += check->getCompatibility( featurePool->getLayer()->geometryType() ) ? featurePool->getFeatureIds().size() : 0;`
	`70`	`+ *totalSteps += check->getCompatibility( it.value()->getLayer()->geometryType() ) ? it.value()->getFeatureIds().size() : 0;`
`71`	`71`	`}`
`72`	`72`	`else`
`73`	`73`	`{`
`@@ -140,15 +140,15 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo`
`140`	`140`	`// Determine what to recheck`
`141`	`141`	`// - Collect all features which were changed, get affected area`
`142`	`142`	`QMap<QString, QSet<QgsFeatureId>> recheckFeatures;`
`143`		`- for ( const QString &layerId : changes.keys() )`
	`143`	`+ for ( auto it = changes.constBegin(); it != changes.constEnd(); ++it )`
`144`	`144`	`{`
`145`		`- const QMap<QgsFeatureId, QList<QgsGeometryCheck::Change>> &layerChanges = changes[layerId];`
`146`		`- QgsFeaturePool *featurePool = mContext->featurePools[layerId];`
	`145`	`+ const QMap<QgsFeatureId, QList<QgsGeometryCheck::Change>> &layerChanges = it.value();`
	`146`	`+ QgsFeaturePool *featurePool = mContext->featurePools[it.key()];`
`147`	`147`	`QgsCoordinateTransform t( featurePool->getLayer()->crs(), mContext->mapCrs, QgsProject::instance() );`
`148`		`- for ( QgsFeatureId id : layerChanges.keys() )`
	`148`	`+ for ( auto layerChangeIt = layerChanges.constBegin(); layerChangeIt != layerChanges.constEnd(); ++layerChangeIt )`
`149`	`149`	`{`
`150`	`150`	`bool removed = false;`
`151`		`- for ( const QgsGeometryCheck::Change &change : layerChanges.value( id ) )`
	`151`	`+ for ( const QgsGeometryCheck::Change &change : layerChangeIt.value() )`
`152`	`152`	`{`
`153`	`153`	`if ( change.what == QgsGeometryCheck::ChangeFeature && change.type == QgsGeometryCheck::ChangeRemoved )`
`154`	`154`	`{`
`@@ -159,16 +159,16 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo`
`159`	`159`	`if ( !removed )`
`160`	`160`	`{`
`161`	`161`	`QgsFeature f;`
`162`		`- if ( featurePool->get( id, f ) )`
	`162`	`+ if ( featurePool->get( layerChangeIt.key(), f ) )`
`163`	`163`	`{`
`164`		`- recheckFeatures[layerId].insert( id );`
	`164`	`+ recheckFeatures[it.key()].insert( layerChangeIt.key() );`
`165`	`165`	`recheckArea.combineExtentWith( t.transformBoundingBox( f.geometry().boundingBox() ) );`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`	`// - Determine extent to recheck for gaps`
`171`		`- for ( QgsGeometryCheckError *err : mCheckErrors )`
	`171`	`+ for ( QgsGeometryCheckError *err : qgis::as_const( mCheckErrors ) )`
`172`	`172`	`{`
`173`	`173`	`if ( err->check()->getCheckType() == QgsGeometryCheck::LayerCheck )`
`174`	`174`	`{`
`@@ -189,7 +189,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo`
`189`	`189`
`190`	`190`	`// Recheck feature / changed area to detect new errors`
`191`	`191`	`QList<QgsGeometryCheckError *> recheckErrors;`
`192`		`- for ( const QgsGeometryCheck *check : mChecks )`
	`192`	`+ for ( const QgsGeometryCheck *check : qgis::as_const( mChecks ) )`
`193`	`193`	`{`
`194`	`194`	`if ( check->getCheckType() == QgsGeometryCheck::LayerCheck )`
`195`	`195`	`{`
`@@ -208,7 +208,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`// Go through error list, update other errors of the checked feature`
`211`		`- for ( QgsGeometryCheckError *err : mCheckErrors )`
	`211`	`+ for ( QgsGeometryCheckError *err : qgis::as_const( mCheckErrors ) )`
`212`	`212`	`{`
`213`	`213`	`if ( err == error \|\| err->status() == QgsGeometryCheckError::StatusObsolete )`
`214`	`214`	`{`
`@@ -222,7 +222,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo`
`222`	`222`	`// Check if this error now matches one found when rechecking the feature/area`
`223`	`223`	`QgsGeometryCheckError *matchErr = nullptr;`
`224`	`224`	`int nMatch = 0;`
`225`		`- for ( QgsGeometryCheckError *recheckErr : recheckErrors )`
	`225`	`+ for ( QgsGeometryCheckError *recheckErr : qgis::as_const( recheckErrors ) )`
`226`	`226`	`{`
`227`	`227`	`if ( recheckErr->isEqual( err ) \|\| recheckErr->closeMatch( err ) )`
`228`	`228`	`{`
`@@ -258,7 +258,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`// Add new errors`
`261`		`- for ( QgsGeometryCheckError *recheckErr : recheckErrors )`
	`261`	`+ for ( QgsGeometryCheckError *recheckErr : qgis::as_const( recheckErrors ) )`
`262`	`262`	`{`
`263`	`263`	`emit errorAdded( recheckErr );`
`264`	`264`	`mCheckErrors.append( recheckErr );`
`@@ -285,7 +285,7 @@ void QgsGeometryChecker::runCheck( const QgsGeometryCheck *check )`
`285`	`285`	`mCheckErrors.append( errors );`
`286`	`286`	`mMessages.append( messages );`
`287`	`287`	`mErrorListMutex.unlock();`
`288`		`- for ( QgsGeometryCheckError *error : errors )`
	`288`	`+ for ( QgsGeometryCheckError *error : qgis::as_const( errors ) )`
`289`	`289`	`{`
`290`	`290`	`emit errorAdded( error );`
`291`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@`
`22`	`22`	`QString QgsGeometryDuplicateCheckError::duplicatesString( const QMap<QString, QgsFeaturePool *> &featurePools, const QMap<QString, QList<QgsFeatureId>> &duplicates )`
`23`	`23`	`{`
`24`	`24`	`QStringList str;`
`25`		`- for ( const QString &layerId : duplicates.keys() )`
	`25`	`+ for ( auto it = duplicates.constBegin(); it != duplicates.constEnd(); ++it )`
`26`	`26`	`{`
`27`		`- str.append( featurePools[layerId]->getLayer()->name() + ":" );`
	`27`	`+ str.append( featurePools[it.key()]->getLayer()->name() + ":" );`
`28`	`28`	`QStringList ids;`
`29`		`- for ( QgsFeatureId id : duplicates[layerId] )`
	`29`	`+ for ( QgsFeatureId id : it.value() )`
`30`	`30`	`{`
`31`	`31`	`ids.append( QString::number( id ) );`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ void QgsGeometryLineIntersectionCheck::collectErrors( QList<QgsGeometryCheckErro`
`59`	`59`	`{`
`60`	`60`	`continue;`
`61`	`61`	`}`
`62`		`- for ( const QgsPoint &inter : QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance ) )`
	`62`	`+ const QList< QgsPoint > intersections = QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance );`
	`63`	`+ for ( const QgsPoint &inter : intersections )`
`63`	`64`	`{`
`64`	`65`	`errors.append( new QgsGeometryCheckError( this, layerFeatureA, inter, QgsVertexId( iPart ), layerFeatureB.id() ) );`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,16 +45,19 @@ void QgsGeometryLineLayerIntersectionCheck::collectErrors( QList<QgsGeometryChec`
`45`	`45`	`const QgsAbstractGeometry *part = QgsGeometryCheckerUtils::getGeomPart( testGeom, jPart );`
`46`	`46`	`if ( const QgsLineString testLine = dynamic_cast<const QgsLineString >( part ) )`
`47`	`47`	`{`
`48`		`- for ( const QgsPoint &inter : QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance ) )`
	`48`	`+ const QList< QgsPoint > intersections = QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance );`
	`49`	`+ for ( const QgsPoint &inter : intersections )`
`49`	`50`	`{`
`50`	`51`	`errors.append( new QgsGeometryCheckError( this, layerFeature, inter, QgsVertexId( iPart ), checkFeature.id() ) );`
`51`	`52`	`}`
`52`	`53`	`}`
`53`	`54`	`else if ( const QgsPolygon polygon = dynamic_cast<const QgsPolygon >( part ) )`
`54`	`55`	`{`
`55`		`- for ( const QgsLineString *ring : QgsGeometryCheckerUtils::polygonRings( polygon ) )`
	`56`	`+ QList< const QgsLineString* > rings = QgsGeometryCheckerUtils::polygonRings( polygon );`
	`57`	`+ for ( const QgsLineString *ring : rings )`
`56`	`58`	`{`
`57`		`- for ( const QgsPoint &inter : QgsGeometryCheckerUtils::lineIntersections( line, ring, mContext->tolerance ) )`
	`59`	`+ const QList< QgsPoint > intersections = QgsGeometryCheckerUtils::lineIntersections( line, ring, mContext->tolerance );`
	`60`	`+ for ( const QgsPoint &inter : intersections )`
`58`	`61`	`{`
`59`	`62`	`errors.append( new QgsGeometryCheckError( this, layerFeature, inter, QgsVertexId( iPart ), checkFeature.id() ) );`
`60`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ QList<QgsMapLayer *> QgsLayerTree::layerOrder() const`
`81`	`81`	`else`
`82`	`82`	`{`
`83`	`83`	`QList<QgsMapLayer *> layers;`
`84`		`- for ( const auto &treeLayer : findLayers() )`
	`84`	`+ const QList< QgsLayerTreeLayer * > foundLayers = findLayers();`
	`85`	`+ for ( const auto &treeLayer : foundLayers )`
`85`	`86`	`{`
`86`	`87`	`QgsMapLayer *layer = treeLayer->layer();`
`87`	`88`	`if ( !layer \|\| !layer->isSpatial() )`
`@@ -212,7 +213,8 @@ void QgsLayerTree::addMissingLayers()`
`212`	`213`	`{`
`213`	`214`	`bool changed = false;`
`214`	`215`
`215`		`- for ( const auto layer : findLayers() )`
	`216`	`+ const QList< QgsLayerTreeLayer * > foundLayers = findLayers();`
	`217`	`+ for ( const auto layer : foundLayers )`
`216`	`218`	`{`
`217`	`219`	`if ( !mCustomLayerOrder.contains( layer->layer() ) &&`
`218`	`220`	`layer->layer() && layer->layer()->isSpatial() )`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,8 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const`
`303`	`303`	`if ( !layer->abstract().isEmpty() )`
`304`	`304`	`{`
`305`	`305`	`parts << QStringLiteral();`
`306`		`- for ( const auto &l : layer->abstract().split( "\n" ) )`
	`306`	`+ const QStringList abstractLines = layer->abstract().split( "\n" );`
	`307`	`+ for ( const auto &l : abstractLines )`
`307`	`308`	`{`
`308`	`309`	`parts << l.toHtmlEscaped();`
`309`	`310`	`}`
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToImage( const QString`
`333`	`333`	`}`
`334`	`334`	`else`
`335`	`335`	`{`
`336`		`- for ( int page : settings.pages )`
	`336`	`+ for ( int page : qgis::as_const( settings.pages ) )`
`337`	`337`	`{`
`338`	`338`	`if ( page >= 0 && page < mLayout->pageCollection()->pageCount() )`
`339`	`339`	`pages << page;`