From 7b32f8c61b18048edd56e8ee62fa10a6d79db6d0 Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Fri, 6 Jul 2018 17:50:37 +0200 Subject: [PATCH] Add virtual default destructors --- python/server/auto_generated/qgsserverparameters.sip.in | 4 ++++ src/server/qgsserverparameters.h | 4 ++++ src/server/services/wfs/qgswfsparameters.h | 4 ++++ src/server/services/wms/qgswmsparameters.h | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/python/server/auto_generated/qgsserverparameters.sip.in b/python/server/auto_generated/qgsserverparameters.sip.in index 75bff377748..8f1cc6c5380 100644 --- a/python/server/auto_generated/qgsserverparameters.sip.in +++ b/python/server/auto_generated/qgsserverparameters.sip.in @@ -29,6 +29,8 @@ the Free Software Foundation; either version 2 of the License, or * QgsServerParameterDefinition( const QVariant::Type type = QVariant::String, const QVariant defaultValue = QVariant( "" ) ); + virtual ~QgsServerParameterDefinition(); + QString typeName() const; virtual bool isValid() const; @@ -110,6 +112,8 @@ Constructor. Constructor. %End + virtual ~QgsServerParameters(); + void load( const QUrlQuery &query ); %Docstring Loads new parameters. diff --git a/src/server/qgsserverparameters.h b/src/server/qgsserverparameters.h index 733fae67441..82e5afb0c96 100644 --- a/src/server/qgsserverparameters.h +++ b/src/server/qgsserverparameters.h @@ -32,6 +32,8 @@ class SERVER_EXPORT QgsServerParameterDefinition QgsServerParameterDefinition( const QVariant::Type type = QVariant::String, const QVariant defaultValue = QVariant( "" ) ); + virtual ~QgsServerParameterDefinition() = default; + QString typeName() const; virtual bool isValid() const; @@ -103,6 +105,8 @@ class SERVER_EXPORT QgsServerParameters */ QgsServerParameters( const QUrlQuery &query ); + virtual ~QgsServerParameters() = default; + /** * Loads new parameters. * \param query url query diff --git a/src/server/services/wfs/qgswfsparameters.h b/src/server/services/wfs/qgswfsparameters.h index 10c9ec8e634..bdaf189312a 100644 --- a/src/server/services/wfs/qgswfsparameters.h +++ b/src/server/services/wfs/qgswfsparameters.h @@ -66,6 +66,8 @@ namespace QgsWfs const QVariant::Type type = QVariant::String, const QVariant defaultValue = QVariant( "" ) ); + virtual ~QgsWfsParameter() = default; + int toInt() const; QStringList toStringListWithExp( const QString &exp = "\\(([^()]+)\\)" ) const; QgsRectangle toRectangle() const; @@ -113,6 +115,8 @@ namespace QgsWfs */ QgsWfsParameters(); + virtual ~QgsWfsParameters() = default; + /** * Loads new parameters. * \param parameters Map of parameters diff --git a/src/server/services/wms/qgswmsparameters.h b/src/server/services/wms/qgswmsparameters.h index 367f07f41be..11ad18dbf68 100644 --- a/src/server/services/wms/qgswmsparameters.h +++ b/src/server/services/wms/qgswmsparameters.h @@ -159,6 +159,8 @@ namespace QgsWms const QVariant::Type type = QVariant::String, const QVariant defaultValue = QVariant( "" ) ); + virtual ~QgsWmsParameter() = default; + bool isValid() const override; QList toGeomList( const char delimiter = ',' ) const; @@ -210,6 +212,8 @@ namespace QgsWms */ QgsWmsParameters(); + virtual ~QgsWmsParameters() = default; + /** * Loads new parameters. * \param parameters Map of parameters