Skip to content
Permalink
Browse files

Remove redundant overridden default destructor implementations

  • Loading branch information
nyalldawson committed Dec 14, 2017
1 parent 4da1ce8 commit 8802482778e31dc178f493a222e8cdbee3666c78
Showing with 3 additions and 63 deletions.
  1. +0 −2 python/analysis/network/qgsgraphdirector.sip
  2. +0 −2 python/analysis/network/qgsvectorlayerdirector.sip
  3. +1 −1 python/analysis/raster/qgsderivativefilter.sip
  4. +0 −1 python/analysis/raster/qgsruggednessfilter.sip
  5. +0 −1 python/analysis/raster/qgsslopefilter.sip
  6. +0 −1 python/analysis/raster/qgstotalcurvaturefilter.sip
  7. +0 −2 python/core/annotations/qgshtmlannotation.sip
  8. +0 −1 python/core/composer/qgscomposerobject.sip
  9. +0 −2 python/core/layout/qgslayoutserializableobject.sip
  10. +0 −2 python/core/symbology/qgsrendererregistry.sip
  11. +0 −2 python/gui/layout/qgslayoutcustomdrophandler.sip
  12. +0 −2 python/gui/layout/qgslayoutdesignerinterface.sip
  13. +0 −5 python/gui/qgsabstractdatasourcewidget.sip
  14. +0 −2 python/gui/qgscomposerinterface.sip
  15. +0 −1 python/gui/qgscustomdrophandler.sip
  16. +0 −2 src/3d/chunks/qgschunkloader_p.h
  17. +0 −1 src/3d/qgsvectorlayer3drenderer.h
  18. +0 −1 src/3d/terrain/qgsdemterraintilegeometry_p.h
  19. +0 −2 src/analysis/network/qgsgraphdirector.h
  20. +0 −2 src/analysis/network/qgsvectorlayerdirector.h
  21. +1 −1 src/analysis/raster/qgsderivativefilter.h
  22. +0 −1 src/analysis/raster/qgsruggednessfilter.h
  23. +0 −1 src/analysis/raster/qgsslopefilter.h
  24. +0 −1 src/analysis/raster/qgstotalcurvaturefilter.h
  25. +0 −2 src/core/annotations/qgshtmlannotation.h
  26. +0 −1 src/core/composer/qgscomposerobject.h
  27. +0 −2 src/core/layout/qgslayoutserializableobject.h
  28. +0 −5 src/core/qgsauxiliarystorage.h
  29. +0 −2 src/core/symbology/qgsrendererregistry.h
  30. +0 −2 src/gui/layout/qgslayoutcustomdrophandler.h
  31. +0 −2 src/gui/layout/qgslayoutdesignerinterface.h
  32. +0 −3 src/gui/qgsabstractdatasourcewidget.h
  33. +0 −2 src/gui/qgscomposerinterface.h
  34. +0 −1 src/gui/qgscustomdrophandler.h
  35. +1 −1 src/providers/wms/qgswmsprovider.h
  36. +0 −1 tests/src/gui/testqgslayoutview.cpp
@@ -32,8 +32,6 @@ using "builder" design patter.
%End
public:

~QgsGraphDirector();

virtual void makeGraph( QgsGraphBuilderInterface *builder,
const QVector< QgsPointXY > &additionalPoints,
QVector< QgsPointXY > &snappedPoints /Out/,
@@ -48,8 +48,6 @@ Default constructor
attribute value is not set or does not equal to the given values
%End

~QgsVectorLayerDirector();

virtual void makeGraph( QgsGraphBuilderInterface *builder,
const QVector< QgsPointXY > &additionalPoints,
QVector< QgsPointXY> &snappedPoints /Out/,
@@ -20,7 +20,7 @@ Adds the ability to calculate derivatives in x- and y-directions. Needs to be su
%End
public:
QgsDerivativeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
~QgsDerivativeFilter();

virtual float processNineCellWindow( float *x11, float *x21, float *x31,
float *x12, float *x22, float *x32,
float *x13, float *x23, float *x33 ) = 0;
@@ -21,7 +21,6 @@ Algorithm from Riley et al. 1999: A terrain ruggedness index that quantifies top
%End
public:
QgsRuggednessFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
~QgsRuggednessFilter();

protected:

@@ -20,7 +20,6 @@ Calculates slope values in a window of 3x3 cells based on first order derivative
%End
public:
QgsSlopeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
~QgsSlopeFilter();

virtual float processNineCellWindow( float *x11, float *x21, float *x31,
float *x12, float *x22, float *x32,
@@ -20,7 +20,6 @@ Calculates total curvature as described by Wilson, Gallant (2000): terrain analy
%End
public:
QgsTotalCurvatureFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
~QgsTotalCurvatureFilter();

protected:

@@ -30,8 +30,6 @@ An annotation item that embeds HTML content.
Constructor for QgsHtmlAnnotation.
%End

~QgsHtmlAnnotation();

virtual QgsHtmlAnnotation *clone() const /Factory/;


@@ -92,7 +92,6 @@ Returns the composer object property definitions.
Constructor
:param composition: parent composition
%End
~QgsComposerObject();

const QgsComposition *composition() const;
%Docstring
@@ -23,8 +23,6 @@ An interface for layout objects which can be stored and read from DOM elements.
%End
public:

~QgsLayoutSerializableObject();

virtual QString stringType() const = 0;
%Docstring
Return the object type as a string.
@@ -114,8 +114,6 @@ Convenience metadata class that uses static functions to create renderer and its



~QgsRendererMetadata();

virtual QgsFeatureRenderer *createRenderer( QDomElement &elem, const QgsReadWriteContext &context ) /Factory/;
virtual QgsRendererWidget *createRendererWidget( QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer ) /Factory/;
virtual QgsFeatureRenderer *createRendererFromSld( QDomElement &elem, QgsWkbTypes::GeometryType geomType ) /Factory/;
@@ -27,8 +27,6 @@ Abstract base class that may be implemented to handle new types of data to be dr
Constructor for QgsLayoutCustomDropHandler.
%End

~QgsLayoutCustomDropHandler();

virtual bool handleFileDrop( QgsLayoutDesignerInterface *iface, const QString &file );
%Docstring
Called when the specified ``file`` has been dropped onto a QGIS layout. If true
@@ -31,8 +31,6 @@ open layout designer dialogs.
Constructor for QgsLayoutDesignerInterface.
%End

~QgsLayoutDesignerInterface();

virtual QgsLayout *layout() = 0;
%Docstring
Returns the layout displayed in the designer.
@@ -27,11 +27,6 @@ and add layers.
%End
public:

~QgsAbstractDataSourceWidget();
%Docstring
Destructor
%End

void setMapCanvas( const QgsMapCanvas *mapCanvas );
%Docstring
Store a pointer to the map canvas to retrieve extent and CRS
@@ -31,8 +31,6 @@ open composer dialogs.
Constructor for QgsComposerInterface.
%End

~QgsComposerInterface();

virtual QgsComposerView *view() = 0;
%Docstring
Returns the composer's QgsComposerView editor widget.
@@ -39,7 +39,6 @@ quickly and defer any intensive or slow processing.
#include "qgscustomdrophandler.h"
%End
public:
~QgsCustomDropHandler();

virtual QString customUriProviderKey() const;
%Docstring
@@ -44,8 +44,6 @@ class QgsChunkLoader : public QgsChunkQueueJob
{
}

~QgsChunkLoader() override = default;

/**
* Run in main thread to use loaded data.
* Returns entity attached to the given parent entity in disabled state
@@ -58,7 +58,6 @@ class _3D_EXPORT QgsVectorLayer3DRenderer : public QgsAbstract3DRenderer
public:
//! Takes ownership of the symbol object
explicit QgsVectorLayer3DRenderer( QgsAbstract3DSymbol *s SIP_TRANSFER = nullptr );
~QgsVectorLayer3DRenderer() override = default;

//! Sets vector layer associated with the renderer
void setLayer( QgsVectorLayer *layer );
@@ -56,7 +56,6 @@ class DemTerrainTileGeometry : public Qt3DRender::QGeometry
* heightMap is array of float values with one height value for each vertex
*/
explicit DemTerrainTileGeometry( int resolution, float skirtHeight, const QByteArray &heightMap, QNode *parent = nullptr );
~DemTerrainTileGeometry() override = default;

private:
void init();
@@ -56,8 +56,6 @@ class ANALYSIS_EXPORT QgsGraphDirector : public QObject

public:

~QgsGraphDirector() override = default;

/**
* Make a graph using QgsGraphBuilder
*
@@ -68,8 +68,6 @@ class ANALYSIS_EXPORT QgsVectorLayerDirector : public QgsGraphDirector
const Direction defaultDirection
);

~QgsVectorLayerDirector() override = default;

/*
* MANDATORY DIRECTOR PROPERTY DECLARATION
*/
@@ -28,7 +28,7 @@ class ANALYSIS_EXPORT QgsDerivativeFilter : public QgsNineCellFilter
{
public:
QgsDerivativeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
~QgsDerivativeFilter() override = default;

//to be implemented by subclasses
float processNineCellWindow( float *x11, float *x21, float *x31,
float *x12, float *x22, float *x32,
@@ -29,7 +29,6 @@ class ANALYSIS_EXPORT QgsRuggednessFilter: public QgsNineCellFilter
{
public:
QgsRuggednessFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
~QgsRuggednessFilter() override = default;

protected:

@@ -28,7 +28,6 @@ class ANALYSIS_EXPORT QgsSlopeFilter: public QgsDerivativeFilter
{
public:
QgsSlopeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
~QgsSlopeFilter() override = default;

/**
* Calculates output value from nine input values. The input values and the output value can be equal to the
@@ -28,7 +28,6 @@ class ANALYSIS_EXPORT QgsTotalCurvatureFilter: public QgsNineCellFilter
{
public:
QgsTotalCurvatureFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
~QgsTotalCurvatureFilter() override = default;

protected:

@@ -42,8 +42,6 @@ class CORE_EXPORT QgsHtmlAnnotation: public QgsAnnotation
*/
QgsHtmlAnnotation( QObject *parent SIP_TRANSFERTHIS = nullptr );

~QgsHtmlAnnotation() override = default;

QgsHtmlAnnotation *clone() const override SIP_FACTORY;

QSizeF minimumFrameSize() const override;
@@ -116,7 +116,6 @@ class CORE_EXPORT QgsComposerObject: public QObject, public QgsExpressionContext
* \param composition parent composition
*/
QgsComposerObject( QgsComposition *composition );
~QgsComposerObject() override = default;

/**
* Returns the composition the item is attached to.
@@ -36,8 +36,6 @@ class CORE_EXPORT QgsLayoutSerializableObject : public QgsLayoutUndoObjectInterf
{
public:

~QgsLayoutSerializableObject() override = default;

/**
* Return the object type as a string.
*
@@ -72,11 +72,6 @@ class CORE_EXPORT QgsAuxiliaryLayer : public QgsVectorLayer
*/
QgsAuxiliaryLayer( const QString &pkField, const QString &filename, const QString &table, QgsVectorLayer *vlayer );

/**
* Destructor
*/
~QgsAuxiliaryLayer() override = default;

/**
* Copy constructor deactivated
*/
@@ -149,8 +149,6 @@ class CORE_EXPORT QgsRendererMetadata : public QgsRendererAbstractMetadata
, mLayerTypes( layerTypes )
{}

~QgsRendererMetadata() override = default;

QgsFeatureRenderer *createRenderer( QDomElement &elem, const QgsReadWriteContext &context ) override SIP_FACTORY
{ return mCreateFunc ? mCreateFunc( elem, context ) : nullptr; }
QgsRendererWidget *createRendererWidget( QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer ) override SIP_FACTORY
@@ -39,8 +39,6 @@ class GUI_EXPORT QgsLayoutCustomDropHandler : public QObject
*/
QgsLayoutCustomDropHandler( QObject *parent SIP_TRANSFERTHIS = nullptr );

~QgsLayoutCustomDropHandler() override = default;

/**
* Called when the specified \a file has been dropped onto a QGIS layout. If true
* is returned, then the handler has accepted this file and it should not
@@ -48,8 +48,6 @@ class GUI_EXPORT QgsLayoutDesignerInterface: public QObject
: QObject( parent )
{}

~QgsLayoutDesignerInterface() override = default;

/**
* Returns the layout displayed in the designer.
* \see view()
@@ -44,9 +44,6 @@ class GUI_EXPORT QgsAbstractDataSourceWidget : public QDialog

public:

//! Destructor
~QgsAbstractDataSourceWidget() override = default;

/**
* Store a pointer to the map canvas to retrieve extent and CRS
* Used to select an appropriate CRS and possibly to retrieve data only in the current extent
@@ -47,8 +47,6 @@ class GUI_EXPORT QgsComposerInterface: public QObject
: QObject( parent )
{}

~QgsComposerInterface() override = default;

/**
* Returns the composer's QgsComposerView editor widget.
*/
@@ -49,7 +49,6 @@ class GUI_EXPORT QgsCustomDropHandler : public QObject
Q_OBJECT

public:
~QgsCustomDropHandler() override = default;

/**
* Type of custom URI recognized by the handler. This must match
@@ -86,7 +86,7 @@ class QgsCachedImageFetcher: public QgsImageFetcher
Q_OBJECT
public:
explicit QgsCachedImageFetcher( const QImage &img );
~QgsCachedImageFetcher() override = default;

void start() override;
private:
const QImage _img; // copy is intentional
@@ -242,7 +242,6 @@ class TestItem : public QgsLayoutItem
public:

TestItem( QgsLayout *layout ) : QgsLayoutItem( layout ) {}
~TestItem() override = default;

int mFlag = 0;

0 comments on commit 8802482

Please sign in to comment.
You can’t perform that action at this time.