Fix broken signals for AFS/AMS layer addition from the datasource dialog

Author: elpaso

src/providers/arcgisrest/qgsafssourceselect.cpp

@@ -139,3 +139,9 @@ QString QgsAfsSourceSelect::getLayerURI( const QgsOwsConnection &connection,
   }
   return ds.uri();
 }
+
+
+void QgsAfsSourceSelect::addServiceLayer( QString uri, QString typeName )
+{
+  emit addVectorLayer( uri, typeName );
+}

src/providers/arcgisrest/qgsafssourceselect.h

@@ -38,6 +38,10 @@ class QgsAfsSourceSelect: public QgsArcGisServiceSourceSelect
                          const QString &crs = QString(),
                          const QString &filter = QString(),
                          const QgsRectangle &bBox = QgsRectangle() ) const override;
+  private:
+    //! A layer is added from the dialog
+    virtual void addServiceLayer( QString uri, QString typeName );
+
 };
 
 #endif // QGSAFSSOURCESELECT_H

src/providers/arcgisrest/qgsamssourceselect.cpp

@@ -97,3 +97,8 @@ QString QgsAmsSourceSelect::getLayerURI( const QgsOwsConnection &connection,
   ds.setParam( QStringLiteral( "format" ), getSelectedImageEncoding() );
   return ds.uri();
 }
+
+void QgsAmsSourceSelect::addServiceLayer( QString uri, QString typeName )
+{
+  emit addRasterLayer( uri, typeName, QStringLiteral( "arcgismapserver" ) );
+}

src/providers/arcgisrest/qgsamssourceselect.h

@@ -37,6 +37,9 @@ class QgsAmsSourceSelect: public QgsArcGisServiceSourceSelect
                          const QString &crs = QString(),
                          const QString &filter = QString(),
                          const QgsRectangle &bBox = QgsRectangle() ) const override;
+  private:
+    //! A layer is added from the dialog
+    virtual void addServiceLayer( QString uri, QString typeName );
 };
 
 #endif // QGSAMSSOURCESELECT_H

src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp

@@ -354,7 +354,7 @@ void QgsArcGisServiceSourceSelect::addButtonClicked()
     QString uri = getLayerURI( connection, layerTitle, layerName, pCrsString, filter, layerExtent );
 
     QgsDebugMsg( "Layer " + layerName + ", uri: " + uri );
-    emit addLayer( uri, layerName );
+    addServiceLayer( uri, layerName );
   }
   accept();
 }

src/providers/arcgisrest/qgsarcgisservicesourceselect.h

@@ -48,10 +48,6 @@ class QgsArcGisServiceSourceSelect : public QgsAbstractDataSourceWidget, protect
     //! Destructor
     ~QgsArcGisServiceSourceSelect() override;
 
-  signals:
-    //! Emitted when a layer is added from the dialog
-    void addLayer( QString uri, QString typeName );
-
   protected:
     QString mServiceName;
     ServiceType mServiceType;
@@ -84,6 +80,9 @@ class QgsArcGisServiceSourceSelect : public QgsAbstractDataSourceWidget, protect
   private:
     void populateConnectionList();
 
+    //! A layer is added from the dialog
+    virtual void addServiceLayer( QString uri, QString typeName ) = 0;
+
     /** Returns the best suited CRS from a set of authority ids
        1. project CRS if contained in the set
        2. WGS84 if contained in the set