Remove more unnecessary destructors, flip empty constructors to =default

Author: nyalldawson

python/core/gps/qgsgpsdconnection.sip

@@ -21,7 +21,6 @@ class QgsGpsdConnection: QgsNMEAConnection
 %End
   public:
     QgsGpsdConnection( const QString &host, qint16 port, const QString &device );
-    ~QgsGpsdConnection();
 
 };
 

python/core/gps/qgsnmeaconnection.sip

@@ -20,7 +20,6 @@ class QgsNMEAConnection: QgsGPSConnection
 %End
   public:
     QgsNMEAConnection( QIODevice *dev );
-    ~QgsNMEAConnection();
 
   protected slots:
     virtual void parseData();

python/core/gps/qgsqtlocationconnection.sip

@@ -28,7 +28,6 @@ class QgsQtLocationConnection: QgsGPSConnection
 %End
   public:
     QgsQtLocationConnection();
-    ~QgsQtLocationConnection();
 
   protected slots:
     void broadcastConnectionAvailable();

src/analysis/interpolation/CloughTocherInterpolator.cpp

@@ -44,11 +44,6 @@ CloughTocherInterpolator::CloughTocherInterpolator( NormVecDecorator *tin )
 
 }
 
-CloughTocherInterpolator::~CloughTocherInterpolator()
-{
-  //nothing to do
-}
-
 void CloughTocherInterpolator::setTriangulation( NormVecDecorator *tin )
 {
   mTIN = tin;

src/analysis/interpolation/CloughTocherInterpolator.h

@@ -102,7 +102,7 @@ class ANALYSIS_EXPORT CloughTocherInterpolator : public TriangleInterpolator
     CloughTocherInterpolator();
     //! Constructor with a pointer to the triangulation as argument
     CloughTocherInterpolator( NormVecDecorator *tin );
-    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 SIP_OUT ) override;
     //! Performs a linear interpolation in a triangle and assigns the x-,y- and z-coordinates to point

src/app/qgspluginregistry.cpp

@@ -54,12 +54,6 @@ QgsPluginRegistry *QgsPluginRegistry::instance()
   return sInstance;
 }
 
-QgsPluginRegistry::QgsPluginRegistry()
-
-{
-// constructor does nothing
-}
-
 void QgsPluginRegistry::setQgisInterface( QgisInterface *iface )
 {
   mQgisInterface = iface;

src/app/qgspluginregistry.h

@@ -96,7 +96,7 @@ class APP_EXPORT QgsPluginRegistry
 
   protected:
     //! protected constructor
-    QgsPluginRegistry();
+    QgsPluginRegistry() = default;
 
     //! Try to load and get metadata from c++ plugin, return true on success
     bool checkCppPlugin( const QString &pluginFullPath );

src/core/geometry/qgsgeos.cpp

@@ -95,8 +95,6 @@ class GEOSInit
       finishGEOS_r( ctxt );
     }
 
-  private:
-
     GEOSInit( const GEOSInit &rh ) = delete;
     GEOSInit &operator=( const GEOSInit &rh ) = delete;
 };
@@ -115,6 +113,10 @@ class GEOSGeomScopedPtr
   public:
     explicit GEOSGeomScopedPtr( GEOSGeometry *geom = nullptr ) : mGeom( geom ) {}
     ~GEOSGeomScopedPtr() { GEOSGeom_destroy_r( geosinit.ctxt, mGeom ); }
+
+    GEOSGeomScopedPtr( const GEOSGeomScopedPtr &rh ) = delete;
+    GEOSGeomScopedPtr &operator=( const GEOSGeomScopedPtr &rh ) = delete;
+
     GEOSGeometry *get() const { return mGeom; }
     operator bool() const { return nullptr != mGeom; }
     void reset( GEOSGeometry *geom )
@@ -126,9 +128,6 @@ class GEOSGeomScopedPtr
   private:
     GEOSGeometry *mGeom = nullptr;
 
-  private:
-    GEOSGeomScopedPtr( const GEOSGeomScopedPtr &rh ) = delete;
-    GEOSGeomScopedPtr &operator=( const GEOSGeomScopedPtr &rh ) = delete;
 };
 
 QgsGeos::QgsGeos( const QgsAbstractGeometry *geometry, double precision )

src/core/gps/qgsgpsdconnection.cpp

@@ -31,11 +31,6 @@ QgsGpsdConnection::QgsGpsdConnection( const QString &host, qint16 port, const QS
   socket->connectToHost( host, port );
 }
 
-QgsGpsdConnection::~QgsGpsdConnection()
-{
-  //connection will be closed by base class
-}
-
 void QgsGpsdConnection::connected()
 {
   QgsDebugMsg( "connected!" );

src/core/gps/qgsgpsdconnection.h

@@ -30,7 +30,6 @@ class CORE_EXPORT QgsGpsdConnection: public QgsNMEAConnection
     Q_OBJECT
   public:
     QgsGpsdConnection( const QString &host, qint16 port, const QString &device );
-    ~QgsGpsdConnection();
 
   private slots:
     void connected();

src/core/gps/qgsnmeaconnection.cpp

@@ -35,11 +35,6 @@ QgsNMEAConnection::QgsNMEAConnection( QIODevice *dev ): QgsGPSConnection( dev )
 {
 }
 
-QgsNMEAConnection::~QgsNMEAConnection()
-{
-  //connection will be closed by base class
-}
-
 void QgsNMEAConnection::parseData()
 {
   if ( !mSource )

src/core/gps/qgsnmeaconnection.h

@@ -29,7 +29,6 @@ class CORE_EXPORT QgsNMEAConnection: public QgsGPSConnection
     Q_OBJECT
   public:
     QgsNMEAConnection( QIODevice *dev );
-    ~QgsNMEAConnection();
 
   protected slots:
     //! Parse available data source content

src/core/gps/qgsqtlocationconnection.cpp

@@ -34,11 +34,6 @@ QgsQtLocationConnection::QgsQtLocationConnection(): QgsGPSConnection( new QLocal
   QTimer::singleShot( 500, this, SLOT( broadcastConnectionAvailable() ) );
 }
 
-QgsQtLocationConnection::~QgsQtLocationConnection()
-{
-  //connection will be closed by base class
-}
-
 //Needed to make connection detectable (half HACK)
 //this signals that the device has started the GPS successfully,
 //not that it has a fix yet.

src/core/gps/qgsqtlocationconnection.h

@@ -52,7 +52,6 @@ class CORE_EXPORT QgsQtLocationConnection: public QgsGPSConnection
     Q_OBJECT
   public:
     QgsQtLocationConnection();
-    ~QgsQtLocationConnection();
 
   protected slots:
     //! Needed to make QtLocation detected

src/core/qgsrulebasedlabeling.cpp

@@ -22,11 +22,6 @@ QgsRuleBasedLabelProvider::QgsRuleBasedLabelProvider( const QgsRuleBasedLabeling
   mRules->rootRule()->createSubProviders( layer, mSubProviders, this );
 }
 
-QgsRuleBasedLabelProvider::~QgsRuleBasedLabelProvider()
-{
-  // sub-providers owned by labeling engine
-}
-
 QgsVectorLayerLabelProvider *QgsRuleBasedLabelProvider::createProvider( QgsVectorLayer *layer, const QString &providerId, bool withFeatureLoop, const QgsPalLayerSettings *settings )
 {
   return new QgsVectorLayerLabelProvider( layer, providerId, withFeatureLoop, settings );

src/core/qgsrulebasedlabeling.h

@@ -358,7 +358,6 @@ class CORE_EXPORT QgsRuleBasedLabelProvider : public QgsVectorLayerLabelProvider
 {
   public:
     QgsRuleBasedLabelProvider( const QgsRuleBasedLabeling &rules, QgsVectorLayer *layer, bool withFeatureLoop = true );
-    ~QgsRuleBasedLabelProvider();
 
     // reimplemented
 

src/core/qgsspatialindex.cpp

@@ -195,6 +195,8 @@ class QgsSpatialIndexData : public QSharedData
       delete mStorage;
     }
 
+    QgsSpatialIndexData &operator=( const QgsSpatialIndexData &rh ) = delete;
+
     void initTree( IDataStream *inputStream = nullptr )
     {
       // for now only memory manager
@@ -224,9 +226,6 @@ class QgsSpatialIndexData : public QSharedData
     //! R-tree containing spatial index
     SpatialIndex::ISpatialIndex *mRTree = nullptr;
 
-  private:
-
-    QgsSpatialIndexData &operator=( const QgsSpatialIndexData &rh ) = delete;
 };
 
 // -------------------------------------------------------------------------

src/gui/qgssourceselectproviderregistry.cpp

@@ -21,12 +21,6 @@
 
 typedef QList<QgsSourceSelectProvider *> *sourceSelectProviders_t();
 
-
-QgsSourceSelectProviderRegistry::QgsSourceSelectProviderRegistry()
-{
-  // Initialization is delayed
-}
-
 QgsSourceSelectProviderRegistry::~QgsSourceSelectProviderRegistry()
 {
   qDeleteAll( mProviders );

src/gui/qgssourceselectproviderregistry.h

@@ -37,7 +37,7 @@ class QgsSourceSelectProvider;
 class GUI_EXPORT QgsSourceSelectProviderRegistry
 {
   public:
-    QgsSourceSelectProviderRegistry();
+    QgsSourceSelectProviderRegistry() = default;
 
     ~QgsSourceSelectProviderRegistry();
 

src/providers/ogr/qgsogrdbconnection.cpp

@@ -34,11 +34,6 @@ QgsOgrDbConnection::QgsOgrDbConnection( const QString &connName, const QString &
   mPath = settings.value( key ).toString();
 }
 
-QgsOgrDbConnection::~QgsOgrDbConnection()
-{
-
-}
-
 QgsDataSourceUri QgsOgrDbConnection::uri()
 {
   QgsDataSourceUri uri;

src/providers/ogr/qgsogrdbconnection.h

@@ -33,8 +33,6 @@ class QgsOgrDbConnection : public QObject
     //! Constructor
     explicit QgsOgrDbConnection( const QString &connName, const QString &settingsKey );
 
-    ~QgsOgrDbConnection();
-
     static const QStringList connectionList( const QString &settingsKey );
     static void deleteConnection( const QString &connName, const QString &settingsKey );
     static QString selectedConnection( const QString &settingsKey );