Modernize code FOREACH -> range for

elpaso · elpaso · commit 2dd55073b0f2 · 2019-02-08T17:49:03.000+01:00
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -462,8 +462,8 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri, const Provider
   mSqliteHandle = mHandle->handle();
   if ( mSqliteHandle )
   {
-    QStringList pragmaList = anUri.params( QStringLiteral( "pragma" ) );
-    Q_FOREACH ( const QString &pragma, pragmaList )
+    const QStringList pragmaList = anUri.params( QStringLiteral( "pragma" ) );
+    for ( const auto &pragma : pragmaList )
     {
       char *errMsg = nullptr;
       int ret = sqlite3_exec( mSqliteHandle, ( "PRAGMA " + pragma ).toUtf8(), nullptr, nullptr, &errMsg );
@@ -882,8 +882,8 @@ void QgsSpatiaLiteProvider::fetchConstraints()
     QRegularExpressionMatch match = re.match( sqlDef );
     if ( match.hasMatch() )
     {
-      QString matched = match.captured( 1 );
-      Q_FOREACH ( QString field, matched.split( ',' ) )
+      const QString matched = match.captured( 1 );
+      for ( auto &field : matched.split( ',' ) )
       {
         field = field.trimmed();
         QString fieldName = field.left( field.indexOf( ' ' ) );
@@ -904,7 +904,7 @@ void QgsSpatiaLiteProvider::fetchConstraints()
   }
   sqlite3_free_table( results );
 
-  Q_FOREACH ( int fieldIdx, mPrimaryKeyAttrs )
+  for ( const auto fieldIdx : qgis::as_const( mPrimaryKeyAttrs ) )
   {
     QgsFieldConstraints constraints = mAttributeFields.at( fieldIdx ).constraints();
     constraints.setConstraint( QgsFieldConstraints::ConstraintUnique, QgsFieldConstraints::ConstraintOriginProvider );
@@ -5682,7 +5682,7 @@ QgsAttributeList QgsSpatiaLiteProvider::pkAttributeIndexes() const
 QList<QgsVectorLayer *> QgsSpatiaLiteProvider::searchLayers( const QList<QgsVectorLayer *> &layers, const QString &connectionInfo, const QString &tableName )
 {
   QList<QgsVectorLayer *> result;
-  Q_FOREACH ( QgsVectorLayer *layer, layers )
+  for ( auto *layer : layers )
   {
     const QgsSpatiaLiteProvider *slProvider = qobject_cast<QgsSpatiaLiteProvider *>( layer->dataProvider() );
     if ( slProvider && slProvider->mSqlitePath == connectionInfo && slProvider->mTableName == tableName )
@@ -5717,7 +5717,7 @@ QList<QgsRelation> QgsSpatiaLiteProvider::discoverRelations( const QgsVectorLaye
       {
         // first reference field => try to find if we have layers for the referenced table
         const QList<QgsVectorLayer *> foundLayers = searchLayers( layers, mSqlitePath, refTable );
-        Q_FOREACH ( const QgsVectorLayer *foundLayer, foundLayers )
+        for ( const auto *foundLayer : foundLayers )
         {
           QgsRelation relation;
           relation.setName( name );

Original file line number	Diff line number	Diff line change
`@@ -462,8 +462,8 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri, const Provider`
`462`	`462`	`mSqliteHandle = mHandle->handle();`
`463`	`463`	`if ( mSqliteHandle )`
`464`	`464`	`{`
`465`		`- QStringList pragmaList = anUri.params( QStringLiteral( "pragma" ) );`
`466`		`- Q_FOREACH ( const QString &pragma, pragmaList )`
	`465`	`+ const QStringList pragmaList = anUri.params( QStringLiteral( "pragma" ) );`
	`466`	`+ for ( const auto &pragma : pragmaList )`
`467`	`467`	`{`
`468`	`468`	`char *errMsg = nullptr;`
`469`	`469`	`int ret = sqlite3_exec( mSqliteHandle, ( "PRAGMA " + pragma ).toUtf8(), nullptr, nullptr, &errMsg );`
`@@ -882,8 +882,8 @@ void QgsSpatiaLiteProvider::fetchConstraints()`
`882`	`882`	`QRegularExpressionMatch match = re.match( sqlDef );`
`883`	`883`	`if ( match.hasMatch() )`
`884`	`884`	`{`
`885`		`- QString matched = match.captured( 1 );`
`886`		`- Q_FOREACH ( QString field, matched.split( ',' ) )`
	`885`	`+ const QString matched = match.captured( 1 );`
	`886`	`+ for ( auto &field : matched.split( ',' ) )`
`887`	`887`	`{`
`888`	`888`	`field = field.trimmed();`
`889`	`889`	`QString fieldName = field.left( field.indexOf( ' ' ) );`
`@@ -904,7 +904,7 @@ void QgsSpatiaLiteProvider::fetchConstraints()`
`904`	`904`	`}`
`905`	`905`	`sqlite3_free_table( results );`
`906`	`906`
`907`		`- Q_FOREACH ( int fieldIdx, mPrimaryKeyAttrs )`
	`907`	`+ for ( const auto fieldIdx : qgis::as_const( mPrimaryKeyAttrs ) )`
`908`	`908`	`{`
`909`	`909`	`QgsFieldConstraints constraints = mAttributeFields.at( fieldIdx ).constraints();`
`910`	`910`	`constraints.setConstraint( QgsFieldConstraints::ConstraintUnique, QgsFieldConstraints::ConstraintOriginProvider );`
`@@ -5682,7 +5682,7 @@ QgsAttributeList QgsSpatiaLiteProvider::pkAttributeIndexes() const`
`5682`	`5682`	`QList<QgsVectorLayer > QgsSpatiaLiteProvider::searchLayers( const QList<QgsVectorLayer > &layers, const QString &connectionInfo, const QString &tableName )`
`5683`	`5683`	`{`
`5684`	`5684`	`QList<QgsVectorLayer *> result;`
`5685`		`- Q_FOREACH ( QgsVectorLayer *layer, layers )`
	`5685`	`+ for ( auto *layer : layers )`
`5686`	`5686`	`{`
`5687`	`5687`	`const QgsSpatiaLiteProvider slProvider = qobject_cast<QgsSpatiaLiteProvider >( layer->dataProvider() );`
`5688`	`5688`	`if ( slProvider && slProvider->mSqlitePath == connectionInfo && slProvider->mTableName == tableName )`
`@@ -5717,7 +5717,7 @@ QList<QgsRelation> QgsSpatiaLiteProvider::discoverRelations( const QgsVectorLaye`
`5717`	`5717`	`{`
`5718`	`5718`	`// first reference field => try to find if we have layers for the referenced table`
`5719`	`5719`	`const QList<QgsVectorLayer *> foundLayers = searchLayers( layers, mSqlitePath, refTable );`
`5720`		`- Q_FOREACH ( const QgsVectorLayer *foundLayer, foundLayers )`
	`5720`	`+ for ( const auto *foundLayer : foundLayers )`
`5721`	`5721`	`{`
`5722`	`5722`	`QgsRelation relation;`
`5723`	`5723`	`relation.setName( name );`