range-based for loops

m-kuhn · m-kuhn · commit 308b16b163bb · 2018-08-24T13:24:13.000+02:00
diff --git a/src/core/qgsrelation.cpp b/src/core/qgsrelation.cpp
@@ -128,11 +128,11 @@ void QgsRelation::writeXml( QDomNode &node, QDomDocument &doc ) const
     elem.setAttribute( QStringLiteral( "strength" ), QStringLiteral( "Association" ) );
   }
 
-  Q_FOREACH ( const FieldPair &fields, d->mFieldPairs )
+  for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )
   {
     QDomElement referenceElem = doc.createElement( QStringLiteral( "fieldRef" ) );
-    referenceElem.setAttribute( QStringLiteral( "referencingField" ), fields.first );
-    referenceElem.setAttribute( QStringLiteral( "referencedField" ), fields.second );
+    referenceElem.setAttribute( QStringLiteral( "referencingField" ), pair.first );
+    referenceElem.setAttribute( QStringLiteral( "referencedField" ), pair.second );
     elem.appendChild( referenceElem );
   }
 
@@ -209,10 +209,10 @@ QString QgsRelation::getRelatedFeaturesFilter( const QgsFeature &feature ) const
 {
   QStringList conditions;
 
-  Q_FOREACH ( const QgsRelation::FieldPair &fieldPair, d->mFieldPairs )
+  for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )
   {
-    QVariant val( feature.attribute( fieldPair.referencedField() ) );
-    conditions << QgsExpression::createFieldEqualityExpression( fieldPair.referencingField(), val );
+    QVariant val( feature.attribute( pair.referencedField() ) );
+    conditions << QgsExpression::createFieldEqualityExpression( pair.referencingField(), val );
   }
 
   return conditions.join( QStringLiteral( " AND " ) );
@@ -222,10 +222,10 @@ QgsFeatureRequest QgsRelation::getReferencedFeatureRequest( const QgsAttributes
 {
   QStringList conditions;
 
-  Q_FOREACH ( const QgsRelation::FieldPair &fieldPair, d->mFieldPairs )
+  for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )
   {
-    int referencingIdx = referencingLayer()->fields().indexFromName( fieldPair.referencingField() );
-    conditions << QgsExpression::createFieldEqualityExpression( fieldPair.referencedField(), attributes.at( referencingIdx ) );
+    int referencingIdx = referencingLayer()->fields().indexFromName( pair.referencingField() );
+    conditions << QgsExpression::createFieldEqualityExpression( pair.referencedField(), attributes.at( referencingIdx ) );
   }
 
   QgsFeatureRequest myRequest;
@@ -305,7 +305,7 @@ QgsAttributeList QgsRelation::referencedFields() const
 {
   QgsAttributeList attrs;
 
-  Q_FOREACH ( const FieldPair &pair, d->mFieldPairs )
+  for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )
   {
     attrs << d->mReferencedLayer->fields().lookupField( pair.second );
   }
@@ -316,7 +316,7 @@ QgsAttributeList QgsRelation::referencingFields() const
 {
   QgsAttributeList attrs;
 
-  Q_FOREACH ( const FieldPair &pair, d->mFieldPairs )
+  for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )
   {
     attrs << d->mReferencingLayer->fields().lookupField( pair.first );
   }
@@ -336,7 +336,7 @@ bool QgsRelation::hasEqualDefinition( const QgsRelation &other ) const
 
 QString QgsRelation::resolveReferencedField( const QString &referencingField ) const
 {
-  Q_FOREACH ( const FieldPair &pair, d->mFieldPairs )
+  for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )
   {
     if ( pair.first == referencingField )
       return pair.second;
@@ -346,7 +346,7 @@ QString QgsRelation::resolveReferencedField( const QString &referencingField ) c
 
 QString QgsRelation::resolveReferencingField( const QString &referencedField ) const
 {
-  Q_FOREACH ( const FieldPair &pair, d->mFieldPairs )
+  for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )
   {
     if ( pair.second == referencedField )
       return pair.first;
@@ -388,17 +388,17 @@ void QgsRelation::updateRelationStatus()
         d->mValid = false;
       }
 
-      Q_FOREACH ( const FieldPair &fieldPair, d->mFieldPairs )
+      for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )
       {
-        if ( -1 == d->mReferencingLayer->fields().lookupField( fieldPair.first ) )
+        if ( -1 == d->mReferencingLayer->fields().lookupField( pair.first ) )
         {
-          QgsDebugMsg( QStringLiteral( "Invalid relation: field %1 does not exist in referencing layer %2" ).arg( fieldPair.first, d->mReferencingLayer->name() ) );
+          QgsDebugMsg( QStringLiteral( "Invalid relation: field %1 does not exist in referencing layer %2" ).arg( pair.first, d->mReferencingLayer->name() ) );
           d->mValid = false;
           break;
         }
-        else if ( -1 == d->mReferencedLayer->fields().lookupField( fieldPair.second ) )
+        else if ( -1 == d->mReferencedLayer->fields().lookupField( pair.second ) )
         {
-          QgsDebugMsg( QStringLiteral( "Invalid relation: field %1 does not exist in referencedg layer %2" ).arg( fieldPair.second, d->mReferencedLayer->name() ) );
+          QgsDebugMsg( QStringLiteral( "Invalid relation: field %1 does not exist in referencedg layer %2" ).arg( pair.second, d->mReferencedLayer->name() ) );
           d->mValid = false;
           break;
         }

Original file line number	Diff line number	Diff line change
`@@ -128,11 +128,11 @@ void QgsRelation::writeXml( QDomNode &node, QDomDocument &doc ) const`
`128`	`128`	`elem.setAttribute( QStringLiteral( "strength" ), QStringLiteral( "Association" ) );`
`129`	`129`	`}`
`130`	`130`
`131`		`- Q_FOREACH ( const FieldPair &fields, d->mFieldPairs )`
	`131`	`+ for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )`
`132`	`132`	`{`
`133`	`133`	`QDomElement referenceElem = doc.createElement( QStringLiteral( "fieldRef" ) );`
`134`		`- referenceElem.setAttribute( QStringLiteral( "referencingField" ), fields.first );`
`135`		`- referenceElem.setAttribute( QStringLiteral( "referencedField" ), fields.second );`
	`134`	`+ referenceElem.setAttribute( QStringLiteral( "referencingField" ), pair.first );`
	`135`	`+ referenceElem.setAttribute( QStringLiteral( "referencedField" ), pair.second );`
`136`	`136`	`elem.appendChild( referenceElem );`
`137`	`137`	`}`
`138`	`138`
`@@ -209,10 +209,10 @@ QString QgsRelation::getRelatedFeaturesFilter( const QgsFeature &feature ) const`
`209`	`209`	`{`
`210`	`210`	`QStringList conditions;`
`211`	`211`
`212`		`- Q_FOREACH ( const QgsRelation::FieldPair &fieldPair, d->mFieldPairs )`
	`212`	`+ for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )`
`213`	`213`	`{`
`214`		`- QVariant val( feature.attribute( fieldPair.referencedField() ) );`
`215`		`- conditions << QgsExpression::createFieldEqualityExpression( fieldPair.referencingField(), val );`
	`214`	`+ QVariant val( feature.attribute( pair.referencedField() ) );`
	`215`	`+ conditions << QgsExpression::createFieldEqualityExpression( pair.referencingField(), val );`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`return conditions.join( QStringLiteral( " AND " ) );`
`@@ -222,10 +222,10 @@ QgsFeatureRequest QgsRelation::getReferencedFeatureRequest( const QgsAttributes`
`222`	`222`	`{`
`223`	`223`	`QStringList conditions;`
`224`	`224`
`225`		`- Q_FOREACH ( const QgsRelation::FieldPair &fieldPair, d->mFieldPairs )`
	`225`	`+ for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )`
`226`	`226`	`{`
`227`		`- int referencingIdx = referencingLayer()->fields().indexFromName( fieldPair.referencingField() );`
`228`		`- conditions << QgsExpression::createFieldEqualityExpression( fieldPair.referencedField(), attributes.at( referencingIdx ) );`
	`227`	`+ int referencingIdx = referencingLayer()->fields().indexFromName( pair.referencingField() );`
	`228`	`+ conditions << QgsExpression::createFieldEqualityExpression( pair.referencedField(), attributes.at( referencingIdx ) );`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`QgsFeatureRequest myRequest;`
`@@ -305,7 +305,7 @@ QgsAttributeList QgsRelation::referencedFields() const`
`305`	`305`	`{`
`306`	`306`	`QgsAttributeList attrs;`
`307`	`307`
`308`		`- Q_FOREACH ( const FieldPair &pair, d->mFieldPairs )`
	`308`	`+ for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )`
`309`	`309`	`{`
`310`	`310`	`attrs << d->mReferencedLayer->fields().lookupField( pair.second );`
`311`	`311`	`}`
`@@ -316,7 +316,7 @@ QgsAttributeList QgsRelation::referencingFields() const`
`316`	`316`	`{`
`317`	`317`	`QgsAttributeList attrs;`
`318`	`318`
`319`		`- Q_FOREACH ( const FieldPair &pair, d->mFieldPairs )`
	`319`	`+ for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )`
`320`	`320`	`{`
`321`	`321`	`attrs << d->mReferencingLayer->fields().lookupField( pair.first );`
`322`	`322`	`}`
`@@ -336,7 +336,7 @@ bool QgsRelation::hasEqualDefinition( const QgsRelation &other ) const`
`336`	`336`
`337`	`337`	`QString QgsRelation::resolveReferencedField( const QString &referencingField ) const`
`338`	`338`	`{`
`339`		`- Q_FOREACH ( const FieldPair &pair, d->mFieldPairs )`
	`339`	`+ for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )`
`340`	`340`	`{`
`341`	`341`	`if ( pair.first == referencingField )`
`342`	`342`	`return pair.second;`
`@@ -346,7 +346,7 @@ QString QgsRelation::resolveReferencedField( const QString &referencingField ) c`
`346`	`346`
`347`	`347`	`QString QgsRelation::resolveReferencingField( const QString &referencedField ) const`
`348`	`348`	`{`
`349`		`- Q_FOREACH ( const FieldPair &pair, d->mFieldPairs )`
	`349`	`+ for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )`
`350`	`350`	`{`
`351`	`351`	`if ( pair.second == referencedField )`
`352`	`352`	`return pair.first;`
`@@ -388,17 +388,17 @@ void QgsRelation::updateRelationStatus()`
`388`	`388`	`d->mValid = false;`
`389`	`389`	`}`
`390`	`390`
`391`		`- Q_FOREACH ( const FieldPair &fieldPair, d->mFieldPairs )`
	`391`	`+ for ( const FieldPair &pair : qgis::as_const( d->mFieldPairs ) )`
`392`	`392`	`{`
`393`		`- if ( -1 == d->mReferencingLayer->fields().lookupField( fieldPair.first ) )`
	`393`	`+ if ( -1 == d->mReferencingLayer->fields().lookupField( pair.first ) )`
`394`	`394`	`{`
`395`		`- QgsDebugMsg( QStringLiteral( "Invalid relation: field %1 does not exist in referencing layer %2" ).arg( fieldPair.first, d->mReferencingLayer->name() ) );`
	`395`	`+ QgsDebugMsg( QStringLiteral( "Invalid relation: field %1 does not exist in referencing layer %2" ).arg( pair.first, d->mReferencingLayer->name() ) );`
`396`	`396`	`d->mValid = false;`
`397`	`397`	`break;`
`398`	`398`	`}`
`399`		`- else if ( -1 == d->mReferencedLayer->fields().lookupField( fieldPair.second ) )`
	`399`	`+ else if ( -1 == d->mReferencedLayer->fields().lookupField( pair.second ) )`
`400`	`400`	`{`
`401`		`- QgsDebugMsg( QStringLiteral( "Invalid relation: field %1 does not exist in referencedg layer %2" ).arg( fieldPair.second, d->mReferencedLayer->name() ) );`
	`401`	`+ QgsDebugMsg( QStringLiteral( "Invalid relation: field %1 does not exist in referencedg layer %2" ).arg( pair.second, d->mReferencedLayer->name() ) );`
`402`	`402`	`d->mValid = false;`
`403`	`403`	`break;`
`404`	`404`	`}`