Also avoid detaching QgsFields and QgsAttributes where possible

Author: nyalldawson

src/analysis/vector/qgsgeometryanalyzer.cpp

@@ -485,8 +485,8 @@ bool QgsGeometryAnalyzer::convexHull( QgsVectorLayer* layer, const QString& shap
       values = simpleMeasure( dissolveGeometry );
       QgsAttributes attributes( 3 );
       attributes[0] = QVariant( currentKey );
-      attributes[1] = values[ 0 ];
-      attributes[2] = values[ 1 ];
+      attributes[1] = values.at( 0 );
+      attributes[2] = values.at( 1 );
       QgsFeature dissolveFeature;
       dissolveFeature.setAttributes( attributes );
       dissolveFeature.setGeometry( dissolveGeometry );

src/analysis/vector/qgsoverlayanalyzer.cpp

@@ -185,7 +185,7 @@ void QgsOverlayAnalyzer::combineFieldLists( QgsFields& fieldListA, const QgsFiel
 {
   QList<QString> names;
   for ( int idx = 0; idx < fieldListA.count(); ++idx )
-    names.append( fieldListA[idx].name() );
+    names.append( fieldListA.at( idx ).name() );
 
   for ( int idx = 0; idx < fieldListB.count(); ++idx )
   {

src/app/qgisapp.cpp

@@ -6164,14 +6164,14 @@ void QgisApp::mergeAttributesOfSelectedFeatures()
 
       QVariant val = merged.at( i );
       // convert to destination data type
-      if ( ! vl->fields()[i].convertCompatible( val ) )
+      if ( ! vl->fields().at( i ).convertCompatible( val ) )
       {
         if ( firstFeature )
         {
           //only warn on first feature
           messageBar()->pushMessage(
             tr( "Invalid result" ),
-            tr( "Could not store value '%1' in field of type %2" ).arg( merged.at( i ).toString(), vl->fields()[i].typeName() ),
+            tr( "Could not store value '%1' in field of type %2" ).arg( merged.at( i ).toString(), vl->fields().at( i ).typeName() ),
             QgsMessageBar::WARNING );
         }
       }
@@ -6301,11 +6301,11 @@ void QgisApp::mergeSelectedFeatures()
   {
     QVariant val = attrs.at( i );
     // convert to destination data type
-    if ( ! vl->fields()[i].convertCompatible( val ) )
+    if ( ! vl->fields().at( i ).convertCompatible( val ) )
     {
       messageBar()->pushMessage(
         tr( "Invalid result" ),
-        tr( "Could not store value '%1' in field of type %2" ).arg( attrs.at( i ).toString(), vl->fields()[i].typeName() ),
+        tr( "Could not store value '%1' in field of type %2" ).arg( attrs.at( i ).toString(), vl->fields().at( i ).typeName() ),
         QgsMessageBar::WARNING );
     }
     attrs[i] = val;
@@ -6527,13 +6527,13 @@ void QgisApp::editPaste( QgsMapLayer *destinationLayer )
       if ( pkAttrList.contains( dst ) )
       {
         dstAttr[ dst ] = pasteVectorLayer->dataProvider()->defaultValue( dst );
-        if ( !dstAttr[ dst ].isNull() )
+        if ( !dstAttr.at( dst ).isNull() )
           continue;
         else if ( pasteVectorLayer->providerType() == "spatialite" )
           continue;
       }
 
-      dstAttr[ dst ] = srcAttr[ src ];
+      dstAttr[ dst ] = srcAttr.at( src );
     }
 
     featureIt->setAttributes( dstAttr );

src/app/qgsattributetabledialog.cpp

@@ -389,7 +389,7 @@ void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, const
   << QgsExpressionContextUtils::projectScope()
   << QgsExpressionContextUtils::layerScope( layer );
 
-  QgsField fld = layer->fields()[ fieldindex ];
+  QgsField fld = layer->fields().at( fieldindex );
 
   //go through all the features and change the new attributes
   QgsFeatureIterator fit = layer->getFeatures( request );

src/app/qgsattributetypedialog.cpp

@@ -43,7 +43,7 @@ QgsAttributeTypeDialog::QgsAttributeTypeDialog( QgsVectorLayer *vl, int fieldIdx
     , mFieldIdx( fieldIdx )
 {
   setupUi( this );
-  setWindowTitle( tr( "Edit Widget Properties - %1 (%2)" ).arg( vl->fields()[fieldIdx].name(), vl->name() ) );
+  setWindowTitle( tr( "Edit Widget Properties - %1 (%2)" ).arg( vl->fields().at( fieldIdx ).name(), vl->name() ) );
 
   connect( selectionListWidget, SIGNAL( currentRowChanged( int ) ), this, SLOT( setStackPage( int ) ) );
 

src/app/qgsclipboard.cpp

@@ -91,7 +91,7 @@ void QgsClipboard::setSystemClipboard()
 
   for ( int idx = 0; idx < mFeatureFields.count(); ++idx )
   {
-    textFields += mFeatureFields[idx].name();
+    textFields += mFeatureFields.at( idx ).name();
   }
   textLines += textFields.join( "\t" );
   textFields.clear();
@@ -116,7 +116,7 @@ void QgsClipboard::setSystemClipboard()
     for ( int idx = 0; idx < attributes.count(); ++idx )
     {
       // QgsDebugMsg(QString("inspecting field '%1'.").arg(it2->toString()));
-      textFields += attributes[idx].toString();
+      textFields += attributes.at( idx ).toString();
     }
 
     textLines += textFields.join( "\t" );

src/app/qgsdxfexportdialog.cpp

@@ -72,7 +72,7 @@ void FieldSelectorDelegate::setEditorData( QWidget *editor, const QModelIndex &i
 
   int idx = m->attributeIndex( vl );
   if ( vl->fields().exists( idx ) )
-    fcb->setField( vl->fields()[ idx ].name() );
+    fcb->setField( vl->fields().at( idx ).name() );
 }
 
 void FieldSelectorDelegate::setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const
@@ -217,7 +217,7 @@ QVariant QgsVectorLayerAndAttributeModel::data( const QModelIndex& idx, int role
     if ( role == Qt::DisplayRole )
     {
       if ( vl->fields().exists( idx ) )
-        return vl->fields()[ idx ].name();
+        return vl->fields().at( idx ).name();
       else
         return vl->name();
     }

src/app/qgsfeatureaction.cpp

@@ -231,10 +231,10 @@ void QgsFeatureAction::onFeatureSaved( const QgsFeature& feature )
     {
       QgsAttributes newValues = feature.attributes();
       QgsAttributeMap origValues = sLastUsedValues[ mLayer ];
-      if ( origValues[idx] != newValues[idx] )
+      if ( origValues[idx] != newValues.at( idx ) )
       {
         QgsDebugMsg( QString( "saving %1 for %2" ).arg( sLastUsedValues[ mLayer ][idx].toString() ).arg( idx ) );
-        sLastUsedValues[ mLayer ][idx] = newValues[idx];
+        sLastUsedValues[ mLayer ][idx] = newValues.at( idx );
       }
     }
   }

src/app/qgsfieldcalculator.cpp

@@ -252,7 +252,7 @@ void QgsFieldCalculator::accept()
     bool useGeometry = exp.needsGeometry();
     int rownum = 1;
 
-    QgsField field = mVectorLayer->fields()[mAttributeId];
+    QgsField field = mVectorLayer->fields().at( mAttributeId );
 
     bool newField = !mUpdateExistingGroupBox->isChecked();
     QVariant emptyAttribute;

src/app/qgsidentifyresultsdialog.cpp

@@ -471,7 +471,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
     if ( i >= fields.count() )
       continue;
 
-    QString value = fields[i].displayString( attrs[i] );
+    QString value = fields.at( i ).displayString( attrs.at( i ) );
     QTreeWidgetItem *attrItem = new QTreeWidgetItem( QStringList() << QString::number( i ) << value );
 
     attrItem->setData( 0, Qt::DisplayRole, vlayer->attributeDisplayName( i ) );
@@ -486,7 +486,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
       continue;
     }
 
-    value = representValue( vlayer, fields[i].name(), attrs[i] );
+    value = representValue( vlayer, fields[i].name(), attrs.at( i ) );
 
     attrItem->setData( 1, Qt::DisplayRole, value );
 
@@ -513,8 +513,8 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
     if ( i >= fields.count() )
       continue;
 
-    QString value = fields[i].displayString( attrs[i] );
-    QString value2 = representValue( vlayer, fields[i].name(), value );
+    QString value = fields.at( i ).displayString( attrs.at( i ) );
+    QString value2 = representValue( vlayer, fields.at( i ).name(), value );
 
     tblResults->setRowCount( j + 1 );
 
@@ -734,11 +734,11 @@ void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,
       if ( i >= fields.count() )
         continue;
 
-      QTreeWidgetItem *attrItem = new QTreeWidgetItem( QStringList() << QString::number( i ) << attrs[i].toString() );
+      QTreeWidgetItem *attrItem = new QTreeWidgetItem( QStringList() << QString::number( i ) << attrs.at( i ).toString() );
 
       attrItem->setData( 0, Qt::DisplayRole, fields[i].name() );
 
-      QVariant value = attrs[i];
+      QVariant value = attrs.at( i );
       attrItem->setData( 1, Qt::DisplayRole, value );
       featItem->addChild( attrItem );
     }