Skip to content

Commit ffdf39e

Browse files
nyalldawsonnyalldawson
committedOct 19, 2018
Modernize some code
·
ltr-3_40final-3_4_0
1 parent ac4f7b5 commit ffdf39e

9 files changed

+49
-37
lines changed
 

‎src/providers/arcgisrest/qgsafsprovider.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ QgsAfsProvider::QgsAfsProvider( const QString &uri, const ProviderOptions &optio
122122
QString objectIdFieldName;
123123

124124
// Read fields
125-
foreach ( const QVariant &fieldData, layerData["fields"].toList() )
125+
const QVariantList fields = layerData.value( QStringLiteral( "fields" ) ).toList();
126+
for ( const QVariant &fieldData : fields )
126127
{
127128
const QVariantMap fieldDataMap = fieldData.toMap();
128129
const QString fieldName = fieldDataMap[QStringLiteral( "name" )].toString();
@@ -189,7 +190,8 @@ QgsAfsProvider::QgsAfsProvider( const QString &uri, const ProviderOptions &optio
189190
break;
190191
}
191192
}
192-
foreach ( const QVariant &objectId, objectIdData["objectIds"].toList() )
193+
const QVariantList objectIds = objectIdData.value( QStringLiteral( "objectIds" ) ).toList();
194+
for ( const QVariant &objectId : objectIds )
193195
{
194196
mSharedData->mObjectIds.append( objectId.toInt() );
195197
}

‎src/providers/arcgisrest/qgsafsshareddata.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ bool QgsAfsSharedData::getFeature( QgsFeatureId id, QgsFeature &f, const QgsRect
100100
const QVariantMap attributesData = featureData[QStringLiteral( "attributes" )].toMap();
101101
feature.setFields( mFields );
102102
QgsAttributes attributes( mFields.size() );
103-
foreach ( int idx, fetchAttribIdx )
103+
for ( int idx : qgis::as_const( fetchAttribIdx ) )
104104
{
105105
QVariant attribute = attributesData[mFields.at( idx ).name()];
106106
if ( attribute.isNull() )

‎src/providers/arcgisrest/qgsafssourceselect.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ bool QgsAfsSourceSelect::connectToService( const QgsOwsConnection &connection )
4545
}
4646

4747
QStringList layerErrors;
48-
foreach ( const QVariant &layerInfo, serviceInfoMap["layers"].toList() )
48+
const QVariantList layers = serviceInfoMap.value( QStringLiteral( "layers" ) ).toList();
49+
for ( const QVariant &layerInfo : layers )
4950
{
5051
const QVariantMap layerInfoMap = layerInfo.toMap();
5152
if ( !layerInfoMap[QStringLiteral( "id" )].isValid() )

‎src/providers/arcgisrest/qgsamsdataitems.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include <QImageReader>
2828

29-
QgsAmsRootItem::QgsAmsRootItem( QgsDataItem *parent, QString name, QString path )
29+
QgsAmsRootItem::QgsAmsRootItem( QgsDataItem *parent, const QString &name, const QString &path )
3030
: QgsDataCollectionItem( parent, name, path )
3131
{
3232
mCapabilities |= Fast | Collapse;
@@ -38,7 +38,8 @@ QVector<QgsDataItem *> QgsAmsRootItem::createChildren()
3838
{
3939
QVector<QgsDataItem *> connections;
4040

41-
Q_FOREACH ( const QString &connName, QgsOwsConnection::connectionList( "arcgismapserver" ) )
41+
const QStringList connectionList = QgsOwsConnection::connectionList( QStringLiteral( "arcgismapserver" ) );
42+
for ( const QString &connName : connectionList )
4243
{
4344
QgsOwsConnection connection( QStringLiteral( "arcgismapserver" ), connName );
4445
QString path = "ams:/" + connName;
@@ -82,7 +83,7 @@ void QgsAmsRootItem::newConnection()
8283

8384
///////////////////////////////////////////////////////////////////////////////
8485

85-
QgsAmsConnectionItem::QgsAmsConnectionItem( QgsDataItem *parent, QString name, QString path, QString url )
86+
QgsAmsConnectionItem::QgsAmsConnectionItem( QgsDataItem *parent, const QString &name, const QString &path, const QString &url )
8687
: QgsDataCollectionItem( parent, name, path )
8788
, mUrl( url )
8889
{
@@ -102,10 +103,11 @@ QVector<QgsDataItem *> QgsAmsConnectionItem::createChildren()
102103
QString authid = QgsArcGisRestUtils::parseSpatialReference( serviceData[QStringLiteral( "spatialReference" )].toMap() ).authid();
103104
QString format = QStringLiteral( "jpg" );
104105
bool found = false;
105-
QList<QByteArray> supportedFormats = QImageReader::supportedImageFormats();
106-
foreach ( const QString &encoding, serviceData["supportedImageFormatTypes"].toString().split( ',' ) )
106+
const QList<QByteArray> supportedFormats = QImageReader::supportedImageFormats();
107+
const QStringList supportedImageFormatTypes = serviceData.value( QStringLiteral( "supportedImageFormatTypes" ) ).toString().split( ',' );
108+
for ( const QString &encoding : supportedImageFormatTypes )
107109
{
108-
foreach ( const QByteArray &fmt, supportedFormats )
110+
for ( const QByteArray &fmt : supportedFormats )
109111
{
110112
if ( encoding.startsWith( fmt, Qt::CaseInsensitive ) )
111113
{
@@ -118,7 +120,8 @@ QVector<QgsDataItem *> QgsAmsConnectionItem::createChildren()
118120
break;
119121
}
120122

121-
foreach ( const QVariant &layerInfo, serviceData["layers"].toList() )
123+
const QVariantList layersList = serviceData.value( QStringLiteral( "layers" ) ).toList();
124+
for ( const QVariant &layerInfo : layersList )
122125
{
123126
QVariantMap layerInfoMap = layerInfo.toMap();
124127
QString id = layerInfoMap[QStringLiteral( "id" )].toString();
@@ -131,7 +134,7 @@ QVector<QgsDataItem *> QgsAmsConnectionItem::createChildren()
131134

132135
bool QgsAmsConnectionItem::equal( const QgsDataItem *other )
133136
{
134-
const QgsAmsConnectionItem *o = dynamic_cast<const QgsAmsConnectionItem *>( other );
137+
const QgsAmsConnectionItem *o = qobject_cast<const QgsAmsConnectionItem *>( other );
135138
return ( type() == other->type() && o && mPath == o->mPath && mName == o->mName );
136139
}
137140

‎src/providers/arcgisrest/qgsamsdataitems.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class QgsAmsRootItem : public QgsDataCollectionItem
2626
{
2727
Q_OBJECT
2828
public:
29-
QgsAmsRootItem( QgsDataItem *parent, QString name, QString path );
29+
QgsAmsRootItem( QgsDataItem *parent, const QString &name, const QString &path );
3030

3131
QVector<QgsDataItem *> createChildren() override;
3232

@@ -49,7 +49,7 @@ class QgsAmsConnectionItem : public QgsDataCollectionItem
4949
{
5050
Q_OBJECT
5151
public:
52-
QgsAmsConnectionItem( QgsDataItem *parent, QString name, QString path, QString url );
52+
QgsAmsConnectionItem( QgsDataItem *parent, const QString &name, const QString &path, const QString &url );
5353
QVector<QgsDataItem *> createChildren() override;
5454
bool equal( const QgsDataItem *other ) override;
5555
#ifdef HAVE_GUI

‎src/providers/arcgisrest/qgsamsprovider.cpp

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,17 @@ void QgsAmsLegendFetcher::handleFinished()
7171
QVariantMap queryResults = doc.object().toVariantMap();
7272
QgsDataSourceUri dataSource( mProvider->dataSourceUri() );
7373
QVector< QPair<QString, QImage> > legendEntries;
74-
foreach ( const QVariant &result, queryResults["layers"].toList() )
74+
const QVariantList layersList = queryResults.value( QStringLiteral( "layers" ) ).toList();
75+
for ( const QVariant &result : layersList )
7576
{
7677
QVariantMap queryResultMap = result.toMap();
7778
QString layerId = queryResultMap[QStringLiteral( "layerId" )].toString();
7879
if ( layerId != dataSource.param( QStringLiteral( "layer" ) ) && !mProvider->subLayers().contains( layerId ) )
7980
{
8081
continue;
8182
}
82-
QVariantList legendSymbols = queryResultMap[QStringLiteral( "legend" )].toList();
83-
foreach ( const QVariant &legendEntry, legendSymbols )
83+
const QVariantList legendSymbols = queryResultMap[QStringLiteral( "legend" )].toList();
84+
for ( const QVariant &legendEntry : legendSymbols )
8485
{
8586
QVariantMap legendEntryMap = legendEntry.toMap();
8687
QString label = legendEntryMap[QStringLiteral( "label" )].toString();
@@ -99,7 +100,7 @@ void QgsAmsLegendFetcher::handleFinished()
99100

100101
typedef QPair<QString, QImage> LegendEntry_t;
101102
QSize maxImageSize( 0, 0 );
102-
foreach ( const LegendEntry_t &legendEntry, legendEntries )
103+
for ( const LegendEntry_t &legendEntry : qgis::as_const( legendEntries ) )
103104
{
104105
maxImageSize.setWidth( std::max( maxImageSize.width(), legendEntry.second.width() ) );
105106
maxImageSize.setHeight( std::max( maxImageSize.height(), legendEntry.second.height() ) );
@@ -111,7 +112,7 @@ void QgsAmsLegendFetcher::handleFinished()
111112
mLegendImage.fill( Qt::transparent );
112113
QPainter painter( &mLegendImage );
113114
int i = 0;
114-
foreach ( const LegendEntry_t &legendEntry, legendEntries )
115+
for ( const LegendEntry_t &legendEntry : qgis::as_const( legendEntries ) )
115116
{
116117
QImage symbol = legendEntry.second.scaled( legendEntry.second.width() * scaleFactor, legendEntry.second.height() * scaleFactor, Qt::KeepAspectRatio, Qt::SmoothTransformation );
117118
painter.drawImage( 0, vpadding + i * ( imageSize + vpadding ) + ( imageSize - symbol.height() ), symbol );
@@ -144,7 +145,9 @@ QgsAmsProvider::QgsAmsProvider( const QString &uri, const ProviderOptions &optio
144145
appendError( QgsErrorMessage( tr( "Could not parse spatial reference" ), QStringLiteral( "AMSProvider" ) ) );
145146
return;
146147
}
147-
foreach ( const QVariant &sublayer, mLayerInfo["subLayers"].toList() )
148+
const QVariantList subLayersList = mLayerInfo.value( QStringLiteral( "subLayers" ) ).toList();
149+
mSubLayers.reserve( subLayersList.size() );
150+
for ( const QVariant &sublayer : subLayersList )
148151
{
149152
mSubLayers.append( sublayer.toMap()[QStringLiteral( "id" )].toString() );
150153
mSubLayerVisibilities.append( true );
@@ -157,6 +160,7 @@ QgsAmsProvider::QgsAmsProvider( const QString &uri, const ProviderOptions &optio
157160
QStringList QgsAmsProvider::subLayerStyles() const
158161
{
159162
QStringList styles;
163+
styles.reserve( mSubLayers.size() );
160164
for ( int i = 0, n = mSubLayers.size(); i < n; ++i )
161165
{
162166
styles.append( QString() );
@@ -170,7 +174,7 @@ void QgsAmsProvider::setLayerOrder( const QStringList &layers )
170174
QList<bool> oldSubLayerVisibilities = mSubLayerVisibilities;
171175
mSubLayers.clear();
172176
mSubLayerVisibilities.clear();
173-
foreach ( const QString &layer, layers )
177+
for ( const QString &layer : layers )
174178
{
175179
// Search for match
176180
for ( int i = 0, n = oldSubLayers.size(); i < n; ++i )
@@ -273,7 +277,7 @@ void QgsAmsProvider::draw( const QgsRectangle &viewExtent, int pixelWidth, int p
273277
double oy = origin[QStringLiteral( "y" )].toDouble();
274278

275279
// Search matching resolution (tile resolution <= targetRes)
276-
QList<QVariant> lodEntries = tileInfo[QStringLiteral( "lods" )].toList();
280+
const QList<QVariant> lodEntries = tileInfo[QStringLiteral( "lods" )].toList();
277281
if ( lodEntries.isEmpty() )
278282
{
279283
mCachedImage = QImage();
@@ -282,7 +286,7 @@ void QgsAmsProvider::draw( const QgsRectangle &viewExtent, int pixelWidth, int p
282286
}
283287
int level = 0;
284288
double resolution = lodEntries.front().toMap()[QStringLiteral( "resolution" )].toDouble();
285-
foreach ( const QVariant &lodEntry, lodEntries )
289+
for ( const QVariant &lodEntry : lodEntries )
286290
{
287291
QVariantMap lodEntryMap = lodEntry.toMap();
288292
level = lodEntryMap[QStringLiteral( "level" )].toInt();

‎src/providers/arcgisrest/qgsamssourceselect.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ bool QgsAmsSourceSelect::connectToService( const QgsOwsConnection &connection )
4747
populateImageEncodings( serviceInfoMap[QStringLiteral( "supportedImageFormatTypes" )].toString().split( ',' ) );
4848

4949
QStringList layerErrors;
50-
foreach ( const QVariant &layerInfo, serviceInfoMap["layers"].toList() )
50+
const QVariantList layersList = serviceInfoMap[QStringLiteral( "layers" )].toList();
51+
for ( const QVariant &layerInfo : layersList )
5152
{
5253
QVariantMap layerInfoMap = layerInfo.toMap();
5354
if ( !layerInfoMap[QStringLiteral( "id" )].isValid() )

‎src/providers/arcgisrest/qgsarcgisrestutils.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ static std::unique_ptr< QgsPoint > parsePoint( const QVariantList &coordList, Qg
125125

126126
static std::unique_ptr< QgsCircularString > parseCircularString( const QVariantMap &curveData, QgsWkbTypes::Type pointType, const QgsPoint &startPoint )
127127
{
128-
QVariantList coordsList = curveData[QStringLiteral( "c" )].toList();
128+
const QVariantList coordsList = curveData[QStringLiteral( "c" )].toList();
129129
if ( coordsList.isEmpty() )
130130
return nullptr;
131131
QVector<QgsPoint> points;
132132
points.append( startPoint );
133-
foreach ( const QVariant &coordData, coordsList )
133+
for ( const QVariant &coordData : coordsList )
134134
{
135135
std::unique_ptr< QgsPoint > point = parsePoint( coordData.toList(), pointType );
136136
if ( !point )
@@ -150,7 +150,7 @@ static std::unique_ptr< QgsCompoundCurve > parseCompoundCurve( const QVariantLis
150150
std::unique_ptr< QgsCompoundCurve > compoundCurve = qgis::make_unique< QgsCompoundCurve >();
151151
QgsLineString *lineString = new QgsLineString();
152152
compoundCurve->addCurve( lineString );
153-
foreach ( const QVariant &curveData, curvesList )
153+
for ( const QVariant &curveData : curvesList )
154154
{
155155
if ( curveData.type() == QVariant::List )
156156
{
@@ -230,7 +230,7 @@ static std::unique_ptr< QgsMultiCurve > parseEsriGeometryPolyline( const QVarian
230230
if ( pathsList.isEmpty() )
231231
return nullptr;
232232
std::unique_ptr< QgsMultiCurve > multiCurve = qgis::make_unique< QgsMultiCurve >();
233-
foreach ( const QVariant &pathData, pathsList )
233+
for ( const QVariant &pathData : qgis::as_const( pathsList ) )
234234
{
235235
std::unique_ptr< QgsCompoundCurve > curve = parseCompoundCurve( pathData.toList(), pointType );
236236
if ( !curve )
@@ -392,7 +392,7 @@ QVariantMap QgsArcGisRestUtils::getObjects( const QString &layerurl, const QList
392392
QString &errorTitle, QString &errorText, QgsFeedback *feedback )
393393
{
394394
QStringList ids;
395-
foreach ( int id, objectIds )
395+
for ( int id : objectIds )
396396
{
397397
ids.append( QString::number( id ) );
398398
}
@@ -413,8 +413,8 @@ QVariantMap QgsArcGisRestUtils::getObjects( const QString &layerurl, const QList
413413
queryUrl.addQueryItem( QStringLiteral( "returnGeometry" ), QStringLiteral( "false" ) );
414414
queryUrl.addQueryItem( QStringLiteral( "outFields" ), outFields );
415415
}
416-
queryUrl.addQueryItem( QStringLiteral( "returnM" ), fetchM ? "true" : "false" );
417-
queryUrl.addQueryItem( QStringLiteral( "returnZ" ), fetchZ ? "true" : "false" );
416+
queryUrl.addQueryItem( QStringLiteral( "returnM" ), fetchM ? QStringLiteral( "true" ) : QStringLiteral( "false" ) );
417+
queryUrl.addQueryItem( QStringLiteral( "returnZ" ), fetchZ ? QStringLiteral( "true" ) : QStringLiteral( "false" ) );
418418
if ( !filterRect.isNull() )
419419
{
420420
queryUrl.addQueryItem( QStringLiteral( "geometry" ), QStringLiteral( "%1,%2,%3,%4" )

‎src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ void QgsArcGisServiceSourceSelect::populateImageEncodings( const QStringList &av
118118
delete item;
119119
}
120120
bool first = true;
121-
QList<QByteArray> supportedFormats = QImageReader::supportedImageFormats();
122-
foreach ( const QString &encoding, availableEncodings )
121+
const QList<QByteArray> supportedFormats = QImageReader::supportedImageFormats();
122+
for ( const QString &encoding : availableEncodings )
123123
{
124124
bool supported = false;
125-
foreach ( const QByteArray &fmt, supportedFormats )
125+
for ( const QByteArray &fmt : supportedFormats )
126126
{
127127
if ( encoding.startsWith( fmt, Qt::CaseInsensitive ) )
128128
{
@@ -149,9 +149,9 @@ QString QgsArcGisServiceSourceSelect::getSelectedImageEncoding() const
149149

150150
void QgsArcGisServiceSourceSelect::populateConnectionList()
151151
{
152-
QStringList conns = QgsOwsConnection::connectionList( mServiceName );
152+
const QStringList conns = QgsOwsConnection::connectionList( mServiceName );
153153
cmbConnections->clear();
154-
foreach ( const QString &item, conns )
154+
for ( const QString &item : conns )
155155
{
156156
cmbConnections->addItem( item );
157157
}
@@ -383,7 +383,8 @@ void QgsArcGisServiceSourceSelect::changeCrsFilter()
383383
if ( crsIterator != mAvailableCRS.constEnd() )
384384
{
385385
QSet<QString> crsNames;
386-
foreach ( const QString &crsName, crsIterator.value() )
386+
const QStringList crsNamesList = crsIterator.value();
387+
for ( const QString &crsName : crsNamesList )
387388
{
388389
crsNames.insert( crsName );
389390
}

0 commit comments

Comments
 (0)
Please sign in to comment.