sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-05 00:09:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use remove_if

Browse Source
This commit is contained in:
Blottiere Paul 2019-03-18 10:47:16 +00:00
parent dad5b756b6
commit 63c0278380
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/services/wms/qgswmsparameters.cpp
View File

@ -1502,12 +1502,12 @@ namespace QgsWms
{
QList<QgsWmsParametersExternalLayer> externalLayers;
for ( const QString &layer : allLayersNickname() )
{
if ( ! isExternalLayer( layer ) )
continue;
QStringList layers = allLayersNickname();
QStringList::const_iterator rit = std::remove_if( layers.begin(), layers.end(), QgsWmsParameters::isExternalLayer );
externalLayers << externalLayerParameter( layer );
for ( QStringList::const_iterator it = layers.begin(); it != rit; ++it )
{
externalLayers << externalLayerParameter( *it );
}
return externalLayers;
@ -1813,7 +1813,7 @@ namespace QgsWms
return param;
}
bool QgsWmsParameters::isExternalLayer( const QString &name ) const
bool QgsWmsParameters::isExternalLayer( const QString &name )
{
return name.startsWith( EXTERNAL_LAYER_PREFIX );
}

3
src/server/services/wms/qgswmsparameters.h
View File

@ -1178,6 +1178,8 @@ namespace QgsWms
QStringList atlasPk() const;
private:
static bool isExternalLayer( const QString &name );
bool loadParameter( const QString &name, const QString &value ) override;
void save( const QgsWmsParameter &parameter, bool multi = false );
@ -1187,7 +1189,6 @@ namespace QgsWms
void raiseError( const QString &msg ) const;
void log( const QString &msg ) const;
bool isExternalLayer( const QString &name ) const;
QgsWmsParametersExternalLayer externalLayerParameter( const QString &name ) const;
QMultiMap<QString, QgsWmsParametersFilter> layerFilters( const QStringList &layers ) const;