Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Cleaning QgsServiceModule
  • Loading branch information
pblottiere committed Jul 13, 2018
1 parent 183335d commit 721e309
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 44 deletions.
13 changes: 7 additions & 6 deletions python/server/auto_generated/qgsservicemodule.sip.in
Expand Up @@ -18,7 +18,8 @@ Class defining the service module interface for QGIS server services

This class acts as a service registrar for services.

For dynamic modules, a QgsServiceModule instance is returned from the QGS_ServiceModule_Init() entry point
For dynamic modules, a QgsServiceModule instance is returned from the
QGS_ServiceModule_Init() entry point.

.. versionadded:: 3.0
%End
Expand All @@ -30,21 +31,21 @@ For dynamic modules, a QgsServiceModule instance is returned from the QGS_Servic

QgsServiceModule();
%Docstring
Constructor
Default constructor for QgsServiceModule.
%End

virtual ~QgsServiceModule() = 0;
virtual ~QgsServiceModule();

virtual void registerSelf( QgsServiceRegistry &registry,
QgsServerInterface *serverIface = 0 ) = 0;
%Docstring
Ask module to register all provided services
Asks the module to register all provided services.

:param registry: :py:class:`QgsServiceRegistry`
:param registry: Service registry
:param serverIface: Interface for plugins
%End
};


/************************************************************************
* This file has been generated automatically from *
* *
Expand Down
1 change: 0 additions & 1 deletion src/server/CMakeLists.txt
Expand Up @@ -39,7 +39,6 @@ SET(QGIS_SERVER_SRCS
qgsserverresponse.cpp
qgsserversettings.cpp
qgsservice.cpp
qgsservicemodule.cpp
qgsservicenativeloader.cpp
qgsserviceregistry.cpp
qgsfeaturefilterprovidergroup.cpp
Expand Down
29 changes: 0 additions & 29 deletions src/server/qgsservicemodule.cpp

This file was deleted.

21 changes: 13 additions & 8 deletions src/server/qgsservicemodule.h
Expand Up @@ -33,7 +33,8 @@ class QgsServerInterface;
*
* This class acts as a service registrar for services.
*
* For dynamic modules, a QgsServiceModule instance is returned from the QGS_ServiceModule_Init() entry point
* For dynamic modules, a QgsServiceModule instance is returned from the
* QGS_ServiceModule_Init() entry point.
*
* \since QGIS 3.0
*/
Expand All @@ -42,19 +43,23 @@ class SERVER_EXPORT QgsServiceModule

public:

//! Constructor
QgsServiceModule();
/**
* Default constructor for QgsServiceModule.
*/
QgsServiceModule() = default;

//! Destructor
virtual ~QgsServiceModule() = 0;
/**
* Default destructor for QgsServiceModule.
*/
virtual ~QgsServiceModule() = default;

/**
* Ask module to register all provided services
* \param registry QgsServiceRegistry
* Asks the module to register all provided services.
* \param registry Service registry
* \param serverIface Interface for plugins
*/
virtual void registerSelf( QgsServiceRegistry &registry,
QgsServerInterface *serverIface = nullptr ) = 0;
};

#endif

0 comments on commit 721e309

Please sign in to comment.