De-Q_FOREACH-ification

wonder-sk · wonder-sk · commit a01caa43fe54 · 2019-01-18T11:17:15.000+01:00
diff --git a/src/3d/qgsrulebased3drenderer.cpp b/src/3d/qgsrulebased3drenderer.cpp
@@ -106,7 +106,7 @@ void QgsRuleBased3DRenderer::Rule::initFilter()
 void QgsRuleBased3DRenderer::Rule::updateElseRules()
 {
   mElseRules.clear();
-  Q_FOREACH ( Rule *rule, mChildren )
+  for ( Rule *rule : qgis::as_const( mChildren ) )
   {
     if ( rule->isElse() )
       mElseRules << rule;
@@ -142,7 +142,7 @@ const QgsRuleBased3DRenderer::Rule *QgsRuleBased3DRenderer::Rule::findRuleByKey(
   if ( key == mRuleKey )
     return this;
 
-  Q_FOREACH ( Rule *rule, mChildren )
+  for ( Rule *rule : qgis::as_const( mChildren ) )
   {
     const Rule *r = rule->findRuleByKey( key );
     if ( r )
@@ -171,7 +171,7 @@ QgsRuleBased3DRenderer::Rule *QgsRuleBased3DRenderer::Rule::clone() const
   Rule *newrule = new Rule( symbol, mFilterExp, mDescription );
   newrule->setActive( mIsActive );
   // clone children
-  Q_FOREACH ( Rule *rule, mChildren )
+  for ( Rule *rule : qgis::as_const( mChildren ) )
     newrule->appendChild( rule->clone() );
   return newrule;
 }
@@ -277,7 +277,7 @@ void QgsRuleBased3DRenderer::Rule::createHandlers( QgsVectorLayer *layer, QgsRul
   }
 
   // call recursively
-  Q_FOREACH ( Rule *rule, mChildren )
+  for ( Rule *rule : qgis::as_const( mChildren ) )
   {
     rule->createHandlers( layer, handlers );
   }
@@ -303,7 +303,7 @@ void QgsRuleBased3DRenderer::Rule::prepare( const Qgs3DRenderContext &context, Q
   }
 
   // call recursively
-  Q_FOREACH ( Rule *rule, mChildren )
+  for ( Rule *rule : qgis::as_const( mChildren ) )
   {
     rule->prepare( context, attributeNames, handlers );
   }
@@ -326,7 +326,7 @@ QgsRuleBased3DRenderer::Rule::RegisterResult QgsRuleBased3DRenderer::Rule::regis
   bool willRegisterSomething = false;
 
   // call recursively
-  Q_FOREACH ( Rule *rule, mChildren )
+  for ( Rule *rule : qgis::as_const( mChildren ) )
   {
     // Don't process else rules yet
     if ( !rule->isElse() )
@@ -341,7 +341,7 @@ QgsRuleBased3DRenderer::Rule::RegisterResult QgsRuleBased3DRenderer::Rule::regis
   // If none of the rules passed then we jump into the else rules and process them.
   if ( !willRegisterSomething )
   {
-    Q_FOREACH ( Rule *rule, mElseRules )
+    for ( Rule *rule : qgis::as_const( mElseRules ) )
     {
       registered |= rule->registerFeature( feature, context, handlers ) != Filtered;
     }
@@ -440,7 +440,7 @@ Qt3DCore::QEntity *QgsRuleBased3DRenderer::createEntity( const Qgs3DMapSettings
   }
 
   Qt3DCore::QEntity *entity = new Qt3DCore::QEntity;
-  Q_FOREACH ( QgsFeature3DHandler *handler, handlers.values() )
+  for ( QgsFeature3DHandler *handler : handlers.values() )
     handler->finalize( entity, context );
 
   qDeleteAll( handlers.values() );

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ void QgsRuleBased3DRenderer::Rule::initFilter()`
`106`	`106`	`void QgsRuleBased3DRenderer::Rule::updateElseRules()`
`107`	`107`	`{`
`108`	`108`	`mElseRules.clear();`
`109`		`- Q_FOREACH ( Rule *rule, mChildren )`
	`109`	`+ for ( Rule *rule : qgis::as_const( mChildren ) )`
`110`	`110`	`{`
`111`	`111`	`if ( rule->isElse() )`
`112`	`112`	`mElseRules << rule;`
`@@ -142,7 +142,7 @@ const QgsRuleBased3DRenderer::Rule *QgsRuleBased3DRenderer::Rule::findRuleByKey(`
`142`	`142`	`if ( key == mRuleKey )`
`143`	`143`	`return this;`
`144`	`144`
`145`		`- Q_FOREACH ( Rule *rule, mChildren )`
	`145`	`+ for ( Rule *rule : qgis::as_const( mChildren ) )`
`146`	`146`	`{`
`147`	`147`	`const Rule *r = rule->findRuleByKey( key );`
`148`	`148`	`if ( r )`
`@@ -171,7 +171,7 @@ QgsRuleBased3DRenderer::Rule *QgsRuleBased3DRenderer::Rule::clone() const`
`171`	`171`	`Rule *newrule = new Rule( symbol, mFilterExp, mDescription );`
`172`	`172`	`newrule->setActive( mIsActive );`
`173`	`173`	`// clone children`
`174`		`- Q_FOREACH ( Rule *rule, mChildren )`
	`174`	`+ for ( Rule *rule : qgis::as_const( mChildren ) )`
`175`	`175`	`newrule->appendChild( rule->clone() );`
`176`	`176`	`return newrule;`
`177`	`177`	`}`
`@@ -277,7 +277,7 @@ void QgsRuleBased3DRenderer::Rule::createHandlers( QgsVectorLayer *layer, QgsRul`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`// call recursively`
`280`		`- Q_FOREACH ( Rule *rule, mChildren )`
	`280`	`+ for ( Rule *rule : qgis::as_const( mChildren ) )`
`281`	`281`	`{`
`282`	`282`	`rule->createHandlers( layer, handlers );`
`283`	`283`	`}`
`@@ -303,7 +303,7 @@ void QgsRuleBased3DRenderer::Rule::prepare( const Qgs3DRenderContext &context, Q`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`// call recursively`
`306`		`- Q_FOREACH ( Rule *rule, mChildren )`
	`306`	`+ for ( Rule *rule : qgis::as_const( mChildren ) )`
`307`	`307`	`{`
`308`	`308`	`rule->prepare( context, attributeNames, handlers );`
`309`	`309`	`}`
`@@ -326,7 +326,7 @@ QgsRuleBased3DRenderer::Rule::RegisterResult QgsRuleBased3DRenderer::Rule::regis`
`326`	`326`	`bool willRegisterSomething = false;`
`327`	`327`
`328`	`328`	`// call recursively`
`329`		`- Q_FOREACH ( Rule *rule, mChildren )`
	`329`	`+ for ( Rule *rule : qgis::as_const( mChildren ) )`
`330`	`330`	`{`
`331`	`331`	`// Don't process else rules yet`
`332`	`332`	`if ( !rule->isElse() )`
`@@ -341,7 +341,7 @@ QgsRuleBased3DRenderer::Rule::RegisterResult QgsRuleBased3DRenderer::Rule::regis`
`341`	`341`	`// If none of the rules passed then we jump into the else rules and process them.`
`342`	`342`	`if ( !willRegisterSomething )`
`343`	`343`	`{`
`344`		`- Q_FOREACH ( Rule *rule, mElseRules )`
	`344`	`+ for ( Rule *rule : qgis::as_const( mElseRules ) )`
`345`	`345`	`{`
`346`	`346`	`registered \|= rule->registerFeature( feature, context, handlers ) != Filtered;`
`347`	`347`	`}`
`@@ -440,7 +440,7 @@ Qt3DCore::QEntity *QgsRuleBased3DRenderer::createEntity( const Qgs3DMapSettings`
`440`	`440`	`}`
`441`	`441`
`442`	`442`	`Qt3DCore::QEntity *entity = new Qt3DCore::QEntity;`
`443`		`- Q_FOREACH ( QgsFeature3DHandler *handler, handlers.values() )`
	`443`	`+ for ( QgsFeature3DHandler *handler : handlers.values() )`
`444`	`444`	`handler->finalize( entity, context );`
`445`	`445`
`446`	`446`	`qDeleteAll( handlers.values() );`