Optimise destructors (pt 1)

- Remove some non-base class empty destructors. These add no value and it's better to let the compiler auto generate optimised versions - use virtual ~Class = default instead of virtual ~Class {}
qgis · Dec 30, 2016 · 850171c · 850171c
1 parent 9021bb4
commit 850171c
Show file tree

Hide file tree

Showing 134 changed files with 50 additions and 313 deletions.
diff --git a/src/analysis/interpolation/HalfEdge.h b/src/analysis/interpolation/HalfEdge.h
@@ -38,7 +38,7 @@ class ANALYSIS_EXPORT HalfEdge
     //! Default constructor. Values for mDual, mNext, mPoint are set to -10 which means that they are undefined
     HalfEdge();
     HalfEdge( int dual, int next, int point, bool mbreak, bool forced );
-    ~HalfEdge();
+
     //! Returns the number of the dual HalfEdge
     int getDual() const;
     //! Returns the number of the next HalfEdge
@@ -71,11 +71,6 @@ inline HalfEdge::HalfEdge( int dual, int next, int point, bool mbreak, bool forc
 
 }
 
-inline HalfEdge::~HalfEdge()
-{
-
-}
-
 inline int HalfEdge::getDual() const
 {
   return mDual;

diff --git a/src/analysis/interpolation/Point3D.h b/src/analysis/interpolation/Point3D.h
@@ -35,7 +35,6 @@ class ANALYSIS_EXPORT Point3D
     //! Constructor with the x-, y- and z-coordinate as arguments
     Point3D( double x, double y, double z );
     Point3D( const Point3D& p );
-    ~Point3D();
     Point3D& operator=( const Point3D& p );
     bool operator==( const Point3D& p ) const;
     bool operator!=( const Point3D& p ) const;
@@ -76,11 +75,6 @@ inline Point3D::Point3D( const Point3D& p ): mX( p.mX ), mY( p.mY ), mZ( p.mZ )
 
 }
 
-inline Point3D::~Point3D()
-{
-
-}
-
 inline double Point3D::getX() const
 {
   return mX;

diff --git a/src/analysis/interpolation/TriangleInterpolator.h b/src/analysis/interpolation/TriangleInterpolator.h
@@ -25,7 +25,7 @@
 class ANALYSIS_EXPORT TriangleInterpolator
 {
   public:
-    virtual ~TriangleInterpolator() {}
+    virtual ~TriangleInterpolator() = default;
     //! Calculates the normal vector and assigns it to vec
     virtual bool calcNormVec( double x, double y, Vector3D* result ) = 0;
     //! Performs a linear interpolation in a triangle and assigns the x-,y- and z-coordinates to point

diff --git a/src/analysis/interpolation/Vector3D.h b/src/analysis/interpolation/Vector3D.h
@@ -43,7 +43,6 @@ class ANALYSIS_EXPORT Vector3D
     //! Copy constructor
     Vector3D( const Vector3D& v );
 
-    ~Vector3D();
     Vector3D& operator=( const Vector3D& v );
     bool operator==( const Vector3D& v ) const;
     bool operator!=( const Vector3D& v ) const;
@@ -83,11 +82,6 @@ inline Vector3D::Vector3D()
 
 }
 
-inline Vector3D::~Vector3D()
-{
-
-}
-
 //-------------------------------------------setter and getters-------------------------------
 
 inline double Vector3D::getX() const

diff --git a/src/analysis/interpolation/qgsidwinterpolator.cpp b/src/analysis/interpolation/qgsidwinterpolator.cpp
@@ -29,11 +29,6 @@ QgsIDWInterpolator::QgsIDWInterpolator(): QgsInterpolator( QList<LayerData>() ),
 
 }
 
-QgsIDWInterpolator::~QgsIDWInterpolator()
-{
-
-}
-
 int QgsIDWInterpolator::interpolatePoint( double x, double y, double& result )
 {
   if ( !mDataIsCached )

diff --git a/src/analysis/interpolation/qgsidwinterpolator.h b/src/analysis/interpolation/qgsidwinterpolator.h
@@ -27,7 +27,6 @@ class ANALYSIS_EXPORT QgsIDWInterpolator: public QgsInterpolator
 {
   public:
     QgsIDWInterpolator( const QList<LayerData>& layerData );
-    ~QgsIDWInterpolator();
 
     /** Calculates interpolation value for map coordinates x, y
        @param x x-coordinate (in map units)

diff --git a/src/analysis/network/qgsnetworkstrategy.h b/src/analysis/network/qgsnetworkstrategy.h
@@ -39,7 +39,7 @@ class ANALYSIS_EXPORT QgsNetworkStrategy
      */
     QgsNetworkStrategy() {}
 
-    virtual ~QgsNetworkStrategy() {}
+    virtual ~QgsNetworkStrategy() = default;
 
     /**
      * Returns list of the source layer attributes needed for cost calculation.

diff --git a/src/analysis/raster/qgsalignraster.h b/src/analysis/raster/qgsalignraster.h
@@ -147,7 +147,7 @@ class ANALYSIS_EXPORT QgsAlignRaster
       //! @return false if the execution should be cancelled, true otherwise
       virtual bool progress( double complete ) = 0;
 
-      virtual ~ProgressHandler() {}
+      virtual ~ProgressHandler() = default;
     };
 
     //! Assign a progress handler instance. Does not take ownership. nullptr can be passed.

diff --git a/src/analysis/raster/qgsaspectfilter.cpp b/src/analysis/raster/qgsaspectfilter.cpp
@@ -23,11 +23,6 @@ QgsAspectFilter::QgsAspectFilter( const QString& inputFile, const QString& outpu
 
 }
 
-QgsAspectFilter::~QgsAspectFilter()
-{
-
-}
-
 float QgsAspectFilter::processNineCellWindow(
   float* x11, float* x21, float* x31,
   float* x12, float* x22, float* x32,

diff --git a/src/analysis/raster/qgsaspectfilter.h b/src/analysis/raster/qgsaspectfilter.h
@@ -26,7 +26,6 @@ class ANALYSIS_EXPORT QgsAspectFilter: public QgsDerivativeFilter
 {
   public:
     QgsAspectFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
-    ~QgsAspectFilter();
 
     /** Calculates output value from nine input values. The input values and the output value can be equal to the
       nodata value if not present or outside of the border. Must be implemented by subclasses*/

diff --git a/src/analysis/raster/qgshillshadefilter.cpp b/src/analysis/raster/qgshillshadefilter.cpp
@@ -25,10 +25,6 @@ QgsHillshadeFilter::QgsHillshadeFilter( const QString& inputFile, const QString&
 {
 }
 
-QgsHillshadeFilter::~QgsHillshadeFilter()
-{
-}
-
 float QgsHillshadeFilter::processNineCellWindow( float* x11, float* x21, float* x31,
     float* x12, float* x22, float* x32,
     float* x13, float* x23, float* x33 )

diff --git a/src/analysis/raster/qgshillshadefilter.h b/src/analysis/raster/qgshillshadefilter.h
@@ -28,7 +28,6 @@ class ANALYSIS_EXPORT QgsHillshadeFilter: public QgsDerivativeFilter
   public:
     QgsHillshadeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, double lightAzimuth = 300,
                         double lightAngle = 40 );
-    ~QgsHillshadeFilter();
 
     /** Calculates output value from nine input values. The input values and the output value can be equal to the
     nodata value if not present or outside of the border. Must be implemented by subclasses*/

diff --git a/src/analysis/vector/qgsgeometrysnapper.h b/src/analysis/vector/qgsgeometrysnapper.h
@@ -122,7 +122,7 @@ class QgsSnapIndex
     class SnapItem
     {
       public:
-        virtual ~SnapItem() {}
+        virtual ~SnapItem() = default;
         SnapType type;
         virtual QgsPointV2 getSnapPoint( const QgsPointV2& p ) const = 0;
 

diff --git a/src/app/dwg/libdxfrw/drw_entities.h b/src/app/dwg/libdxfrw/drw_entities.h
@@ -1237,8 +1237,6 @@ class DRW_Dimension : public DRW_Entity
     {
     }
 
-    virtual ~DRW_Dimension() {}
-
     virtual void applyExtrusion() {}
 
   protected:

diff --git a/src/app/dwg/libdxfrw/intern/drw_dbg.cpp b/src/app/dwg/libdxfrw/intern/drw_dbg.cpp
@@ -33,7 +33,7 @@ class print_none
     virtual void printHL( int c, int s, int h ) {( void )c;( void )s;( void )h;}
     virtual void printPT( double x, double y, double z ) {( void )x;( void )y;( void )z;}
     print_none() {}
-    virtual ~print_none() {}
+    virtual ~print_none() = default;
 };
 
 class print_debug : public print_none

diff --git a/src/app/dwg/libdxfrw/intern/drw_textcodec.h b/src/app/dwg/libdxfrw/intern/drw_textcodec.h
@@ -36,7 +36,7 @@ class DRW_Converter
       table = t;
       cpLenght = l;
     }
-    virtual ~DRW_Converter() {}
+    virtual ~DRW_Converter() = default;
     virtual std::string fromUtf8( std::string *s ) {return *s;}
     virtual std::string toUtf8( std::string *s );
     std::string encodeText( std::string stmp );

diff --git a/src/app/dwg/libdxfrw/intern/dwgbuffer.h b/src/app/dwg/libdxfrw/intern/dwgbuffer.h
@@ -25,7 +25,7 @@ class dwgBasicStream
   protected:
     dwgBasicStream() {}
   public:
-    virtual ~dwgBasicStream() {}
+    virtual ~dwgBasicStream() = default;
     virtual bool read( duint8* s, duint64 n ) = 0;
     virtual duint64 size() = 0;
     virtual duint64 getPos() = 0;
@@ -44,7 +44,6 @@ class dwgFileStream: public dwgBasicStream
       sz = stream->tellg();
       stream->seekg( 0, std::ios_base::beg );
     }
-    virtual ~dwgFileStream() {}
     virtual bool read( duint8* s, duint64 n );
     virtual duint64 size() {return sz;}
     virtual duint64 getPos() {return stream->tellg();}
@@ -66,7 +65,6 @@ class dwgCharStream: public dwgBasicStream
       pos = 0;
       isOk = true;
     }
-    virtual ~dwgCharStream() {}
     virtual bool read( duint8* s, duint64 n );
     virtual duint64 size() {return sz;}
     virtual duint64 getPos() {return pos;}

diff --git a/src/app/dwg/libdxfrw/intern/dwgreader.h b/src/app/dwg/libdxfrw/intern/dwgreader.h
@@ -69,7 +69,7 @@ class dwgPageInfo
         , uSize( 0 )
     {
     }
-    ~dwgPageInfo() {}
+
     duint64 Id;
     duint64 address; //in file stream, for rd18, rd21
     duint64 size; //in file stream, for rd18, rd21
@@ -101,7 +101,7 @@ class dwgSectionInfo
         , address( 0 )
     {
     }
-    ~dwgSectionInfo() {}
+
     dint32 Id; //section Id, 2000-   rd15 rd18
     std::string name; //section name rd18
     duint32 compressed;//is compressed? 1=no, 2=yes rd18, rd21(encoding)

diff --git a/src/app/dwg/libdxfrw/intern/dwgreader15.h b/src/app/dwg/libdxfrw/intern/dwgreader15.h
@@ -23,7 +23,6 @@ class dwgReader15 : public dwgReader
 {
   public:
     dwgReader15( std::ifstream *stream, dwgR *p ): dwgReader( stream, p ) { }
-    virtual ~dwgReader15() {}
     bool readMetaData();
     bool readFileHeader();
     bool readDwgHeader( DRW_Header& hdr );

diff --git a/src/app/dwg/libdxfrw/intern/dwgreader24.h b/src/app/dwg/libdxfrw/intern/dwgreader24.h
@@ -23,7 +23,6 @@ class dwgReader24 : public dwgReader18
 {
   public:
     dwgReader24( std::ifstream *stream, dwgR *p ): dwgReader18( stream, p ) { }
-    virtual ~dwgReader24() {}
     bool readFileHeader();
     bool readDwgHeader( DRW_Header& hdr );
     bool readDwgClasses();

diff --git a/src/app/dwg/libdxfrw/intern/dwgreader27.h b/src/app/dwg/libdxfrw/intern/dwgreader27.h
@@ -23,7 +23,6 @@ class dwgReader27 : public dwgReader18
 {
   public:
     dwgReader27( std::ifstream *stream, dwgR *p ): dwgReader18( stream, p ) { }
-    virtual ~dwgReader27() {}
     bool readFileHeader();
     bool readDwgHeader( DRW_Header& hdr );
     bool readDwgClasses();

diff --git a/src/app/dwg/libdxfrw/intern/dwgutil.h b/src/app/dwg/libdxfrw/intern/dwgutil.h
@@ -24,7 +24,7 @@ class dwgRSCodec
 {
   public:
     dwgRSCodec() {}
-    ~dwgRSCodec() {}
+
     static void decode239I( duint8 *in, duint8 *out, duint32 blk );
     static void decode251I( duint8 *in, duint8 *out, duint32 blk );
 };
@@ -41,8 +41,6 @@ class dwgCompressor
         , rpos( 0 )
     {}
 
-    ~dwgCompressor() {}
-
     void decompress18( duint8 *cbuf, duint8 *dbuf, duint32 csize, duint32 dsize );
     static void decrypt18Hdr( duint8 *buf, duint32 size, duint32 offset );
 //  static void decrypt18Data(duint8 *buf, duint32 size, duint32 offset);
@@ -96,7 +94,6 @@ class secEnum
     };
 
     secEnum() {}
-    ~secEnum() {}
 
     static DWGSection getEnum( std::string nameSec );
 };

diff --git a/src/app/dwg/libdxfrw/intern/dxfreader.h b/src/app/dwg/libdxfrw/intern/dxfreader.h
@@ -38,7 +38,7 @@ class dxfReader
       filestr = stream;
       type = INVALID;
     }
-    virtual ~dxfReader() {}
+    virtual ~dxfReader() = default;
     bool readRec( int *code );
 
     std::string getString() {return strData;}
@@ -81,7 +81,6 @@ class dxfReaderBinary : public dxfReader
     explicit dxfReaderBinary( std::ifstream *stream )
         : dxfReader( stream, false )
     {}
-    virtual ~dxfReaderBinary() {}
     virtual bool readCode( int *code );
     virtual bool readString( std::string *text );
     virtual bool readString();
@@ -98,7 +97,6 @@ class dxfReaderAscii : public dxfReader
     explicit dxfReaderAscii( std::ifstream *stream )
         : dxfReader( stream, true )
     {}
-    virtual ~dxfReaderAscii() {}
     virtual bool readCode( int *code );
     virtual bool readString( std::string *text );
     virtual bool readString();

diff --git a/src/app/dwg/libdxfrw/intern/dxfwriter.h b/src/app/dwg/libdxfrw/intern/dxfwriter.h
@@ -22,7 +22,7 @@ class dxfWriter
         : filestr( stream )
 //    , count( 0 )
     {}
-    virtual ~dxfWriter() {}
+    virtual ~dxfWriter() = default;
     virtual bool writeString( int code, std::string text ) = 0;
     bool writeUtf8String( int code, std::string text );
     bool writeUtf8Caps( int code, std::string text );
@@ -47,7 +47,6 @@ class dxfWriterBinary : public dxfWriter
     explicit dxfWriterBinary( std::ofstream *stream )
         : dxfWriter( stream )
     {}
-    virtual ~dxfWriterBinary() {}
     virtual bool writeString( int code, std::string text );
     virtual bool writeInt16( int code, int data );
     virtual bool writeInt32( int code, int data );
@@ -60,7 +59,6 @@ class dxfWriterAscii : public dxfWriter
 {
   public:
     explicit dxfWriterAscii( std::ofstream *stream );
-    virtual ~dxfWriterAscii() {}
     virtual bool writeString( int code, std::string text );
     virtual bool writeInt16( int code, int data );
     virtual bool writeInt32( int code, int data );

diff --git a/src/app/qgsattributeactiondialog.h b/src/app/qgsattributeactiondialog.h
@@ -49,8 +49,6 @@ class APP_EXPORT QgsAttributeActionDialog: public QWidget, private Ui::QgsAttrib
     QgsAttributeActionDialog( const QgsActionManager& actions,
                               QWidget* parent = nullptr );
 
-    ~QgsAttributeActionDialog() {}
-
     void init( const QgsActionManager& action , const QgsAttributeTableConfig& attributeTableConfig );
 
     QList<QgsAction> actions() const;

diff --git a/src/app/qgsdecorationcopyright.cpp b/src/app/qgsdecorationcopyright.cpp
@@ -54,9 +54,6 @@ QgsDecorationCopyright::QgsDecorationCopyright( QObject* parent )
   projectRead();
 }
 
-QgsDecorationCopyright::~QgsDecorationCopyright()
-{}
-
 void QgsDecorationCopyright::projectRead()
 {
   QgsDecorationItem::projectRead();

diff --git a/src/app/qgsdecorationcopyright.h b/src/app/qgsdecorationcopyright.h
@@ -37,8 +37,6 @@ class APP_EXPORT QgsDecorationCopyright : public QgsDecorationItem
     //! Constructor
     QgsDecorationCopyright( QObject* parent = nullptr );
 
-    virtual ~QgsDecorationCopyright();
-
   public slots:
     //! set values on the gui when a project is read or the gui first loaded
     void projectRead() override;

diff --git a/src/core/auth/qgsauthconfig.h b/src/core/auth/qgsauthconfig.h
@@ -299,8 +299,6 @@ class CORE_EXPORT QgsAuthConfigSslServer
     //! Construct a default SSL server configuration
     QgsAuthConfigSslServer();
 
-    ~QgsAuthConfigSslServer() {}
-
     //! Server certificate object
     const QSslCertificate sslCertificate() const { return mSslCert; }
     //! Set server certificate object

diff --git a/src/core/auth/qgsauthmethod.h b/src/core/auth/qgsauthmethod.h
@@ -53,8 +53,6 @@ class CORE_EXPORT QgsAuthMethod : public QObject
     };
     Q_DECLARE_FLAGS( Expansions, Expansion )
 
-    virtual ~QgsAuthMethod() {}
-
     //! A non-translated short name representing the auth method
     virtual QString key() const = 0;
 

diff --git a/src/core/effects/qgspainteffectregistry.h b/src/core/effects/qgspainteffectregistry.h
@@ -43,7 +43,7 @@ class CORE_EXPORT QgsPaintEffectAbstractMetadata
      */
     QgsPaintEffectAbstractMetadata( const QString& name, const QString& visibleName );
 
-    virtual ~QgsPaintEffectAbstractMetadata() {}
+    virtual ~QgsPaintEffectAbstractMetadata() = default;
 
     /** Returns the unique string representing the paint effect class
      * @returns unique string

diff --git a/src/core/geometry/qgsabstractgeometry.cpp b/src/core/geometry/qgsabstractgeometry.cpp
@@ -27,10 +27,6 @@ QgsAbstractGeometry::QgsAbstractGeometry(): mWkbType( QgsWkbTypes::Unknown )
 {
 }
 
-QgsAbstractGeometry::~QgsAbstractGeometry()
-{
-}
-
 QgsAbstractGeometry::QgsAbstractGeometry( const QgsAbstractGeometry& geom )
 {
   mWkbType = geom.mWkbType;