qgis · Apr 5, 2019
diff --git a/‎src/providers/db2/qgsdb2dataitems.cpp
Lines changed: 12 additions & 6 deletions b/‎src/providers/db2/qgsdb2dataitems.cpp
Lines changed: 12 additions & 6 deletions
diff --git a/‎src/providers/db2/qgsdb2featureiterator.cpp
Lines changed: 6 additions & 3 deletions b/‎src/providers/db2/qgsdb2featureiterator.cpp
Lines changed: 6 additions & 3 deletions
@@ -137,7 +137,8 @@ void QgsDb2ConnectionItem::refresh()
   QVector<QgsDataItem *> items = createChildren();
 
   // Add new items
-  Q_FOREACH ( QgsDataItem *item, items )
+  const auto constItems = items;
+  for ( QgsDataItem *item : constItems )
   {
     // Is it present in children?
     int index = findItem( mChildren, item );
@@ -202,7 +203,8 @@ QVector<QgsDataItem *> QgsDb2ConnectionItem::createChildren()
   while ( db2GC.populateLayerProperty( layer ) )
   {
     QgsDb2SchemaItem *schemaItem = nullptr;
-    Q_FOREACH ( QgsDataItem *child, children )
+    const auto constChildren = children;
+    for ( QgsDataItem *child : constChildren )
     {
       if ( child->name() == layer.schemaName )
       {
@@ -325,7 +327,8 @@ bool QgsDb2ConnectionItem::handleDrop( const QMimeData *data, const QString &toS
   bool hasError = false;
 
   QgsMimeDataUtils::UriList lst = QgsMimeDataUtils::decodeUriList( data );
-  Q_FOREACH ( const QgsMimeDataUtils::Uri &u, lst )
+  const auto constLst = lst;
+  for ( const QgsMimeDataUtils::Uri &u : constLst )
   {
     if ( u.layerType != QLatin1String( "vector" ) )
     {
@@ -415,7 +418,8 @@ QVector<QgsDataItem *> QgsDb2RootItem::createChildren()
   QVector<QgsDataItem *> connections;
   QgsSettings settings;
   settings.beginGroup( QStringLiteral( "/DB2/connections" ) );
-  Q_FOREACH ( const QString &connName, settings.childGroups() )
+  const auto constChildGroups = settings.childGroups();
+  for ( const QString &connName : constChildGroups )
   {
     connections << new QgsDb2ConnectionItem( this, connName, mPath + "/" + connName );
   }
@@ -498,7 +502,8 @@ QVector<QgsDataItem *> QgsDb2SchemaItem::createChildren()
 
   QVector<QgsDataItem *>items;
 
-  Q_FOREACH ( QgsDataItem *child, this->children() )
+  const auto constChildren = this->children();
+  for ( QgsDataItem *child : constChildren )
   {
     items.append( ( ( QgsDb2LayerItem * )child )->createClone() );
   }
@@ -508,7 +513,8 @@ QVector<QgsDataItem *> QgsDb2SchemaItem::createChildren()
 void QgsDb2SchemaItem::addLayers( QgsDataItem *newLayers )
 {
   // Add new items
-  Q_FOREACH ( QgsDataItem *child, newLayers->children() )
+  const auto constChildren = newLayers->children();
+  for ( QgsDataItem *child : constChildren )
   {
     // Is it present in children?
     if ( findItem( mChildren, child ) >= 0 )
 
@@ -93,7 +93,8 @@ void QgsDb2FeatureIterator::BuildStatement( const QgsFeatureRequest &request )
     attrs = attributeIndexes.toList();
   }
 
-  Q_FOREACH ( int i, attrs )
+  const auto constAttrs = attrs;
+  for ( int i : constAttrs )
   {
     QString fieldname = mSource->mFields.at( i ).name();
     if ( mSource->mFidColName == fieldname )
@@ -161,7 +162,8 @@ void QgsDb2FeatureIterator::BuildStatement( const QgsFeatureRequest &request )
   {
     QString delim;
     QString inClause = QStringLiteral( "%1 IN (" ).arg( mSource->mFidColName );
-    Q_FOREACH ( QgsFeatureId featureId, mRequest.filterFids() )
+    const auto constFilterFids = mRequest.filterFids();
+    for ( QgsFeatureId featureId : constFilterFids )
     {
       inClause += delim + FID_TO_STRING( featureId );
       delim = ',';
@@ -225,7 +227,8 @@ void QgsDb2FeatureIterator::BuildStatement( const QgsFeatureRequest &request )
   QgsDebugMsg( QStringLiteral( "compileExpressions: %1" ).arg( QgsSettings().value( "qgis/compileExpressions", true ).toString() ) );
   if ( QgsSettings().value( QStringLiteral( "qgis/compileExpressions" ), true ).toBool() && limitAtProvider )
   {
-    Q_FOREACH ( const QgsFeatureRequest::OrderByClause &clause, request.orderBy() )
+    const auto constOrderBy = request.orderBy();
+    for ( const QgsFeatureRequest::OrderByClause &clause : constOrderBy )
     {
       QgsDebugMsg( QStringLiteral( "processing a clause; ascending: %1; nullsFirst: %2" ).arg( clause.ascending() ).arg( clause.nullsFirst() ) );
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,8 @@ void QgsDb2ConnectionItem::refresh()`
`137`	`137`	`QVector<QgsDataItem *> items = createChildren();`
`138`	`138`
`139`	`139`	`// Add new items`
`140`		`- Q_FOREACH ( QgsDataItem *item, items )`
	`140`	`+ const auto constItems = items;`
	`141`	`+ for ( QgsDataItem *item : constItems )`
`141`	`142`	`{`
`142`	`143`	`// Is it present in children?`
`143`	`144`	`int index = findItem( mChildren, item );`
`@@ -202,7 +203,8 @@ QVector<QgsDataItem *> QgsDb2ConnectionItem::createChildren()`
`202`	`203`	`while ( db2GC.populateLayerProperty( layer ) )`
`203`	`204`	`{`
`204`	`205`	`QgsDb2SchemaItem *schemaItem = nullptr;`
`205`		`- Q_FOREACH ( QgsDataItem *child, children )`
	`206`	`+ const auto constChildren = children;`
	`207`	`+ for ( QgsDataItem *child : constChildren )`
`206`	`208`	`{`
`207`	`209`	`if ( child->name() == layer.schemaName )`
`208`	`210`	`{`
`@@ -325,7 +327,8 @@ bool QgsDb2ConnectionItem::handleDrop( const QMimeData *data, const QString &toS`
`325`	`327`	`bool hasError = false;`
`326`	`328`
`327`	`329`	`QgsMimeDataUtils::UriList lst = QgsMimeDataUtils::decodeUriList( data );`
`328`		`- Q_FOREACH ( const QgsMimeDataUtils::Uri &u, lst )`
	`330`	`+ const auto constLst = lst;`
	`331`	`+ for ( const QgsMimeDataUtils::Uri &u : constLst )`
`329`	`332`	`{`
`330`	`333`	`if ( u.layerType != QLatin1String( "vector" ) )`
`331`	`334`	`{`
`@@ -415,7 +418,8 @@ QVector<QgsDataItem *> QgsDb2RootItem::createChildren()`
`415`	`418`	`QVector<QgsDataItem *> connections;`
`416`	`419`	`QgsSettings settings;`
`417`	`420`	`settings.beginGroup( QStringLiteral( "/DB2/connections" ) );`
`418`		`- Q_FOREACH ( const QString &connName, settings.childGroups() )`
	`421`	`+ const auto constChildGroups = settings.childGroups();`
	`422`	`+ for ( const QString &connName : constChildGroups )`
`419`	`423`	`{`
`420`	`424`	`connections << new QgsDb2ConnectionItem( this, connName, mPath + "/" + connName );`
`421`	`425`	`}`
`@@ -498,7 +502,8 @@ QVector<QgsDataItem *> QgsDb2SchemaItem::createChildren()`
`498`	`502`
`499`	`503`	`QVector<QgsDataItem *>items;`
`500`	`504`
`501`		`- Q_FOREACH ( QgsDataItem *child, this->children() )`
	`505`	`+ const auto constChildren = this->children();`
	`506`	`+ for ( QgsDataItem *child : constChildren )`
`502`	`507`	`{`
`503`	`508`	`items.append( ( ( QgsDb2LayerItem * )child )->createClone() );`
`504`	`509`	`}`
`@@ -508,7 +513,8 @@ QVector<QgsDataItem *> QgsDb2SchemaItem::createChildren()`
`508`	`513`	`void QgsDb2SchemaItem::addLayers( QgsDataItem *newLayers )`
`509`	`514`	`{`
`510`	`515`	`// Add new items`
`511`		`- Q_FOREACH ( QgsDataItem *child, newLayers->children() )`
	`516`	`+ const auto constChildren = newLayers->children();`
	`517`	`+ for ( QgsDataItem *child : constChildren )`
`512`	`518`	`{`
`513`	`519`	`// Is it present in children?`
`514`	`520`	`if ( findItem( mChildren, child ) >= 0 )`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ void QgsDb2FeatureIterator::BuildStatement( const QgsFeatureRequest &request )`
`93`	`93`	`attrs = attributeIndexes.toList();`
`94`	`94`	`}`
`95`	`95`
`96`		`- Q_FOREACH ( int i, attrs )`
	`96`	`+ const auto constAttrs = attrs;`
	`97`	`+ for ( int i : constAttrs )`
`97`	`98`	`{`
`98`	`99`	`QString fieldname = mSource->mFields.at( i ).name();`
`99`	`100`	`if ( mSource->mFidColName == fieldname )`
`@@ -161,7 +162,8 @@ void QgsDb2FeatureIterator::BuildStatement( const QgsFeatureRequest &request )`
`161`	`162`	`{`
`162`	`163`	`QString delim;`
`163`	`164`	`QString inClause = QStringLiteral( "%1 IN (" ).arg( mSource->mFidColName );`
`164`		`- Q_FOREACH ( QgsFeatureId featureId, mRequest.filterFids() )`
	`165`	`+ const auto constFilterFids = mRequest.filterFids();`
	`166`	`+ for ( QgsFeatureId featureId : constFilterFids )`
`165`	`167`	`{`
`166`	`168`	`inClause += delim + FID_TO_STRING( featureId );`
`167`	`169`	`delim = ',';`
`@@ -225,7 +227,8 @@ void QgsDb2FeatureIterator::BuildStatement( const QgsFeatureRequest &request )`
`225`	`227`	`QgsDebugMsg( QStringLiteral( "compileExpressions: %1" ).arg( QgsSettings().value( "qgis/compileExpressions", true ).toString() ) );`
`226`	`228`	`if ( QgsSettings().value( QStringLiteral( "qgis/compileExpressions" ), true ).toBool() && limitAtProvider )`
`227`	`229`	`{`
`228`		`- Q_FOREACH ( const QgsFeatureRequest::OrderByClause &clause, request.orderBy() )`
	`230`	`+ const auto constOrderBy = request.orderBy();`
	`231`	`+ for ( const QgsFeatureRequest::OrderByClause &clause : constOrderBy )`
`229`	`232`	`{`
`230`	`233`	`QgsDebugMsg( QStringLiteral( "processing a clause; ascending: %1; nullsFirst: %2" ).arg( clause.ascending() ).arg( clause.nullsFirst() ) );`
`231`	`234`