Replace Q_FOREACH with range-based for loops in HANA

qgis · Dec 7, 2020 · 5364c89 · 5364c89
1 parent 85960cc
commit 5364c89
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 23 deletions.
diff --git a/src/providers/hana/qgshanafeatureiterator.cpp b/src/providers/hana/qgshanafeatureiterator.cpp
@@ -145,7 +145,7 @@ bool QgsHanaFeatureIterator::fetchFeature( QgsFeature &feature )
   // Read attributes
   if ( mHasAttributes )
   {
-    Q_FOREACH ( int idx, mAttributesToFetch )
+    for ( int idx : mAttributesToFetch )
     {
       feature.setAttribute( idx, mResultSet->getValue( paramIndex ) );
       ++paramIndex;
@@ -275,7 +275,7 @@ QString QgsHanaFeatureIterator::buildSqlQuery( const QgsFeatureRequest &request
     }
   }
 
-  Q_FOREACH ( int i, attrs )
+  for ( int i : attrs )
   {
     QString fieldname = mSource->mFields.at( i ).name();
     if ( mFidColumn == fieldname )
@@ -289,7 +289,7 @@ QString QgsHanaFeatureIterator::buildSqlQuery( const QgsFeatureRequest &request
   if ( !mFidColumn.isEmpty() )
     sqlFields += QgsHanaUtils::quotedIdentifier( mFidColumn ) + ",";
 
-  Q_FOREACH ( int i, mAttributesToFetch )
+  for ( int i : mAttributesToFetch )
   {
     QString fieldname = mSource->mFields.at( i ).name();
     sqlFields += QStringLiteral( "%1," ).arg( QgsHanaUtils::quotedIdentifier( fieldname ) );
@@ -341,7 +341,7 @@ QString QgsHanaFeatureIterator::buildSqlQuery( const QgsFeatureRequest &request
     {
       QString delim;
       QString inClause = QStringLiteral( "%1 IN (" ).arg( QgsHanaUtils::quotedIdentifier( mFidColumn ) );
-      Q_FOREACH ( QgsFeatureId featureId, mRequest.filterFids() )
+      for ( QgsFeatureId featureId : mRequest.filterFids() )
       {
         inClause += delim + FID_TO_STRING( featureId );
         delim = ',';

diff --git a/src/providers/hana/qgshanasourceselect.cpp b/src/providers/hana/qgshanasourceselect.cpp
@@ -56,17 +56,17 @@ QWidget *QgsHanaSourceSelectDelegate::createEditor(
   if ( index.column() == QgsHanaTableModel::DbtmGeomType && index.data( Qt::UserRole + 1 ).toBool() )
   {
     QComboBox *cb = new QComboBox( parent );
-    Q_FOREACH ( QgsWkbTypes::Type type,
-                QList<QgsWkbTypes::Type>()
-                << QgsWkbTypes::Point
-                << QgsWkbTypes::LineString
-                << QgsWkbTypes::Polygon
-                << QgsWkbTypes::MultiPoint
-                << QgsWkbTypes::MultiLineString
-                << QgsWkbTypes::MultiPolygon
-                << QgsWkbTypes::CircularString
-                << QgsWkbTypes::GeometryCollection
-                << QgsWkbTypes::NoGeometry )
+    for ( QgsWkbTypes::Type type :
+          QList<QgsWkbTypes::Type>()
+          << QgsWkbTypes::Point
+          << QgsWkbTypes::LineString
+          << QgsWkbTypes::Polygon
+          << QgsWkbTypes::MultiPoint
+          << QgsWkbTypes::MultiLineString
+          << QgsWkbTypes::MultiPolygon
+          << QgsWkbTypes::CircularString
+          << QgsWkbTypes::GeometryCollection
+          << QgsWkbTypes::NoGeometry )
     {
       cb->addItem( QgsHanaTableModel::iconForWkbType( type ), QgsWkbTypes::displayString( type ), type );
     }
@@ -85,7 +85,7 @@ QWidget *QgsHanaSourceSelectDelegate::createEditor(
       QStandardItemModel *model = new QStandardItemModel( values.size(), 1, cb );
 
       int row = 0;
-      Q_FOREACH ( const QString &value, values )
+      for ( const QString &value : values )
       {
         QStandardItem *item = new QStandardItem( value );
         item->setFlags( Qt::ItemIsUserCheckable | Qt::ItemIsEnabled );
@@ -165,15 +165,14 @@ void QgsHanaSourceSelectDelegate::setEditorData( QWidget *editor, const QModelIn
     if ( index.column() == QgsHanaTableModel::DbtmPkCol &&
          !index.data( Qt::UserRole + 2 ).toStringList().isEmpty() )
     {
-      QStringList cols = index.data( Qt::UserRole + 2 ).toStringList();
-
-      Q_FOREACH ( const QString &col, cols )
+      QStringList columns = index.data( Qt::UserRole + 2 ).toStringList();
+      for ( const QString &colName : columns )
       {
         QStandardItemModel *cbm = qobject_cast<QStandardItemModel *>( cb->model() );
-        for ( int idx = 0; idx < cbm->rowCount(); idx++ )
+        for ( int idx = 0; idx < cbm->rowCount(); ++idx )
         {
           QStandardItem *item = cbm->item( idx, 0 );
-          if ( item->text() != col )
+          if ( item->text() != colName )
             continue;
 
           item->setData( Qt::Checked, Qt::CheckStateRole );
@@ -503,7 +502,7 @@ void QgsHanaSourceSelect::addButtonClicked()
 {
   mSelectedTables.clear();
 
-  Q_FOREACH ( const QModelIndex &idx, mTablesTreeView->selectionModel()->selection().indexes() )
+  for ( const QModelIndex &idx : mTablesTreeView->selectionModel()->selection().indexes() )
   {
     if ( idx.column() != QgsHanaTableModel::DbtmTable )
       continue;

diff --git a/src/providers/hana/qgshanatablemodel.cpp b/src/providers/hana/qgshanatablemodel.cpp
@@ -111,7 +111,7 @@ void QgsHanaTableModel::addTableEntry( const QgsHanaLayerProperty &layerProperty
   childItemList << selItem;
   childItemList << sqlItem;
 
-  Q_FOREACH ( QStandardItem *item, childItemList )
+  for ( QStandardItem *item : childItemList )
   {
     if ( tip.isEmpty() )
     {