Skip to content

Commit 06cf59a

Browse files
nyalldawsonnyalldawson
committedOct 22, 2016
Add missing references in Q_FOREACH loops
·
ltr-3_40final-3_0_0
1 parent 35ecdd1 commit 06cf59a

11 files changed

+23
-19
lines changed
 

‎src/core/qgsexpression.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3264,7 +3264,7 @@ static QVariant fcnArrayRemoveAll( const QVariantList& values, const QgsExpressi
32643264
static QVariant fcnArrayCat( const QVariantList& values, const QgsExpressionContext*, QgsExpression* parent )
32653265
{
32663266
QVariantList list;
3267-
Q_FOREACH ( QVariant cur, values )
3267+
Q_FOREACH ( const QVariant& cur, values )
32683268
{
32693269
list += getListValue( cur, parent );
32703270
}
@@ -3274,7 +3274,11 @@ static QVariant fcnArrayCat( const QVariantList& values, const QgsExpressionCont
32743274
static QVariant fcnArrayIntersect( const QVariantList& values, const QgsExpressionContext*, QgsExpression* parent )
32753275
{
32763276
const QVariantList array1 = getListValue( values.at( 0 ), parent );
3277-
Q_FOREACH ( QVariant cur, getListValue( values.at( 1 ), parent ) ) if ( array1.contains( cur ) ) return QVariant( true );
3277+
Q_FOREACH ( const QVariant& cur, getListValue( values.at( 1 ), parent ) )
3278+
{
3279+
if ( array1.contains( cur ) )
3280+
return QVariant( true );
3281+
}
32783282
return QVariant( false );
32793283
}
32803284

@@ -3315,7 +3319,7 @@ static QVariant fcnMapInsert( const QVariantList& values, const QgsExpressionCon
33153319
static QVariant fcnMapConcat( const QVariantList& values, const QgsExpressionContext*, QgsExpression* parent )
33163320
{
33173321
QVariantMap result;
3318-
Q_FOREACH ( QVariant cur, values )
3322+
Q_FOREACH ( const QVariant& cur, values )
33193323
{
33203324
const QVariantMap curMap = getMapValue( cur, parent );
33213325
for ( QVariantMap::const_iterator it = curMap.constBegin(); it != curMap.constEnd(); ++it )

‎src/core/qgsjsonutils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ QVariantList QgsJSONUtils::parseArray( const QString& json, QVariant::Type type
299299
QgsLogger::warning( QString( "Cannot parse json (%1) as array: %2" ).arg( error.errorString(), json ) );
300300
return result;
301301
}
302-
Q_FOREACH ( const QJsonValue cur, jsonDoc.array() )
302+
Q_FOREACH ( const QJsonValue& cur, jsonDoc.array() )
303303
{
304304
QVariant curVariant = cur.toVariant();
305305
if ( curVariant.convert( type ) )
@@ -308,4 +308,4 @@ QVariantList QgsJSONUtils::parseArray( const QString& json, QVariant::Type type
308308
QgsLogger::warning( QString( "Cannot convert json array element: %1" ).arg( cur.toString() ) );
309309
}
310310
return result;
311-
}
311+
}

‎src/core/qgsogcutils.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3293,7 +3293,7 @@ QDomElement QgsOgcUtilsSQLStatementToFilter::toOgcFilter( const QgsSQLStatement:
32933293
}
32943294

32953295
QList<QDomElement> listElem;
3296-
Q_FOREACH ( QString columnName, node->usingColumns() )
3296+
Q_FOREACH ( const QString& columnName, node->usingColumns() )
32973297
{
32983298
QDomElement eqElem = mDoc.createElement( mFilterPrefix + ":PropertyIsEqualTo" );
32993299
QDomElement propElem1 = mDoc.createElement( mFilterPrefix + ":" + mPropertyName );
@@ -3312,7 +3312,7 @@ QDomElement QgsOgcUtilsSQLStatementToFilter::toOgcFilter( const QgsSQLStatement:
33123312
else if ( listElem.size() > 1 )
33133313
{
33143314
QDomElement andElem = mDoc.createElement( mFilterPrefix + ":And" );
3315-
Q_FOREACH ( QDomElement elem, listElem )
3315+
Q_FOREACH ( const QDomElement& elem, listElem )
33163316
{
33173317
andElem.appendChild( elem );
33183318
}
@@ -3383,7 +3383,7 @@ QDomElement QgsOgcUtilsSQLStatementToFilter::toOgcFilter( const QgsSQLStatement:
33833383
else if ( listElem.size() > 1 )
33843384
{
33853385
QDomElement andElem = mDoc.createElement( mFilterPrefix + ":And" );
3386-
Q_FOREACH ( QDomElement elem, listElem )
3386+
Q_FOREACH ( const QDomElement& elem, listElem )
33873387
{
33883388
andElem.appendChild( elem );
33893389
}

‎src/core/qgssqlstatement.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ bool QgsSQLStatement::doBasicValidationChecks( QString& errorMsgOut ) const
231231
QgsSQLStatementCollectTableNames v;
232232
mRootNode->accept( v );
233233

234-
Q_FOREACH ( QgsSQLStatementCollectTableNames::TableColumnPair pair, v.tableNamesReferenced )
234+
Q_FOREACH ( const QgsSQLStatementCollectTableNames::TableColumnPair& pair, v.tableNamesReferenced )
235235
{
236236
if ( !v.tableNamesDeclared.contains( pair.first ) )
237237
{

‎src/core/qgsvectorfilewriter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,
263263
{
264264
QFileInfoList fileList = dir.entryInfoList(
265265
QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::AllDirs | QDir::Files, QDir::DirsFirst );
266-
Q_FOREACH ( QFileInfo info, fileList )
266+
Q_FOREACH ( const QFileInfo& info, fileList )
267267
{
268268
QFile::remove( info.absoluteFilePath() );
269269
}

‎src/providers/arcgisrest/qgsafsdataitems.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ QVector<QgsDataItem*> QgsAfsRootItem::createChildren()
3737
{
3838
QVector<QgsDataItem*> connections;
3939

40-
foreach ( QString connName, QgsOwsConnection::connectionList( "ArcGisFeatureServer" ) )
40+
Q_FOREACH ( const QString& connName, QgsOwsConnection::connectionList( "ArcGisFeatureServer" ) )
4141
{
4242
QgsOwsConnection connection( "ArcGisFeatureServer", connName );
4343
QString path = "afs:/" + connName;

‎src/providers/arcgisrest/qgsamsdataitems.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ QVector<QgsDataItem*> QgsAmsRootItem::createChildren()
3333
{
3434
QVector<QgsDataItem*> connections;
3535

36-
foreach ( QString connName, QgsOwsConnection::connectionList( "ArcGisMapServer" ) )
36+
Q_FOREACH ( const QString& connName, QgsOwsConnection::connectionList( "ArcGisMapServer" ) )
3737
{
3838
QgsOwsConnection connection( "ArcGisMapServer", connName );
3939
QString path = "ams:/" + connName;

‎src/providers/arcgisrest/qgsarcgisrestutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static QgsAbstractGeometry* parseEsriGeometryMultiPoint( const QVariantMap& geom
202202
return nullptr;
203203

204204
QgsMultiPointV2* multiPoint = new QgsMultiPointV2();
205-
foreach ( QVariant coordData, coordsList )
205+
Q_FOREACH ( const QVariant& coordData, coordsList )
206206
{
207207
QVariantList coordList = coordData.toList();
208208
QgsPointV2* p = parsePoint( coordList, pointType );

‎src/providers/wfs/qgswfsdatasourceuri.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ QgsWFSDataSourceURI::QgsWFSDataSourceURI( const QString& uri )
3030
// Transform all param keys to lowercase
3131
typedef QPair<QString, QString> queryItem;
3232
QList<queryItem> items( url.queryItems() );
33-
foreach ( queryItem item, items )
33+
Q_FOREACH ( const queryItem& item, items )
3434
{
3535
url.removeQueryItem( item.first );
3636
url.addQueryItem( item.first.toLower(), item.second );

‎src/providers/wfs/qgswfsprovider.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ bool QgsWFSProvider::processSQL( const QString& sqlString, QString& errorMsg, QS
410410
}
411411

412412
QString concatenatedTypenames;
413-
Q_FOREACH ( QString typeName, typenameList )
413+
Q_FOREACH ( const QString& typeName, typenameList )
414414
{
415415
if ( !concatenatedTypenames.isEmpty() )
416416
concatenatedTypenames += ",";
@@ -441,7 +441,7 @@ bool QgsWFSProvider::processSQL( const QString& sqlString, QString& errorMsg, QS
441441
mShared->mLayerPropertiesList.clear();
442442
QMap < QString, QgsFields > mapTypenameToFields;
443443
QMap < QString, QString > mapTypenameToGeometryAttribute;
444-
Q_FOREACH ( QString typeName, typenameList )
444+
Q_FOREACH ( const QString& typeName, typenameList )
445445
{
446446
QString geometryAttribute;
447447
QgsFields fields;
@@ -558,7 +558,7 @@ bool QgsWFSProvider::processSQL( const QString& sqlString, QString& errorMsg, QS
558558
else
559559
{
560560
// * syntax
561-
Q_FOREACH ( QString typeName, typenameList )
561+
Q_FOREACH ( const QString& typeName, typenameList )
562562
{
563563
const QgsFields tableFields = mapTypenameToFields[typeName];
564564
for ( int i = 0; i < tableFields.size();i++ )

‎src/providers/wfs/qgswfsshareddata.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ bool QgsWFSSharedData::createCache()
383383
{
384384
mCacheTablename = "features";
385385
sql = QString( "CREATE TABLE %1 (%2 INTEGER PRIMARY KEY" ).arg( mCacheTablename, fidName );
386-
Q_FOREACH ( QgsField field, cacheFields )
386+
Q_FOREACH ( const QgsField& field, cacheFields )
387387
{
388388
QString type( "VARCHAR" );
389389
if ( field.type() == QVariant::Int )
@@ -830,7 +830,7 @@ void QgsWFSSharedData::serializeFeatures( QVector<QgsWFSFeatureGmlIdPair>& featu
830830
QVector<QgsWFSFeatureGmlIdPair> updatedFeatureList;
831831

832832
QgsRectangle localComputedExtent( mComputedExtent );
833-
Q_FOREACH ( QgsWFSFeatureGmlIdPair featPair, featureList )
833+
Q_FOREACH ( const QgsWFSFeatureGmlIdPair& featPair, featureList )
834834
{
835835
const QgsFeature& gmlFeature = featPair.first;
836836

0 commit comments

Comments
 (0)
Please sign in to comment.