Skip to content

Commit 8802482

Browse files
committed
Remove redundant overridden default destructor implementations
1 parent 4da1ce8 commit 8802482

36 files changed

+3
-63
lines changed

python/analysis/network/qgsgraphdirector.sip

-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ using "builder" design patter.
3232
%End
3333
public:
3434

35-
~QgsGraphDirector();
36-
3735
virtual void makeGraph( QgsGraphBuilderInterface *builder,
3836
const QVector< QgsPointXY > &additionalPoints,
3937
QVector< QgsPointXY > &snappedPoints /Out/,

python/analysis/network/qgsvectorlayerdirector.sip

-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ Default constructor
4848
attribute value is not set or does not equal to the given values
4949
%End
5050

51-
~QgsVectorLayerDirector();
52-
5351
virtual void makeGraph( QgsGraphBuilderInterface *builder,
5452
const QVector< QgsPointXY > &additionalPoints,
5553
QVector< QgsPointXY> &snappedPoints /Out/,

python/analysis/raster/qgsderivativefilter.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Adds the ability to calculate derivatives in x- and y-directions. Needs to be su
2020
%End
2121
public:
2222
QgsDerivativeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
23-
~QgsDerivativeFilter();
23+
2424
virtual float processNineCellWindow( float *x11, float *x21, float *x31,
2525
float *x12, float *x22, float *x32,
2626
float *x13, float *x23, float *x33 ) = 0;

python/analysis/raster/qgsruggednessfilter.sip

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Algorithm from Riley et al. 1999: A terrain ruggedness index that quantifies top
2121
%End
2222
public:
2323
QgsRuggednessFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
24-
~QgsRuggednessFilter();
2524

2625
protected:
2726

python/analysis/raster/qgsslopefilter.sip

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Calculates slope values in a window of 3x3 cells based on first order derivative
2020
%End
2121
public:
2222
QgsSlopeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
23-
~QgsSlopeFilter();
2423

2524
virtual float processNineCellWindow( float *x11, float *x21, float *x31,
2625
float *x12, float *x22, float *x32,

python/analysis/raster/qgstotalcurvaturefilter.sip

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Calculates total curvature as described by Wilson, Gallant (2000): terrain analy
2020
%End
2121
public:
2222
QgsTotalCurvatureFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
23-
~QgsTotalCurvatureFilter();
2423

2524
protected:
2625

python/core/annotations/qgshtmlannotation.sip

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ An annotation item that embeds HTML content.
3030
Constructor for QgsHtmlAnnotation.
3131
%End
3232

33-
~QgsHtmlAnnotation();
34-
3533
virtual QgsHtmlAnnotation *clone() const /Factory/;
3634

3735

python/core/composer/qgscomposerobject.sip

-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ Returns the composer object property definitions.
9292
Constructor
9393
:param composition: parent composition
9494
%End
95-
~QgsComposerObject();
9695

9796
const QgsComposition *composition() const;
9897
%Docstring

python/core/layout/qgslayoutserializableobject.sip

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ An interface for layout objects which can be stored and read from DOM elements.
2323
%End
2424
public:
2525

26-
~QgsLayoutSerializableObject();
27-
2826
virtual QString stringType() const = 0;
2927
%Docstring
3028
Return the object type as a string.

python/core/symbology/qgsrendererregistry.sip

-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ Convenience metadata class that uses static functions to create renderer and its
114114

115115

116116

117-
~QgsRendererMetadata();
118-
119117
virtual QgsFeatureRenderer *createRenderer( QDomElement &elem, const QgsReadWriteContext &context ) /Factory/;
120118
virtual QgsRendererWidget *createRendererWidget( QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer ) /Factory/;
121119
virtual QgsFeatureRenderer *createRendererFromSld( QDomElement &elem, QgsWkbTypes::GeometryType geomType ) /Factory/;

python/gui/layout/qgslayoutcustomdrophandler.sip

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ Abstract base class that may be implemented to handle new types of data to be dr
2727
Constructor for QgsLayoutCustomDropHandler.
2828
%End
2929

30-
~QgsLayoutCustomDropHandler();
31-
3230
virtual bool handleFileDrop( QgsLayoutDesignerInterface *iface, const QString &file );
3331
%Docstring
3432
Called when the specified ``file`` has been dropped onto a QGIS layout. If true

python/gui/layout/qgslayoutdesignerinterface.sip

-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ open layout designer dialogs.
3131
Constructor for QgsLayoutDesignerInterface.
3232
%End
3333

34-
~QgsLayoutDesignerInterface();
35-
3634
virtual QgsLayout *layout() = 0;
3735
%Docstring
3836
Returns the layout displayed in the designer.

python/gui/qgsabstractdatasourcewidget.sip

-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ and add layers.
2727
%End
2828
public:
2929

30-
~QgsAbstractDataSourceWidget();
31-
%Docstring
32-
Destructor
33-
%End
34-
3530
void setMapCanvas( const QgsMapCanvas *mapCanvas );
3631
%Docstring
3732
Store a pointer to the map canvas to retrieve extent and CRS

python/gui/qgscomposerinterface.sip

-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ open composer dialogs.
3131
Constructor for QgsComposerInterface.
3232
%End
3333

34-
~QgsComposerInterface();
35-
3634
virtual QgsComposerView *view() = 0;
3735
%Docstring
3836
Returns the composer's QgsComposerView editor widget.

python/gui/qgscustomdrophandler.sip

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ quickly and defer any intensive or slow processing.
3939
#include "qgscustomdrophandler.h"
4040
%End
4141
public:
42-
~QgsCustomDropHandler();
4342

4443
virtual QString customUriProviderKey() const;
4544
%Docstring

src/3d/chunks/qgschunkloader_p.h

-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ class QgsChunkLoader : public QgsChunkQueueJob
4444
{
4545
}
4646

47-
~QgsChunkLoader() override = default;
48-
4947
/**
5048
* Run in main thread to use loaded data.
5149
* Returns entity attached to the given parent entity in disabled state

src/3d/qgsvectorlayer3drenderer.h

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class _3D_EXPORT QgsVectorLayer3DRenderer : public QgsAbstract3DRenderer
5858
public:
5959
//! Takes ownership of the symbol object
6060
explicit QgsVectorLayer3DRenderer( QgsAbstract3DSymbol *s SIP_TRANSFER = nullptr );
61-
~QgsVectorLayer3DRenderer() override = default;
6261

6362
//! Sets vector layer associated with the renderer
6463
void setLayer( QgsVectorLayer *layer );

src/3d/terrain/qgsdemterraintilegeometry_p.h

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ class DemTerrainTileGeometry : public Qt3DRender::QGeometry
5656
* heightMap is array of float values with one height value for each vertex
5757
*/
5858
explicit DemTerrainTileGeometry( int resolution, float skirtHeight, const QByteArray &heightMap, QNode *parent = nullptr );
59-
~DemTerrainTileGeometry() override = default;
6059

6160
private:
6261
void init();

src/analysis/network/qgsgraphdirector.h

-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ class ANALYSIS_EXPORT QgsGraphDirector : public QObject
5656

5757
public:
5858

59-
~QgsGraphDirector() override = default;
60-
6159
/**
6260
* Make a graph using QgsGraphBuilder
6361
*

src/analysis/network/qgsvectorlayerdirector.h

-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ class ANALYSIS_EXPORT QgsVectorLayerDirector : public QgsGraphDirector
6868
const Direction defaultDirection
6969
);
7070

71-
~QgsVectorLayerDirector() override = default;
72-
7371
/*
7472
* MANDATORY DIRECTOR PROPERTY DECLARATION
7573
*/

src/analysis/raster/qgsderivativefilter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class ANALYSIS_EXPORT QgsDerivativeFilter : public QgsNineCellFilter
2828
{
2929
public:
3030
QgsDerivativeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
31-
~QgsDerivativeFilter() override = default;
31+
3232
//to be implemented by subclasses
3333
float processNineCellWindow( float *x11, float *x21, float *x31,
3434
float *x12, float *x22, float *x32,

src/analysis/raster/qgsruggednessfilter.h

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class ANALYSIS_EXPORT QgsRuggednessFilter: public QgsNineCellFilter
2929
{
3030
public:
3131
QgsRuggednessFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
32-
~QgsRuggednessFilter() override = default;
3332

3433
protected:
3534

src/analysis/raster/qgsslopefilter.h

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class ANALYSIS_EXPORT QgsSlopeFilter: public QgsDerivativeFilter
2828
{
2929
public:
3030
QgsSlopeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
31-
~QgsSlopeFilter() override = default;
3231

3332
/**
3433
* Calculates output value from nine input values. The input values and the output value can be equal to the

src/analysis/raster/qgstotalcurvaturefilter.h

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class ANALYSIS_EXPORT QgsTotalCurvatureFilter: public QgsNineCellFilter
2828
{
2929
public:
3030
QgsTotalCurvatureFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
31-
~QgsTotalCurvatureFilter() override = default;
3231

3332
protected:
3433

src/core/annotations/qgshtmlannotation.h

-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ class CORE_EXPORT QgsHtmlAnnotation: public QgsAnnotation
4242
*/
4343
QgsHtmlAnnotation( QObject *parent SIP_TRANSFERTHIS = nullptr );
4444

45-
~QgsHtmlAnnotation() override = default;
46-
4745
QgsHtmlAnnotation *clone() const override SIP_FACTORY;
4846

4947
QSizeF minimumFrameSize() const override;

src/core/composer/qgscomposerobject.h

-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ class CORE_EXPORT QgsComposerObject: public QObject, public QgsExpressionContext
116116
* \param composition parent composition
117117
*/
118118
QgsComposerObject( QgsComposition *composition );
119-
~QgsComposerObject() override = default;
120119

121120
/**
122121
* Returns the composition the item is attached to.

src/core/layout/qgslayoutserializableobject.h

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ class CORE_EXPORT QgsLayoutSerializableObject : public QgsLayoutUndoObjectInterf
3636
{
3737
public:
3838

39-
~QgsLayoutSerializableObject() override = default;
40-
4139
/**
4240
* Return the object type as a string.
4341
*

src/core/qgsauxiliarystorage.h

-5
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ class CORE_EXPORT QgsAuxiliaryLayer : public QgsVectorLayer
7272
*/
7373
QgsAuxiliaryLayer( const QString &pkField, const QString &filename, const QString &table, QgsVectorLayer *vlayer );
7474

75-
/**
76-
* Destructor
77-
*/
78-
~QgsAuxiliaryLayer() override = default;
79-
8075
/**
8176
* Copy constructor deactivated
8277
*/

src/core/symbology/qgsrendererregistry.h

-2
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ class CORE_EXPORT QgsRendererMetadata : public QgsRendererAbstractMetadata
149149
, mLayerTypes( layerTypes )
150150
{}
151151

152-
~QgsRendererMetadata() override = default;
153-
154152
QgsFeatureRenderer *createRenderer( QDomElement &elem, const QgsReadWriteContext &context ) override SIP_FACTORY
155153
{ return mCreateFunc ? mCreateFunc( elem, context ) : nullptr; }
156154
QgsRendererWidget *createRendererWidget( QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer ) override SIP_FACTORY

src/gui/layout/qgslayoutcustomdrophandler.h

-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ class GUI_EXPORT QgsLayoutCustomDropHandler : public QObject
3939
*/
4040
QgsLayoutCustomDropHandler( QObject *parent SIP_TRANSFERTHIS = nullptr );
4141

42-
~QgsLayoutCustomDropHandler() override = default;
43-
4442
/**
4543
* Called when the specified \a file has been dropped onto a QGIS layout. If true
4644
* is returned, then the handler has accepted this file and it should not

src/gui/layout/qgslayoutdesignerinterface.h

-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ class GUI_EXPORT QgsLayoutDesignerInterface: public QObject
4848
: QObject( parent )
4949
{}
5050

51-
~QgsLayoutDesignerInterface() override = default;
52-
5351
/**
5452
* Returns the layout displayed in the designer.
5553
* \see view()

src/gui/qgsabstractdatasourcewidget.h

-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ class GUI_EXPORT QgsAbstractDataSourceWidget : public QDialog
4444

4545
public:
4646

47-
//! Destructor
48-
~QgsAbstractDataSourceWidget() override = default;
49-
5047
/**
5148
* Store a pointer to the map canvas to retrieve extent and CRS
5249
* Used to select an appropriate CRS and possibly to retrieve data only in the current extent

src/gui/qgscomposerinterface.h

-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ class GUI_EXPORT QgsComposerInterface: public QObject
4747
: QObject( parent )
4848
{}
4949

50-
~QgsComposerInterface() override = default;
51-
5250
/**
5351
* Returns the composer's QgsComposerView editor widget.
5452
*/

src/gui/qgscustomdrophandler.h

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ class GUI_EXPORT QgsCustomDropHandler : public QObject
4949
Q_OBJECT
5050

5151
public:
52-
~QgsCustomDropHandler() override = default;
5352

5453
/**
5554
* Type of custom URI recognized by the handler. This must match

src/providers/wms/qgswmsprovider.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class QgsCachedImageFetcher: public QgsImageFetcher
8686
Q_OBJECT
8787
public:
8888
explicit QgsCachedImageFetcher( const QImage &img );
89-
~QgsCachedImageFetcher() override = default;
89+
9090
void start() override;
9191
private:
9292
const QImage _img; // copy is intentional

tests/src/gui/testqgslayoutview.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ class TestItem : public QgsLayoutItem
242242
public:
243243

244244
TestItem( QgsLayout *layout ) : QgsLayoutItem( layout ) {}
245-
~TestItem() override = default;
246245

247246
int mFlag = 0;
248247

0 commit comments

Comments
 (0)