Skip to content

Commit f6d0fc0

Browse files
rldhontrldhont
committed
[Server] Q_FOREACH replaced by for
1 parent 29d280f commit f6d0fc0

11 files changed

+45
-46
lines changed

‎src/server/qgsaccesscontrol.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
void QgsAccessControl::resolveFilterFeatures( const QList<QgsMapLayer *> &layers )
2626
{
27-
Q_FOREACH ( QgsMapLayer *l, layers )
27+
for ( QgsMapLayer *l : layers )
2828
{
2929
if ( l->type() == QgsMapLayer::LayerType::VectorLayer )
3030
{

‎src/server/qgsrequesthandler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ void QgsRequestHandler::parseInput()
228228
typedef QPair<QString, QString> pair_t;
229229
QUrlQuery query( inputString );
230230
QList<pair_t> items = query.queryItems();
231-
Q_FOREACH ( pair_t pair, items )
231+
for ( pair_t pair : items )
232232
{
233233
// QUrl::fromPercentEncoding doesn't replace '+' with space
234234
const QString key = QUrl::fromPercentEncoding( pair.first.replace( '+', ' ' ).toUtf8() );

‎src/server/qgsserverplugins.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ bool QgsServerPlugins::initPlugins( QgsServerInterface *interface )
9090
//Init plugins: loads a list of installed plugins and filter them
9191
//for "server" metadata
9292
bool atLeastOneEnabled = false;
93-
Q_FOREACH ( const QString &pluginName, sPythonUtils->pluginList() )
93+
for ( const QString &pluginName : sPythonUtils->pluginList() )
9494
{
9595
QString pluginService = sPythonUtils->getPluginMetadata( pluginName, QStringLiteral( "server" ) );
9696
if ( pluginService == QLatin1String( "True" ) )

‎src/server/qgsservicenativeloader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void QgsServiceNativeLoader::loadModules( const QString &modulePath, QgsServiceR
7070
qDebug() << QString( "Checking %1 for native services modules" ).arg( moduleDir.path() );
7171
//QgsDebugMsg( QString( "Checking %1 for native services modules" ).arg( moduleDir.path() ) );
7272

73-
Q_FOREACH ( const QFileInfo &fi, moduleDir.entryInfoList() )
73+
for ( const QFileInfo &fi : moduleDir.entryInfoList() )
7474
{
7575
QgsServiceModule *module = loadNativeModule( fi.filePath() );
7676
if ( module )

‎src/server/services/wfs/qgswfsgetfeature.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ namespace QgsWfs
317317
accessControl->filterFeatures( vlayer, featureRequest );
318318

319319
QStringList attributes = QStringList();
320-
Q_FOREACH ( int idx, attrIndexes )
320+
for ( int idx : attrIndexes )
321321
{
322322
attributes.append( vlayer->fields().field( idx ).name() );
323323
}

‎src/server/services/wms/qgslayerrestorer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
QgsLayerRestorer::QgsLayerRestorer( const QList<QgsMapLayer *> &layers )
2525
{
26-
Q_FOREACH ( QgsMapLayer *layer, layers )
26+
for ( QgsMapLayer *layer : layers )
2727
{
2828
QgsLayerSettings settings;
2929
settings.name = layer->name();

‎src/server/services/wms/qgswmsdescribelayer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ namespace QgsWms
113113
// WCS layers
114114
QStringList wcsLayerIds = QgsServerProjectUtils::wcsLayerIds( *project );
115115

116-
Q_FOREACH ( QgsMapLayer *layer, project->mapLayers() )
116+
for ( QgsMapLayer *layer : project->mapLayers() )
117117
{
118118
QString name = layer->name();
119119
if ( useLayerIds )

‎src/server/services/wms/qgswmsgetcapabilities.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ namespace QgsWms
11691169
//href needs to be a prefix
11701170
QString hrefString = href.toString( QUrl::FullyDecoded );
11711171
hrefString.append( href.hasQuery() ? "&" : "?" );
1172-
Q_FOREACH ( QString styleName, currentLayer->styleManager()->styles() )
1172+
for ( const QString &styleName : currentLayer->styleManager()->styles() )
11731173
{
11741174
QDomElement styleElem = doc.createElement( QStringLiteral( "Style" ) );
11751175
QDomElement styleNameElem = doc.createElement( QStringLiteral( "Name" ) );
@@ -1268,7 +1268,7 @@ namespace QgsWms
12681268
}
12691269
else //no crs constraint
12701270
{
1271-
Q_FOREACH ( const QString &crs, crsList )
1271+
for ( const QString &crs : crsList )
12721272
{
12731273
appendCrsElementToLayer( doc, layerElement, CRSPrecedingElement, crs );
12741274
}
@@ -1379,7 +1379,7 @@ namespace QgsWms
13791379
}
13801380
else //no crs constraint
13811381
{
1382-
Q_FOREACH ( const QString &crs, crsList )
1382+
for ( const QString &crs : crsList )
13831383
{
13841384
appendLayerBoundingBox( doc, layerElem, layerExtent, layerCRS, crs, project );
13851385
}

‎src/server/services/wms/qgswmsgetcontext.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ namespace QgsWms
435435

436436
void appendOwsLayerStyles( QDomDocument &doc, QDomElement &layerElem, QgsMapLayer *currentLayer )
437437
{
438-
Q_FOREACH ( QString styleName, currentLayer->styleManager()->styles() )
438+
for ( const QString &styleName : currentLayer->styleManager()->styles() )
439439
{
440440
QDomElement styleListElem = doc.createElement( QStringLiteral( "StyleList" ) );
441441
//only one default style in project file mode

‎src/server/services/wms/qgswmsgetstyles.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ namespace QgsWms
133133
// WMS restricted layers
134134
QStringList restrictedLayers = QgsServerProjectUtils::wmsRestrictedLayers( *project );
135135

136-
Q_FOREACH ( QgsMapLayer *layer, project->mapLayers() )
136+
for ( QgsMapLayer *layer : project->mapLayers() )
137137
{
138138
QString name = layer->name();
139139
if ( useLayerIds )
@@ -172,7 +172,7 @@ namespace QgsWms
172172
if ( vlayer->isSpatial() )
173173
{
174174
QString currentStyle = vlayer->styleManager()->currentStyle();
175-
Q_FOREACH ( QString styleName, vlayer->styleManager()->styles() )
175+
for ( const QString &styleName : vlayer->styleManager()->styles() )
176176
{
177177
vlayer->styleManager()->setCurrentStyle( styleName );
178178
QDomElement styleElem = vlayer->renderer()->writeSld( myDocument, styleName );

‎src/server/services/wms/qgswmsrenderer.cpp

+32-33
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ namespace QgsWms
111111

112112
QgsLayerTreeModelLegendNode *_findLegendNodeForRule( QgsLayerTreeModel *legendModel, const QString &rule )
113113
{
114-
Q_FOREACH ( QgsLayerTreeLayer *nodeLayer, legendModel->rootGroup()->findLayers() )
114+
for ( QgsLayerTreeLayer *nodeLayer : legendModel->rootGroup()->findLayers() )
115115
{
116-
Q_FOREACH ( QgsLayerTreeModelLegendNode *legendNode, legendModel->layerLegendNodes( nodeLayer ) )
116+
for ( QgsLayerTreeModelLegendNode *legendNode : legendModel->layerLegendNodes( nodeLayer ) )
117117
{
118118
if ( legendNode->data( Qt::DisplayRole ).toString() == rule )
119119
return legendNode;
@@ -181,7 +181,7 @@ namespace QgsWms
181181
std::reverse( layers.begin(), layers.end() );
182182

183183
// check permissions
184-
Q_FOREACH ( QgsMapLayer *ml, layers )
184+
for ( QgsMapLayer *ml : layers )
185185
checkLayerReadPermissions( ml );
186186

187187
// build layer tree model for legend
@@ -241,7 +241,7 @@ namespace QgsWms
241241
{
242242
QgsRenderContext context = QgsRenderContext::fromMapSettings( mapSettings );
243243

244-
Q_FOREACH ( const QString &id, mapSettings.layerIds() )
244+
for ( const QString &id : mapSettings.layerIds() )
245245
{
246246
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( mProject->mapLayer( id ) );
247247
if ( !vl || !vl->renderer() )
@@ -276,7 +276,7 @@ namespace QgsWms
276276
context.expressionContext().setFeature( f );
277277
if ( moreSymbolsPerFeature )
278278
{
279-
Q_FOREACH ( QgsSymbol *s, r->originalSymbolsForFeature( f, context ) )
279+
for ( QgsSymbol *s : r->originalSymbolsForFeature( f, context ) )
280280
usedSymbols.insert( QgsSymbolLayerUtils::symbolProperties( s ) );
281281
}
282282
else
@@ -328,11 +328,11 @@ namespace QgsWms
328328

329329
// configure each layer with opacity, selection filter, ...
330330
bool updateMapExtent = mWmsParameters.bbox().isEmpty();
331-
Q_FOREACH ( QgsMapLayer *layer, layers )
331+
for ( QgsMapLayer *layer : layers )
332332
{
333333
checkLayerReadPermissions( layer );
334334

335-
Q_FOREACH ( QgsWmsParametersLayer param, params )
335+
for ( QgsWmsParametersLayer param : params )
336336
{
337337
if ( param.mNickname == layerNickname( *layer ) )
338338
{
@@ -677,11 +677,11 @@ namespace QgsWms
677677

678678
// configure each layer with opacity, selection filter, ...
679679
bool updateMapExtent = mWmsParameters.bbox().isEmpty();
680-
Q_FOREACH ( QgsMapLayer *layer, layers )
680+
for ( QgsMapLayer *layer : layers )
681681
{
682682
checkLayerReadPermissions( layer );
683683

684-
Q_FOREACH ( QgsWmsParametersLayer param, params )
684+
for ( const QgsWmsParametersLayer param : params )
685685
{
686686
if ( param.mNickname == layerNickname( *layer ) )
687687
{
@@ -774,7 +774,7 @@ namespace QgsWms
774774
// get dxf layers
775775
QList< QgsDxfExport::DxfLayer > dxfLayers;
776776
int layerIdx = -1;
777-
Q_FOREACH ( QgsMapLayer *layer, layers )
777+
for ( QgsMapLayer *layer : layers )
778778
{
779779
layerIdx++;
780780
if ( layer->type() != QgsMapLayer::VectorLayer )
@@ -784,7 +784,7 @@ namespace QgsWms
784784

785785
checkLayerReadPermissions( layer );
786786

787-
Q_FOREACH ( QgsWmsParametersLayer param, params )
787+
for ( QgsWmsParametersLayer param : params )
788788
{
789789
if ( param.mNickname == layerNickname( *layer ) )
790790
{
@@ -951,11 +951,11 @@ namespace QgsWms
951951
// remove non identifiable layers
952952
//removeNonIdentifiableLayers( layers );
953953

954-
Q_FOREACH ( QgsMapLayer *layer, layers )
954+
for ( QgsMapLayer *layer : layers )
955955
{
956956
checkLayerReadPermissions( layer );
957957

958-
Q_FOREACH ( QgsWmsParametersLayer param, params )
958+
for ( QgsWmsParametersLayer param : params )
959959
{
960960
if ( param.mNickname == layerNickname( *layer ) )
961961
{
@@ -1244,11 +1244,11 @@ namespace QgsWms
12441244
//layers can have assigned a different name for GetCapabilities
12451245
QHash<QString, QString> layerAliasMap = QgsServerProjectUtils::wmsFeatureInfoLayerAliasMap( *mProject );
12461246

1247-
Q_FOREACH ( QString queryLayer, queryLayers )
1247+
for ( const QString &queryLayer : queryLayers )
12481248
{
12491249
bool validLayer = false;
12501250
bool queryableLayer = true;
1251-
Q_FOREACH ( QgsMapLayer *layer, layers )
1251+
for ( QgsMapLayer *layer : layers )
12521252
{
12531253
if ( queryLayer == layerNickname( *layer ) )
12541254
{
@@ -1456,8 +1456,7 @@ namespace QgsWms
14561456
mAccessControl->filterFeatures( layer, fReq );
14571457

14581458
QStringList attributes;
1459-
QgsField field;
1460-
Q_FOREACH ( field, layer->fields().toList() )
1459+
for ( QgsField field : layer->fields().toList() )
14611460
{
14621461
attributes.append( field.name() );
14631462
}
@@ -2368,13 +2367,13 @@ namespace QgsWms
23682367
QStringList restrictedLayersNames;
23692368
QgsLayerTreeGroup *root = mProject->layerTreeRoot();
23702369

2371-
Q_FOREACH ( QString l, restricted )
2370+
for ( const QString &l : restricted )
23722371
{
23732372
QgsLayerTreeGroup *group = root->findGroup( l );
23742373
if ( group )
23752374
{
23762375
QList<QgsLayerTreeLayer *> groupLayers = group->findLayers();
2377-
Q_FOREACH ( QgsLayerTreeLayer *treeLayer, groupLayers )
2376+
for ( QgsLayerTreeLayer *treeLayer : groupLayers )
23782377
{
23792378
restrictedLayersNames.append( treeLayer->name() );
23802379
}
@@ -2387,7 +2386,7 @@ namespace QgsWms
23872386

23882387
// build output with names, ids or short name according to the configuration
23892388
QList<QgsLayerTreeLayer *> layers = root->findLayers();
2390-
Q_FOREACH ( QgsLayerTreeLayer *layer, layers )
2389+
for ( QgsLayerTreeLayer *layer : layers )
23912390
{
23922391
if ( restrictedLayersNames.contains( layer->name() ) )
23932392
{
@@ -2398,7 +2397,7 @@ namespace QgsWms
23982397

23992398
void QgsRenderer::initNicknameLayers()
24002399
{
2401-
Q_FOREACH ( QgsMapLayer *ml, mProject->mapLayers() )
2400+
for ( QgsMapLayer *ml : mProject->mapLayers() )
24022401
{
24032402
mNicknameLayers[ layerNickname( *ml ) ] = ml;
24042403
}
@@ -2469,7 +2468,7 @@ namespace QgsWms
24692468

24702469
// try to create highlight layer for each geometry
24712470
QString crs = mWmsParameters.crs();
2472-
Q_FOREACH ( QgsWmsParametersHighlightLayer param, params )
2471+
for ( QgsWmsParametersHighlightLayer param : params )
24732472
{
24742473
// create sld document from symbology
24752474
QDomDocument sldDoc;
@@ -2675,7 +2674,7 @@ namespace QgsWms
26752674
{
26762675
QList<QgsMapLayer *> layers;
26772676

2678-
Q_FOREACH ( QgsWmsParametersLayer param, params )
2677+
for ( QgsWmsParametersLayer param : params )
26792678
{
26802679
QString nickname = param.mNickname;
26812680
QString style = param.mStyle;
@@ -2798,7 +2797,7 @@ namespace QgsWms
27982797
if ( layer->type() == QgsMapLayer::VectorLayer )
27992798
{
28002799
QgsVectorLayer *filteredLayer = qobject_cast<QgsVectorLayer *>( layer );
2801-
Q_FOREACH ( QString filter, filters )
2800+
for ( const QString &filter : filters )
28022801
{
28032802
if ( filter.startsWith( QStringLiteral( "<" ) ) && filter.endsWith( QStringLiteral( "Filter>" ) ) )
28042803
{
@@ -2850,7 +2849,7 @@ namespace QgsWms
28502849
{
28512850
QgsFeatureIds selectedIds;
28522851

2853-
Q_FOREACH ( const QString &id, fids )
2852+
for ( const QString &id : fids )
28542853
{
28552854
selectedIds.insert( STRING_TO_FID( id ) );
28562855
}
@@ -2927,7 +2926,7 @@ namespace QgsWms
29272926
{
29282927
QList<QgsMapLayer *> wantedLayers;
29292928

2930-
Q_FOREACH ( QgsMapLayer *layer, layers )
2929+
for ( QgsMapLayer *layer : layers )
29312930
{
29322931
if ( !layerScaleVisibility( *layer, scaleDenominator ) )
29332932
continue;
@@ -2948,7 +2947,7 @@ namespace QgsWms
29482947
{
29492948
QList<QgsMapLayer *> wantedLayers;
29502949

2951-
Q_FOREACH ( QgsMapLayer *layer, layers )
2950+
for ( QgsMapLayer *layer : layers )
29522951
{
29532952
if ( nonIdentifiableLayers.contains( layer->id() ) )
29542953
continue;
@@ -2989,7 +2988,7 @@ namespace QgsWms
29892988
// build layer tree
29902989
rootGroup.clear();
29912990
QList<QgsVectorLayerFeatureCounter *> counters;
2992-
Q_FOREACH ( QgsMapLayer *ml, layers )
2991+
for ( QgsMapLayer *ml : layers )
29932992
{
29942993
QgsLayerTreeLayer *lt = rootGroup.addLayer( ml );
29952994
lt->setCustomProperty( QStringLiteral( "showFeatureCount" ), showFeatureCount );
@@ -3018,7 +3017,7 @@ namespace QgsWms
30183017
HitTest hitTest;
30193018
getMap( contentBasedMapSettings, &hitTest );
30203019

3021-
Q_FOREACH ( QgsLayerTreeNode *node, rootGroup.children() )
3020+
for ( QgsLayerTreeNode *node : rootGroup.children() )
30223021
{
30233022
Q_ASSERT( QgsLayerTree::isLayer( node ) );
30243023
QgsLayerTreeLayer *nodeLayer = QgsLayerTree::toLayer( node );
@@ -3030,7 +3029,7 @@ namespace QgsWms
30303029
const SymbolSet &usedSymbols = hitTest[vl];
30313030
QList<int> order;
30323031
int i = 0;
3033-
Q_FOREACH ( const QgsLegendSymbolItem &legendItem, vl->renderer()->legendSymbolItems() )
3032+
for ( const QgsLegendSymbolItem &legendItem : vl->renderer()->legendSymbolItems() )
30343033
{
30353034
QString sProp = QgsSymbolLayerUtils::symbolProperties( legendItem.legacyRuleKey() );
30363035
if ( usedSymbols.contains( sProp ) )
@@ -3053,7 +3052,7 @@ namespace QgsWms
30533052
if ( ! ruleDefined )
30543053
{
30553054
QList<QgsLayerTreeNode *> rootChildren = rootGroup.children();
3056-
Q_FOREACH ( QgsLayerTreeNode *node, rootChildren )
3055+
for ( QgsLayerTreeNode *node : rootChildren )
30573056
{
30583057
if ( QgsLayerTree::isLayer( node ) )
30593058
{
@@ -3065,14 +3064,14 @@ namespace QgsWms
30653064
// rule item titles
30663065
if ( !drawLegendItemLabel )
30673066
{
3068-
Q_FOREACH ( QgsLayerTreeModelLegendNode *legendNode, legendModel->layerLegendNodes( nodeLayer ) )
3067+
for ( QgsLayerTreeModelLegendNode *legendNode : legendModel->layerLegendNodes( nodeLayer ) )
30693068
{
30703069
legendNode->setUserLabel( QStringLiteral( " " ) ); // empty string = no override, so let's use one space
30713070
}
30723071
}
30733072
else if ( !drawLegendLayerLabel )
30743073
{
3075-
Q_FOREACH ( QgsLayerTreeModelLegendNode *legendNode, legendModel->layerLegendNodes( nodeLayer ) )
3074+
for ( QgsLayerTreeModelLegendNode *legendNode : legendModel->layerLegendNodes( nodeLayer ) )
30763075
{
30773076
if ( legendNode->isEmbeddedInParent() )
30783077
legendNode->setEmbeddedInParent( false );

0 commit comments

Comments
 (0)