From 9021bb479c877865daa302f39841f4ba691d0aec Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Fri, 30 Dec 2016 13:10:34 +1000 Subject: [PATCH] Remove "//! Destructor" doxygen comments This documentation doesn't add any value --- src/analysis/interpolation/Bezier3D.h | 2 +- .../interpolation/CloughTocherInterpolator.h | 1 - .../interpolation/LinTriangleInterpolator.h | 1 - src/analysis/interpolation/ParametricLine.h | 1 - src/analysis/interpolation/Vector3D.h | 2 +- .../network/qgsgraphbuilderinterface.h | 1 - src/analysis/network/qgsgraphdirector.h | 2 +- src/analysis/network/qgsvectorlayerdirector.h | 1 - src/app/ogr/qgsnewogrconnection.h | 2 +- .../qgsapppluginmanagerinterface.h | 1 - src/app/pluginmanager/qgspluginmanager.h | 1 - src/app/qgisapp.h | 2 +- src/app/qgsclipboard.h | 1 - src/app/qgsdecorationcopyright.h | 2 +- src/app/qgsdecorationgrid.h | 2 +- src/app/qgsdecorationitem.h | 2 +- src/app/qgsdecorationnortharrow.h | 2 +- src/app/qgsdecorationscalebar.h | 2 +- src/app/qgsoptions.cpp | 2 +- src/app/qgsoptions.h | 2 +- src/app/qgsprojectproperties.h | 2 +- src/app/qgsrasterlayerproperties.h | 2 +- src/app/qgssnappingwidget.h | 2 +- src/app/qgsstatusbarmagnifierwidget.h | 2 +- src/app/qgsstatusbarscalewidget.h | 2 +- src/app/qgstipfactory.h | 2 +- src/core/composer/qgscomposernodesitem.h | 2 +- src/core/composer/qgscomposerpolygon.h | 2 +- src/core/composer/qgscomposerpolyline.h | 2 +- src/core/geometry/qgsgeometry.h | 2 +- src/core/qgsattributeeditorelement.h | 8 ++++---- src/core/qgscontexthelp.h | 2 +- src/core/qgscredentials.h | 2 +- src/core/qgsdistancearea.h | 2 +- src/core/qgsfeature.h | 2 +- src/core/qgsfeaturefilterprovider.h | 2 +- src/core/qgsfield.h | 2 +- src/core/qgslabelingengine.h | 2 +- src/core/qgsmessageoutput.h | 1 - src/core/qgsnetworkaccessmanager.h | 2 +- src/core/qgsowsconnection.h | 2 +- src/core/qgsrectangle.h | 2 +- src/core/qgsrenderchecker.h | 2 +- src/core/qgsvectordataprovider.h | 3 --- src/core/qgsvectorfilewriter.h | 4 ++-- src/core/qgsvectorlayer.h | 2 +- src/core/raster/qgscolorrampshader.h | 2 -- src/core/raster/qgsrasterchecker.h | 2 +- src/core/raster/qgsrasterdataprovider.h | 2 +- src/core/raster/qgsrasterlayer.h | 1 - src/core/raster/qgsrasterprojector.h | 1 - src/gui/attributetable/qgsfeaturelistview.h | 3 --- .../qgsorganizetablecolumnsdialog.h | 3 --- .../core/qgseditorconfigwidget.h | 3 --- src/gui/qgisinterface.h | 1 - src/gui/qgsactionmenu.h | 3 --- src/gui/qgsgenericprojectionselector.cpp | 2 +- src/gui/qgsgenericprojectionselector.h | 2 +- src/gui/qgsmapcanvas.h | 2 +- src/gui/qgsmaplayerconfigwidgetfactory.h | 2 +- src/gui/qgsmaptip.h | 2 -- src/gui/qgsmaptool.h | 1 - src/gui/qgsmaptoolcapture.h | 2 +- src/gui/qgsnewhttpconnection.h | 2 +- src/gui/qgsowssourceselect.h | 2 +- src/gui/qgspluginmanagerinterface.h | 1 - src/gui/qgssourceselectdialog.h | 2 +- src/gui/symbology-ng/qgssymbolslistwidget.h | 2 +- .../coordinate_capture/coordinatecapture.h | 2 +- .../evisdatabaseconnectiongui.cpp | 3 --- .../evisdatabaseconnectiongui.h | 1 - .../eventbrowser/evisgenericeventbrowsergui.h | 1 - .../eventbrowser/evisimagedisplaywidget.h | 1 - src/plugins/evis/evis.h | 1 - src/plugins/georeferencer/qgsgeorefplugin.h | 2 +- src/plugins/gps_importer/qgsgpsplugin.h | 2 +- src/plugins/grass/qgsgrassmapcalc.h | 2 +- src/plugins/grass/qgsgrassmodule.h | 2 +- src/plugins/grass/qgsgrassmoduleinput.h | 2 +- src/plugins/grass/qgsgrassmoduleoptions.h | 4 ++-- src/plugins/grass/qgsgrassmoduleparam.h | 20 +++++++++---------- src/plugins/grass/qgsgrassnewmapset.h | 2 +- src/plugins/grass/qgsgrassplugin.h | 2 +- src/plugins/grass/qgsgrassregion.h | 2 +- src/plugins/grass/qgsgrassselect.h | 2 +- src/plugins/grass/qgsgrasstools.h | 2 +- src/plugins/grass/qgsgrassutils.h | 4 ++-- .../qgsgeometrycoordinatetransform.h | 3 --- src/plugins/spatialquery/qgsmngprogressbar.h | 3 --- src/plugins/spatialquery/qgsrubberselectid.h | 3 --- src/plugins/spatialquery/qgsspatialquery.h | 3 --- .../spatialquery/qgsspatialquerydialog.h | 2 +- .../spatialquery/qgsspatialqueryplugin.h | 2 +- src/plugins/topology/topol.h | 2 +- src/plugins/topology/topolError.h | 3 --- src/providers/db2/qgsdb2newconnection.h | 2 +- src/providers/db2/qgsdb2sourceselect.h | 2 +- src/providers/grass/qgsgrassrasterprovider.h | 2 +- src/providers/mssql/qgsmssqlnewconnection.h | 2 +- src/providers/mssql/qgsmssqlsourceselect.h | 2 +- src/providers/ogr/qgsogrprovider.h | 3 --- src/providers/ows/qgsowsprovider.h | 2 +- src/providers/postgres/qgspgnewconnection.h | 2 +- src/providers/postgres/qgspgsourceselect.h | 2 +- .../spatialite/qgsspatialitesourceselect.h | 2 +- src/providers/wcs/qgswcscapabilities.h | 2 +- src/providers/wcs/qgswcsprovider.h | 2 +- src/providers/wcs/qgswcssourceselect.h | 2 +- src/providers/wms/qgswmsconnection.h | 2 +- src/providers/wms/qgswmssourceselect.h | 2 +- src/providers/wms/qgswmtsdimensions.h | 2 +- src/server/qgsaccesscontrol.h | 2 +- src/server/qgsaccesscontrolfilter.cpp | 2 +- src/server/qgsaccesscontrolfilter.h | 2 +- src/server/qgsserverfilter.h | 2 +- src/server/qgsserverinterface.cpp | 2 +- src/server/qgsserverinterface.h | 2 +- src/server/qgsserverinterfaceimpl.cpp | 2 +- src/server/qgsserverinterfaceimpl.h | 2 +- 119 files changed, 102 insertions(+), 160 deletions(-) diff --git a/src/analysis/interpolation/Bezier3D.h b/src/analysis/interpolation/Bezier3D.h index bc471924f61..842fedeff34 100644 --- a/src/analysis/interpolation/Bezier3D.h +++ b/src/analysis/interpolation/Bezier3D.h @@ -31,7 +31,7 @@ class ANALYSIS_EXPORT Bezier3D: public ParametricLine Bezier3D(); //! Constructor, par is a pointer to the parent, controlpoly a controlpolygon Bezier3D( ParametricLine* par, QVector* controlpoly ); - //! Destructor + virtual ~Bezier3D(); //! Do not use this method, since a Bezier curve does not consist of other curves virtual void add( ParametricLine *pl ) override; diff --git a/src/analysis/interpolation/CloughTocherInterpolator.h b/src/analysis/interpolation/CloughTocherInterpolator.h index 7458c962c3e..b8ef213301b 100644 --- a/src/analysis/interpolation/CloughTocherInterpolator.h +++ b/src/analysis/interpolation/CloughTocherInterpolator.h @@ -81,7 +81,6 @@ class ANALYSIS_EXPORT CloughTocherInterpolator : public TriangleInterpolator CloughTocherInterpolator(); //! Constructor with a pointer to the triangulation as argument CloughTocherInterpolator( NormVecDecorator* tin ); - //! Destructor virtual ~CloughTocherInterpolator(); //! Calculates the normal vector and assigns it to vec (not implemented at the moment) virtual bool calcNormVec( double x, double y, Vector3D* result ) override; diff --git a/src/analysis/interpolation/LinTriangleInterpolator.h b/src/analysis/interpolation/LinTriangleInterpolator.h index 75de7762533..83baa50b0b0 100644 --- a/src/analysis/interpolation/LinTriangleInterpolator.h +++ b/src/analysis/interpolation/LinTriangleInterpolator.h @@ -29,7 +29,6 @@ class ANALYSIS_EXPORT LinTriangleInterpolator : public TriangleInterpolator LinTriangleInterpolator(); //! Constructor with reference to a DualEdgeTriangulation object LinTriangleInterpolator( DualEdgeTriangulation* tin ); - //! Destructor virtual ~LinTriangleInterpolator(); //! Calculates the normal vector and assigns it to vec virtual bool calcNormVec( double x, double y, Vector3D* result ) override; diff --git a/src/analysis/interpolation/ParametricLine.h b/src/analysis/interpolation/ParametricLine.h index 1204c9a86c4..317db8fd4b4 100644 --- a/src/analysis/interpolation/ParametricLine.h +++ b/src/analysis/interpolation/ParametricLine.h @@ -41,7 +41,6 @@ class ANALYSIS_EXPORT ParametricLine /** Constructor, par is a pointer to the parent object, controlpoly the controlpolygon */ ParametricLine( ParametricLine* par, QVector* controlpoly ); - //! Destructor virtual ~ParametricLine(); virtual void add( ParametricLine* pl ) = 0; virtual void calcFirstDer( float t, Vector3D* v ) = 0; diff --git a/src/analysis/interpolation/Vector3D.h b/src/analysis/interpolation/Vector3D.h index f4ae8441614..1f16118e23b 100644 --- a/src/analysis/interpolation/Vector3D.h +++ b/src/analysis/interpolation/Vector3D.h @@ -42,7 +42,7 @@ class ANALYSIS_EXPORT Vector3D Vector3D(); //! Copy constructor Vector3D( const Vector3D& v ); - //! Destructor + ~Vector3D(); Vector3D& operator=( const Vector3D& v ); bool operator==( const Vector3D& v ) const; diff --git a/src/analysis/network/qgsgraphbuilderinterface.h b/src/analysis/network/qgsgraphbuilderinterface.h index e63672e0df5..12b61538f25 100644 --- a/src/analysis/network/qgsgraphbuilderinterface.h +++ b/src/analysis/network/qgsgraphbuilderinterface.h @@ -50,7 +50,6 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface mDa.setEllipsoidalMode( ctfEnabled ); } - //! Destructor virtual ~QgsGraphBuilderInterface() { } diff --git a/src/analysis/network/qgsgraphdirector.h b/src/analysis/network/qgsgraphdirector.h index bb7de5c8d3f..3e6d83e33d7 100644 --- a/src/analysis/network/qgsgraphdirector.h +++ b/src/analysis/network/qgsgraphdirector.h @@ -40,7 +40,7 @@ class ANALYSIS_EXPORT QgsGraphDirector : public QObject void buildMessage( const QString& ) const; public: - //! Destructor + virtual ~QgsGraphDirector() { } /** diff --git a/src/analysis/network/qgsvectorlayerdirector.h b/src/analysis/network/qgsvectorlayerdirector.h index 6b4fd8816f8..ad40e2e2e7c 100644 --- a/src/analysis/network/qgsvectorlayerdirector.h +++ b/src/analysis/network/qgsvectorlayerdirector.h @@ -64,7 +64,6 @@ class ANALYSIS_EXPORT QgsVectorLayerDirector : public QgsGraphDirector const Direction defaultDirection ); - //! Destructor virtual ~QgsVectorLayerDirector(); /* diff --git a/src/app/ogr/qgsnewogrconnection.h b/src/app/ogr/qgsnewogrconnection.h index 100d829232b..c93cd992751 100644 --- a/src/app/ogr/qgsnewogrconnection.h +++ b/src/app/ogr/qgsnewogrconnection.h @@ -32,7 +32,7 @@ class QgsNewOgrConnection : public QDialog, private Ui::QgsNewOgrConnectionBase public: //! Constructor QgsNewOgrConnection( QWidget *parent = nullptr, const QString& connType = QString::null, const QString& connName = QString::null, Qt::WindowFlags fl = QgisGui::ModalDialogFlags ); - //! Destructor + ~QgsNewOgrConnection(); //! Tests the connection using the parameters supplied void testConnection(); diff --git a/src/app/pluginmanager/qgsapppluginmanagerinterface.h b/src/app/pluginmanager/qgsapppluginmanagerinterface.h index 7e528827bea..3a18e6d572e 100644 --- a/src/app/pluginmanager/qgsapppluginmanagerinterface.h +++ b/src/app/pluginmanager/qgsapppluginmanagerinterface.h @@ -34,7 +34,6 @@ class QgsAppPluginManagerInterface : public QgsPluginManagerInterface //! Constructor explicit QgsAppPluginManagerInterface( QgsPluginManager * pluginManager ); - //! Destructor ~QgsAppPluginManagerInterface(); //! remove python plugins from the metadata registry (c++ plugins stay) diff --git a/src/app/pluginmanager/qgspluginmanager.h b/src/app/pluginmanager/qgspluginmanager.h index 08307b12225..fdece7a7501 100644 --- a/src/app/pluginmanager/qgspluginmanager.h +++ b/src/app/pluginmanager/qgspluginmanager.h @@ -50,7 +50,6 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag //! Constructor; set pluginsAreEnabled to false in --noplugins mode QgsPluginManager( QWidget *parent = nullptr, bool pluginsAreEnabled = true, Qt::WindowFlags fl = QgisGui::ModalDialogFlags ); - //! Destructor ~QgsPluginManager(); //! Save pointer to python utils and enable Python support diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h index 07dde561f59..8086a24056f 100644 --- a/src/app/qgisapp.h +++ b/src/app/qgisapp.h @@ -151,7 +151,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow QgisApp( QSplashScreen *splash, bool restorePlugins = true, bool skipVersionCheck = false, QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Window ); //! Constructor for unit tests QgisApp(); - //! Destructor + ~QgisApp(); /** diff --git a/src/app/qgsclipboard.h b/src/app/qgsclipboard.h index 16b56fac6a7..78f3d4405c9 100644 --- a/src/app/qgsclipboard.h +++ b/src/app/qgsclipboard.h @@ -67,7 +67,6 @@ class APP_EXPORT QgsClipboard : public QObject */ QgsClipboard(); - //! Destructor virtual ~QgsClipboard(); /** diff --git a/src/app/qgsdecorationcopyright.h b/src/app/qgsdecorationcopyright.h index 55754c2b027..7e713866d17 100644 --- a/src/app/qgsdecorationcopyright.h +++ b/src/app/qgsdecorationcopyright.h @@ -36,7 +36,7 @@ class APP_EXPORT QgsDecorationCopyright : public QgsDecorationItem //! Constructor QgsDecorationCopyright( QObject* parent = nullptr ); - //! Destructor + virtual ~QgsDecorationCopyright(); public slots: diff --git a/src/app/qgsdecorationgrid.h b/src/app/qgsdecorationgrid.h index 692442b98db..8982a8a0655 100644 --- a/src/app/qgsdecorationgrid.h +++ b/src/app/qgsdecorationgrid.h @@ -35,7 +35,7 @@ class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem public: //! Constructor QgsDecorationGrid( QObject* parent = nullptr ); - //! Destructor + virtual ~ QgsDecorationGrid(); enum GridStyle diff --git a/src/app/qgsdecorationitem.h b/src/app/qgsdecorationitem.h index 9e6ea80473d..7ef98061eae 100644 --- a/src/app/qgsdecorationitem.h +++ b/src/app/qgsdecorationitem.h @@ -41,7 +41,7 @@ class APP_EXPORT QgsDecorationItem: public QObject //! Constructor QgsDecorationItem( QObject* parent = nullptr ); - //! Destructor + virtual ~ QgsDecorationItem(); void setEnabled( bool enabled ) { mEnabled = enabled; } diff --git a/src/app/qgsdecorationnortharrow.h b/src/app/qgsdecorationnortharrow.h index 0a1b934ab09..a52bcc24c60 100644 --- a/src/app/qgsdecorationnortharrow.h +++ b/src/app/qgsdecorationnortharrow.h @@ -34,7 +34,7 @@ class APP_EXPORT QgsDecorationNorthArrow: public QgsDecorationItem public: //! Constructor QgsDecorationNorthArrow( QObject* parent = nullptr ); - //! Destructor + virtual ~QgsDecorationNorthArrow(); public slots: diff --git a/src/app/qgsdecorationscalebar.h b/src/app/qgsdecorationscalebar.h index 1121824d31a..584dedd1b24 100644 --- a/src/app/qgsdecorationscalebar.h +++ b/src/app/qgsdecorationscalebar.h @@ -34,7 +34,7 @@ class APP_EXPORT QgsDecorationScaleBar: public QgsDecorationItem public: //! Constructor QgsDecorationScaleBar( QObject* parent = nullptr ); - //! Destructor + virtual ~ QgsDecorationScaleBar(); public slots: diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp index 5879bf3b660..b81494b09b3 100644 --- a/src/app/qgsoptions.cpp +++ b/src/app/qgsoptions.cpp @@ -929,7 +929,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) restoreOptionsBaseUi(); } -//! Destructor + QgsOptions::~QgsOptions() { delete mSettings; diff --git a/src/app/qgsoptions.h b/src/app/qgsoptions.h index 355999b11d9..0e9317169b1 100644 --- a/src/app/qgsoptions.h +++ b/src/app/qgsoptions.h @@ -46,7 +46,7 @@ class APP_EXPORT QgsOptions : public QgsOptionsDialogBase, private Ui::QgsOption * @param modal true for modal dialog */ QgsOptions( QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags ); - //! Destructor + ~QgsOptions(); /** Sets the page with the specified widget name as the current page diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h index 54a086fbf66..e8f0ebfd37a 100644 --- a/src/app/qgsprojectproperties.h +++ b/src/app/qgsprojectproperties.h @@ -43,7 +43,7 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui: //! Constructor QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags ); - //! Destructor + ~QgsProjectProperties(); /** Gets the currently select map units diff --git a/src/app/qgsrasterlayerproperties.h b/src/app/qgsrasterlayerproperties.h index 42aa87ad9a5..de82da50e64 100644 --- a/src/app/qgsrasterlayerproperties.h +++ b/src/app/qgsrasterlayerproperties.h @@ -48,7 +48,7 @@ class APP_EXPORT QgsRasterLayerProperties : public QgsOptionsDialogBase, private * @param ml Map layer for which properties will be displayed */ QgsRasterLayerProperties( QgsMapLayer *lyr, QgsMapCanvas* theCanvas, QWidget *parent = nullptr, Qt::WindowFlags = QgisGui::ModalDialogFlags ); - //! \brief Destructor + ~QgsRasterLayerProperties(); //! Synchronize state with associated raster layer diff --git a/src/app/qgssnappingwidget.h b/src/app/qgssnappingwidget.h index dccf5c71212..2ba29c397ee 100644 --- a/src/app/qgssnappingwidget.h +++ b/src/app/qgssnappingwidget.h @@ -55,7 +55,7 @@ class APP_EXPORT QgsSnappingWidget : public QWidget */ QgsSnappingWidget( QgsProject* project, QgsMapCanvas* canvas, QWidget* parent = nullptr ); - //! Destructor + virtual ~QgsSnappingWidget(); /** diff --git a/src/app/qgsstatusbarmagnifierwidget.h b/src/app/qgsstatusbarmagnifierwidget.h index 88784893922..9a982bf44c0 100644 --- a/src/app/qgsstatusbarmagnifierwidget.h +++ b/src/app/qgsstatusbarmagnifierwidget.h @@ -40,7 +40,7 @@ class APP_EXPORT QgsStatusBarMagnifierWidget : public QWidget */ QgsStatusBarMagnifierWidget( QWidget* parent = nullptr ); - //! Destructor + virtual ~QgsStatusBarMagnifierWidget(); void setDefaultFactor( double factor ); diff --git a/src/app/qgsstatusbarscalewidget.h b/src/app/qgsstatusbarscalewidget.h index aa382b4d2a0..f02ce51f95f 100644 --- a/src/app/qgsstatusbarscalewidget.h +++ b/src/app/qgsstatusbarscalewidget.h @@ -39,7 +39,7 @@ class APP_EXPORT QgsStatusBarScaleWidget : public QWidget public: explicit QgsStatusBarScaleWidget( QgsMapCanvas* canvas, QWidget *parent = 0 ); - //! Destructor + virtual ~QgsStatusBarScaleWidget(); /** diff --git a/src/app/qgstipfactory.h b/src/app/qgstipfactory.h index eeba72e6421..100d7aad750 100644 --- a/src/app/qgstipfactory.h +++ b/src/app/qgstipfactory.h @@ -33,7 +33,7 @@ class APP_EXPORT QgsTipFactory : public QObject public: //! Constructor QgsTipFactory(); - //! Destructor + ~QgsTipFactory(); /** Get a random tip (generic or gui-centric) diff --git a/src/core/composer/qgscomposernodesitem.h b/src/core/composer/qgscomposernodesitem.h index 5f16b4f290b..6fec0ff44bc 100644 --- a/src/core/composer/qgscomposernodesitem.h +++ b/src/core/composer/qgscomposernodesitem.h @@ -45,7 +45,7 @@ class CORE_EXPORT QgsComposerNodesItem: public QgsComposerItem */ QgsComposerNodesItem( const QString &mTagName, const QPolygonF &polygon, QgsComposition* c ); - //! Destructor + ~QgsComposerNodesItem(); /** Add a node in current shape. diff --git a/src/core/composer/qgscomposerpolygon.h b/src/core/composer/qgscomposerpolygon.h index d4e533cfff7..732c8daf6af 100644 --- a/src/core/composer/qgscomposerpolygon.h +++ b/src/core/composer/qgscomposerpolygon.h @@ -45,7 +45,7 @@ class CORE_EXPORT QgsComposerPolygon: public QgsComposerNodesItem */ QgsComposerPolygon( const QPolygonF &polygon, QgsComposition* c ); - //! Destructor + ~QgsComposerPolygon(); //! Overridden to return shape name diff --git a/src/core/composer/qgscomposerpolyline.h b/src/core/composer/qgscomposerpolyline.h index ba748c868ae..9acf6299cee 100644 --- a/src/core/composer/qgscomposerpolyline.h +++ b/src/core/composer/qgscomposerpolyline.h @@ -44,7 +44,7 @@ class CORE_EXPORT QgsComposerPolyline: public QgsComposerNodesItem */ QgsComposerPolyline( const QPolygonF &polyline, QgsComposition* c ); - //! Destructor + ~QgsComposerPolyline(); //! Overridden to return shape name diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h index db42fbc7768..401fa81eb1d 100644 --- a/src/core/geometry/qgsgeometry.h +++ b/src/core/geometry/qgsgeometry.h @@ -95,7 +95,7 @@ class CORE_EXPORT QgsGeometry */ explicit QgsGeometry( QgsAbstractGeometry* geom ); - //! Destructor + ~QgsGeometry(); /** Returns the underlying geometry store. diff --git a/src/core/qgsattributeeditorelement.h b/src/core/qgsattributeeditorelement.h index 5e6535db7d1..8dd158e7522 100644 --- a/src/core/qgsattributeeditorelement.h +++ b/src/core/qgsattributeeditorelement.h @@ -56,7 +56,7 @@ class CORE_EXPORT QgsAttributeEditorElement , mShowLabel( true ) {} - //! Destructor + virtual ~QgsAttributeEditorElement() {} /** @@ -155,7 +155,7 @@ class CORE_EXPORT QgsAttributeEditorContainer : public QgsAttributeEditorElement , mColumnCount( 1 ) {} - //! Destructor + virtual ~QgsAttributeEditorContainer(); /** @@ -269,7 +269,7 @@ class CORE_EXPORT QgsAttributeEditorField : public QgsAttributeEditorElement , mIdx( idx ) {} - //! Destructor + virtual ~QgsAttributeEditorField() {} /** @@ -322,7 +322,7 @@ class CORE_EXPORT QgsAttributeEditorRelation : public QgsAttributeEditorElement , mShowUnlinkButton( true ) {} - //! Destructor + virtual ~QgsAttributeEditorRelation() {} /** diff --git a/src/core/qgscontexthelp.h b/src/core/qgscontexthelp.h index e48bf17b051..583ac59ceae 100644 --- a/src/core/qgscontexthelp.h +++ b/src/core/qgscontexthelp.h @@ -45,7 +45,7 @@ class CORE_EXPORT QgsContextHelp : public QObject private: //! Constructor QgsContextHelp(); - //! Destructor + ~QgsContextHelp(); QProcess *start(); diff --git a/src/core/qgscredentials.h b/src/core/qgscredentials.h index d5bb1405ef0..2c53d7baefc 100644 --- a/src/core/qgscredentials.h +++ b/src/core/qgscredentials.h @@ -37,7 +37,7 @@ class CORE_EXPORT QgsCredentials { public: - //! virtual destructor + virtual ~QgsCredentials(); bool get( const QString& realm, QString &username, QString &password, const QString& message = QString::null ); diff --git a/src/core/qgsdistancearea.h b/src/core/qgsdistancearea.h index 252e8b9736f..2be5987044d 100644 --- a/src/core/qgsdistancearea.h +++ b/src/core/qgsdistancearea.h @@ -41,7 +41,7 @@ class CORE_EXPORT QgsDistanceArea //! Constructor QgsDistanceArea(); - //! Destructor + ~QgsDistanceArea(); //! Copy constructor diff --git a/src/core/qgsfeature.h b/src/core/qgsfeature.h index 0c2d51b796e..3ed4839cfcc 100644 --- a/src/core/qgsfeature.h +++ b/src/core/qgsfeature.h @@ -172,7 +172,7 @@ class CORE_EXPORT QgsFeature bool operator!=( const QgsFeature& other ) const; - //! Destructor + virtual ~QgsFeature(); /** Get the feature ID for this feature. diff --git a/src/core/qgsfeaturefilterprovider.h b/src/core/qgsfeaturefilterprovider.h index 66743ec8046..db741bd4171 100644 --- a/src/core/qgsfeaturefilterprovider.h +++ b/src/core/qgsfeaturefilterprovider.h @@ -40,7 +40,7 @@ class CORE_EXPORT QgsFeatureFilterProvider //! Constructor QgsFeatureFilterProvider() {} - //! Destructor + virtual ~QgsFeatureFilterProvider() {} /** Add additional filters to the feature request to further restrict the features returned by the request. diff --git a/src/core/qgsfield.h b/src/core/qgsfield.h index 36802aeb4d1..b4ba41c126d 100644 --- a/src/core/qgsfield.h +++ b/src/core/qgsfield.h @@ -89,7 +89,7 @@ class CORE_EXPORT QgsField */ QgsField& operator =( const QgsField &other ); - //! Destructor + virtual ~QgsField(); bool operator==( const QgsField& other ) const; diff --git a/src/core/qgslabelingengine.h b/src/core/qgslabelingengine.h index 5e8bd6fd4c1..2f2586971d5 100644 --- a/src/core/qgslabelingengine.h +++ b/src/core/qgslabelingengine.h @@ -43,7 +43,7 @@ class CORE_EXPORT QgsAbstractLabelProvider public: //! Construct the provider with default values QgsAbstractLabelProvider( const QString& layerId = QString(), const QString& providerId = QString() ); - //! Vritual destructor + virtual ~QgsAbstractLabelProvider() {} //! Associate provider with a labeling engine (should be only called internally from QgsLabelingEngine) diff --git a/src/core/qgsmessageoutput.h b/src/core/qgsmessageoutput.h index cdd4bbcfb72..240690c5ffc 100644 --- a/src/core/qgsmessageoutput.h +++ b/src/core/qgsmessageoutput.h @@ -42,7 +42,6 @@ class CORE_EXPORT QgsMessageOutput //! message can be in plain text or in html format enum MessageType { MessageText, MessageHtml }; - //! virtual destructor virtual ~QgsMessageOutput(); //! set message, it won't be displayed until diff --git a/src/core/qgsnetworkaccessmanager.h b/src/core/qgsnetworkaccessmanager.h index 9fd74c551bf..4039f455515 100644 --- a/src/core/qgsnetworkaccessmanager.h +++ b/src/core/qgsnetworkaccessmanager.h @@ -52,7 +52,7 @@ class CORE_EXPORT QgsNetworkAccessManager : public QNetworkAccessManager QgsNetworkAccessManager( QObject *parent = nullptr ); - //! destructor + ~QgsNetworkAccessManager(); //! insert a factory into the proxy factories list diff --git a/src/core/qgsowsconnection.h b/src/core/qgsowsconnection.h index defa0f4d496..9ba115cc3a6 100644 --- a/src/core/qgsowsconnection.h +++ b/src/core/qgsowsconnection.h @@ -43,7 +43,7 @@ class CORE_EXPORT QgsOwsConnection : public QObject */ QgsOwsConnection( const QString & theService, const QString & theConnName ); - //! Destructor + ~QgsOwsConnection(); //! Returns the list of connections for the specified service diff --git a/src/core/qgsrectangle.h b/src/core/qgsrectangle.h index 00c51acfe3a..4bb49ba6dad 100644 --- a/src/core/qgsrectangle.h +++ b/src/core/qgsrectangle.h @@ -43,7 +43,7 @@ class CORE_EXPORT QgsRectangle QgsRectangle( const QRectF & qRectF ); //! Copy constructor QgsRectangle( const QgsRectangle &other ); - //! Destructor + ~QgsRectangle(); //! Set the rectangle from two QgsPoints. The rectangle is //! normalised after construction. diff --git a/src/core/qgsrenderchecker.h b/src/core/qgsrenderchecker.h index 187e23a522d..ba621538ced 100644 --- a/src/core/qgsrenderchecker.h +++ b/src/core/qgsrenderchecker.h @@ -39,7 +39,7 @@ class CORE_EXPORT QgsRenderChecker QgsRenderChecker(); - //! Destructor + ~QgsRenderChecker() {} QString controlImagePath() const; diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h index 7b55659ddea..8f50eb143b4 100644 --- a/src/core/qgsvectordataprovider.h +++ b/src/core/qgsvectordataprovider.h @@ -117,9 +117,6 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider */ QgsVectorDataProvider( const QString& uri = QString() ); - /** - * Destructor - */ virtual ~QgsVectorDataProvider(); /** diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h index 4b039ac1d91..4e9da4890c2 100644 --- a/src/core/qgsvectorfilewriter.h +++ b/src/core/qgsvectorfilewriter.h @@ -182,7 +182,7 @@ class CORE_EXPORT QgsVectorFileWriter //! Constructor FieldValueConverter(); - //! Destructor + virtual ~FieldValueConverter(); /** Return a possibly modified field definition. Default implementation will return provided field unmodified. @@ -337,7 +337,7 @@ class CORE_EXPORT QgsVectorFileWriter //! Constructor SaveVectorOptions(); - //! Destructor + virtual ~SaveVectorOptions(); //! OGR driver to use diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h index 3924f0a5329..e3993b31072 100644 --- a/src/core/qgsvectorlayer.h +++ b/src/core/qgsvectorlayer.h @@ -454,7 +454,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte QgsVectorLayer( const QString& path = QString::null, const QString& baseName = QString::null, const QString& providerLib = QString::null, bool loadDefaultStyleFlag = true ); - //! Destructor + virtual ~QgsVectorLayer(); //! Returns the permanent storage type for this layer as a friendly name. diff --git a/src/core/raster/qgscolorrampshader.h b/src/core/raster/qgscolorrampshader.h index fd89ea25483..af689c90939 100644 --- a/src/core/raster/qgscolorrampshader.h +++ b/src/core/raster/qgscolorrampshader.h @@ -63,8 +63,6 @@ class CORE_EXPORT QgsColorRampShader : public QgsRasterShaderFunction */ QgsColorRampShader( double theMinimumValue = 0.0, double theMaximumValue = 255.0, QgsColorRamp* theColorRamp = nullptr, Type theType = Interpolated, ClassificationMode theClassificationMode = Continuous ); - /** Destructor - */ virtual ~QgsColorRampShader(); /** Copy constructor diff --git a/src/core/raster/qgsrasterchecker.h b/src/core/raster/qgsrasterchecker.h index 68b44846720..6ac3c239808 100644 --- a/src/core/raster/qgsrasterchecker.h +++ b/src/core/raster/qgsrasterchecker.h @@ -31,7 +31,7 @@ class CORE_EXPORT QgsRasterChecker QgsRasterChecker(); - //! Destructor + ~QgsRasterChecker() {} QString report() { return mReport; } diff --git a/src/core/raster/qgsrasterdataprovider.h b/src/core/raster/qgsrasterdataprovider.h index 6bccd2af864..8a5cd219790 100644 --- a/src/core/raster/qgsrasterdataprovider.h +++ b/src/core/raster/qgsrasterdataprovider.h @@ -56,7 +56,7 @@ class CORE_EXPORT QgsImageFetcher : public QObject public: //! Constructor QgsImageFetcher( QObject* parent = 0 ) : QObject( parent ) {} - //! Destructor + virtual ~QgsImageFetcher() {} /** Starts the image download diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h index e4d4fb8773e..fefffbf2ceb 100644 --- a/src/core/raster/qgsrasterlayer.h +++ b/src/core/raster/qgsrasterlayer.h @@ -193,7 +193,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer const QString &providerKey, bool loadDefaultStyleFlag = true ); - //! \brief The destructor ~QgsRasterLayer(); //! \brief This enumerator describes the types of shading that can be used diff --git a/src/core/raster/qgsrasterprojector.h b/src/core/raster/qgsrasterprojector.h index 26aa5bd0c93..0f06a47bbe7 100644 --- a/src/core/raster/qgsrasterprojector.h +++ b/src/core/raster/qgsrasterprojector.h @@ -56,7 +56,6 @@ class CORE_EXPORT QgsRasterProjector : public QgsRasterInterface QgsRasterProjector(); - //! \brief The destructor ~QgsRasterProjector(); QgsRasterProjector *clone() const override; diff --git a/src/gui/attributetable/qgsfeaturelistview.h b/src/gui/attributetable/qgsfeaturelistview.h index 21f288e1280..ba0114846a2 100644 --- a/src/gui/attributetable/qgsfeaturelistview.h +++ b/src/gui/attributetable/qgsfeaturelistview.h @@ -52,9 +52,6 @@ class GUI_EXPORT QgsFeatureListView : public QListView */ explicit QgsFeatureListView( QWidget* parent = nullptr ); - /** - * Destructor - */ virtual ~QgsFeatureListView() {} /** diff --git a/src/gui/attributetable/qgsorganizetablecolumnsdialog.h b/src/gui/attributetable/qgsorganizetablecolumnsdialog.h index 5d2f7f2372e..ee1337ee231 100644 --- a/src/gui/attributetable/qgsorganizetablecolumnsdialog.h +++ b/src/gui/attributetable/qgsorganizetablecolumnsdialog.h @@ -44,9 +44,6 @@ class GUI_EXPORT QgsOrganizeTableColumnsDialog : public QDialog, private Ui::Qgs */ QgsOrganizeTableColumnsDialog( const QgsVectorLayer* vl, QWidget* parent = nullptr, Qt::WindowFlags flags = Qt::Window ); - /** - * Destructor - */ ~QgsOrganizeTableColumnsDialog(); /** diff --git a/src/gui/editorwidgets/core/qgseditorconfigwidget.h b/src/gui/editorwidgets/core/qgseditorconfigwidget.h index c6bf97e8b66..1089085fec6 100644 --- a/src/gui/editorwidgets/core/qgseditorconfigwidget.h +++ b/src/gui/editorwidgets/core/qgseditorconfigwidget.h @@ -71,9 +71,6 @@ class GUI_EXPORT QgsEditorConfigWidget : public QWidget */ QgsVectorLayer* layer(); - /** - * Destructor - */ virtual ~QgsEditorConfigWidget() {} signals: diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h index 6b0485b173f..1a500a80afb 100644 --- a/src/gui/qgisinterface.h +++ b/src/gui/qgisinterface.h @@ -72,7 +72,6 @@ class GUI_EXPORT QgisInterface : public QObject //! Constructor QgisInterface(); - //! Virtual destructor virtual ~QgisInterface(); virtual QgsPluginManagerInterface* pluginManagerInterface() = 0; diff --git a/src/gui/qgsactionmenu.h b/src/gui/qgsactionmenu.h index 0056a77eba9..f0a7b22d8e4 100644 --- a/src/gui/qgsactionmenu.h +++ b/src/gui/qgsactionmenu.h @@ -76,9 +76,6 @@ class GUI_EXPORT QgsActionMenu : public QMenu */ explicit QgsActionMenu( QgsVectorLayer *layer, const QgsFeatureId fid, const QString& actionScope, QWidget *parent = nullptr ); - /** - * Destructor - */ ~QgsActionMenu(); /** diff --git a/src/gui/qgsgenericprojectionselector.cpp b/src/gui/qgsgenericprojectionselector.cpp index 2ab1dc86862..6877e9ea716 100644 --- a/src/gui/qgsgenericprojectionselector.cpp +++ b/src/gui/qgsgenericprojectionselector.cpp @@ -61,7 +61,7 @@ void QgsGenericProjectionSelector::setMessage( QString theMessage ) textEdit->setHtml( theMessage ); textEdit->show(); } -//! Destructor + QgsGenericProjectionSelector::~QgsGenericProjectionSelector() { QSettings settings; diff --git a/src/gui/qgsgenericprojectionselector.h b/src/gui/qgsgenericprojectionselector.h index a145b5c84bf..4a37f18e28c 100644 --- a/src/gui/qgsgenericprojectionselector.h +++ b/src/gui/qgsgenericprojectionselector.h @@ -55,7 +55,7 @@ class GUI_EXPORT QgsGenericProjectionSelector : public QDialog, private Ui::QgsG QgsGenericProjectionSelector( QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags ); - //! Destructor + ~QgsGenericProjectionSelector(); public slots: diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h index c3b31635c6f..90ea741ab3d 100644 --- a/src/gui/qgsmapcanvas.h +++ b/src/gui/qgsmapcanvas.h @@ -79,7 +79,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView //! Constructor QgsMapCanvas( QWidget * parent = nullptr ); - //! Destructor + ~QgsMapCanvas(); //! Returns the magnification factor diff --git a/src/gui/qgsmaplayerconfigwidgetfactory.h b/src/gui/qgsmaplayerconfigwidgetfactory.h index 061e91de6e8..d29f2b598bd 100644 --- a/src/gui/qgsmaplayerconfigwidgetfactory.h +++ b/src/gui/qgsmaplayerconfigwidgetfactory.h @@ -37,7 +37,7 @@ class GUI_EXPORT QgsMapLayerConfigWidgetFactory //! Constructor QgsMapLayerConfigWidgetFactory( const QString &title, const QIcon &icon ); - //! Destructor + virtual ~QgsMapLayerConfigWidgetFactory(); /** diff --git a/src/gui/qgsmaptip.h b/src/gui/qgsmaptip.h index b90a58bcaa8..05e945683a7 100644 --- a/src/gui/qgsmaptip.h +++ b/src/gui/qgsmaptip.h @@ -55,8 +55,6 @@ class GUI_EXPORT QgsMapTip : public QWidget */ QgsMapTip(); - /** Destructor - */ virtual ~QgsMapTip(); /** Show a maptip at a given point on the map canvas diff --git a/src/gui/qgsmaptool.h b/src/gui/qgsmaptool.h index e059e2333a7..af43fcd9ed6 100644 --- a/src/gui/qgsmaptool.h +++ b/src/gui/qgsmaptool.h @@ -71,7 +71,6 @@ class GUI_EXPORT QgsMapTool : public QObject */ virtual Flags flags() const { return Flags(); } - //! virtual destructor virtual ~QgsMapTool(); //! Mouse move event for overriding. Default implementation does nothing. diff --git a/src/gui/qgsmaptoolcapture.h b/src/gui/qgsmaptoolcapture.h index 07617bdf771..a9abfd72e73 100644 --- a/src/gui/qgsmaptoolcapture.h +++ b/src/gui/qgsmaptoolcapture.h @@ -40,7 +40,7 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing //! constructor QgsMapToolCapture( QgsMapCanvas* canvas, QgsAdvancedDigitizingDockWidget* cadDockWidget, CaptureMode mode = CaptureNone ); - //! destructor + virtual ~QgsMapToolCapture(); //! active the tool diff --git a/src/gui/qgsnewhttpconnection.h b/src/gui/qgsnewhttpconnection.h index 975c6706c85..d66cb825ddd 100644 --- a/src/gui/qgsnewhttpconnection.h +++ b/src/gui/qgsnewhttpconnection.h @@ -33,7 +33,7 @@ class GUI_EXPORT QgsNewHttpConnection : public QDialog, private Ui::QgsNewHttpCo public: //! Constructor QgsNewHttpConnection( QWidget *parent = nullptr, const QString& baseKey = "/Qgis/connections-wms/", const QString& connName = QString::null, Qt::WindowFlags fl = QgisGui::ModalDialogFlags ); - //! Destructor + ~QgsNewHttpConnection(); public slots: //! Saves the connection to ~/.qt/qgisrc diff --git a/src/gui/qgsowssourceselect.h b/src/gui/qgsowssourceselect.h index 2c5c3f8b7f8..ad039622474 100644 --- a/src/gui/qgsowssourceselect.h +++ b/src/gui/qgsowssourceselect.h @@ -58,7 +58,7 @@ class GUI_EXPORT QgsOWSSourceSelect : public QDialog, public Ui::QgsOWSSourceSel //! Constructor QgsOWSSourceSelect( const QString& service, QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false ); - //! Destructor + ~QgsOWSSourceSelect(); public slots: diff --git a/src/gui/qgspluginmanagerinterface.h b/src/gui/qgspluginmanagerinterface.h index a9272893a90..af66d8160e6 100644 --- a/src/gui/qgspluginmanagerinterface.h +++ b/src/gui/qgspluginmanagerinterface.h @@ -34,7 +34,6 @@ class GUI_EXPORT QgsPluginManagerInterface : public QObject //! Constructor QgsPluginManagerInterface(); - //! Virtual destructor virtual ~QgsPluginManagerInterface(); //! remove python plugins from the metadata registry (c++ plugins stay) diff --git a/src/gui/qgssourceselectdialog.h b/src/gui/qgssourceselectdialog.h index 8cda87e293a..bcd8c514259 100644 --- a/src/gui/qgssourceselectdialog.h +++ b/src/gui/qgssourceselectdialog.h @@ -38,7 +38,7 @@ class GUI_EXPORT QgsSourceSelectDialog : public QDialog, protected Ui::QgsSource //! Constructor QgsSourceSelectDialog( const QString& serviceName, ServiceType serviceType, QWidget* parent, Qt::WindowFlags fl ); - //! Destructor + ~QgsSourceSelectDialog(); //! Sets the current extent and CRS. Used to select an appropriate CRS and possibly to retrieve data only in the current extent void setCurrentExtentAndCrs( const QgsRectangle& canvasExtent, const QgsCoordinateReferenceSystem& canvasCrs ); diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.h b/src/gui/symbology-ng/qgssymbolslistwidget.h index d27b7658e84..321c045ee1d 100644 --- a/src/gui/symbology-ng/qgssymbolslistwidget.h +++ b/src/gui/symbology-ng/qgssymbolslistwidget.h @@ -37,7 +37,7 @@ class GUI_EXPORT QgsSymbolsListWidget : public QWidget, private Ui::SymbolsListW public: QgsSymbolsListWidget( QgsSymbol* symbol, QgsStyle* style, QMenu* menu, QWidget* parent, const QgsVectorLayer * layer = nullptr ); - //! Destructor + virtual ~QgsSymbolsListWidget(); /** Sets the context in which the symbol widget is shown, e.g., the associated map canvas and expression contexts. diff --git a/src/plugins/coordinate_capture/coordinatecapture.h b/src/plugins/coordinate_capture/coordinatecapture.h index b99f154374f..8c51c70651b 100644 --- a/src/plugins/coordinate_capture/coordinatecapture.h +++ b/src/plugins/coordinate_capture/coordinatecapture.h @@ -80,7 +80,7 @@ class CoordinateCapture: public QObject, public QgisPlugin * @param theInterface Pointer to the QgisInterface object. */ explicit CoordinateCapture( QgisInterface * theInterface ); - //! Destructor + virtual ~CoordinateCapture(); public slots: diff --git a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp index 29c9335efe2..aac530cde1e 100644 --- a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp +++ b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp @@ -84,9 +84,6 @@ eVisDatabaseConnectionGui::eVisDatabaseConnectionGui( QList* th pbtnLoadPredefinedQueries->setToolTip( tr( "Open File" ) ); } -/** -* Destructor -*/ eVisDatabaseConnectionGui::~eVisDatabaseConnectionGui() { QSettings settings; diff --git a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h index 8f43a679255..8e0d5861e13 100644 --- a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h +++ b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h @@ -52,7 +52,6 @@ class eVisDatabaseConnectionGui : public QDialog, private Ui::eVisDatabaseConnec //! \brief Constructor eVisDatabaseConnectionGui( QList*, QWidget* parent = nullptr, Qt::WindowFlags fl = 0 ); - //! \brief Destructor ~eVisDatabaseConnectionGui(); private: diff --git a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h index 21403f61351..8c89cbfb97f 100644 --- a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h +++ b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h @@ -61,7 +61,6 @@ class eVisGenericEventBrowserGui : public QDialog, private Ui::eVisGenericEventB //! \brief Constructor called when new browser is requested by the eVisEventIdTool eVisGenericEventBrowserGui( QWidget* parent, QgsMapCanvas* canvas, Qt::WindowFlags fl ); - //! \Brief Destructor ~eVisGenericEventBrowserGui(); protected: diff --git a/src/plugins/evis/eventbrowser/evisimagedisplaywidget.h b/src/plugins/evis/eventbrowser/evisimagedisplaywidget.h index da1cb3e9fb2..a6b2159fb95 100644 --- a/src/plugins/evis/eventbrowser/evisimagedisplaywidget.h +++ b/src/plugins/evis/eventbrowser/evisimagedisplaywidget.h @@ -51,7 +51,6 @@ class eVisImageDisplayWidget : public QWidget //! \brief Constructor eVisImageDisplayWidget( QWidget* parent = nullptr, Qt::WindowFlags fl = 0 ); - //! \brief Destructor ~eVisImageDisplayWidget(); //! \brief Load an image from disk and display diff --git a/src/plugins/evis/evis.h b/src/plugins/evis/evis.h index 0938b29a8f6..ee575ce9b84 100644 --- a/src/plugins/evis/evis.h +++ b/src/plugins/evis/evis.h @@ -94,7 +94,6 @@ class eVis: public QObject, public QgisPlugin //! Constructor explicit eVis( QgisInterface * theInterface ); - //! Destructor */ ~eVis(); public slots: diff --git a/src/plugins/georeferencer/qgsgeorefplugin.h b/src/plugins/georeferencer/qgsgeorefplugin.h index 9e8217dd71b..d5805b71569 100644 --- a/src/plugins/georeferencer/qgsgeorefplugin.h +++ b/src/plugins/georeferencer/qgsgeorefplugin.h @@ -75,7 +75,7 @@ class QgsGeorefPlugin: public QObject, public QgisPlugin * @param Pointer to the QgisIface object. */ explicit QgsGeorefPlugin( QgisInterface * ); - //! Destructor + virtual ~ QgsGeorefPlugin(); public slots: diff --git a/src/plugins/gps_importer/qgsgpsplugin.h b/src/plugins/gps_importer/qgsgpsplugin.h index 0defa96fad9..b3e014a0d6e 100644 --- a/src/plugins/gps_importer/qgsgpsplugin.h +++ b/src/plugins/gps_importer/qgsgpsplugin.h @@ -41,7 +41,7 @@ class QgsGPSPlugin: public QObject, public QgisPlugin */ explicit QgsGPSPlugin( QgisInterface * ); - //! Destructor + virtual ~QgsGPSPlugin(); public slots: diff --git a/src/plugins/grass/qgsgrassmapcalc.h b/src/plugins/grass/qgsgrassmapcalc.h index c077b83cf6f..3d89530c2ea 100644 --- a/src/plugins/grass/qgsgrassmapcalc.h +++ b/src/plugins/grass/qgsgrassmapcalc.h @@ -43,7 +43,7 @@ class QgsGrassMapcalc: public QMainWindow, private Ui::QgsGrassMapcalcBase, QgisInterface *iface, QWidget * parent = 0, Qt::WindowFlags f = 0 ); - //! Destructor + ~QgsGrassMapcalc(); // Current tool diff --git a/src/plugins/grass/qgsgrassmodule.h b/src/plugins/grass/qgsgrassmodule.h index cf3a5938e92..75e194155ce 100644 --- a/src/plugins/grass/qgsgrassmodule.h +++ b/src/plugins/grass/qgsgrassmodule.h @@ -51,7 +51,7 @@ class QgsGrassModule : public QWidget, private Ui::QgsGrassModuleBase QgsGrassModule( QgsGrassTools *tools, QString moduleName, QgisInterface *iface, bool direct, QWidget *parent = 0, Qt::WindowFlags f = 0 ); - //! Destructor + ~QgsGrassModule(); QString translate( QString string ); diff --git a/src/plugins/grass/qgsgrassmoduleinput.h b/src/plugins/grass/qgsgrassmoduleinput.h index fad2da97bf7..8140f2cdc7b 100644 --- a/src/plugins/grass/qgsgrassmoduleinput.h +++ b/src/plugins/grass/qgsgrassmoduleinput.h @@ -243,7 +243,7 @@ class QgsGrassModuleInput : public QgsGrassModuleGroupBoxItem QDomElement &qdesc, QDomElement &gdesc, QDomNode &gnode, bool direct, QWidget * parent = 0 ); - //! Destructor + ~QgsGrassModuleInput(); //! Retruns list of options which will be passed to module diff --git a/src/plugins/grass/qgsgrassmoduleoptions.h b/src/plugins/grass/qgsgrassmoduleoptions.h index 70c7aba7b61..1ec4ce0d601 100644 --- a/src/plugins/grass/qgsgrassmoduleoptions.h +++ b/src/plugins/grass/qgsgrassmoduleoptions.h @@ -55,7 +55,7 @@ class QgsGrassModuleOptions QgsGrassTools *tools, QgsGrassModule *module, QgisInterface *iface, bool direct ); - //! Destructor + virtual ~QgsGrassModuleOptions(); //! Get module options as list of arguments for QProcess @@ -149,7 +149,7 @@ class QgsGrassModuleStandardOptions: public QWidget, public QgsGrassModuleOption QString xname, QDomElement confDocElem, bool direct, QWidget * parent = 0, Qt::WindowFlags f = 0 ); - //! Destructor + ~QgsGrassModuleStandardOptions(); //! Get module options as list of arguments for QProcess diff --git a/src/plugins/grass/qgsgrassmoduleparam.h b/src/plugins/grass/qgsgrassmoduleparam.h index 5b9ec6d5715..4618b4a4eb6 100644 --- a/src/plugins/grass/qgsgrassmoduleparam.h +++ b/src/plugins/grass/qgsgrassmoduleparam.h @@ -59,7 +59,7 @@ class QgsGrassModuleCheckBox : public QCheckBox */ QgsGrassModuleCheckBox( const QString & text, QWidget * parent = 0 ); - //! Destructor + virtual ~QgsGrassModuleCheckBox(); void resizeEvent( QResizeEvent * event ) override; @@ -93,7 +93,7 @@ class QgsGrassModuleParam QgsGrassModuleParam( QgsGrassModule *module, QString key, QDomElement &qdesc, QDomElement &gdesc, QDomNode &gnode, bool direct ); - //! Destructor + virtual ~QgsGrassModuleParam(); //! Is the item hidden @@ -184,7 +184,7 @@ class QgsGrassModuleGroupBoxItem : public QGroupBox, public QgsGrassModuleParam QDomElement &qdesc, QDomElement &gdesc, QDomNode &gnode, bool direct, QWidget * parent = 0 ); - //! Destructor + virtual ~QgsGrassModuleGroupBoxItem(); void resizeEvent( QResizeEvent * event ) override; @@ -250,7 +250,7 @@ class QgsGrassModuleOption : public QgsGrassModuleMultiParam QDomElement &qdesc, QDomElement &gdesc, QDomNode &gnode, bool direct, QWidget * parent = 0 ); - //! Destructor + ~QgsGrassModuleOption(); //! Control option @@ -356,7 +356,7 @@ class QgsGrassModuleFlag : public QgsGrassModuleCheckBox, public QgsGrassModuleP QDomElement &qdesc, QDomElement &gdesc, QDomNode &gnode, bool direct, QWidget * parent = 0 ); - //! Destructor + ~QgsGrassModuleFlag(); //! Retruns list of options which will be passed to module @@ -384,7 +384,7 @@ class QgsGrassModuleGdalInput : public QgsGrassModuleGroupBoxItem QDomElement &qdesc, QDomElement &gdesc, QDomNode &gnode, bool direct, QWidget * parent = 0 ); - //! Destructor + ~QgsGrassModuleGdalInput(); //! Reimplemented @@ -446,7 +446,7 @@ class QgsGrassModuleField : public QgsGrassModuleOption QDomElement &qdesc, QDomElement &gdesc, QDomNode &gnode, bool direct, QWidget * parent = 0 ); - //! Destructor + ~QgsGrassModuleField(); }; @@ -471,7 +471,7 @@ class QgsGrassModuleVectorField : public QgsGrassModuleMultiParam QDomElement &qdesc, QDomElement &gdesc, QDomNode &gnode, bool direct, QWidget * parent = 0 ); - //! Destructor + ~QgsGrassModuleVectorField(); //! Retruns list of options which will be passed to module @@ -536,7 +536,7 @@ class QgsGrassModuleSelection : public QgsGrassModuleGroupBoxItem QDomNode &gnode, bool direct, QWidget * parent = 0 ); - //! Destructor + ~QgsGrassModuleSelection(); //! Retruns list of options which will be passed to module @@ -602,7 +602,7 @@ class QgsGrassModuleFile : public QgsGrassModuleGroupBoxItem QDomNode &gnode, bool direct, QWidget *parent = 0 ); - //! Destructor + ~QgsGrassModuleFile(); //! File type diff --git a/src/plugins/grass/qgsgrassnewmapset.h b/src/plugins/grass/qgsgrassnewmapset.h index 14885fe13b8..ec44e04739b 100644 --- a/src/plugins/grass/qgsgrassnewmapset.h +++ b/src/plugins/grass/qgsgrassnewmapset.h @@ -55,7 +55,7 @@ class QgsGrassNewMapset : public QWizard, private Ui::QgsGrassNewMapsetBase QgsGrassPlugin *plugin, QWidget * parent = 0, Qt::WindowFlags f = 0 ); - //! Destructor + ~QgsGrassNewMapset(); //! Next page diff --git a/src/plugins/grass/qgsgrassplugin.h b/src/plugins/grass/qgsgrassplugin.h index 2508a4fcc68..a8f123bcfa2 100644 --- a/src/plugins/grass/qgsgrassplugin.h +++ b/src/plugins/grass/qgsgrassplugin.h @@ -78,7 +78,7 @@ class QgsGrassPlugin : public QObject, public QgisPlugin * Return the plugin type */ virtual int type(); - //! Destructor + virtual ~QgsGrassPlugin(); //! Get an icon from the active theme if possible diff --git a/src/plugins/grass/qgsgrassregion.h b/src/plugins/grass/qgsgrassregion.h index 362fc7f6b65..368293a41e2 100644 --- a/src/plugins/grass/qgsgrassregion.h +++ b/src/plugins/grass/qgsgrassregion.h @@ -50,7 +50,7 @@ class QgsGrassRegion: public QWidget, private Ui::QgsGrassRegionBase QgsGrassRegion( QgisInterface *iface, QWidget * parent = 0, Qt::WindowFlags f = 0 ); - //! Destructor + ~QgsGrassRegion(); public slots: diff --git a/src/plugins/grass/qgsgrassselect.h b/src/plugins/grass/qgsgrassselect.h index 8b4e0c7a01f..fe9a8c6af10 100644 --- a/src/plugins/grass/qgsgrassselect.h +++ b/src/plugins/grass/qgsgrassselect.h @@ -29,7 +29,7 @@ class QgsGrassSelect: public QDialog, private Ui::QgsGrassSelectBase //! Constructor //QgsGrassSelect(QWidget *parent = 0, int type = VECTOR ); QgsGrassSelect( QWidget *parent, int type = VECTOR ); - //! Destructor + ~QgsGrassSelect(); enum TYPE diff --git a/src/plugins/grass/qgsgrasstools.h b/src/plugins/grass/qgsgrasstools.h index 7ac5c36319c..32858221ab8 100644 --- a/src/plugins/grass/qgsgrasstools.h +++ b/src/plugins/grass/qgsgrasstools.h @@ -44,7 +44,7 @@ class QgsGrassTools: public QgsDockWidget, public Ui::QgsGrassToolsBase QgsGrassTools( QgisInterface *iface, QWidget * parent = 0, const char * name = 0, Qt::WindowFlags f = 0 ); - //! Destructor + ~QgsGrassTools(); //! Append item to model or parent diff --git a/src/plugins/grass/qgsgrassutils.h b/src/plugins/grass/qgsgrassutils.h index ea1b978076a..8038909c39f 100644 --- a/src/plugins/grass/qgsgrassutils.h +++ b/src/plugins/grass/qgsgrassutils.h @@ -33,7 +33,7 @@ class QgsGrassUtils //! Constructor QgsGrassUtils(); - //! Destructor + ~QgsGrassUtils(); public: @@ -62,7 +62,7 @@ class QgsGrassElementDialog: public QObject //! Constructor explicit QgsGrassElementDialog( QWidget *parent ); - //! Destructor + ~QgsGrassElementDialog(); public: diff --git a/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h b/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h index babd112abe7..0de6eeb33e1 100644 --- a/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h +++ b/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h @@ -36,9 +36,6 @@ class QgsGeometryCoordinateTransform */ QgsGeometryCoordinateTransform(); - /** - * \brief Destructor - */ ~QgsGeometryCoordinateTransform(); /** diff --git a/src/plugins/spatialquery/qgsmngprogressbar.h b/src/plugins/spatialquery/qgsmngprogressbar.h index e7d6cd5dfb7..44d5a4fb739 100644 --- a/src/plugins/spatialquery/qgsmngprogressbar.h +++ b/src/plugins/spatialquery/qgsmngprogressbar.h @@ -34,9 +34,6 @@ class MngProgressBar */ explicit MngProgressBar( QProgressBar *pb ); - /** - * \brief Destructor - */ ~MngProgressBar() { mPb->reset(); } /** diff --git a/src/plugins/spatialquery/qgsrubberselectid.h b/src/plugins/spatialquery/qgsrubberselectid.h index 78daad81cd5..38d9ca54c4e 100644 --- a/src/plugins/spatialquery/qgsrubberselectid.h +++ b/src/plugins/spatialquery/qgsrubberselectid.h @@ -37,9 +37,6 @@ class QgsRubberSelectId */ explicit QgsRubberSelectId( QgsMapCanvas* mapCanvas ); - /** - * \brief Destructor - */ ~QgsRubberSelectId(); /** diff --git a/src/plugins/spatialquery/qgsspatialquery.h b/src/plugins/spatialquery/qgsspatialquery.h index 084faa6674d..74a5c4e2adb 100644 --- a/src/plugins/spatialquery/qgsspatialquery.h +++ b/src/plugins/spatialquery/qgsspatialquery.h @@ -59,9 +59,6 @@ class QgsSpatialQuery */ explicit QgsSpatialQuery( MngProgressBar *pb ); - /** - * \brief Destructor - */ ~QgsSpatialQuery(); /** diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.h b/src/plugins/spatialquery/qgsspatialquerydialog.h index c2333740041..7bb936ee401 100644 --- a/src/plugins/spatialquery/qgsspatialquerydialog.h +++ b/src/plugins/spatialquery/qgsspatialquerydialog.h @@ -41,7 +41,7 @@ class QgsSpatialQueryDialog : public QDialog, private Ui::QgsSpatialQueryDialogB * @param iface Pointer to the QgisInterface object. */ QgsSpatialQueryDialog( QWidget *parent = nullptr, QgisInterface* iface = nullptr ); - //! Destructor + ~QgsSpatialQueryDialog(); //! Verify is possible execute the query diff --git a/src/plugins/spatialquery/qgsspatialqueryplugin.h b/src/plugins/spatialquery/qgsspatialqueryplugin.h index 56fa515a18a..e3e2dccd305 100644 --- a/src/plugins/spatialquery/qgsspatialqueryplugin.h +++ b/src/plugins/spatialquery/qgsspatialqueryplugin.h @@ -52,7 +52,7 @@ class QgsSpatialQueryPlugin: public QObject, public QgisPlugin * \param iface Pointer to the QgisInterface object. */ explicit QgsSpatialQueryPlugin( QgisInterface* iface ); - //! Destructor + ~QgsSpatialQueryPlugin(); public slots: diff --git a/src/plugins/topology/topol.h b/src/plugins/topology/topol.h index f72a789469b..6e00732821b 100644 --- a/src/plugins/topology/topol.h +++ b/src/plugins/topology/topol.h @@ -71,7 +71,7 @@ class Topol: public QObject, public QgisPlugin * @param theInterface Pointer to the QgisInterface object. */ explicit Topol( QgisInterface * theInterface ); - //! Destructor + virtual ~Topol(); public slots: diff --git a/src/plugins/topology/topolError.h b/src/plugins/topology/topolError.h index b5e043260dc..ad35eff433f 100644 --- a/src/plugins/topology/topolError.h +++ b/src/plugins/topology/topolError.h @@ -123,9 +123,6 @@ class TopolError */ TopolError( const QgsRectangle& theBoundingBox, const QgsGeometry& theConflict, const QList& theFeaturePairs ); - /** - * Destructor - */ virtual ~TopolError() {} /** diff --git a/src/providers/db2/qgsdb2newconnection.h b/src/providers/db2/qgsdb2newconnection.h index e5389d7796f..1288e4033bb 100644 --- a/src/providers/db2/qgsdb2newconnection.h +++ b/src/providers/db2/qgsdb2newconnection.h @@ -33,7 +33,7 @@ class QgsDb2NewConnection : public QDialog, private Ui::QgsDb2NewConnectionBase //! Constructor QgsDb2NewConnection( QWidget *parent = 0, const QString& connName = QString::null, Qt::WindowFlags fl = QgisGui::ModalDialogFlags ); - //! Destructor + ~QgsDb2NewConnection(); //! Tests the connection using the parameters supplied diff --git a/src/providers/db2/qgsdb2sourceselect.h b/src/providers/db2/qgsdb2sourceselect.h index 9da9bff981e..65bc6e82103 100644 --- a/src/providers/db2/qgsdb2sourceselect.h +++ b/src/providers/db2/qgsdb2sourceselect.h @@ -98,7 +98,7 @@ class QgsDb2SourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase //! Constructor QgsDb2SourceSelect( QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false ); - //! Destructor + ~QgsDb2SourceSelect(); //! Populate the connection list combo box void populateConnectionList(); diff --git a/src/providers/grass/qgsgrassrasterprovider.h b/src/providers/grass/qgsgrassrasterprovider.h index 8eb0e7758ab..31f877107ba 100644 --- a/src/providers/grass/qgsgrassrasterprovider.h +++ b/src/providers/grass/qgsgrassrasterprovider.h @@ -99,7 +99,7 @@ class GRASS_LIB_EXPORT QgsGrassRasterProvider : public QgsRasterDataProvider */ explicit QgsGrassRasterProvider( QString const & uri = 0 ); - //! Destructor + ~QgsGrassRasterProvider(); QgsRasterInterface * clone() const override; diff --git a/src/providers/mssql/qgsmssqlnewconnection.h b/src/providers/mssql/qgsmssqlnewconnection.h index 74dd35d2990..972f42c48ca 100644 --- a/src/providers/mssql/qgsmssqlnewconnection.h +++ b/src/providers/mssql/qgsmssqlnewconnection.h @@ -32,7 +32,7 @@ class QgsMssqlNewConnection : public QDialog, private Ui::QgsMssqlNewConnectionB //! Constructor QgsMssqlNewConnection( QWidget *parent = nullptr, const QString& connName = QString::null, Qt::WindowFlags fl = QgisGui::ModalDialogFlags ); - //! Destructor + ~QgsMssqlNewConnection(); //! Tests the connection using the parameters supplied diff --git a/src/providers/mssql/qgsmssqlsourceselect.h b/src/providers/mssql/qgsmssqlsourceselect.h index 40cabbdac12..09973e2f5be 100644 --- a/src/providers/mssql/qgsmssqlsourceselect.h +++ b/src/providers/mssql/qgsmssqlsourceselect.h @@ -96,7 +96,7 @@ class QgsMssqlSourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase //! Constructor QgsMssqlSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false ); - //! Destructor + ~QgsMssqlSourceSelect(); //! Populate the connection list combo box void populateConnectionList(); diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h index 8f5ed9e675c..2bddecb8f58 100644 --- a/src/providers/ogr/qgsogrprovider.h +++ b/src/providers/ogr/qgsogrprovider.h @@ -70,9 +70,6 @@ class QgsOgrProvider : public QgsVectorDataProvider */ explicit QgsOgrProvider( QString const & uri = "" ); - /** - * Destructor - */ virtual ~QgsOgrProvider(); virtual QgsAbstractFeatureSource* featureSource() const override; diff --git a/src/providers/ows/qgsowsprovider.h b/src/providers/ows/qgsowsprovider.h index 33edc25fc29..cce62f928df 100644 --- a/src/providers/ows/qgsowsprovider.h +++ b/src/providers/ows/qgsowsprovider.h @@ -48,7 +48,7 @@ class QgsOwsProvider : public QgsDataProvider */ explicit QgsOwsProvider( const QString & uri = QString() ); - //! Destructor + ~QgsOwsProvider(); /* Pure virtuals */ diff --git a/src/providers/postgres/qgspgnewconnection.h b/src/providers/postgres/qgspgnewconnection.h index 8749a98fba2..6a2373f34a0 100644 --- a/src/providers/postgres/qgspgnewconnection.h +++ b/src/providers/postgres/qgspgnewconnection.h @@ -31,7 +31,7 @@ class QgsPgNewConnection : public QDialog, private Ui::QgsPgNewConnectionBase public: //! Constructor QgsPgNewConnection( QWidget *parent = nullptr, const QString& connName = QString::null, Qt::WindowFlags fl = QgisGui::ModalDialogFlags ); - //! Destructor + ~QgsPgNewConnection(); //! Tests the connection using the parameters supplied void testConnection(); diff --git a/src/providers/postgres/qgspgsourceselect.h b/src/providers/postgres/qgspgsourceselect.h index 2cc6a3dd019..02f70811ec3 100644 --- a/src/providers/postgres/qgspgsourceselect.h +++ b/src/providers/postgres/qgspgsourceselect.h @@ -64,7 +64,7 @@ class QgsPgSourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase public: //! Constructor QgsPgSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false ); - //! Destructor + ~QgsPgSourceSelect(); //! Populate the connection list combo box void populateConnectionList(); diff --git a/src/providers/spatialite/qgsspatialitesourceselect.h b/src/providers/spatialite/qgsspatialitesourceselect.h index 151761c63c8..43be40c1671 100644 --- a/src/providers/spatialite/qgsspatialitesourceselect.h +++ b/src/providers/spatialite/qgsspatialitesourceselect.h @@ -51,7 +51,7 @@ class QgsSpatiaLiteSourceSelect: public QDialog, private Ui::QgsDbSourceSelectBa //! Constructor QgsSpatiaLiteSourceSelect( QWidget * parent, Qt::WindowFlags fl = QgisGui::ModalDialogFlags, bool embedded = false ); - //! Destructor + ~QgsSpatiaLiteSourceSelect(); //! Populate the connection list combo box void populateConnectionList(); diff --git a/src/providers/wcs/qgswcscapabilities.h b/src/providers/wcs/qgswcscapabilities.h index b2d3306f8d5..db2c43b9d10 100644 --- a/src/providers/wcs/qgswcscapabilities.h +++ b/src/providers/wcs/qgswcscapabilities.h @@ -100,7 +100,7 @@ class QgsWcsCapabilities : public QObject explicit QgsWcsCapabilities( QgsDataSourceUri const & theUri ); QgsWcsCapabilities(); - //! Destructor + ~QgsWcsCapabilities(); void setUri( QgsDataSourceUri const &theUri ); diff --git a/src/providers/wcs/qgswcsprovider.h b/src/providers/wcs/qgswcsprovider.h index d99e226380c..bd95b2c0d2a 100644 --- a/src/providers/wcs/qgswcsprovider.h +++ b/src/providers/wcs/qgswcsprovider.h @@ -116,7 +116,7 @@ class QgsWcsProvider : public QgsRasterDataProvider, QgsGdalProviderBase */ explicit QgsWcsProvider( const QString& uri = QString() ); - //! Destructor + virtual ~QgsWcsProvider(); QgsWcsProvider * clone() const override; diff --git a/src/providers/wcs/qgswcssourceselect.h b/src/providers/wcs/qgswcssourceselect.h index bcc88a7cf94..ea83b597e52 100644 --- a/src/providers/wcs/qgswcssourceselect.h +++ b/src/providers/wcs/qgswcssourceselect.h @@ -54,7 +54,7 @@ class QgsWCSSourceSelect : public QgsOWSSourceSelect public: //! Constructor QgsWCSSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false ); - //! Destructor + ~QgsWCSSourceSelect(); public slots: diff --git a/src/providers/wms/qgswmsconnection.h b/src/providers/wms/qgswmsconnection.h index 587c0159810..4820c30ea16 100644 --- a/src/providers/wms/qgswmsconnection.h +++ b/src/providers/wms/qgswmsconnection.h @@ -32,7 +32,7 @@ class QgsWMSConnection : public QObject public: //! Constructor explicit QgsWMSConnection( const QString& theConnName ); - //! Destructor + ~QgsWMSConnection(); static QStringList connectionList(); diff --git a/src/providers/wms/qgswmssourceselect.h b/src/providers/wms/qgswmssourceselect.h index b3ce029a219..343218b64fc 100644 --- a/src/providers/wms/qgswmssourceselect.h +++ b/src/providers/wms/qgswmssourceselect.h @@ -51,7 +51,7 @@ class QgsWMSSourceSelect : public QDialog, private Ui::QgsWMSSourceSelectBase public: //! Constructor QgsWMSSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false ); - //! Destructor + ~QgsWMSSourceSelect(); public slots: diff --git a/src/providers/wms/qgswmtsdimensions.h b/src/providers/wms/qgswmtsdimensions.h index 08cb4241557..83c1ba4b597 100644 --- a/src/providers/wms/qgswmtsdimensions.h +++ b/src/providers/wms/qgswmtsdimensions.h @@ -38,7 +38,7 @@ class QgsWmtsDimensions : public QDialog, private Ui::QgsWmtsDimensionsBase public: //! Constructor QgsWmtsDimensions( const QgsWmtsTileLayer &layer, QWidget *parent = nullptr, Qt::WindowFlags fl = 0 ); - //! Destructor + ~QgsWmtsDimensions(); void selectedDimensions( QHash &dims ); diff --git a/src/server/qgsaccesscontrol.h b/src/server/qgsaccesscontrol.h index f039ab7b900..1134279e38c 100644 --- a/src/server/qgsaccesscontrol.h +++ b/src/server/qgsaccesscontrol.h @@ -47,7 +47,7 @@ class SERVER_EXPORT QgsAccessControl : public QgsFeatureFilterProvider mPluginsAccessControls = new QgsAccessControlFilterMap( *copy.mPluginsAccessControls ); } - //! Destructor + ~QgsAccessControl() { delete mPluginsAccessControls; diff --git a/src/server/qgsaccesscontrolfilter.cpp b/src/server/qgsaccesscontrolfilter.cpp index 386b1806beb..70974d0ffe2 100644 --- a/src/server/qgsaccesscontrolfilter.cpp +++ b/src/server/qgsaccesscontrolfilter.cpp @@ -32,7 +32,7 @@ QgsAccessControlFilter::QgsAccessControlFilter( const QgsServerInterface* server { } -//! Destructor + QgsAccessControlFilter::~QgsAccessControlFilter() { } diff --git a/src/server/qgsaccesscontrolfilter.h b/src/server/qgsaccesscontrolfilter.h index cb596ad17e5..903c226c7ac 100644 --- a/src/server/qgsaccesscontrolfilter.h +++ b/src/server/qgsaccesscontrolfilter.h @@ -54,7 +54,7 @@ class SERVER_EXPORT QgsAccessControlFilter * and must be passed to QgsAccessControlFilter instances. */ QgsAccessControlFilter( const QgsServerInterface* serverInterface ); - //! Destructor + virtual ~QgsAccessControlFilter(); //! Describe the layer permission diff --git a/src/server/qgsserverfilter.h b/src/server/qgsserverfilter.h index e2f5f5836fc..4c34a9e6c34 100644 --- a/src/server/qgsserverfilter.h +++ b/src/server/qgsserverfilter.h @@ -46,7 +46,7 @@ class SERVER_EXPORT QgsServerFilter * and must be passed to QgsServerFilter instances. */ QgsServerFilter( QgsServerInterface* serverInterface ); - //! Destructor + virtual ~QgsServerFilter(); //! Return the QgsServerInterface instance QgsServerInterface* serverInterface() { return mServerInterface; } diff --git a/src/server/qgsserverinterface.cpp b/src/server/qgsserverinterface.cpp index 302bcfd2bc0..65919466dab 100644 --- a/src/server/qgsserverinterface.cpp +++ b/src/server/qgsserverinterface.cpp @@ -24,7 +24,7 @@ QgsServerInterface::QgsServerInterface(): { } -//! Destructor + QgsServerInterface::~QgsServerInterface() { } diff --git a/src/server/qgsserverinterface.h b/src/server/qgsserverinterface.h index cc21381ba5f..f900487fc24 100644 --- a/src/server/qgsserverinterface.h +++ b/src/server/qgsserverinterface.h @@ -48,7 +48,7 @@ class SERVER_EXPORT QgsServerInterface //! Constructor QgsServerInterface(); - //! Destructor + virtual ~QgsServerInterface() = 0; /** diff --git a/src/server/qgsserverinterfaceimpl.cpp b/src/server/qgsserverinterfaceimpl.cpp index a90cc65135e..692a01686c0 100644 --- a/src/server/qgsserverinterfaceimpl.cpp +++ b/src/server/qgsserverinterfaceimpl.cpp @@ -36,7 +36,7 @@ QString QgsServerInterfaceImpl::getEnv( const QString& name ) const } -//! Destructor + QgsServerInterfaceImpl::~QgsServerInterfaceImpl() { delete mAccessControls; diff --git a/src/server/qgsserverinterfaceimpl.h b/src/server/qgsserverinterfaceimpl.h index 9cf31091b5c..7ce7afcd642 100644 --- a/src/server/qgsserverinterfaceimpl.h +++ b/src/server/qgsserverinterfaceimpl.h @@ -39,7 +39,7 @@ class QgsServerInterfaceImpl : public QgsServerInterface //! Constructor explicit QgsServerInterfaceImpl( QgsCapabilitiesCache *capCache ); - //! Destructor + ~QgsServerInterfaceImpl(); void setRequestHandler( QgsRequestHandler* requestHandler ) override;