From 2dbda4f66b64df77fcb355f5f9b42fa1c8e203a1 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Fri, 2 Feb 2018 12:55:30 +1000 Subject: [PATCH] Fix clazy container detach warnings --- .../qgsalgorithmaddincrementalfield.cpp | 2 +- .../geometry_checker/qgsgeometryareacheck.cpp | 3 +- .../geometry_checker/qgsgeometrycheck.h | 3 +- .../geometry_checker/qgsgeometrychecker.cpp | 50 +++++++++---------- .../qgsgeometryduplicatecheck.cpp | 6 +-- .../qgsgeometrylineintersectioncheck.cpp | 3 +- .../qgsgeometrylinelayerintersectioncheck.cpp | 9 ++-- src/core/layertree/qgslayertree.cpp | 6 ++- src/core/layertree/qgslayertreemodel.cpp | 3 +- src/core/layout/qgslayoutexporter.cpp | 2 +- .../layout/qgslayoutitemgroupundocommand.cpp | 2 +- src/core/layout/qgslayoutitemmapitem.cpp | 2 +- src/core/qgsarchive.cpp | 3 +- src/core/qgsauxiliarystorage.cpp | 3 +- src/core/qgsproject.cpp | 2 +- src/core/qgsrulebasedlabeling.cpp | 2 +- src/core/qgsvectorlayerutils.cpp | 3 +- src/gui/auth/qgsauthsslerrorsdialog.cpp | 3 +- .../qgsrelationreferencewidget.cpp | 2 +- src/gui/qgsrubberband.cpp | 10 ++-- .../qgsgeometrycheckerresulttab.cpp | 4 +- .../qgsgeometrycheckersetuptab.cpp | 8 +-- 22 files changed, 72 insertions(+), 59 deletions(-) diff --git a/src/analysis/processing/qgsalgorithmaddincrementalfield.cpp b/src/analysis/processing/qgsalgorithmaddincrementalfield.cpp index ed5be287b62..e8fccef1924 100644 --- 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 index 60ba7088565..db2f866b35f 100644 --- 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 index 6d289250359..4cf30672559 100644 --- 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 index 1b648c7810c..7fef678dcd1 100644 --- a/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp +++ b/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp @@ -29,13 +29,13 @@ QgsGeometryChecker::QgsGeometryChecker( const QList &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 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> recheckFeatures; - for ( const QString &layerId : changes.keys() ) + for ( auto it = changes.constBegin(); it != changes.constEnd(); ++it ) { - const QMap> &layerChanges = changes[layerId]; - QgsFeaturePool *featurePool = mContext->featurePools[layerId]; + const QMap> &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 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 index 090c2ad625c..acf9da86285 100644 --- 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 &featurePools, const QMap> &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 index 48406075450..079bc20ef18 100644 --- a/src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.cpp +++ b/src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.cpp @@ -59,7 +59,8 @@ void QgsGeometryLineIntersectionCheck::collectErrors( QListtolerance ) ) + 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 index 33eeb4fe380..9f45a0ae4da 100644 --- a/src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.cpp +++ b/src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.cpp @@ -45,16 +45,19 @@ void QgsGeometryLineLayerIntersectionCheck::collectErrors( QList( 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( 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 index 502cea45575..3cf9f61583b 100644 --- a/src/core/layertree/qgslayertree.cpp +++ b/src/core/layertree/qgslayertree.cpp @@ -81,7 +81,8 @@ QList QgsLayerTree::layerOrder() const else { QList 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 index 6a8cd82a23e..21b232af5f4 100644 --- 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 index 1fb178bd138..dd7ec332f7f 100644 --- 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 index 442498aa82e..d7b605c6465 100644 --- 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 index 04d8c41b37d..db6ccb92ad1 100644 --- 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 index 3ab3057fbca..da1f53e1695 100644 --- 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 index 731093ddbd9..9316e252d53 100644 --- 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 index 23526e26564..1ee089d2885 100644 --- a/src/core/qgsproject.cpp +++ b/src/core/qgsproject.cpp @@ -2295,7 +2295,7 @@ QList QgsProject::addMapLayers( bool addToLegend, bool takeOwnership ) { - QList myResultList = mLayerStore->addMapLayers( layers, takeOwnership ); + const QList myResultList = mLayerStore->addMapLayers( layers, takeOwnership ); if ( !myResultList.isEmpty() ) { if ( addToLegend ) diff --git a/src/core/qgsrulebasedlabeling.cpp b/src/core/qgsrulebasedlabeling.cpp index 788aad8baf6..db9dbee56c8 100644 --- 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 index fca9bd5934e..7d69279363f 100644 --- 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 index c8c424aec1e..31e1d4014c8 100644 --- 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 index 9b4f1f8fb5a..7b58f3e9485 100644 --- 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 index bacf2eb8bc2..75daba00c43 100644 --- 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 index 9712444a580..d42c5de8a61 100644 --- a/src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp +++ b/src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp @@ -461,7 +461,7 @@ void QgsGeometryCheckerResultTab::fixErrors( bool prompt ) rows = ui.tableWidgetErrors->selectionModel()->selectedRows(); } QList errors; - for ( const QModelIndex &index : rows ) + for ( const QModelIndex &index : qgis::as_const( rows ) ) { QgsGeometryCheckError *error = ui.tableWidgetErrors->item( index.row(), 0 )->data( Qt::UserRole ).value(); if ( error->status() < QgsGeometryCheckError::StatusFixed ) @@ -507,7 +507,7 @@ void QgsGeometryCheckerResultTab::fixErrors( bool prompt ) ui.progressBarFixErrors->setVisible( true ); ui.progressBarFixErrors->setRange( 0, errors.size() ); - for ( QgsGeometryCheckError *error : errors ) + for ( QgsGeometryCheckError *error : qgis::as_const( errors ) ) { int fixMethod = QgsSettings().value( sSettingsGroup + error->check()->errorName(), QVariant::fromValue( 0 ) ).toInt(); mChecker->fixError( error, fixMethod ); diff --git a/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp b/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp index 02d978d7962..ecfe3950e2a 100644 --- a/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp +++ b/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp @@ -369,7 +369,7 @@ void QgsGeometryCheckerSetupTab::runChecks() // Check if output layers are editable QList nonEditableLayers; - for ( QgsVectorLayer *layer : processLayers ) + for ( QgsVectorLayer *layer : qgis::as_const( processLayers ) ) { if ( ( layer->dataProvider()->capabilities() & QgsVectorDataProvider::ChangeGeometries ) == 0 ) { @@ -387,7 +387,7 @@ void QgsGeometryCheckerSetupTab::runChecks() { if ( ui.radioButtonOutputNew->isChecked() ) { - for ( QgsVectorLayer *layer : processLayers ) + for ( QgsVectorLayer *layer : qgis::as_const( processLayers ) ) { QString layerPath = layer->dataProvider()->dataSourceUri(); delete layer; @@ -412,7 +412,7 @@ void QgsGeometryCheckerSetupTab::runChecks() ui.labelStatus->setText( tr( "Building spatial index..." ) ); QApplication::processEvents( QEventLoop::ExcludeUserInputEvents ); QMap featurePools; - for ( QgsVectorLayer *layer : processLayers ) + for ( QgsVectorLayer *layer : qgis::as_const( processLayers ) ) { double layerToMapUntis = mIface->mapCanvas()->mapSettings().layerToMapUnits( layer ); QgsCoordinateTransform layerToMapTransform( layer->crs(), QgsProject::instance()->crs(), QgsProject::instance() ); @@ -446,7 +446,7 @@ void QgsGeometryCheckerSetupTab::runChecks() if ( ui.radioButtonOutputNew->isChecked() ) { QList addLayers; - for ( QgsVectorLayer *layer : processLayers ) + for ( QgsVectorLayer *layer : qgis::as_const( processLayers ) ) { addLayers.append( layer ); }