Cleanup loops

qgis · Jul 29, 2021 · 1b78b48 · 1b78b48
1 parent 1306595
commit 1b78b48
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 27 deletions.
diff --git a/src/core/maprenderer/qgsmaprenderercustompainterjob.cpp b/src/core/maprenderer/qgsmaprenderercustompainterjob.cpp
@@ -161,11 +161,11 @@ void QgsMapRendererCustomPainterJob::cancelWithoutBlocking()
   }
 
   mLabelJob.context.setRenderingStopped( true );
-  for ( auto it = mLayerJobs.begin(); it != mLayerJobs.end(); ++it )
+  for ( LayerRenderJob &job : mLayerJobs )
   {
-    it->context()->setRenderingStopped( true );
-    if ( it->renderer && it->renderer->feedback() )
-      it->renderer->feedback()->cancel();
+    job.context()->setRenderingStopped( true );
+    if ( job.renderer && job.renderer->feedback() )
+      job.renderer->feedback()->cancel();
   }
 }
 
@@ -289,10 +289,8 @@ void QgsMapRendererCustomPainterJob::doRender()
   QElapsedTimer renderTime;
   renderTime.start();
 
-  for ( auto it = mLayerJobs.begin(); it != mLayerJobs.end(); ++it )
+  for ( LayerRenderJob &job : mLayerJobs )
   {
-    LayerRenderJob &job = *it;
-
     if ( job.context()->renderingStopped() )
       break;
 

diff --git a/src/core/maprenderer/qgsmaprendererjob.cpp b/src/core/maprenderer/qgsmaprendererjob.cpp
@@ -796,9 +796,8 @@ LabelRenderJob QgsMapRendererJob::prepareLabelingJob( QPainter *painter, QgsLabe
 
 void QgsMapRendererJob::cleanupJobs( std::vector<LayerRenderJob> &jobs )
 {
-  for ( auto it = jobs.begin(); it != jobs.end(); ++it )
+  for ( LayerRenderJob &job : jobs )
   {
-    LayerRenderJob &job = *it;
     if ( job.img )
     {
       delete job.context()->painter();
@@ -842,7 +841,7 @@ void QgsMapRendererJob::cleanupJobs( std::vector<LayerRenderJob> &jobs )
 
 void QgsMapRendererJob::cleanupSecondPassJobs( std::vector< LayerRenderJob > &jobs )
 {
-  for ( auto &job : jobs )
+  for ( LayerRenderJob &job : jobs )
   {
     if ( job.img )
     {
@@ -909,10 +908,8 @@ QImage QgsMapRendererJob::composeImage( const QgsMapSettings &settings,
 #if DEBUG_RENDERING
   int i = 0;
 #endif
-  for ( auto it = jobs.begin(); it != jobs.end(); ++it )
+  for ( const LayerRenderJob &job : jobs )
   {
-    const LayerRenderJob &job = *it;
-
     if ( job.layer && job.layer->customProperty( QStringLiteral( "rendering/renderAboveLabels" ) ).toBool() )
       continue; // skip layer for now, it will be rendered after labels
 
@@ -952,10 +949,8 @@ QImage QgsMapRendererJob::composeImage( const QgsMapSettings &settings,
   }
 
   // render any layers with the renderAboveLabels flag now
-  for ( auto it = jobs.begin(); it != jobs.end(); ++it )
+  for ( const LayerRenderJob &job : jobs )
   {
-    const LayerRenderJob &job = *it;
-
     if ( !job.layer || !job.layer->customProperty( QStringLiteral( "rendering/renderAboveLabels" ) ).toBool() )
       continue;
 

diff --git a/src/core/maprenderer/qgsmaprendererparalleljob.cpp b/src/core/maprenderer/qgsmaprendererparalleljob.cpp
@@ -80,11 +80,11 @@ void QgsMapRendererParallelJob::cancel()
   QgsDebugMsgLevel( QStringLiteral( "PARALLEL cancel at status %1" ).arg( mStatus ), 2 );
 
   mLabelJob.context.setRenderingStopped( true );
-  for ( auto it = mLayerJobs.begin(); it != mLayerJobs.end(); ++it )
+  for ( LayerRenderJob &job : mLayerJobs )
   {
-    it->context()->setRenderingStopped( true );
-    if ( it->renderer && it->renderer->feedback() )
-      it->renderer->feedback()->cancel();
+    job.context()->setRenderingStopped( true );
+    if ( job.renderer && job.renderer->feedback() )
+      job.renderer->feedback()->cancel();
   }
 
   if ( mStatus == RenderingLayers )
@@ -125,11 +125,11 @@ void QgsMapRendererParallelJob::cancelWithoutBlocking()
   QgsDebugMsgLevel( QStringLiteral( "PARALLEL cancel at status %1" ).arg( mStatus ), 2 );
 
   mLabelJob.context.setRenderingStopped( true );
-  for ( auto it = mLayerJobs.begin(); it != mLayerJobs.end(); ++it )
+  for ( LayerRenderJob &job : mLayerJobs )
   {
-    it->context()->setRenderingStopped( true );
-    if ( it->renderer && it->renderer->feedback() )
-      it->renderer->feedback()->cancel();
+    job.context()->setRenderingStopped( true );
+    if ( job.renderer && job.renderer->feedback() )
+      job.renderer->feedback()->cancel();
   }
 
   if ( mStatus == RenderingLayers )
@@ -224,11 +224,11 @@ void QgsMapRendererParallelJob::renderLayersFinished()
 {
   Q_ASSERT( mStatus == RenderingLayers );
 
-  for ( auto it = mLayerJobs.begin(); it != mLayerJobs.end(); ++it )
+  for ( const LayerRenderJob &job : mLayerJobs )
   {
-    if ( !it->errors.isEmpty() )
+    if ( !job.errors.isEmpty() )
     {
-      mErrors.append( Error( it->layer->id(), it->errors.join( ',' ) ) );
+      mErrors.append( Error( job.layerId, job.errors.join( ',' ) ) );
     }
   }