Fix writeGetSchemaExtension signature

qgis · Apr 13, 2020 · 1c5b0f7 · 1c5b0f7
1 parent ceaf887
commit 1c5b0f7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/src/server/services/wms/qgswms.cpp b/src/server/services/wms/qgswms.cpp
@@ -128,7 +128,7 @@ namespace QgsWms
         }
         else if ( QSTR_COMPARE( req, "GetSchemaExtension" ) )
         {
-          writeGetSchemaExtension( mServerIface, version, request, response );
+          writeGetSchemaExtension( response );
         }
         else if ( QSTR_COMPARE( req, "GetStyle" ) )
         {

diff --git a/src/server/services/wms/qgswmsgetschemaextension.cpp b/src/server/services/wms/qgswmsgetschemaextension.cpp
@@ -29,16 +29,7 @@
 namespace QgsWms
 {
 
-//    void writeGetSchemaExtension( QgsServerInterface *serverIface, const QString &version,
-//                                  const QgsServerRequest &request, QgsServerResponse &response )
-//    {
-//      QDomDocument doc = getSchemaExtension( serverIface, version, request );
-//      response.setHeader( QStringLiteral( "Content-Type" ), QStringLiteral( "text/xml; charset=utf-8" ) );
-//      response.write( doc.toByteArray() );
-//    }
-
-  void writeGetSchemaExtension( QgsServerInterface *serverIface, const QString &version,
-                                const QgsServerRequest &request, QgsServerResponse &response )
+  void writeGetSchemaExtension( QgsServerResponse &response )
   {
     QDir resourcesDir = QFileInfo( QgsApplication::serverResourcesPath() ).absoluteDir();
     QFileInfo xsdFileInfo( resourcesDir, QStringLiteral( "schemaExtension.xsd" ) );

diff --git a/src/server/services/wms/qgswmsgetschemaextension.h b/src/server/services/wms/qgswmsgetschemaextension.h
@@ -25,16 +25,7 @@ namespace QgsWms
   /**
    * Output GetSchemaExtension response
    */
-  void writeGetSchemaExtension( QgsServerInterface *serverIface, const QString &version,
-                                const QgsServerRequest &request, QgsServerResponse &response );
-
-
-  /**
-   * Returns the schemaExtension for WMS 1.3.0 capabilities
-   */
-  QDomDocument getSchemaExtension( QgsServerInterface *serverIface, const QString &version,
-                                   const QgsServerRequest &request );
-
+  void writeGetSchemaExtension( QgsServerResponse &response );
 
 } // namespace QgsWms