sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-03 00:02:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Range based for loops in labeling

Browse Source
This commit is contained in:
Matthias Kuhn 2019-03-09 11:45:53 +01:00
parent 4f1dd95606
commit cebfa7b2a8
No known key found for this signature in database
GPG Key ID: 7A7F1A1C90C3E6A7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/qgslabelingengine.cpp
View File

@ -85,12 +85,12 @@ QgsLabelingEngine::~QgsLabelingEngine()
QList< QgsMapLayer * > QgsLabelingEngine::participatingLayers() const
{
QSet< QgsMapLayer * > layers;
Q_FOREACH ( QgsAbstractLabelProvider *provider, mProviders )
for ( QgsAbstractLabelProvider *provider : mProviders )
{
if ( provider->layer() )
layers << provider->layer();
}
Q_FOREACH ( QgsAbstractLabelProvider *provider, mSubProviders )
for ( QgsAbstractLabelProvider *provider : mSubProviders )
{
if ( provider->layer() )
layers << provider->layer();
@ -161,9 +161,9 @@ void QgsLabelingEngine::processProvider( QgsAbstractLabelProvider *provider, Qgs
l->setUpsidedownLabels( upsdnlabels );
QList<QgsLabelFeature *> features = provider->labelFeatures( context );
const QList<QgsLabelFeature *> features = provider->labelFeatures( context );
Q_FOREACH ( QgsLabelFeature *feature, features )
for ( QgsLabelFeature *feature : features )
{
try
{
@ -178,7 +178,8 @@ void QgsLabelingEngine::processProvider( QgsAbstractLabelProvider *provider, Qgs
}
// any sub-providers?
Q_FOREACH ( QgsAbstractLabelProvider *subProvider, provider->subProviders() )
const auto subproviders = provider->subProviders();
for ( QgsAbstractLabelProvider *subProvider : subproviders )
{
mSubProviders << subProvider;
processProvider( subProvider, context, p );
@ -224,7 +225,7 @@ void QgsLabelingEngine::run( QgsRenderContext &context )
// for each provider: get labels and register them in PAL
Q_FOREACH ( QgsAbstractLabelProvider *provider, mProviders )
for ( QgsAbstractLabelProvider *provider : qgis::as_const( mProviders ) )
{
bool appendedLayerScope = false;
if ( QgsMapLayer *ml = provider->layer() )