Use =default, =delete where possible

qgis · Nov 11, 2017 · 2e6d125 · 2e6d125
1 parent bcd9071
commit 2e6d125
Show file tree

Hide file tree

Showing 120 changed files with 181 additions and 281 deletions.
diff --git a/python/core/effects/qgsimageoperation.sip b/python/core/effects/qgsimageoperation.sip
@@ -93,7 +93,6 @@ class QgsImageOperation
 
     struct DistanceTransformProperties
     {
-      DistanceTransformProperties();
 
       bool shadeExterior;
 %Docstring

diff --git a/python/core/fieldformatter/qgsvaluerelationfieldformatter.sip b/python/core/fieldformatter/qgsvaluerelationfieldformatter.sip
@@ -25,8 +25,14 @@ class QgsValueRelationFieldFormatter : QgsFieldFormatter
     struct ValueRelationItem
     {
       ValueRelationItem( const QVariant &key, const QString &value );
+%Docstring
+Constructor for ValueRelationItem
+%End
 
       ValueRelationItem();
+%Docstring
+Constructor for ValueRelationItem
+%End
 
       QVariant key;
       QString value;

diff --git a/python/core/qgsdartmeasurement.sip b/python/core/qgsdartmeasurement.sip
@@ -24,6 +24,9 @@ class QgsDartMeasurement
     };
 
     QgsDartMeasurement();
+%Docstring
+Constructor for QgsDartMeasurement
+%End
 
     QgsDartMeasurement( const QString &name, Type type, const QString &value );
 

diff --git a/python/core/qgsdiagramrenderer.sip b/python/core/qgsdiagramrenderer.sip
@@ -319,6 +319,9 @@ class QgsDiagramSettings
     };
 
     QgsDiagramSettings();
+%Docstring
+Constructor for QgsDiagramSettings
+%End
 
     bool enabled;
     QFont font;

diff --git a/python/core/qgseditformconfig.sip b/python/core/qgseditformconfig.sip
@@ -29,6 +29,9 @@ class QgsEditFormConfig
     struct GroupData
     {
       GroupData();
+%Docstring
+Constructor for GroupData
+%End
       GroupData( const QString &name, const QList<QString> &fields );
       QString mName;
       QList<QString> mFields;
@@ -37,6 +40,9 @@ class QgsEditFormConfig
     struct TabData
     {
       TabData();
+%Docstring
+Constructor for TabData
+%End
       TabData( const QString &name, const QList<QString> &fields, const QList<QgsEditFormConfig::GroupData> &groups );
       QString mName;
       QList<QString> mFields;

diff --git a/python/core/qgseditorwidgetsetup.sip b/python/core/qgseditorwidgetsetup.sip
@@ -27,6 +27,9 @@ class QgsEditorWidgetSetup
 %End
 
     QgsEditorWidgetSetup();
+%Docstring
+Constructor for QgsEditorWidgetSetup
+%End
 
     QString type() const;
 %Docstring

diff --git a/python/core/qgserror.sip b/python/core/qgserror.sip
@@ -27,6 +27,9 @@ class QgsErrorMessage
     };
 
     QgsErrorMessage();
+%Docstring
+Constructor for QgsErrorMessage
+%End
 
     QgsErrorMessage( const QString &message, const QString &tag = QString(), const QString &file = QString(), const QString &function = QString(), int line = 0 );
 %Docstring

diff --git a/python/core/qgsexpressioncontext.sip b/python/core/qgsexpressioncontext.sip
@@ -345,6 +345,9 @@ class QgsExpressionContext
   public:
 
     QgsExpressionContext();
+%Docstring
+Constructor for QgsExpressionContext
+%End
 
     explicit QgsExpressionContext( const QList<QgsExpressionContextScope *> &scopes /Transfer/ );
 %Docstring

diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip
@@ -20,7 +20,11 @@ class QgsLabelPosition
 %End
   public:
     QgsLabelPosition( int id, double r, const QVector< QgsPointXY > &corners, const QgsRectangle &rect, double w, double h, const QString &layer, const QString &labeltext, const QFont &labelfont, bool upside_down, bool diagram = false, bool pinned = false, const QString &providerId = QString() );
+
     QgsLabelPosition();
+%Docstring
+Constructor for QgsLabelPosition
+%End
 
     int featureId;
     double rotation;

diff --git a/python/core/qgsvectorfilewriter.sip b/python/core/qgsvectorfilewriter.sip
@@ -107,6 +107,9 @@ There are two possibilities how to use this class:
     struct MetaData
     {
       MetaData();
+%Docstring
+Constructor for MetaData
+%End
 
       MetaData( const QString &longName, const QString &trLongName, const QString &glob, const QString &ext, const QMap<QString, QgsVectorFileWriter::Option *> &driverOptions, const QMap<QString, QgsVectorFileWriter::Option *> &layerOptions, const QString &compulsoryEncoding = QString() );
 

diff --git a/python/core/qgsvectorlayereditbuffer.sip b/python/core/qgsvectorlayereditbuffer.sip
@@ -249,6 +249,9 @@ Signals emitted after committing changes
   protected:
 
     QgsVectorLayerEditBuffer();
+%Docstring
+Constructor for QgsVectorLayerEditBuffer
+%End
 
     void updateFields( QgsFields &fields );
 

diff --git a/python/core/qgsvectorlayerutils.sip b/python/core/qgsvectorlayerutils.sip
@@ -36,6 +36,9 @@ class QgsVectorLayerUtils
       public:
 
         QgsDuplicateFeatureContext();
+%Docstring
+Constructor for QgsDuplicateFeatureContext
+%End
 
         QList<QgsVectorLayer *> layers() const;
 %Docstring

diff --git a/python/core/symbology/qgssymbol.sip b/python/core/symbology/qgssymbol.sip
@@ -404,6 +404,7 @@ class QgsSymbolRenderContext
  \param mapUnitScale
 %End
 
+
     QgsRenderContext &renderContext();
 %Docstring
  :rtype: QgsRenderContext

diff --git a/python/gui/qgsattributeeditorcontext.sip b/python/gui/qgsattributeeditorcontext.sip
@@ -39,6 +39,9 @@ class QgsAttributeEditorContext
     };
 
     QgsAttributeEditorContext();
+%Docstring
+Constructor for QgsAttributeEditorContext
+%End
 
     QgsAttributeEditorContext( const QgsAttributeEditorContext &parentContext, FormMode formMode );
 

diff --git a/python/gui/qgsidentifymenu.sip b/python/gui/qgsidentifymenu.sip
@@ -32,6 +32,9 @@ class QgsIdentifyMenu : QMenu
     struct ActionData
     {
       ActionData();
+%Docstring
+Constructor for ActionData
+%End
 
       ActionData( QgsMapLayer *layer, QgsMapLayerAction *mapLayerAction = 0 );
 

diff --git a/python/gui/qgslonglongvalidator.sip b/python/gui/qgslonglongvalidator.sip
@@ -20,8 +20,6 @@ class QgsLongLongValidator : QValidator
 
     QgsLongLongValidator( qint64 bottom, qint64 top, QObject *parent );
 
-    ~QgsLongLongValidator();
-
     virtual QValidator::State validate( QString &input, int & ) const;
 
     void setBottom( qint64 bottom );

diff --git a/python/gui/qgsmaptoolidentify.sip b/python/gui/qgsmaptoolidentify.sip
@@ -47,6 +47,9 @@ after selecting a point, performs the identification:
     struct IdentifyResult
     {
       IdentifyResult();
+%Docstring
+Constructor for IdentifyResult
+%End
 
       IdentifyResult( QgsMapLayer *layer, const QgsFeature &feature, const QMap< QString, QString > &derivedAttributes );
       IdentifyResult( QgsMapLayer *layer, const QString &label, const QMap< QString, QString > &attributes, const QMap< QString, QString > &derivedAttributes );

diff --git a/python/gui/qgssublayersdialog.sip b/python/gui/qgssublayersdialog.sip
@@ -25,8 +25,6 @@ class QgsSublayersDialog : QDialog
 
     struct LayerDefinition
     {
-      LayerDefinition();
-
       int layerId;
       QString layerName;  //!< Name of the layer (not necessarily unique)
       int count;

diff --git a/python/server/qgsbufferserverresponse.sip b/python/server/qgsbufferserverresponse.sip
@@ -22,6 +22,7 @@ class QgsBufferServerResponse: QgsServerResponse
 
     QgsBufferServerResponse();
 
+
     virtual void setHeader( const QString &key, const QString &value );
 
 %Docstring

diff --git a/src/3d/terrain/qgsdemterraintilegeometry_p.cpp b/src/3d/terrain/qgsdemterraintilegeometry_p.cpp
@@ -141,8 +141,6 @@ class PlaneVertexBufferFunctor : public QBufferDataGenerator
       , mHeightMap( heightMap )
     {}
 
-    ~PlaneVertexBufferFunctor() {}
-
     QByteArray operator()() final
     {
       return createPlaneVertexData( mResolution, mSkirtHeight, mHeightMap );
@@ -175,8 +173,6 @@ class PlaneIndexBufferFunctor : public QBufferDataGenerator
       : mResolution( resolution )
     {}
 
-    ~PlaneIndexBufferFunctor() {}
-
     QByteArray operator()() final
     {
       return createPlaneIndexData( mResolution );

diff --git a/src/3d/terrain/qgsdemterraintileloader_p.cpp b/src/3d/terrain/qgsdemterraintileloader_p.cpp
@@ -57,10 +57,6 @@ QgsDemTerrainTileLoader::QgsDemTerrainTileLoader( QgsTerrainEntity *terrain, Qgs
   mSkirtHeight = generator->skirtHeight();
 }
 
-QgsDemTerrainTileLoader::~QgsDemTerrainTileLoader()
-{
-}
-
 Qt3DCore::QEntity *QgsDemTerrainTileLoader::createEntity( Qt3DCore::QEntity *parent )
 {
   QgsTerrainTileEntity *entity = new QgsTerrainTileEntity;

diff --git a/src/3d/terrain/qgsdemterraintileloader_p.h b/src/3d/terrain/qgsdemterraintileloader_p.h
@@ -49,7 +49,6 @@ class QgsDemTerrainTileLoader : public QgsTerrainTileLoader
   public:
     //! Constructs loader for the given chunk node
     QgsDemTerrainTileLoader( QgsTerrainEntity *terrain, QgsChunkNode *node );
-    ~QgsDemTerrainTileLoader();
 
     virtual Qt3DCore::QEntity *createEntity( Qt3DCore::QEntity *parent );
 

diff --git a/src/3d/terrain/qgsflatterraingenerator.cpp b/src/3d/terrain/qgsflatterraingenerator.cpp
@@ -92,11 +92,6 @@ Qt3DCore::QEntity *FlatTerrainChunkLoader::createEntity( Qt3DCore::QEntity *pare
 
 // ---------------
 
-
-QgsFlatTerrainGenerator::QgsFlatTerrainGenerator()
-{
-}
-
 QgsChunkLoader *QgsFlatTerrainGenerator::createChunkLoader( QgsChunkNode *node ) const
 {
   return new FlatTerrainChunkLoader( mTerrain, node );

diff --git a/src/3d/terrain/qgsflatterraingenerator.h b/src/3d/terrain/qgsflatterraingenerator.h
@@ -33,7 +33,7 @@ class _3D_EXPORT QgsFlatTerrainGenerator : public QgsTerrainGenerator
 {
   public:
     //! Creates flat terrain generator object
-    QgsFlatTerrainGenerator();
+    QgsFlatTerrainGenerator() = default;
 
     virtual QgsChunkLoader *createChunkLoader( QgsChunkNode *node ) const override SIP_FACTORY;
 

diff --git a/src/3d/terrain/qgsterraintextureimage_p.cpp b/src/3d/terrain/qgsterraintextureimage_p.cpp
@@ -76,11 +76,6 @@ QgsTerrainTextureImage::QgsTerrainTextureImage( const QImage &image, const QgsRe
 {
 }
 
-
-QgsTerrainTextureImage::~QgsTerrainTextureImage()
-{
-}
-
 Qt3DRender::QTextureImageDataGeneratorPtr QgsTerrainTextureImage::dataGenerator() const
 {
   return Qt3DRender::QTextureImageDataGeneratorPtr( new TerrainTextureImageDataGenerator( mExtent, mDebugText, mImage, mVersion ) );

diff --git a/src/3d/terrain/qgsterraintextureimage_p.h b/src/3d/terrain/qgsterraintextureimage_p.h
@@ -47,7 +47,6 @@ class QgsTerrainTextureImage : public Qt3DRender::QAbstractTextureImage
   public:
     //! Constructs the object with given image and map extent
     QgsTerrainTextureImage( const QImage &image, const QgsRectangle &extent, const QString &debugText, Qt3DCore::QNode *parent = nullptr );
-    ~QgsTerrainTextureImage();
 
     virtual Qt3DRender::QTextureImageDataGeneratorPtr dataGenerator() const override;
 

diff --git a/src/analysis/interpolation/Bezier3D.h b/src/analysis/interpolation/Bezier3D.h
@@ -38,7 +38,6 @@ class ANALYSIS_EXPORT Bezier3D: public ParametricLine
     //! Constructor, par is a pointer to the parent, controlpoly a controlpolygon
     Bezier3D( ParametricLine *par, QVector<QgsPoint *> *controlpoly );
 
-    virtual ~Bezier3D();
     //! Do not use this method, since a Bezier curve does not consist of other curves
     virtual void add( ParametricLine *pl SIP_TRANSFER ) override;
     //! Calculates the first derivative and assigns it to v
@@ -83,11 +82,6 @@ inline Bezier3D::Bezier3D( ParametricLine *parent, QVector<QgsPoint *> *controlp
   mDegree = mControlPoly->count() - 1;
 }
 
-inline Bezier3D::~Bezier3D()
-{
-
-}
-
 //----------------------------------------------invalid methods add and remove (because of inheritance from ParametricLine)
 
 inline void Bezier3D::add( ParametricLine *pl )

diff --git a/src/analysis/interpolation/HalfEdge.h b/src/analysis/interpolation/HalfEdge.h
@@ -42,7 +42,7 @@ class ANALYSIS_EXPORT HalfEdge
 
   public:
     //! Default constructor. Values for mDual, mNext, mPoint are set to -10 which means that they are undefined
-    HalfEdge();
+    HalfEdge() = default;
     HalfEdge( int dual, int next, int point, bool mbreak, bool forced );
 
     //! Returns the number of the dual HalfEdge
@@ -69,12 +69,6 @@ class ANALYSIS_EXPORT HalfEdge
 
 #ifndef SIP_RUN
 
-
-inline HalfEdge::HalfEdge()
-{
-
-}
-
 inline HalfEdge::HalfEdge( int dual, int next, int point, bool mbreak, bool forced ): mDual( dual ), mNext( next ), mPoint( point ), mBreak( mbreak ), mForced( forced )
 {
 

diff --git a/src/analysis/interpolation/LinTriangleInterpolator.h b/src/analysis/interpolation/LinTriangleInterpolator.h
@@ -32,10 +32,9 @@ class ANALYSIS_EXPORT LinTriangleInterpolator : public TriangleInterpolator
 {
   public:
     //! Default constructor
-    LinTriangleInterpolator();
+    LinTriangleInterpolator() = default;
     //! Constructor with reference to a DualEdgeTriangulation object
     LinTriangleInterpolator( DualEdgeTriangulation *tin );
-    virtual ~LinTriangleInterpolator();
     //! Calculates the normal vector and assigns it to vec
     virtual bool calcNormVec( double x, double y, Vector3D *result SIP_OUT ) override;
     bool calcPoint( double x, double y, QgsPoint &result SIP_OUT ) override;
@@ -55,21 +54,11 @@ class ANALYSIS_EXPORT LinTriangleInterpolator : public TriangleInterpolator
 
 #ifndef SIP_RUN
 
-inline LinTriangleInterpolator::LinTriangleInterpolator()
-{
-
-}
-
 inline LinTriangleInterpolator::LinTriangleInterpolator( DualEdgeTriangulation *tin ): mTIN( tin )
 {
 
 }
 
-inline LinTriangleInterpolator::~LinTriangleInterpolator()
-{
-
-}
-
 inline DualEdgeTriangulation *LinTriangleInterpolator::getTriangulation() const
 {
   return mTIN;

diff --git a/src/analysis/interpolation/ParametricLine.h b/src/analysis/interpolation/ParametricLine.h
@@ -43,13 +43,13 @@ class ANALYSIS_EXPORT ParametricLine
     QVector<QgsPoint *> *mControlPoly = nullptr;
   public:
     //! Default constructor
-    ParametricLine();
+    ParametricLine() = default;
 
     /**
      * Constructor, par is a pointer to the parent object, controlpoly the controlpolygon
       */
     ParametricLine( ParametricLine *par SIP_TRANSFER, QVector<QgsPoint *> *controlpoly );
-    virtual ~ParametricLine();
+    virtual ~ParametricLine() = default;
     virtual void add( ParametricLine *pl SIP_TRANSFER ) = 0;
     virtual void calcFirstDer( float t, Vector3D *v SIP_OUT ) = 0;
     virtual void calcSecDer( float t, Vector3D *v SIP_OUT ) = 0;
@@ -71,23 +71,13 @@ class ANALYSIS_EXPORT ParametricLine
 
 //-----------------------------------------constructors and destructor----------------------
 
-inline ParametricLine::ParametricLine()
-{
-
-}
-
 inline ParametricLine::ParametricLine( ParametricLine *par, QVector<QgsPoint *> *controlpoly )
   : mParent( par )
   , mControlPoly( controlpoly )
 {
 
 }
 
-inline ParametricLine::~ParametricLine()
-{
-  //delete mParent;
-}
-
 #endif
 
 #endif