Remove Q_FOREACH

qgis · Oct 9, 2017 · c3b1cb3 · c3b1cb3
1 parent c677c40
commit c3b1cb3
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/src/app/qgsmaptoollabel.cpp b/src/app/qgsmaptoollabel.cpp
@@ -732,7 +732,7 @@ bool QgsMapToolLabel::createAuxiliaryFields( LabelDetails &details, QgsPalIndexe
   if ( !vlayer->auxiliaryLayer() )
     return false;
 
-  Q_FOREACH ( const QgsPalLayerSettings::Property &p, mPalProperties )
+  for ( const QgsPalLayerSettings::Property &p : qgsAsConst( mPalProperties ) )
   {
     int index = -1;
 
@@ -779,7 +779,7 @@ bool QgsMapToolLabel::createAuxiliaryFields( LabelDetails &details, QgsDiagramIn
   if ( !vlayer->auxiliaryLayer() )
     return false;
 
-  Q_FOREACH ( const QgsDiagramLayerSettings::Property &p, mDiagramProperties )
+  for ( const QgsDiagramLayerSettings::Property &p : qgsAsConst( mDiagramProperties ) )
   {
     int index = -1;
 

diff --git a/src/app/qgsmaptoolshowhidelabels.cpp b/src/app/qgsmaptoolshowhidelabels.cpp
@@ -142,7 +142,7 @@ void QgsMapToolShowHideLabels::showHideLabels( QMouseEvent *e )
     QList<QgsLabelPosition> positions;
     if ( selectedLabelFeatures( vlayer, positions ) )
     {
-      Q_FOREACH ( const QgsLabelPosition &pos, positions )
+      for ( const QgsLabelPosition &pos : qgsAsConst( positions ) )
       {
         if ( showHide( pos, false ) )
           labelChanged = true;
@@ -154,7 +154,7 @@ void QgsMapToolShowHideLabels::showHideLabels( QMouseEvent *e )
     QgsFeatureIds fids;
     if ( selectedFeatures( vlayer, fids ) )
     {
-      Q_FOREACH ( QgsFeatureId fid, fids )
+      for ( const QgsFeatureId &fid : qgsAsConst( fids ) )
       {
         QgsLabelPosition pos;
         pos.featureId = fid;

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -1529,7 +1529,7 @@ void QgsVectorLayerProperties::updateAuxiliaryStoragePage( bool reset )
 
       // add fields
       mAuxiliaryStorageFieldsTree->clear();
-      Q_FOREACH ( const QgsField &field, alayer->auxiliaryFields() )
+      for ( const QgsField &field : alayer->auxiliaryFields() )
       {
         const QgsPropertyDefinition prop = QgsAuxiliaryLayer::propertyDefinitionFromField( field );
         QTreeWidgetItem *item = new QTreeWidgetItem();

diff --git a/src/core/qgsarchive.cpp b/src/core/qgsarchive.cpp
@@ -142,7 +142,7 @@ QString QgsProjectArchive::auxiliaryStorageFile() const
 {
   const QString extension = QgsAuxiliaryStorage::extension();
 
-  Q_FOREACH ( const QString &file, files() )
+  for ( const QString &file : files() )
   {
     const QFileInfo fileInfo( file );
     if ( fileInfo.suffix().compare( extension, Qt::CaseInsensitive ) == 0 )

diff --git a/src/core/qgsauxiliarystorage.cpp b/src/core/qgsauxiliarystorage.cpp
@@ -277,7 +277,7 @@ bool QgsAuxiliaryLayer::isHiddenProperty( int index ) const
 
   if ( def.origin().compare( "labeling" ) == 0 )
   {
-    Q_FOREACH ( const QgsPalLayerSettings::Property &p, palHiddenProperties )
+    for ( const QgsPalLayerSettings::Property &p : palHiddenProperties )
     {
       const QString propName = QgsPalLayerSettings::propertyDefinitions()[ p ].name();
       if ( propName.compare( def.name() ) == 0 )
@@ -404,7 +404,7 @@ QgsPropertyDefinition QgsAuxiliaryLayer::propertyDefinitionFromField( const QgsF
   if ( origin.compare( "labeling", Qt::CaseInsensitive ) == 0 )
   {
     const QgsPropertiesDefinition props = QgsPalLayerSettings::propertyDefinitions();
-    Q_FOREACH ( const QgsPropertyDefinition p, props.values() )
+    for ( const QgsPropertyDefinition &p : props.values() )
     {
       if ( p.name().compare( propertyName, Qt::CaseInsensitive ) == 0 )
       {
@@ -418,7 +418,7 @@ QgsPropertyDefinition QgsAuxiliaryLayer::propertyDefinitionFromField( const QgsF
   else if ( origin.compare( "symbol", Qt::CaseInsensitive ) == 0 )
   {
     const QgsPropertiesDefinition props = QgsSymbolLayer::propertyDefinitions();
-    Q_FOREACH ( const QgsPropertyDefinition p, props.values() )
+    for ( const QgsPropertyDefinition &p : props.values() )
     {
       if ( p.name().compare( propertyName, Qt::CaseInsensitive ) == 0 )
       {
@@ -432,7 +432,7 @@ QgsPropertyDefinition QgsAuxiliaryLayer::propertyDefinitionFromField( const QgsF
   else if ( origin.compare( "diagram", Qt::CaseInsensitive ) == 0 )
   {
     const QgsPropertiesDefinition props = QgsDiagramLayerSettings::propertyDefinitions();
-    Q_FOREACH ( const QgsPropertyDefinition p, props.values() )
+    for ( const QgsPropertyDefinition &p : props.values() )
     {
       if ( p.name().compare( propertyName, Qt::CaseInsensitive ) == 0 )
       {

diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -2246,7 +2246,7 @@ QList<QgsMapLayer *> QgsProject::addMapLayers(
 
   if ( mAuxiliaryStorage )
   {
-    Q_FOREACH ( QgsMapLayer *mlayer, myResultList )
+    for ( QgsMapLayer *mlayer : myResultList )
     {
       if ( mlayer->type() != QgsMapLayer::VectorLayer )
         continue;
@@ -2356,7 +2356,7 @@ void QgsProject::setTrustLayerMetadata( bool trust )
 
 bool QgsProject::saveAuxiliaryStorage( const QString &filename )
 {
-  Q_FOREACH ( QgsMapLayer *l, mapLayers().values() )
+  for ( QgsMapLayer *l : mapLayers().values() )
   {
     if ( l->type() != QgsMapLayer::VectorLayer )
       continue;

diff --git a/src/core/qgsrulebasedlabeling.cpp b/src/core/qgsrulebasedlabeling.cpp
@@ -182,7 +182,7 @@ QgsRuleBasedLabeling::Rule *QgsRuleBasedLabeling::Rule::findRuleByKey( const QSt
   if ( key == mRuleKey )
     return this;
 
-  Q_FOREACH ( Rule *rule, mChildren )
+  for ( Rule *rule : mChildren )
   {
     Rule *r = rule->findRuleByKey( key );
     if ( r )

diff --git a/src/core/qgsvectorlayerjoininfo.cpp b/src/core/qgsvectorlayerjoininfo.cpp
@@ -78,15 +78,15 @@ QStringList QgsVectorLayerJoinInfo::joinFieldNamesSubset( const QgsVectorLayerJo
     QStringList *lst = info.joinFieldNamesSubset();
     if ( lst )
     {
-      Q_FOREACH ( const QString &s, *lst )
+      for ( const QString &s : qgsAsConst( *lst ) )
       {
         if ( !info.joinFieldNamesBlackList().contains( s ) )
           fieldNames.append( s );
       }
     }
     else
     {
-      Q_FOREACH ( const QgsField &f, info.joinLayer()->fields() )
+      for ( const QgsField &f : info.joinLayer()->fields() )
       {
         if ( !info.joinFieldNamesBlackList().contains( f.name() )
              && f.name() != info.joinFieldName() )

diff --git a/src/gui/qgsnewauxiliarylayerdialog.cpp b/src/gui/qgsnewauxiliarylayerdialog.cpp
@@ -27,7 +27,7 @@ QgsNewAuxiliaryLayerDialog::QgsNewAuxiliaryLayerDialog( QgsVectorLayer *layer, Q
 {
   setupUi( this );
 
-  Q_FOREACH ( const QgsField &field, mLayer->fields() )
+  for ( const QgsField &field : mLayer->fields() )
     comboBox->addItem( field.name() );
 }