Definitely no more Q_FOREACH

qgis · Mar 21, 2021 · 2559555 · 2559555
1 parent 106c826
commit 2559555
Show file tree

Hide file tree

Showing 71 changed files with 268 additions and 250 deletions.
diff --git a/src/3d/chunks/qgschunkboundsentity_p.cpp b/src/3d/chunks/qgschunkboundsentity_p.cpp
@@ -73,7 +73,7 @@ AABBMesh::AABBMesh( Qt3DCore::QNode *parent )
 void AABBMesh::setBoxes( const QList<QgsAABB> &bboxes )
 {
   QList<QVector3D> vertices;
-  Q_FOREACH ( const QgsAABB &bbox, bboxes )
+  for ( const QgsAABB &bbox : bboxes )
     vertices << bbox.verticesForLines();
   mLineMeshGeo->setVertices( vertices );
   setVertexCount( mLineMeshGeo->vertexCount() );

diff --git a/src/3d/chunks/qgschunkedentity_p.cpp b/src/3d/chunks/qgschunkedentity_p.cpp
@@ -177,7 +177,7 @@ void QgsChunkedEntity::update( const SceneState &state )
   if ( mBboxesEntity )
   {
     QList<QgsAABB> bboxes;
-    Q_FOREACH ( QgsChunkNode *n, mActiveNodes )
+    for ( QgsChunkNode *n : std::as_const( mActiveNodes ) )
       bboxes << n->bbox();
     mBboxesEntity->setBoxes( bboxes );
   }
@@ -217,7 +217,7 @@ void QgsChunkedEntity::setShowBoundingBoxes( bool enabled )
 
 void QgsChunkedEntity::updateNodes( const QList<QgsChunkNode *> &nodes, QgsChunkQueueJobFactory *updateJobFactory )
 {
-  Q_FOREACH ( QgsChunkNode *node, nodes )
+  for ( QgsChunkNode *node : nodes )
   {
     if ( node->state() == QgsChunkNode::QueuedForUpdate )
     {

diff --git a/src/3d/qgs3dmapscene.cpp b/src/3d/qgs3dmapscene.cpp
@@ -561,7 +561,8 @@ void Qgs3DMapScene::createTerrainDeferred()
   onCameraChanged();  // force update of the new terrain
 
   // make sure that renderers for layers are re-created as well
-  Q_FOREACH ( QgsMapLayer *layer, mMap.layers() )
+  const QList<QgsMapLayer *> layers = mMap.layers();
+  for ( QgsMapLayer *layer : layers )
   {
     // remove old entity - if any
     removeLayerEntity( layer );
@@ -704,7 +705,8 @@ void Qgs3DMapScene::onLayersChanged()
 {
   QSet<QgsMapLayer *> layersBefore = qgis::listToSet( mLayerEntities.keys() );
   QList<QgsMapLayer *> layersAdded;
-  Q_FOREACH ( QgsMapLayer *layer, mMap.layers() )
+  const QList<QgsMapLayer *> layers = mMap.layers();
+  for ( QgsMapLayer *layer : layers )
   {
     if ( !layersBefore.contains( layer ) )
     {
@@ -717,12 +719,12 @@ void Qgs3DMapScene::onLayersChanged()
   }
 
   // what is left in layersBefore are layers that have been removed
-  Q_FOREACH ( QgsMapLayer *layer, layersBefore )
+  for ( QgsMapLayer *layer : std::as_const( layersBefore ) )
   {
     removeLayerEntity( layer );
   }
 
-  Q_FOREACH ( QgsMapLayer *layer, layersAdded )
+  for ( QgsMapLayer *layer : std::as_const( layersAdded ) )
   {
     addLayerEntity( layer );
   }

diff --git a/src/3d/qgs3dmapsettings.cpp b/src/3d/qgs3dmapsettings.cpp
@@ -78,7 +78,7 @@ Qgs3DMapSettings::Qgs3DMapSettings( const Qgs3DMapSettings &other )
   , mDebugDepthMapCorner( other.mDebugDepthMapCorner )
   , mDebugDepthMapSize( other.mDebugDepthMapSize )
 {
-  Q_FOREACH ( QgsAbstract3DRenderer *renderer, other.mRenderers )
+  for ( QgsAbstract3DRenderer *renderer : std::as_const( other.mRenderers ) )
   {
     mRenderers << renderer->clone();
   }
@@ -353,7 +353,7 @@ QDomElement Qgs3DMapSettings::writeXml( QDomDocument &doc, const QgsReadWriteCon
   elem.appendChild( elemDirectionalLights );
 
   QDomElement elemMapLayers = doc.createElement( QStringLiteral( "layers" ) );
-  Q_FOREACH ( const QgsMapLayerRef &layerRef, mLayers )
+  for ( const QgsMapLayerRef &layerRef : mLayers )
   {
     QDomElement elemMapLayer = doc.createElement( QStringLiteral( "layer" ) );
     elemMapLayer.setAttribute( QStringLiteral( "id" ), layerRef.layerId );
@@ -362,7 +362,7 @@ QDomElement Qgs3DMapSettings::writeXml( QDomDocument &doc, const QgsReadWriteCon
   elemTerrain.appendChild( elemMapLayers );
 
   QDomElement elemTerrainMapLayers = doc.createElement( QStringLiteral( "terrainLayers" ) );
-  Q_FOREACH ( const QgsMapLayerRef &layerRef, mTerrainLayers )
+  for ( const QgsMapLayerRef &layerRef : mTerrainLayers )
   {
     QDomElement elemMapLayer = doc.createElement( QStringLiteral( "layer" ) );
     elemMapLayer.setAttribute( QStringLiteral( "id" ), layerRef.layerId );
@@ -377,7 +377,7 @@ QDomElement Qgs3DMapSettings::writeXml( QDomDocument &doc, const QgsReadWriteCon
   elem.appendChild( elemTerrain );
 
   QDomElement elemRenderers = doc.createElement( QStringLiteral( "renderers" ) );
-  Q_FOREACH ( const QgsAbstract3DRenderer *renderer, mRenderers )
+  for ( const QgsAbstract3DRenderer *renderer : mRenderers )
   {
     QDomElement elemRenderer = doc.createElement( QStringLiteral( "renderer" ) );
     elemRenderer.setAttribute( QStringLiteral( "type" ), renderer->type() );
@@ -519,7 +519,7 @@ void Qgs3DMapSettings::setLayers( const QList<QgsMapLayer *> &layers )
 {
   QList<QgsMapLayerRef> lst;
   lst.reserve( layers.count() );
-  Q_FOREACH ( QgsMapLayer *layer, layers )
+  for ( QgsMapLayer *layer : layers )
   {
     lst.append( layer );
   }
@@ -535,7 +535,7 @@ QList<QgsMapLayer *> Qgs3DMapSettings::layers() const
 {
   QList<QgsMapLayer *> lst;
   lst.reserve( mLayers.count() );
-  Q_FOREACH ( const QgsMapLayerRef &layerRef, mLayers )
+  for ( const QgsMapLayerRef &layerRef : mLayers )
   {
     if ( layerRef.layer )
       lst.append( layerRef.layer );
@@ -547,7 +547,7 @@ void Qgs3DMapSettings::setTerrainLayers( const QList<QgsMapLayer *> &layers )
 {
   QList<QgsMapLayerRef> lst;
   lst.reserve( layers.count() );
-  Q_FOREACH ( QgsMapLayer *layer, layers )
+  for ( QgsMapLayer *layer : layers )
   {
     lst.append( layer );
   }
@@ -563,7 +563,7 @@ QList<QgsMapLayer *> Qgs3DMapSettings::terrainLayers() const
 {
   QList<QgsMapLayer *> lst;
   lst.reserve( mTerrainLayers.count() );
-  Q_FOREACH ( const QgsMapLayerRef &layerRef, mTerrainLayers )
+  for ( const QgsMapLayerRef &layerRef : mTerrainLayers )
   {
     if ( layerRef.layer )
       lst.append( layerRef.layer );

diff --git a/src/3d/terrain/qgsterrainentity_p.cpp b/src/3d/terrain/qgsterrainentity_p.cpp
@@ -152,7 +152,8 @@ void QgsTerrainEntity::invalidateMapImages()
   // handle inactive nodes afterwards
 
   QList<QgsChunkNode *> inactiveNodes;
-  Q_FOREACH ( QgsChunkNode *node, mRootNode->descendants() )
+  const QList<QgsChunkNode *> descendants = mRootNode->descendants();
+  for ( QgsChunkNode *node : descendants )
   {
     if ( !node->entity() )
       continue;
@@ -174,14 +175,14 @@ void QgsTerrainEntity::onLayersChanged()
 
 void QgsTerrainEntity::connectToLayersRepaintRequest()
 {
-  Q_FOREACH ( QgsMapLayer *layer, mLayers )
+  for ( QgsMapLayer *layer : std::as_const( mLayers ) )
   {
     disconnect( layer, &QgsMapLayer::repaintRequested, this, &QgsTerrainEntity::invalidateMapImages );
   }
 
   mLayers = mMap.terrainLayers();
 
-  Q_FOREACH ( QgsMapLayer *layer, mLayers )
+  for ( QgsMapLayer *layer : std::as_const( mLayers ) )
   {
     connect( layer, &QgsMapLayer::repaintRequested, this, &QgsTerrainEntity::invalidateMapImages );
   }

diff --git a/src/3d/terrain/qgsterraintexturegenerator_p.cpp b/src/3d/terrain/qgsterraintexturegenerator_p.cpp
@@ -59,7 +59,7 @@ int QgsTerrainTextureGenerator::render( const QgsRectangle &extent, QgsChunkNode
 
 void QgsTerrainTextureGenerator::cancelJob( int jobId )
 {
-  Q_FOREACH ( const JobData &jd, mJobs )
+  for ( const JobData &jd : std::as_const( mJobs ) )
   {
     if ( jd.jobId == jobId )
     {

diff --git a/src/core/qgstracer.cpp b/src/core/qgstracer.cpp
@@ -253,9 +253,6 @@ QVector<QgsPointXY> shortestPath( const QgsTracerGraph &g, int v1, int v2 )
   }
 
   std::reverse( path.begin(), path.end() );
-  //Q_FOREACH (int x, path)
-  //  qDebug("e: %d", x);
-
   std::reverse( points.begin(), points.end() );
   return points;
 }

diff --git a/src/core/symbology/qgscptcityarchive.cpp b/src/core/symbology/qgscptcityarchive.cpp
@@ -1338,12 +1338,6 @@ void QgsCptCityBrowserModel::addRootItems()
 
 void QgsCptCityBrowserModel::removeRootItems()
 {
-  // don't remove root items, they belong to the QgsCptCityArchive
-  // Q_FOREACH ( QgsCptCityDataItem* item, mRootItems )
-  // {
-  //   delete item;
-  // }
-
   mRootItems.clear();
 }
 

diff --git a/src/crashhandler/qgscrashreport.cpp b/src/crashhandler/qgscrashreport.cpp
@@ -55,7 +55,7 @@ const QString QgsCrashReport::toHtml() const
     else
     {
       reportData.append( QStringLiteral( "<pre>" ) );
-      Q_FOREACH ( const QgsStackTrace::StackLine &line, mStackTrace->lines )
+      for ( const QgsStackTrace::StackLine &line : mStackTrace->lines )
       {
         QFileInfo fileInfo( line.fileName );
         QString filename( fileInfo.fileName() );
@@ -98,7 +98,7 @@ const QString QgsCrashReport::toHtml() const
   }
 
   QString report;
-  Q_FOREACH ( const QString &line, reportData )
+  for ( const QString &line : std::as_const( reportData ) )
   {
     report += line + "<br>";
   }
@@ -115,7 +115,7 @@ const QString QgsCrashReport::crashID() const
   QString data = QString();
 
   // Hashes the full stack.
-  Q_FOREACH ( const QgsStackTrace::StackLine &line, mStackTrace->lines )
+  for ( const QgsStackTrace::StackLine &line : mStackTrace->lines )
   {
 #if 0
     QFileInfo fileInfo( line.fileName );

diff --git a/src/gui/ogr/qgsvectorlayersaveasdialog.cpp b/src/gui/ogr/qgsvectorlayersaveasdialog.cpp
@@ -582,7 +582,6 @@ void QgsVectorLayerSaveAsDialog::mFormatComboBox_currentIndexChanged( int idx )
     delete item;
   }
 
-  // workaround so the Q_FOREACH macro does not get confused by the ','
   typedef QPair<QLabel *, QWidget *> LabelControlPair;
 
   if ( QgsVectorFileWriter::driverMetadata( format(), driverMetaData ) )

diff --git a/src/gui/symbology/qgssymbolslistwidget.cpp b/src/gui/symbology/qgssymbolslistwidget.cpp
@@ -240,13 +240,6 @@ void QgsSymbolsListWidget::setContext( const QgsSymbolWidgetContext &context )
   {
     unitWidget->setMapCanvas( mContext.mapCanvas() );
   }
-#if 0
-  Q_FOREACH ( QgsPropertyOverrideButton *ddButton, findChildren<QgsPropertyOverrideButton *>() )
-  {
-    if ( ddButton->assistant() )
-      ddButton->assistant()->setMapCanvas( mContext.mapCanvas() );
-  }
-#endif
 }
 
 QgsSymbolWidgetContext QgsSymbolsListWidget::context() const

diff --git a/src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp b/src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp
@@ -382,7 +382,7 @@ void QgsGeometryCheckerResultTab::highlightErrors( bool current )
   {
     double cx = 0., cy = 0.;
     QgsRectangle pointExtent( errorPositions.first(), errorPositions.first() );
-    Q_FOREACH ( const QgsPointXY &p, errorPositions )
+    for ( const QgsPointXY &p : std::as_const( errorPositions ) )
     {
       cx += p.x();
       cy += p.y();

diff --git a/src/plugins/grass/qgsgrasseditrenderer.cpp b/src/plugins/grass/qgsgrasseditrenderer.cpp
@@ -64,7 +64,7 @@ QgsGrassEditRenderer::QgsGrassEditRenderer()
   firstVertexMarkerLine->setPlacement( QgsTemplatedLineSymbolLayerBase::FirstVertex );
   QgsMarkerLineSymbolLayer *lastVertexMarkerLine = static_cast<QgsMarkerLineSymbolLayer *>( firstVertexMarkerLine->clone() );
   lastVertexMarkerLine->setPlacement( QgsTemplatedLineSymbolLayerBase::LastVertex );
-  Q_FOREACH ( int value, colors.keys() )
+  for ( int value : colors.keys() )
   {
     QgsSymbol *symbol = QgsSymbol::defaultSymbol( QgsWkbTypes::LineGeometry );
     symbol->setColor( colors.value( value ) );
@@ -91,7 +91,7 @@ QgsGrassEditRenderer::QgsGrassEditRenderer()
 
   categoryList.clear();
 
-  Q_FOREACH ( int value, colors.keys() )
+  for ( int value : colors.keys() )
   {
     QgsSymbol *symbol = QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry );
     symbol->setColor( colors.value( value ) );

diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -620,7 +620,7 @@ void QgsGrassModule::run()
 
       // Print some important variables
       variables << QStringLiteral( "QGIS_PREFIX_PATH" ) << QStringLiteral( "QGIS_GRASS_CRS" ) << QStringLiteral( "GRASS_REGION" );
-      Q_FOREACH ( const QString &v, variables )
+      for ( const QString &v : variables )
       {
         mOutputTextBrowser->append( v + "=" + environment.value( v ) + "<BR>" );
       }