Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Avoid potential QgsFields detachments
  • Loading branch information
@nyalldawson
nyalldawson committed Aug 4, 2016
1 parent ed4d34f commit 4f3564c
Show file tree
Hide file tree
Showing 25 changed files with 68 additions and 68 deletions.
2 changes: 1 addition & 1 deletion src/analysis/vector/qgsoverlayanalyzer.cpp
View file
Expand Up @@ -192,7 +192,7 @@ void QgsOverlayAnalyzer::combineFieldLists( QgsFields& fieldListA, const QgsFiel

for ( int idx = 0; idx < fieldListB.count(); ++idx )
{
QgsField field = fieldListB[idx];
QgsField field = fieldListB.at( idx );
int count = 0;
while ( names.contains( field.name() ) )
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsdelattrdialog.cpp
View file
Expand Up @@ -34,7 +34,7 @@ QgsDelAttrDialog::QgsDelAttrDialog( const QgsVectorLayer* vl )
const QgsFields& layerAttributes = vl->fields();
for ( int idx = 0; idx < layerAttributes.count(); ++idx )
{
QListWidgetItem* item = new QListWidgetItem( layerAttributes[idx].name(), listBox2 );
QListWidgetItem* item = new QListWidgetItem( layerAttributes.at( idx ).name(), listBox2 );
switch ( vl->fields().fieldOrigin( idx ) )
{
case QgsFields::OriginExpression:
Expand Down
8 changes: 4 additions & 4 deletions src/app/qgsdiagramproperties.cpp
View file
Expand Up @@ -184,14 +184,14 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer,
for ( int idx = 0; idx < layerFields.count(); ++idx )
{
QTreeWidgetItem *newItem = new QTreeWidgetItem( mAttributesTreeWidget );
QString name = QString( "\"%1\"" ).arg( layerFields[idx].name() );
QString name = QString( "\"%1\"" ).arg( layerFields.at( idx ).name() );
newItem->setText( 0, name );
newItem->setData( 0, Qt::UserRole, name );
newItem->setFlags( newItem->flags() & ~Qt::ItemIsDropEnabled );

mDataDefinedXComboBox->addItem( layerFields[idx].name(), idx );
mDataDefinedYComboBox->addItem( layerFields[idx].name(), idx );
mDataDefinedVisibilityComboBox->addItem( layerFields[idx].name(), idx );
mDataDefinedXComboBox->addItem( layerFields.at( idx ).name(), idx );
mDataDefinedYComboBox->addItem( layerFields.at( idx ).name(), idx );
mDataDefinedVisibilityComboBox->addItem( layerFields.at( idx ).name(), idx );
}

const QgsDiagramRendererV2* dr = layer->diagramRenderer();
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsfieldcalculator.cpp
View file
Expand Up @@ -234,7 +234,7 @@ void QgsFieldCalculator::accept()

for ( int idx = 0; idx < fields.count(); ++idx )
{
if ( fields[idx].name() == mOutputFieldNameLineEdit->text() )
if ( fields.at( idx ).name() == mOutputFieldNameLineEdit->text() )
{
mAttributeId = idx;
break;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsfieldsproperties.cpp
View file
Expand Up @@ -576,7 +576,7 @@ void QgsFieldsProperties::attributeAdded( int idx )
const QgsFields &fields = mLayer->fields();
int row = mFieldsList->rowCount();
mFieldsList->insertRow( row );
setRow( row, idx, fields[idx] );
setRow( row, idx, fields.at( idx ) );
mFieldsList->setCurrentCell( row, idx );

for ( int i = idx + 1; i < mIndexedWidgets.count(); i++ )
Expand Down
14 changes: 7 additions & 7 deletions src/app/qgsidentifyresultsdialog.cpp
View file
Expand Up @@ -493,7 +493,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
featItem->addChild( attrItem );

attrItem->setData( 0, Qt::DisplayRole, vlayer->attributeDisplayName( i ) );
attrItem->setData( 0, Qt::UserRole, fields[i].name() );
attrItem->setData( 0, Qt::UserRole, fields.at( i ).name() );
attrItem->setData( 0, Qt::UserRole + 1, i );

attrItem->setData( 1, Qt::UserRole, value );
Expand All @@ -515,7 +515,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
attrItem->treeWidget()->setItemWidget( attrItem, 1, nullptr );
}

if ( fields[i].name() == vlayer->displayField() )
if ( fields.at( i ).name() == vlayer->displayField() )
{
featItem->setText( 0, attrItem->text( 0 ) );
featItem->setText( 1, attrItem->text( 1 ) );
Expand Down Expand Up @@ -560,11 +560,11 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
tblResults->setItem( j, 1, item );

item = new QTableWidgetItem( QString::number( i ) );
if ( fields[i].name() == vlayer->displayField() )
if ( fields.at( i ).name() == vlayer->displayField() )
item->setData( Qt::DisplayRole, vlayer->attributeDisplayName( i ) + " *" );
else
item->setData( Qt::DisplayRole, vlayer->attributeDisplayName( i ) );
item->setData( Qt::UserRole, fields[i].name() );
item->setData( Qt::UserRole, fields.at( i ).name() );
item->setData( Qt::UserRole + 1, i );
tblResults->setItem( j, 2, item );

Expand Down Expand Up @@ -765,7 +765,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,

QTreeWidgetItem *attrItem = new QTreeWidgetItem( QStringList() << QString::number( i ) << attrs.at( i ).toString() );

attrItem->setData( 0, Qt::DisplayRole, fields[i].name() );
attrItem->setData( 0, Qt::DisplayRole, fields.at( i ).name() );

QVariant value = attrs.at( i );
attrItem->setData( 1, Qt::DisplayRole, value );
Expand Down Expand Up @@ -1188,7 +1188,7 @@ void QgsIdentifyResultsDialog::doAction( QTreeWidgetItem *item, int action )
const QgsFields& fields = layer->fields();
for ( int fldIdx = 0; fldIdx < fields.count(); ++fldIdx )
{
if ( fields[fldIdx].name() == fieldName )
if ( fields.at( fldIdx ).name() == fieldName )
{
idx = fldIdx;
break;
Expand Down Expand Up @@ -1741,7 +1741,7 @@ void QgsIdentifyResultsDialog::copyFeatureAttributes()
if ( attrIdx < 0 || attrIdx >= fields.count() )
continue;

text += QString( "%1: %2\n" ).arg( fields[attrIdx].name(), it.value().toString() );
text += QString( "%1: %2\n" ).arg( fields.at( attrIdx ).name(), it.value().toString() );
}
}
else if ( rlayer )
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgslabelpropertydialog.cpp
View file
Expand Up @@ -103,7 +103,7 @@ void QgsLabelPropertyDialog::init( const QString& layerId, const QString& provid
{
mLabelTextLineEdit->setText( attributeValues.at( mCurLabelField ).toString() );
const QgsFields& layerFields = vlayer->fields();
switch ( layerFields[mCurLabelField].type() )
switch ( layerFields.at( mCurLabelField ).type() )
{
case QVariant::Double:
mLabelTextLineEdit->setValidator( new QDoubleValidator( this ) );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmergeattributesdialog.cpp
View file
Expand Up @@ -358,7 +358,7 @@ QVariant QgsMergeAttributesDialog::calcStatistic( int col, QgsStatisticalSummary

if ( values.isEmpty() )
{
return QVariant( mVectorLayer->fields()[col].type() );
return QVariant( mVectorLayer->fields().at( col ).type() );
}

summary.calculate( values );
Expand Down
4 changes: 2 additions & 2 deletions src/core/composer/qgscomposerattributetable.cpp
View file
Expand Up @@ -241,7 +241,7 @@ void QgsComposerAttributeTable::setDisplayAttributes( const QSet<int>& attr, boo
}
QString currentAlias = mVectorLayer->attributeDisplayName( attrIdx );
QgsComposerTableColumn* col = new QgsComposerTableColumn;
col->setAttribute( fields[attrIdx].name() );
col->setAttribute( fields.at( attrIdx ).name() );
col->setHeading( currentAlias );
mColumns.append( col );
}
Expand Down Expand Up @@ -652,7 +652,7 @@ bool QgsComposerAttributeTable::readXml( const QDomElement& itemElem, const QDom
//find corresponding column
Q_FOREACH ( QgsComposerTableColumn* column, mColumns )
{
if ( column->attribute() == fields[attribute].name() )
if ( column->attribute() == fields.at( attribute ).name() )
{
column->setSortByRank( i + 1 );
column->setSortOrder( order );
Expand Down
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposerattributetablev2.cpp
View file
Expand Up @@ -338,7 +338,7 @@ void QgsComposerAttributeTableV2::setDisplayAttributes( const QSet<int>& attr, b
}
QString currentAlias = source->attributeDisplayName( attrIdx );
QgsComposerTableColumn* col = new QgsComposerTableColumn;
col->setAttribute( fields[attrIdx].name() );
col->setAttribute( fields.at( attrIdx ).name() );
col->setHeading( currentAlias );
mColumns.append( col );
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgsactionmanager.cpp
View file
Expand Up @@ -210,13 +210,13 @@ QString QgsActionManager::expandAction( QString action, const QgsAttributeMap &a
switch ( i )
{
case 0:
to_replace = "[%" + fields[attrIdx].name() + ']';
to_replace = "[%" + fields.at( attrIdx ).name() + ']';
break;
case 1:
to_replace = "[%" + mLayer->attributeDisplayName( attrIdx ) + ']';
break;
case 2:
to_replace = '%' + fields[attrIdx].name();
to_replace = '%' + fields.at( attrIdx ).name();
break;
case 3:
to_replace = '%' + mLayer->attributeDisplayName( attrIdx );
Expand Down
8 changes: 4 additions & 4 deletions src/core/qgsgml.cpp
View file
Expand Up @@ -294,7 +294,7 @@ QgsGmlStreamingParser::QgsGmlStreamingParser( const QString& typeName,
mThematicAttributes.clear();
for ( int i = 0; i < fields.size(); i++ )
{
mThematicAttributes.insert( fields[i].name(), qMakePair( i, fields[i] ) );
mThematicAttributes.insert( fields.at( i ).name(), qMakePair( i, fields.at( i ) ) );
}

mEndian = QgsApplication::endian();
Expand Down Expand Up @@ -355,13 +355,13 @@ QgsGmlStreamingParser::QgsGmlStreamingParser( const QList<LayerProperties>& laye
mThematicAttributes.clear();
for ( int i = 0; i < fields.size(); i++ )
{
QMap< QString, QPair<QString, QString> >::const_iterator att_it = mapFieldNameToSrcLayerNameFieldName.constFind( fields[i].name() );
QMap< QString, QPair<QString, QString> >::const_iterator att_it = mapFieldNameToSrcLayerNameFieldName.constFind( fields.at( i ).name() );
if ( att_it != mapFieldNameToSrcLayerNameFieldName.constEnd() )
{
if ( mLayerProperties.size() == 1 )
mThematicAttributes.insert( att_it.value().second, qMakePair( i, fields[i] ) );
mThematicAttributes.insert( att_it.value().second, qMakePair( i, fields.at( i ) ) );
else
mThematicAttributes.insert( stripNS( att_it.value().first ) + "|" + att_it.value().second, qMakePair( i, fields[i] ) );
mThematicAttributes.insert( stripNS( att_it.value().first ) + "|" + att_it.value().second, qMakePair( i, fields.at( i ) ) );
}
}
bool alreadyFoundGeometry = false;
Expand Down
6 changes: 3 additions & 3 deletions src/core/qgsvectorfilewriter.cpp
View file
Expand Up @@ -398,13 +398,13 @@ void QgsVectorFileWriter::init( QString vectorFileName,

for ( int fldIdx = 0; fldIdx < fields.count(); ++fldIdx )
{
QgsField attrField = fields[fldIdx];
QgsField attrField = fields.at( fldIdx );

OGRFieldType ogrType = OFTString; //default to string

if ( fieldValueConverter )
{
attrField = fieldValueConverter->fieldDefinition( fields[fldIdx] );
attrField = fieldValueConverter->fieldDefinition( fields.at( fldIdx ) );
}

int ogrWidth = attrField.length();
Expand Down Expand Up @@ -489,7 +489,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,
name = QString( "ogc_fid%1" ).arg( i );

int j;
for ( j = 0; j < fields.size() && name.compare( fields[j].name(), Qt::CaseInsensitive ) != 0; j++ )
for ( j = 0; j < fields.size() && name.compare( fields.at( j ).name(), Qt::CaseInsensitive ) != 0; j++ )
;

if ( j == fields.size() )
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsquerybuilder.cpp
View file
Expand Up @@ -77,7 +77,7 @@ void QgsQueryBuilder::populateFields()
// only consider native fields
continue;
}
QStandardItem *myItem = new QStandardItem( fields[idx].name() );
QStandardItem *myItem = new QStandardItem( fields.at( idx ).name() );
myItem->setData( idx );
myItem->setEditable( false );
mModelFields->insertRow( mModelFields->rowCount(), myItem );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgssearchquerybuilder.cpp
View file
Expand Up @@ -77,7 +77,7 @@ void QgsSearchQueryBuilder::populateFields()
const QgsFields& fields = mLayer->fields();
for ( int idx = 0; idx < fields.count(); ++idx )
{
QString fieldName = fields[idx].name();
QString fieldName = fields.at( idx ).name();
mFieldMap[fieldName] = idx;
QStandardItem *myItem = new QStandardItem( fieldName );
myItem->setEditable( false );
Expand Down
6 changes: 3 additions & 3 deletions src/providers/db2/qgsdb2provider.cpp
View file
Expand Up @@ -1332,7 +1332,7 @@ QgsVectorLayerImport::ImportError QgsDb2Provider::createEmptyLayer( const QStrin
QString pk = primaryKey = "QGS_FID";
for ( int i = 0; i < fieldCount; ++i )
{
if ( fields[i].name() == primaryKey )
if ( fields.at( i ).name() == primaryKey )
{
// it already exists, try again with a new name
primaryKey = QString( "%1_%2" ).arg( pk ).arg( index++ );
Expand All @@ -1345,10 +1345,10 @@ QgsVectorLayerImport::ImportError QgsDb2Provider::createEmptyLayer( const QStrin
// search for the passed field
for ( int i = 0; i < fieldCount; ++i )
{
if ( fields[i].name() == primaryKey )
if ( fields.at( i ).name() == primaryKey )
{
// found, get the field type
QgsField fld = fields[i];
QgsField fld = fields.at( i );
if ( convertField( fld ) )
{
primaryKeyType = fld.typeName();
Expand Down
2 changes: 1 addition & 1 deletion src/providers/memory/qgsmemoryprovider.cpp
View file
Expand Up @@ -262,7 +262,7 @@ QString QgsMemoryProvider::dataSourceUri( bool expandAuthConfig ) const
QgsAttributeList attrs = const_cast<QgsMemoryProvider *>( this )->attributeIndexes();
for ( int i = 0; i < attrs.size(); i++ )
{
QgsField field = mFields[attrs[i]];
QgsField field = mFields.at( attrs[i] );
QString fieldDef = field.name();
fieldDef.append( QString( ":%2(%3,%4)" ).arg( field.typeName() ).arg( field.length() ).arg( field.precision() ) );
uri.addQueryItem( "field", fieldDef );
Expand Down
8 changes: 4 additions & 4 deletions src/providers/mssql/qgsmssqlprovider.cpp
View file
Expand Up @@ -1669,7 +1669,7 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer( const QStr
QString pk = primaryKey = "qgs_fid";
for ( int i = 0, n = fields.size(); i < n; ++i )
{
if ( fields[i].name() == primaryKey )
if ( fields.at( i ).name() == primaryKey )
{
// it already exists, try again with a new name
primaryKey = QString( "%1_%2" ).arg( pk ).arg( index++ );
Expand All @@ -1682,10 +1682,10 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer( const QStr
// search for the passed field
for ( int i = 0, n = fields.size(); i < n; ++i )
{
if ( fields[i].name() == primaryKey )
if ( fields.at( i ).name() == primaryKey )
{
// found, get the field type
QgsField fld = fields[i];
QgsField fld = fields.at( i );
if ( convertField( fld ) )
{
primaryKeyType = fld.typeName();
Expand Down Expand Up @@ -1830,7 +1830,7 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer( const QStr
QList<QgsField> flist;
for ( int i = 0, n = fields.size(); i < n; ++i )
{
QgsField fld = fields[i];
QgsField fld = fields.at( i );
if ( oldToNewAttrIdxMap && fld.name() == primaryKey )
{
oldToNewAttrIdxMap->insert( fields.fieldNameIndex( fld.name() ), 0 );
Expand Down
6 changes: 3 additions & 3 deletions src/providers/oracle/qgsoraclefeatureiterator.cpp
View file
Expand Up @@ -452,14 +452,14 @@ bool QgsOracleFeatureIterator::openQuery( QString whereClause, bool showLog )
break;

case pktInt:
query += delim + QgsOracleProvider::quotedIdentifier( mSource->mFields[ mSource->mPrimaryKeyAttrs[0] ].name() );
query += delim + QgsOracleProvider::quotedIdentifier( mSource->mFields.at( mSource->mPrimaryKeyAttrs[0] ).name() );
delim = ",";
break;

case pktFidMap:
Q_FOREACH ( int idx, mSource->mPrimaryKeyAttrs )
{
query += delim + mConnection->fieldExpression( mSource->mFields[idx] );
query += delim + mConnection->fieldExpression( mSource->mFields.at( idx ) );
delim = ",";
}
break;
Expand All @@ -475,7 +475,7 @@ bool QgsOracleFeatureIterator::openQuery( QString whereClause, bool showLog )
if ( mSource->mPrimaryKeyAttrs.contains( idx ) )
continue;

query += delim + mConnection->fieldExpression( mSource->mFields[idx] );
query += delim + mConnection->fieldExpression( mSource->mFields.at( idx ) );
}

query += QString( " FROM %1 \"FEATUREREQUEST\"" ).arg( mSource->mQuery );
Expand Down
18 changes: 9 additions & 9 deletions src/providers/oracle/qgsoracleprovider.cpp
View file
Expand Up @@ -181,7 +181,7 @@ QgsOracleProvider::QgsOracleProvider( QString const & uri )
Q_FOREACH ( int idx, mPrimaryKeyAttrs )
{
Q_ASSERT( idx >= 0 && idx < mAttributeFields.size() );
key += delim + mAttributeFields[ idx ].name();
key += delim + mAttributeFields.at( idx ).name();
delim = ",";
}
}
Expand Down Expand Up @@ -416,7 +416,7 @@ QString QgsOracleUtils::whereClause( QgsFeatureId featureId, const QgsFields& fi
{
case pktInt:
Q_ASSERT( primaryKeyAttrs.size() == 1 );
whereClause = QString( "%1=%2" ).arg( QgsOracleConn::quotedIdentifier( fields[ primaryKeyAttrs[0] ].name() ) ).arg( featureId );
whereClause = QString( "%1=%2" ).arg( QgsOracleConn::quotedIdentifier( fields.at( primaryKeyAttrs[0] ).name() ) ).arg( featureId );
break;

case pktRowId:
Expand Down Expand Up @@ -966,9 +966,9 @@ bool QgsOracleProvider::determinePrimaryKey()
int idx = fieldNameIndex( mUri.keyColumn() );

if ( idx >= 0 && (
mAttributeFields[idx].type() == QVariant::Int ||
mAttributeFields[idx].type() == QVariant::LongLong ||
mAttributeFields[idx].type() == QVariant::Double
mAttributeFields.at( idx ).type() == QVariant::Int ||
mAttributeFields.at( idx ).type() == QVariant::LongLong ||
mAttributeFields.at( idx ).type() == QVariant::Double
) )
{
if ( mUseEstimatedMetadata || uniqueData( mQuery, primaryKey ) )
Expand Down Expand Up @@ -1299,7 +1299,7 @@ bool QgsOracleProvider::addFeatures( QgsFeatureList &flist )
}
else
{
values += delim + quotedValue( v, mAttributeFields[idx].type() );
values += delim + quotedValue( v, mAttributeFields.at( idx ).type() );
}
}
else
Expand Down Expand Up @@ -2091,7 +2091,7 @@ bool QgsOracleProvider::setSubsetString( const QString& theSQL, bool updateFeatu
}
qry.finish();

if ( mPrimaryKeyType == pktInt && !uniqueData( mQuery, mAttributeFields[ mPrimaryKeyAttrs[0] ].name() ) )
if ( mPrimaryKeyType == pktInt && !uniqueData( mQuery, mAttributeFields.at( mPrimaryKeyAttrs[0] ).name() ) )
{
mSqlWhereClause = prevWhere;
return false;
Expand Down Expand Up @@ -2649,7 +2649,7 @@ QgsVectorLayerImport::ImportError QgsOracleProvider::createEmptyLayer(
int idx = fields.indexFromName( primaryKey );
if ( idx >= 0 )
{
QgsField fld = fields[idx];
QgsField fld = fields.at( idx );
if ( convertField( fld ) )
{
primaryKeyType = fld.typeName();
Expand Down Expand Up @@ -2856,7 +2856,7 @@ QgsVectorLayerImport::ImportError QgsOracleProvider::createEmptyLayer(
QList<QgsField> launderedFields;
for ( int i = 0; i < fields.size(); i++ )
{
QgsField fld = fields[i];
QgsField fld = fields.at( i );

QString name = fld.name().left( 30 ).toUpper();

Expand Down

0 comments on commit 4f3564c

Please sign in to comment.