Some fixes

qgis · Mar 18, 2019 · dad5b756b6ace4c96691fc6776a9d44d635ed279 · dad5b75
1 parent ed31a32
commit dad5b756b6ace4c96691fc6776a9d44d635ed279
Unified Split

Showing with 2 additions and 4 deletions.

+1 −2 src/server/services/wms/qgswmsparameters.cpp

+1 −2 src/server/services/wms/qgswmsrenderer.cpp
diff --git a/src/server/services/wms/qgswmsparameters.cpp b/src/server/services/wms/qgswmsparameters.cpp
@@ -1502,7 +1502,6 @@ namespace QgsWms
   {
     QList<QgsWmsParametersExternalLayer> externalLayers;
 
-    const QStringList layers = allLayersNickname();
     for ( const QString &layer : allLayersNickname() )
     {
       if ( ! isExternalLayer( layer ) )
@@ -1610,7 +1609,7 @@ namespace QgsWms
     QStringList layers;
     QList<QgsWmsParametersExternalLayer> eParams;
 
-    for ( const auto &layer : allLayers )
+    for ( const auto &layer : qgis::as_const( allLayers ) )
     {
       if ( isExternalLayer( layer ) )
       {

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2924,8 +2924,7 @@ namespace QgsWms
 
     for ( const QgsWmsParametersExternalLayer &param : params )
     {
-      std::unique_ptr<QgsMapLayer> layer;
-      layer.reset( new QgsRasterLayer( param.mUri, param.mName, QStringLiteral( "wms" ) ) );
+      std::unique_ptr<QgsMapLayer> layer = qgis::make_unique< QgsRasterLayer >( param.mUri, param.mName, QStringLiteral( "wms" ) );
 
       if ( layer->isValid() )
       {