Port more field iterating to Q_FOREACH, avoid some detachments

nyalldawson · nyalldawson · commit 1563193707de · 2016-03-10T10:45:19.000+11:00
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -147,10 +147,10 @@ void QgsAtlasComposition::setSortKeyAttributeIndex( int idx )
 {
   if ( mCoverageLayer )
   {
-    const QgsFields fields = mCoverageLayer->fields();
+    QgsFields fields = mCoverageLayer->fields();
     if ( idx >= 0 && idx < fields.count() )
     {
-      mSortKeyAttributeName = fields[idx].name();
+      mSortKeyAttributeName = fields.at( idx ).name();
       return;
     }
   }
@@ -714,10 +714,10 @@ void QgsAtlasComposition::readXML( const QDomElement& atlasElem, const QDomDocum
     int idx = mSortKeyAttributeName.toInt( &isIndex );
     if ( isIndex && mCoverageLayer )
     {
-      const QgsFields fields = mCoverageLayer->fields();
+      QgsFields fields = mCoverageLayer->fields();
       if ( idx >= 0 && idx < fields.count() )
       {
-        mSortKeyAttributeName = fields[idx].name();
+        mSortKeyAttributeName = fields.at( idx ).name();
       }
     }
     mSortAscending = atlasElem.attribute( "sortAscending", "true" ) == "true" ? true : false;
diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp
@@ -181,14 +181,15 @@ void QgsComposerAttributeTable::resetColumns()
   mColumns.clear();
 
   //rebuild columns list from vector layer fields
-  const QgsFields& fields = mVectorLayer->fields();
-  for ( int idx = 0; idx < fields.count(); ++idx )
+  int idx = 0;
+  Q_FOREACH ( const QgsField& field, mVectorLayer->fields() )
   {
     QString currentAlias = mVectorLayer->attributeDisplayName( idx );
     QgsComposerTableColumn* col = new QgsComposerTableColumn;
-    col->setAttribute( fields[idx].name() );
+    col->setAttribute( field.name() );
     col->setHeading( currentAlias );
     mColumns.append( col );
+    idx++;
   }
 }
 
@@ -296,13 +297,15 @@ void QgsComposerAttributeTable::setDisplayAttributes( const QSet<int>& attr, boo
   else
   {
     //resetting, so add all attributes to columns
-    for ( int idx = 0; idx < fields.count(); ++idx )
+    int idx = 0;
+    Q_FOREACH ( const QgsField& field, fields )
     {
       QString currentAlias = mVectorLayer->attributeDisplayName( idx );
       QgsComposerTableColumn* col = new QgsComposerTableColumn;
-      col->setAttribute( fields[idx].name() );
+      col->setAttribute( field.name() );
       col->setHeading( currentAlias );
       mColumns.append( col );
+      idx++;
     }
   }
 
diff --git a/src/core/composer/qgscomposerattributetablev2.cpp b/src/core/composer/qgscomposerattributetablev2.cpp
@@ -253,14 +253,15 @@ void QgsComposerAttributeTableV2::resetColumns()
   mColumns.clear();
 
   //rebuild columns list from vector layer fields
-  const QgsFields& fields = source->fields();
-  for ( int idx = 0; idx < fields.count(); ++idx )
+  int idx = 0;
+  Q_FOREACH ( const QgsField& field, source->fields() )
   {
     QString currentAlias = source->attributeDisplayName( idx );
     QgsComposerTableColumn* col = new QgsComposerTableColumn;
-    col->setAttribute( fields[idx].name() );
+    col->setAttribute( field.name() );
     col->setHeading( currentAlias );
     mColumns.append( col );
+    idx++;
   }
 }
 
@@ -393,13 +394,15 @@ void QgsComposerAttributeTableV2::setDisplayAttributes( const QSet<int>& attr, b
   else
   {
     //resetting, so add all attributes to columns
-    for ( int idx = 0; idx < fields.count(); ++idx )
+    int idx = 0;
+    Q_FOREACH ( const QgsField& field, fields )
     {
       QString currentAlias = source->attributeDisplayName( idx );
       QgsComposerTableColumn* col = new QgsComposerTableColumn;
-      col->setAttribute( fields[idx].name() );
+      col->setAttribute( field.name() );
       col->setHeading( currentAlias );
       mColumns.append( col );
+      idx++;
     }
   }
 
diff --git a/src/core/qgseditformconfig.cpp b/src/core/qgseditformconfig.cpp
@@ -29,7 +29,7 @@ QString QgsEditFormConfig::widgetType( int fieldIdx ) const
   if ( fieldIdx < 0 || fieldIdx >= mFields.count() )
     return "TextEdit";
 
-  return mEditorWidgetV2Types.value( mFields[fieldIdx].name(), "TextEdit" );
+  return mEditorWidgetV2Types.value( mFields.at( fieldIdx ).name(), "TextEdit" );
 }
 
 QString QgsEditFormConfig::widgetType( const QString& fieldName ) const
@@ -42,7 +42,7 @@ QgsEditorWidgetConfig QgsEditFormConfig::widgetConfig( int fieldIdx ) const
   if ( fieldIdx < 0 || fieldIdx >= mFields.count() )
     return QgsEditorWidgetConfig();
 
-  return mWidgetConfigs.value( mFields[fieldIdx].name() );
+  return mWidgetConfigs.value( mFields.at( fieldIdx ).name() );
 }
 
 QgsEditorWidgetConfig QgsEditFormConfig::widgetConfig( const QString& widgetName ) const
@@ -82,7 +82,7 @@ bool QgsEditFormConfig::removeWidgetConfig( int fieldIdx )
   if ( fieldIdx < 0 || fieldIdx >= mFields.count() )
     return false;
 
-  return mWidgetConfigs.remove( mFields[fieldIdx].name() );
+  return mWidgetConfigs.remove( mFields.at( fieldIdx ).name() );
 }
 
 void QgsEditFormConfig::setUiForm( const QString& ui )
diff --git a/src/core/qgslabel.cpp b/src/core/qgslabel.cpp
@@ -504,7 +504,7 @@ QString QgsLabel::labelField( int attr ) const
   int fieldIndex = mLabelFieldIdx[attr];
   if ( fieldIndex < 0 || fieldIndex >= mFields.count() )
     return QString();
-  return mFields[fieldIndex].name();
+  return mFields.at( fieldIndex ).name();
 }
 
 QgsLabelAttributes *QgsLabel::labelAttributes( void )
diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp
@@ -461,11 +461,10 @@ QgsVectorLayer* QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlit
   // create table
   QString sql = QString( "CREATE TABLE '%1' (" ).arg( tableName );
   QString delim = "";
-  const QgsFields& fields = layer->dataProvider()->fields();
-  for ( int idx = 0; idx < fields.count(); ++idx )
+  Q_FOREACH ( const QgsField& field, layer->dataProvider()->fields() )
   {
     QString dataType = "";
-    QVariant::Type type = fields[idx].type();
+    QVariant::Type type = field.type();
     if ( type == QVariant::Int || type == QVariant::LongLong )
     {
       dataType = "INTEGER";
@@ -480,10 +479,10 @@ QgsVectorLayer* QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlit
     }
     else
     {
-      showWarning( tr( "%1: Unknown data type %2. Not using type affinity for the field." ).arg( fields[idx].name(), QVariant::typeToName( type ) ) );
+      showWarning( tr( "%1: Unknown data type %2. Not using type affinity for the field." ).arg( field.name(), QVariant::typeToName( type ) ) );
     }
 
-    sql += delim + QString( "'%1' %2" ).arg( fields[idx].name(), dataType );
+    sql += delim + QString( "'%1' %2" ).arg( field.name(), dataType );
     delim = ',';
   }
   sql += ')';
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -254,9 +254,9 @@ void QgsVectorLayer::setDisplayField( const QString& fldName )
   {
     int fieldsSize = mUpdatedFields.size();
 
-    for ( int idx = 0; idx < mUpdatedFields.count(); ++idx )
+    Q_FOREACH ( const QgsField& field, mUpdatedFields )
     {
-      QString fldName = mUpdatedFields.at( idx ).name();
+      QString fldName = field.name();
       QgsDebugMsg( "Checking field " + fldName + " of " + QString::number( fieldsSize ) + " total" );
 
       // Check the fields and keep the first one that matches.
@@ -2158,7 +2158,7 @@ QString QgsVectorLayer::attributeDisplayName( int attributeIndex ) const
   {
     if ( attributeIndex >= 0 && attributeIndex < mUpdatedFields.count() )
     {
-      displayName = mUpdatedFields[attributeIndex].name();
+      displayName = mUpdatedFields.at( attributeIndex ).name();
     }
   }
   return displayName;
diff --git a/src/core/qgsvectorlayereditbuffer.cpp b/src/core/qgsvectorlayereditbuffer.cpp
@@ -225,10 +225,9 @@ bool QgsVectorLayerEditBuffer::addAttribute( const QgsField &field )
   if ( field.name().isEmpty() )
     return false;
 
-  const QgsFields& updatedFields = L->fields();
-  for ( int idx = 0; idx < updatedFields.count(); ++idx )
+  Q_FOREACH ( const QgsField& updatedField, L->fields() )
   {
-    if ( updatedFields[idx].name() == field.name() )
+    if ( updatedField.name() == field.name() )
       return false;
   }
 
diff --git a/src/core/qgsvectorlayerjoinbuffer.cpp b/src/core/qgsvectorlayerjoinbuffer.cpp
@@ -240,14 +240,14 @@ void QgsVectorLayerJoinBuffer::updateFields( QgsFields& fields )
     for ( int idx = 0; idx < joinFields.count(); ++idx )
     {
       // if using just a subset of fields, filter some of them out
-      if ( hasSubset && !subset.contains( joinFields[idx].name() ) )
+      if ( hasSubset && !subset.contains( joinFields.at( idx ).name() ) )
         continue;
 
       //skip the join field to avoid double field names (fields often have the same name)
       // when using subset of field, use all the selected fields
-      if ( hasSubset || joinFields[idx].name() != joinFieldName )
+      if ( hasSubset || joinFields.at( idx ).name() != joinFieldName )
       {
-        QgsField f = joinFields[idx];
+        QgsField f = joinFields.at( idx );
         f.setName( prefix + f.name() );
         fields.append( f, QgsFields::OriginJoin, idx + ( joinIdx*1000 ) );
       }
diff --git a/src/core/qgsvirtuallayerdefinition.cpp b/src/core/qgsvirtuallayerdefinition.cpp
@@ -201,9 +201,8 @@ QUrl QgsVirtualLayerDefinition::toUrl() const
       url.addQueryItem( "geometry", geometryField() );
   }
 
-  for ( int i = 0; i < fields().count(); i++ )
+  Q_FOREACH ( const QgsField& f, fields() )
   {
-    const QgsField& f = fields()[i];
     if ( f.type() == QVariant::Int )
       url.addQueryItem( "field", f.name() + ":int" );
     else if ( f.type() == QVariant::Double )
diff --git a/src/core/qgsvirtuallayerdefinitionutils.cpp b/src/core/qgsvirtuallayerdefinitionutils.cpp
@@ -64,10 +64,8 @@ QgsVirtualLayerDefinition QgsVirtualLayerDefinitionUtils::fromJoinedLayer( QgsVe
     }
     else
     {
-      const QgsFields& joinedFields = layer->dataProvider()->fields();
-      for ( int i = 0; i < joinedFields.count(); i++ )
+      Q_FOREACH ( const QgsField& f, layer->dataProvider()->fields() )
       {
-        const QgsField& f = joinedFields.field( i );
         columns << joinName + "." + f.name() + " AS " + prefix + f.name();
       }
     }
diff --git a/src/gui/qgsdatadefinedbutton.cpp b/src/gui/qgsdatadefinedbutton.cpp
@@ -166,10 +166,8 @@ void QgsDataDefinedButton::init( const QgsVectorLayer* vl,
   if ( mVectorLayer )
   {
     // store just a list of fields of unknown type or those that match the expected type
-    const QgsFields& fields = mVectorLayer->fields();
-    for ( int i = 0; i < fields.count(); ++i )
+    Q_FOREACH ( const QgsField& f, mVectorLayer->fields() )
     {
-      const QgsField& f = fields.at( i );
       bool fieldMatch = false;
       // NOTE: these are the only QVariant enums supported at this time (see QgsField)
       QString fieldType;
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -301,7 +301,7 @@ void QgsExpressionBuilderWidget::loadFieldNames( const QgsFields& fields )
   fieldNames.reserve( fields.count() );
   for ( int i = 0; i < fields.count(); ++i )
   {
-    QString fieldName = fields[i].name();
+    QString fieldName = fields.at( i ).name();
     fieldNames << fieldName;
     registerItem( "Fields and Values", fieldName, " \"" + fieldName + "\" ", "", QgsExpressionItem::Field, false, i );
   }
diff --git a/src/gui/qgsformannotationitem.cpp b/src/gui/qgsformannotationitem.cpp
@@ -99,7 +99,7 @@ QWidget* QgsFormAnnotationItem::createDesignerWidget( const QString& filePath )
       {
         if ( i < fields.count() )
         {
-          QWidget* attWidget = widget->findChild<QWidget*>( fields[i].name() );
+          QWidget* attWidget = widget->findChild<QWidget*>( fields.at( i ).name() );
           if ( attWidget )
           {
             QgsAttributeEditor::createAttributeEditor( widget, attWidget, mVectorLayer, i, attrs.at( i ) );
diff --git a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
@@ -68,10 +68,9 @@ QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVecto
   //insert attributes into combo box
   if ( layer )
   {
-    const QgsFields& layerAttributes = layer->fields();
-    for ( int idx = 0; idx < layerAttributes.count(); ++idx )
+    Q_FOREACH ( const QgsField& f, layer->fields() )
     {
-      mLabelFieldComboBox->addItem( layerAttributes[idx].name() );
+      mLabelFieldComboBox->addItem( f.name() );
     }
     mLabelFieldComboBox->addItem( tr( "None" ) );
 
diff --git a/src/gui/symbology-ng/qgsrendererv2widget.cpp b/src/gui/symbology-ng/qgsrendererv2widget.cpp
@@ -340,10 +340,8 @@ void QgsRendererV2DataDefinedMenus::populateMenu( QMenu* menu, const QString& fi
   menu->addSeparator();
 
   bool hasField = false;
-  const QgsFields & flds = mLayer->fields();
-  for ( int idx = 0; idx < flds.count(); ++idx )
+  Q_FOREACH ( const QgsField& fld, mLayer->fields() )
   {
-    const QgsField& fld = flds[idx];
     if ( fld.type() == QVariant::Int || fld.type() == QVariant::Double )
     {
       QAction* a = new QAction( fld.name(), actionGroup );
diff --git a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
@@ -24,12 +24,11 @@ QgsVectorFieldSymbolLayerWidget::QgsVectorFieldSymbolLayerWidget( const QgsVecto
 
   if ( mVectorLayer )
   {
-    const QgsFields& fm = mVectorLayer->fields();
     mXAttributeComboBox->addItem( "" );
     mYAttributeComboBox->addItem( "" );
-    for ( int idx = 0; idx < fm.count(); ++idx )
+    Q_FOREACH ( const QgsField& f, mVectorLayer->fields() )
     {
-      QString fieldName = fm[idx].name();
+      QString fieldName = f.name();
       mXAttributeComboBox->addItem( fieldName );
       mYAttributeComboBox->addItem( fieldName );
     }
diff --git a/src/plugins/grass/qgsgrassmoduleparam.cpp b/src/plugins/grass/qgsgrassmoduleparam.cpp
@@ -1192,16 +1192,15 @@ void QgsGrassModuleVectorField::updateFields()
     {
       continue;
     }
-    QgsFields fields = mLayerInput->currentFields();
 
     int index = 0;
-    for ( int i = 0; i < fields.size(); i++ )
+    Q_FOREACH ( const QgsField& field, mLayerInput->currentFields() )
     {
-      if ( mType.contains( fields.at( i ).typeName() ) )
+      if ( mType.contains( field.typeName() ) )
       {
-        comboBox->addItem( fields.at( i ).name() );
-        QgsDebugMsg( "current = " +  current + " field = " + fields.at( i ).name() );
-        if ( fields.at( i ).name() == current )
+        comboBox->addItem( field.name() );
+        QgsDebugMsg( "current = " +  current + " field = " + field.name() );
+        if ( field.name() == current )
         {
           comboBox->setCurrentIndex( index );
         }
diff --git a/src/plugins/interpolation/qgsinterpolationdialog.cpp b/src/plugins/interpolation/qgsinterpolationdialog.cpp
@@ -245,10 +245,8 @@ void QgsInterpolationDialog::on_mInputLayerComboBox_currentIndexChanged( const Q
   }
 
   //insert numeric attributes of layer into mInterpolationAttributesComboBox
-  const QgsFields& fields = provider->fields();
-  for ( int idx = 0; idx < fields.count(); ++idx )
+  Q_FOREACH ( const QgsField& currentField, provider->fields() )
   {
-    const QgsField& currentField = fields[idx];
     QVariant::Type currentType = currentField.type();
     if ( currentType == QVariant::Int || currentType == QVariant::Double )
     {
diff --git a/src/plugins/roadgraph/linevectorlayerwidget.cpp b/src/plugins/roadgraph/linevectorlayerwidget.cpp
@@ -209,10 +209,8 @@ void RgLineVectorLayerSettingsWidget::on_mcbLayers_selectItem()
   if ( !provider )
     return;
 
-  const QgsFields& fields = provider->fields();
-  for ( int idx = 0; idx < fields.count(); ++idx )
+  Q_FOREACH ( const QgsField& currentField, provider->fields() )
   {
-    const QgsField& currentField = fields[idx];
     QVariant currentType = currentField.type();
     if ( currentType == QVariant::Int || currentType == QVariant::String )
     {
diff --git a/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp b/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
@@ -218,12 +218,11 @@ bool QgsZonalStatisticsDialog::prefixIsValid( const QString& prefix ) const
     return false;
   }
 
-  const QgsFields& providerFields = dp->fields();
   QString currentFieldName;
 
-  for ( int idx = 0; idx < providerFields.count(); ++idx )
+  Q_FOREACH ( const QgsField& field, dp->fields() )
   {
-    currentFieldName = providerFields[idx].name();
+    currentFieldName = field.name();
     if ( currentFieldName == ( prefix + "mean" ) || currentFieldName == ( prefix + "sum" ) || currentFieldName == ( prefix + "count" ) )
     {
       return false;
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -2480,9 +2480,8 @@ void QgsGrass::createTable( dbDriver *driver, const QString tableName, const Qgs
   }
 
   QStringList fieldsStringList;
-  for ( int i = 0; i < fields.size(); i++ )
+  Q_FOREACH ( const QgsField& field, fields )
   {
-    QgsField field = fields.field( i );
     QString name = field.name().toLower().replace( " ", "_" );
     if ( name.at( 0 ).isDigit() )
     {
diff --git a/src/providers/grass/qgsgrassvectormaplayer.cpp b/src/providers/grass/qgsgrassvectormaplayer.cpp
diff --git a/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp b/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
diff --git a/src/server/qgswfsprojectparser.cpp b/src/server/qgswfsprojectparser.cpp
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp

Original file line number	Diff line number	Diff line change
`@@ -147,10 +147,10 @@ void QgsAtlasComposition::setSortKeyAttributeIndex( int idx )`
`147`	`147`	`{`
`148`	`148`	`if ( mCoverageLayer )`
`149`	`149`	`{`
`150`		`- const QgsFields fields = mCoverageLayer->fields();`
	`150`	`+ QgsFields fields = mCoverageLayer->fields();`
`151`	`151`	`if ( idx >= 0 && idx < fields.count() )`
`152`	`152`	`{`
`153`		`- mSortKeyAttributeName = fields[idx].name();`
	`153`	`+ mSortKeyAttributeName = fields.at( idx ).name();`
`154`	`154`	`return;`
`155`	`155`	`}`
`156`	`156`	`}`
`@@ -714,10 +714,10 @@ void QgsAtlasComposition::readXML( const QDomElement& atlasElem, const QDomDocum`
`714`	`714`	`int idx = mSortKeyAttributeName.toInt( &isIndex );`
`715`	`715`	`if ( isIndex && mCoverageLayer )`
`716`	`716`	`{`
`717`		`- const QgsFields fields = mCoverageLayer->fields();`
	`717`	`+ QgsFields fields = mCoverageLayer->fields();`
`718`	`718`	`if ( idx >= 0 && idx < fields.count() )`
`719`	`719`	`{`
`720`		`- mSortKeyAttributeName = fields[idx].name();`
	`720`	`+ mSortKeyAttributeName = fields.at( idx ).name();`
`721`	`721`	`}`
`722`	`722`	`}`
`723`	`723`	`mSortAscending = atlasElem.attribute( "sortAscending", "true" ) == "true" ? true : false;`
Original file line number	Diff line number	Diff line change
`@@ -181,14 +181,15 @@ void QgsComposerAttributeTable::resetColumns()`
`181`	`181`	`mColumns.clear();`
`182`	`182`
`183`	`183`	`//rebuild columns list from vector layer fields`
`184`		`- const QgsFields& fields = mVectorLayer->fields();`
`185`		`- for ( int idx = 0; idx < fields.count(); ++idx )`
	`184`	`+ int idx = 0;`
	`185`	`+ Q_FOREACH ( const QgsField& field, mVectorLayer->fields() )`
`186`	`186`	`{`
`187`	`187`	`QString currentAlias = mVectorLayer->attributeDisplayName( idx );`
`188`	`188`	`QgsComposerTableColumn* col = new QgsComposerTableColumn;`
`189`		`- col->setAttribute( fields[idx].name() );`
	`189`	`+ col->setAttribute( field.name() );`
`190`	`190`	`col->setHeading( currentAlias );`
`191`	`191`	`mColumns.append( col );`
	`192`	`+ idx++;`
`192`	`193`	`}`
`193`	`194`	`}`
`194`	`195`
`@@ -296,13 +297,15 @@ void QgsComposerAttributeTable::setDisplayAttributes( const QSet<int>& attr, boo`
`296`	`297`	`else`
`297`	`298`	`{`
`298`	`299`	`//resetting, so add all attributes to columns`
`299`		`- for ( int idx = 0; idx < fields.count(); ++idx )`
	`300`	`+ int idx = 0;`
	`301`	`+ Q_FOREACH ( const QgsField& field, fields )`
`300`	`302`	`{`
`301`	`303`	`QString currentAlias = mVectorLayer->attributeDisplayName( idx );`
`302`	`304`	`QgsComposerTableColumn* col = new QgsComposerTableColumn;`
`303`		`- col->setAttribute( fields[idx].name() );`
	`305`	`+ col->setAttribute( field.name() );`
`304`	`306`	`col->setHeading( currentAlias );`
`305`	`307`	`mColumns.append( col );`
	`308`	`+ idx++;`
`306`	`309`	`}`
`307`	`310`	`}`
`308`	`311`
Original file line number	Diff line number	Diff line change
`@@ -253,14 +253,15 @@ void QgsComposerAttributeTableV2::resetColumns()`
`253`	`253`	`mColumns.clear();`
`254`	`254`
`255`	`255`	`//rebuild columns list from vector layer fields`
`256`		`- const QgsFields& fields = source->fields();`
`257`		`- for ( int idx = 0; idx < fields.count(); ++idx )`
	`256`	`+ int idx = 0;`
	`257`	`+ Q_FOREACH ( const QgsField& field, source->fields() )`
`258`	`258`	`{`
`259`	`259`	`QString currentAlias = source->attributeDisplayName( idx );`
`260`	`260`	`QgsComposerTableColumn* col = new QgsComposerTableColumn;`
`261`		`- col->setAttribute( fields[idx].name() );`
	`261`	`+ col->setAttribute( field.name() );`
`262`	`262`	`col->setHeading( currentAlias );`
`263`	`263`	`mColumns.append( col );`
	`264`	`+ idx++;`
`264`	`265`	`}`
`265`	`266`	`}`
`266`	`267`
`@@ -393,13 +394,15 @@ void QgsComposerAttributeTableV2::setDisplayAttributes( const QSet<int>& attr, b`
`393`	`394`	`else`
`394`	`395`	`{`
`395`	`396`	`//resetting, so add all attributes to columns`
`396`		`- for ( int idx = 0; idx < fields.count(); ++idx )`
	`397`	`+ int idx = 0;`
	`398`	`+ Q_FOREACH ( const QgsField& field, fields )`
`397`	`399`	`{`
`398`	`400`	`QString currentAlias = source->attributeDisplayName( idx );`
`399`	`401`	`QgsComposerTableColumn* col = new QgsComposerTableColumn;`
`400`		`- col->setAttribute( fields[idx].name() );`
	`402`	`+ col->setAttribute( field.name() );`
`401`	`403`	`col->setHeading( currentAlias );`
`402`	`404`	`mColumns.append( col );`
	`405`	`+ idx++;`
`403`	`406`	`}`
`404`	`407`	`}`
`405`	`408`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ QString QgsEditFormConfig::widgetType( int fieldIdx ) const`
`29`	`29`	`if ( fieldIdx < 0 \|\| fieldIdx >= mFields.count() )`
`30`	`30`	`return "TextEdit";`
`31`	`31`
`32`		`- return mEditorWidgetV2Types.value( mFields[fieldIdx].name(), "TextEdit" );`
	`32`	`+ return mEditorWidgetV2Types.value( mFields.at( fieldIdx ).name(), "TextEdit" );`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`QString QgsEditFormConfig::widgetType( const QString& fieldName ) const`
`@@ -42,7 +42,7 @@ QgsEditorWidgetConfig QgsEditFormConfig::widgetConfig( int fieldIdx ) const`
`42`	`42`	`if ( fieldIdx < 0 \|\| fieldIdx >= mFields.count() )`
`43`	`43`	`return QgsEditorWidgetConfig();`
`44`	`44`
`45`		`- return mWidgetConfigs.value( mFields[fieldIdx].name() );`
	`45`	`+ return mWidgetConfigs.value( mFields.at( fieldIdx ).name() );`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`QgsEditorWidgetConfig QgsEditFormConfig::widgetConfig( const QString& widgetName ) const`
`@@ -82,7 +82,7 @@ bool QgsEditFormConfig::removeWidgetConfig( int fieldIdx )`
`82`	`82`	`if ( fieldIdx < 0 \|\| fieldIdx >= mFields.count() )`
`83`	`83`	`return false;`
`84`	`84`
`85`		`- return mWidgetConfigs.remove( mFields[fieldIdx].name() );`
	`85`	`+ return mWidgetConfigs.remove( mFields.at( fieldIdx ).name() );`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`void QgsEditFormConfig::setUiForm( const QString& ui )`
Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ QString QgsLabel::labelField( int attr ) const`
`504`	`504`	`int fieldIndex = mLabelFieldIdx[attr];`
`505`	`505`	`if ( fieldIndex < 0 \|\| fieldIndex >= mFields.count() )`
`506`	`506`	`return QString();`
`507`		`- return mFields[fieldIndex].name();`
	`507`	`+ return mFields.at( fieldIndex ).name();`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`QgsLabelAttributes *QgsLabel::labelAttributes( void )`
Original file line number	Diff line number	Diff line change
`@@ -461,11 +461,10 @@ QgsVectorLayer* QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlit`
`461`	`461`	`// create table`
`462`	`462`	`QString sql = QString( "CREATE TABLE '%1' (" ).arg( tableName );`
`463`	`463`	`QString delim = "";`
`464`		`- const QgsFields& fields = layer->dataProvider()->fields();`
`465`		`- for ( int idx = 0; idx < fields.count(); ++idx )`
	`464`	`+ Q_FOREACH ( const QgsField& field, layer->dataProvider()->fields() )`
`466`	`465`	`{`
`467`	`466`	`QString dataType = "";`
`468`		`- QVariant::Type type = fields[idx].type();`
	`467`	`+ QVariant::Type type = field.type();`
`469`	`468`	`if ( type == QVariant::Int \|\| type == QVariant::LongLong )`
`470`	`469`	`{`
`471`	`470`	`dataType = "INTEGER";`
`@@ -480,10 +479,10 @@ QgsVectorLayer* QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlit`
`480`	`479`	`}`
`481`	`480`	`else`
`482`	`481`	`{`
`483`		`- showWarning( tr( "%1: Unknown data type %2. Not using type affinity for the field." ).arg( fields[idx].name(), QVariant::typeToName( type ) ) );`
	`482`	`+ showWarning( tr( "%1: Unknown data type %2. Not using type affinity for the field." ).arg( field.name(), QVariant::typeToName( type ) ) );`
`484`	`483`	`}`
`485`	`484`
`486`		`- sql += delim + QString( "'%1' %2" ).arg( fields[idx].name(), dataType );`
	`485`	`+ sql += delim + QString( "'%1' %2" ).arg( field.name(), dataType );`
`487`	`486`	`delim = ',';`
`488`	`487`	`}`
`489`	`488`	`sql += ')';`
Original file line number	Diff line number	Diff line change
`@@ -254,9 +254,9 @@ void QgsVectorLayer::setDisplayField( const QString& fldName )`
`254`	`254`	`{`
`255`	`255`	`int fieldsSize = mUpdatedFields.size();`
`256`	`256`
`257`		`- for ( int idx = 0; idx < mUpdatedFields.count(); ++idx )`
	`257`	`+ Q_FOREACH ( const QgsField& field, mUpdatedFields )`
`258`	`258`	`{`
`259`		`- QString fldName = mUpdatedFields.at( idx ).name();`
	`259`	`+ QString fldName = field.name();`
`260`	`260`	`QgsDebugMsg( "Checking field " + fldName + " of " + QString::number( fieldsSize ) + " total" );`
`261`	`261`
`262`	`262`	`// Check the fields and keep the first one that matches.`
`@@ -2158,7 +2158,7 @@ QString QgsVectorLayer::attributeDisplayName( int attributeIndex ) const`
`2158`	`2158`	`{`
`2159`	`2159`	`if ( attributeIndex >= 0 && attributeIndex < mUpdatedFields.count() )`
`2160`	`2160`	`{`
`2161`		`- displayName = mUpdatedFields[attributeIndex].name();`
	`2161`	`+ displayName = mUpdatedFields.at( attributeIndex ).name();`
`2162`	`2162`	`}`
`2163`	`2163`	`}`
`2164`	`2164`	`return displayName;`
Original file line number	Diff line number	Diff line change
`@@ -225,10 +225,9 @@ bool QgsVectorLayerEditBuffer::addAttribute( const QgsField &field )`
`225`	`225`	`if ( field.name().isEmpty() )`
`226`	`226`	`return false;`
`227`	`227`
`228`		`- const QgsFields& updatedFields = L->fields();`
`229`		`- for ( int idx = 0; idx < updatedFields.count(); ++idx )`
	`228`	`+ Q_FOREACH ( const QgsField& updatedField, L->fields() )`
`230`	`229`	`{`
`231`		`- if ( updatedFields[idx].name() == field.name() )`
	`230`	`+ if ( updatedField.name() == field.name() )`
`232`	`231`	`return false;`
`233`	`232`	`}`
`234`	`233`
Original file line number	Diff line number	Diff line change
`@@ -240,14 +240,14 @@ void QgsVectorLayerJoinBuffer::updateFields( QgsFields& fields )`
`240`	`240`	`for ( int idx = 0; idx < joinFields.count(); ++idx )`
`241`	`241`	`{`
`242`	`242`	`// if using just a subset of fields, filter some of them out`
`243`		`- if ( hasSubset && !subset.contains( joinFields[idx].name() ) )`
	`243`	`+ if ( hasSubset && !subset.contains( joinFields.at( idx ).name() ) )`
`244`	`244`	`continue;`
`245`	`245`
`246`	`246`	`//skip the join field to avoid double field names (fields often have the same name)`
`247`	`247`	`// when using subset of field, use all the selected fields`
`248`		`- if ( hasSubset \|\| joinFields[idx].name() != joinFieldName )`
	`248`	`+ if ( hasSubset \|\| joinFields.at( idx ).name() != joinFieldName )`
`249`	`249`	`{`
`250`		`- QgsField f = joinFields[idx];`
	`250`	`+ QgsField f = joinFields.at( idx );`
`251`	`251`	`f.setName( prefix + f.name() );`
`252`	`252`	`fields.append( f, QgsFields::OriginJoin, idx + ( joinIdx*1000 ) );`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,9 +201,8 @@ QUrl QgsVirtualLayerDefinition::toUrl() const`
`201`	`201`	`url.addQueryItem( "geometry", geometryField() );`
`202`	`202`	`}`
`203`	`203`
`204`		`- for ( int i = 0; i < fields().count(); i++ )`
	`204`	`+ Q_FOREACH ( const QgsField& f, fields() )`
`205`	`205`	`{`
`206`		`- const QgsField& f = fields()[i];`
`207`	`206`	`if ( f.type() == QVariant::Int )`
`208`	`207`	`url.addQueryItem( "field", f.name() + ":int" );`
`209`	`208`	`else if ( f.type() == QVariant::Double )`