Use remove_if

Author: pblottiere

src/server/services/wms/qgswmsparameters.cpp

@@ -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 );
   }

src/server/services/wms/qgswmsparameters.h

@@ -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;