Optimise destructors (pt 3)

qgis · Jan 1, 2017 · ef0131d · ef0131d
1 parent 6579c4c
commit ef0131d
Show file tree

Hide file tree

Showing 230 changed files with 16 additions and 712 deletions.
diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -71,10 +71,6 @@ QgisAppInterface::QgisAppInterface( QgisApp * _qgis )
            this, SIGNAL( layerSavedAs( QgsMapLayer*, QString ) ) );
 }
 
-QgisAppInterface::~QgisAppInterface()
-{
-}
-
 QgsPluginManagerInterface* QgisAppInterface::pluginManagerInterface()
 {
   return &pluginManagerIface;

diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h
@@ -43,7 +43,6 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
      * @param qgis Pointer to the QgisApp object
      */
     QgisAppInterface( QgisApp *qgisapp );
-    ~QgisAppInterface();
 
     QgisAppInterface( QgisAppInterface const & ) = delete;
     QgisAppInterface & operator=( QgisAppInterface const & ) = delete;

diff --git a/src/core/symbology-ng/qgsrendererregistry.cpp b/src/core/symbology-ng/qgsrendererregistry.cpp
@@ -120,8 +120,6 @@ QgsRendererAbstractMetadata* QgsRendererRegistry::rendererMetadata( const QStrin
   return mRenderers.value( rendererName );
 }
 
-QgsRendererMetadata::~QgsRendererMetadata() {}
-
 QStringList QgsRendererRegistry::renderersList( QgsRendererAbstractMetadata::LayerTypes layerTypes ) const
 {
   QStringList renderers;

diff --git a/src/core/symbology-ng/qgsrendererregistry.h b/src/core/symbology-ng/qgsrendererregistry.h
@@ -137,7 +137,7 @@ class CORE_EXPORT QgsRendererMetadata : public QgsRendererAbstractMetadata
         , mLayerTypes( layerTypes )
     {}
 
-    virtual ~QgsRendererMetadata();
+    virtual ~QgsRendererMetadata() = default;
 
     virtual QgsFeatureRenderer* createRenderer( QDomElement& elem ) override { return mCreateFunc ? mCreateFunc( elem ) : nullptr; }
     virtual QgsRendererWidget* createRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) override

diff --git a/src/gui/auth/qgsauthauthoritieseditor.cpp b/src/gui/auth/qgsauthauthoritieseditor.cpp
@@ -99,10 +99,6 @@ QgsAuthAuthoritiesEditor::QgsAuthAuthoritiesEditor( QWidget *parent )
   }
 }
 
-QgsAuthAuthoritiesEditor::~QgsAuthAuthoritiesEditor()
-{
-}
-
 static void setItemBold_( QTreeWidgetItem* item )
 {
   item->setFirstColumnSpanned( true );

diff --git a/src/gui/auth/qgsauthauthoritieseditor.h b/src/gui/auth/qgsauthauthoritieseditor.h
@@ -42,7 +42,6 @@ class GUI_EXPORT QgsAuthAuthoritiesEditor : public QWidget, private Ui::QgsAuthA
      * @param parent Parent widget
      */
     explicit QgsAuthAuthoritiesEditor( QWidget *parent = nullptr );
-    ~QgsAuthAuthoritiesEditor();
 
   private slots:
     void populateCaCertsView();

diff --git a/src/gui/auth/qgsauthcertificateinfo.cpp b/src/gui/auth/qgsauthcertificateinfo.cpp
@@ -112,10 +112,6 @@ QgsAuthCertInfo::QgsAuthCertInfo( const QSslCertificate& cert,
   }
 }
 
-QgsAuthCertInfo::~QgsAuthCertInfo()
-{
-}
-
 void QgsAuthCertInfo::setupError( const QString &msg )
 {
   lblError->setVisible( true );
@@ -939,6 +935,3 @@ QgsAuthCertInfoDialog::QgsAuthCertInfoDialog( const QSslCertificate& cert,
   setLayout( layout );
 }
 
-QgsAuthCertInfoDialog::~QgsAuthCertInfoDialog()
-{
-}
diff --git a/src/gui/auth/qgsauthcertificateinfo.h b/src/gui/auth/qgsauthcertificateinfo.h
@@ -42,7 +42,6 @@ class GUI_EXPORT QgsAuthCertInfo : public QWidget, private Ui::QgsAuthCertInfo
                               bool manageCertTrust = false,
                               QWidget *parent = nullptr,
                               const QList<QSslCertificate>& connectionCAs = QList<QSslCertificate>() );
-    ~QgsAuthCertInfo();
 
     bool trustCacheRebuilt() { return mTrustCacheRebuilt; }
 
@@ -154,7 +153,6 @@ class GUI_EXPORT QgsAuthCertInfoDialog : public QDialog
                                     bool manageCertTrust,
                                     QWidget *parent = nullptr,
                                     const QList<QSslCertificate>& connectionCAs = QList<QSslCertificate>() );
-    ~QgsAuthCertInfoDialog();
 
     //! Get access to embedded info widget
     QgsAuthCertInfo *certInfoWidget() { return mCertInfoWdgt; }

diff --git a/src/gui/auth/qgsauthcertificatemanager.cpp b/src/gui/auth/qgsauthcertificatemanager.cpp
@@ -26,11 +26,6 @@ QgsAuthCertEditors::QgsAuthCertEditors( QWidget *parent )
   setupUi( this );
 }
 
-QgsAuthCertEditors::~QgsAuthCertEditors()
-{
-}
-
-
 
 QgsAuthCertManager::QgsAuthCertManager( QWidget *parent )
     : QDialog( parent )
@@ -50,7 +45,3 @@ QgsAuthCertManager::QgsAuthCertManager( QWidget *parent )
 
   setLayout( layout );
 }
-
-QgsAuthCertManager::~QgsAuthCertManager()
-{
-}
diff --git a/src/gui/auth/qgsauthcertificatemanager.h b/src/gui/auth/qgsauthcertificatemanager.h
@@ -38,7 +38,6 @@ class GUI_EXPORT QgsAuthCertEditors : public QWidget, private Ui::QgsAuthCertMan
      */
     explicit QgsAuthCertEditors( QWidget *parent = nullptr );
 
-    ~QgsAuthCertEditors();
 };
 
 
@@ -59,8 +58,6 @@ class GUI_EXPORT QgsAuthCertManager : public QDialog
      */
     explicit QgsAuthCertManager( QWidget *parent = nullptr );
 
-    ~QgsAuthCertManager();
-
     //! Get access to embedded editors widget
     QgsAuthCertEditors *certEditorsWidget() { return mCertEditors; }
 

diff --git a/src/gui/auth/qgsauthcerttrustpolicycombobox.cpp b/src/gui/auth/qgsauthcerttrustpolicycombobox.cpp
@@ -58,10 +58,6 @@ QgsAuthCertTrustPolicyComboBox::QgsAuthCertTrustPolicyComboBox( QWidget *parent,
   setDefaultTrustPolicy( defaultpolicy );
 }
 
-QgsAuthCertTrustPolicyComboBox::~QgsAuthCertTrustPolicyComboBox()
-{
-}
-
 QgsAuthCertUtils::CertTrustPolicy QgsAuthCertTrustPolicyComboBox::trustPolicy()
 {
   return ( QgsAuthCertUtils::CertTrustPolicy )itemData( currentIndex() ).toInt();

diff --git a/src/gui/auth/qgsauthcerttrustpolicycombobox.h b/src/gui/auth/qgsauthcerttrustpolicycombobox.h
@@ -39,7 +39,6 @@ class GUI_EXPORT QgsAuthCertTrustPolicyComboBox : public QComboBox
       QWidget *parent = nullptr,
       QgsAuthCertUtils::CertTrustPolicy policy = QgsAuthCertUtils::DefaultTrust,
       QgsAuthCertUtils::CertTrustPolicy defaultpolicy =  QgsAuthCertUtils::DefaultTrust );
-    ~QgsAuthCertTrustPolicyComboBox();
 
     //! Get currently set trust policy
     QgsAuthCertUtils::CertTrustPolicy trustPolicy();

diff --git a/src/gui/auth/qgsauthconfigedit.cpp b/src/gui/auth/qgsauthconfigedit.cpp
@@ -92,10 +92,6 @@ QgsAuthConfigEdit::QgsAuthConfigEdit( QWidget *parent , const QString& authcfg ,
   }
 }
 
-QgsAuthConfigEdit::~QgsAuthConfigEdit()
-{
-}
-
 void QgsAuthConfigEdit::populateAuthMethods()
 {
   QStringList authMethodKeys = QgsAuthManager::instance()->authMethodsKeys( mDataProvider );

diff --git a/src/gui/auth/qgsauthconfigedit.h b/src/gui/auth/qgsauthconfigedit.h
@@ -50,7 +50,6 @@ class GUI_EXPORT QgsAuthConfigEdit : public QDialog, private Ui::QgsAuthConfigEd
      */
     explicit QgsAuthConfigEdit( QWidget *parent = nullptr, const QString& authcfg = QString(),
                                 const QString &dataprovider = QString() );
-    ~QgsAuthConfigEdit();
 
     //! Authentication config id, updated with generated id when a new config is saved to auth database
     const QString configId() const { return mAuthCfg; }

diff --git a/src/gui/auth/qgsauthconfigeditor.cpp b/src/gui/auth/qgsauthconfigeditor.cpp
@@ -126,10 +126,6 @@ QgsAuthConfigEditor::QgsAuthConfigEditor( QWidget *parent, bool showUtilities, b
   }
 }
 
-QgsAuthConfigEditor::~QgsAuthConfigEditor()
-{
-}
-
 void QgsAuthConfigEditor::setMasterPassword()
 {
   QgsAuthGuiUtils::setMasterPassword( messageBar(), messageTimeout() );

diff --git a/src/gui/auth/qgsauthconfigeditor.h b/src/gui/auth/qgsauthconfigeditor.h
@@ -41,7 +41,6 @@ class GUI_EXPORT QgsAuthConfigEditor : public QWidget, private Ui::QgsAuthConfig
      * @param relayMessages Whether to relay auth manager messages to internal message bar
      */
     explicit QgsAuthConfigEditor( QWidget *parent = nullptr, bool showUtilities = true, bool relayMessages = true );
-    ~QgsAuthConfigEditor();
 
     //! Hide the widget's title, e.g. when embedding
     void toggleTitleVisibility( bool visible );

diff --git a/src/gui/auth/qgsauthconfigidedit.cpp b/src/gui/auth/qgsauthconfigidedit.cpp
@@ -37,10 +37,6 @@ QgsAuthConfigIdEdit::QgsAuthConfigIdEdit( QWidget *parent, const QString &authcf
   updateValidityStyle( validate() );
 }
 
-QgsAuthConfigIdEdit::~QgsAuthConfigIdEdit()
-{
-}
-
 const QString QgsAuthConfigIdEdit::configId()
 {
   if ( validate() )

diff --git a/src/gui/auth/qgsauthconfigidedit.h b/src/gui/auth/qgsauthconfigidedit.h
@@ -39,7 +39,6 @@ class GUI_EXPORT QgsAuthConfigIdEdit : public QWidget, private Ui::QgsAuthConfig
      * @param allowEmpty Whether to allow no ID to be set, even when editing, e.g. Add config functions
      */
     explicit QgsAuthConfigIdEdit( QWidget *parent = nullptr, const QString &authcfg = QString(), bool allowEmpty = true );
-    ~QgsAuthConfigIdEdit();
 
     //! The authentication configuration ID, if valid, otherwise null QString
     QString const configId();

diff --git a/src/gui/auth/qgsauthconfigselect.cpp b/src/gui/auth/qgsauthconfigselect.cpp
@@ -58,10 +58,6 @@ QgsAuthConfigSelect::QgsAuthConfigSelect( QWidget *parent, const QString &datapr
   }
 }
 
-QgsAuthConfigSelect::~QgsAuthConfigSelect()
-{
-}
-
 void QgsAuthConfigSelect::setConfigId( const QString& authcfg )
 {
   if ( mDisabled && mAuthNotify )
@@ -288,10 +284,6 @@ QgsAuthConfigUriEdit::QgsAuthConfigUriEdit( QWidget *parent, const QString &data
   }
 }
 
-QgsAuthConfigUriEdit::~QgsAuthConfigUriEdit()
-{
-}
-
 void QgsAuthConfigUriEdit::setDataSourceUri( const QString &datauri )
 {
   if ( mDisabled )

diff --git a/src/gui/auth/qgsauthconfigselect.h b/src/gui/auth/qgsauthconfigselect.h
@@ -39,7 +39,6 @@ class GUI_EXPORT QgsAuthConfigSelect : public QWidget, private Ui::QgsAuthConfig
      * @param dataprovider The key of the calling layer provider, if applicable
      */
     explicit QgsAuthConfigSelect( QWidget *parent = nullptr, const QString &dataprovider = QString() );
-    ~QgsAuthConfigSelect();
 
     //! Set the authentication config id for the resource
     void setConfigId( const QString& authcfg );
@@ -117,7 +116,6 @@ class GUI_EXPORT QgsAuthConfigUriEdit : public QDialog, private Ui::QgsAuthConfi
     explicit QgsAuthConfigUriEdit( QWidget *parent = nullptr,
                                    const QString &datauri = QString(),
                                    const QString &dataprovider = QString() );
-    ~QgsAuthConfigUriEdit();
 
     //! Set the data source URI to parse
     void setDataSourceUri( const QString &datauri );

diff --git a/src/gui/auth/qgsautheditorwidgets.cpp b/src/gui/auth/qgsautheditorwidgets.cpp
@@ -50,10 +50,6 @@ QgsAuthMethodPlugins::QgsAuthMethodPlugins( QWidget *parent )
   }
 }
 
-QgsAuthMethodPlugins::~QgsAuthMethodPlugins()
-{
-}
-
 void QgsAuthMethodPlugins::setupTable()
 {
   tblAuthPlugins->setColumnCount( 3 );
@@ -125,10 +121,6 @@ QgsAuthEditorWidgets::QgsAuthEditorWidgets( QWidget *parent )
   }
 }
 
-QgsAuthEditorWidgets::~QgsAuthEditorWidgets()
-{
-}
-
 void QgsAuthEditorWidgets::on_btnCertManager_clicked()
 {
   QgsAuthCertManager *dlg = new QgsAuthCertManager( this );

diff --git a/src/gui/auth/qgsautheditorwidgets.h b/src/gui/auth/qgsautheditorwidgets.h
@@ -36,8 +36,6 @@ class GUI_EXPORT QgsAuthMethodPlugins : public QDialog, private Ui::QgsAuthMetho
      */
     explicit QgsAuthMethodPlugins( QWidget *parent = nullptr );
 
-    ~QgsAuthMethodPlugins();
-
   private slots:
     void populateTable();
 
@@ -64,8 +62,6 @@ class GUI_EXPORT QgsAuthEditorWidgets : public QWidget, private Ui::QgsAuthEdito
      */
     explicit QgsAuthEditorWidgets( QWidget *parent = nullptr );
 
-    ~QgsAuthEditorWidgets();
-
   private slots:
     void on_btnCertManager_clicked();
     void on_btnAuthPlugins_clicked();

diff --git a/src/gui/auth/qgsauthidentitieseditor.cpp b/src/gui/auth/qgsauthidentitieseditor.cpp
@@ -75,10 +75,6 @@ QgsAuthIdentitiesEditor::QgsAuthIdentitiesEditor( QWidget *parent )
   }
 }
 
-QgsAuthIdentitiesEditor::~QgsAuthIdentitiesEditor()
-{
-}
-
 static void setItemBold_( QTreeWidgetItem* item )
 {
   item->setFirstColumnSpanned( true );

diff --git a/src/gui/auth/qgsauthidentitieseditor.h b/src/gui/auth/qgsauthidentitieseditor.h
@@ -39,7 +39,6 @@ class GUI_EXPORT QgsAuthIdentitiesEditor : public QWidget, private Ui::QgsAuthId
      * @param parent Parent widget
      */
     explicit QgsAuthIdentitiesEditor( QWidget *parent = nullptr );
-    ~QgsAuthIdentitiesEditor();
 
   private slots:
     void populateIdentitiesView();

diff --git a/src/gui/auth/qgsauthimportcertdialog.cpp b/src/gui/auth/qgsauthimportcertdialog.cpp
@@ -85,10 +85,6 @@ QgsAuthImportCertDialog::QgsAuthImportCertDialog( QWidget *parent ,
   }
 }
 
-QgsAuthImportCertDialog::~QgsAuthImportCertDialog()
-{
-}
-
 const QList<QSslCertificate> QgsAuthImportCertDialog::certificatesToImport()
 {
   if ( mDisabled )

diff --git a/src/gui/auth/qgsauthimportcertdialog.h b/src/gui/auth/qgsauthimportcertdialog.h
@@ -56,7 +56,6 @@ class GUI_EXPORT QgsAuthImportCertDialog : public QDialog, private Ui::QgsAuthIm
     explicit QgsAuthImportCertDialog( QWidget *parent = nullptr,
                                       QgsAuthImportCertDialog::CertFilter filter = NoFilter,
                                       QgsAuthImportCertDialog::CertInput input = AllInputs );
-    ~QgsAuthImportCertDialog();
 
     //! Get list of certificate objects to import
     const QList<QSslCertificate> certificatesToImport();

diff --git a/src/gui/auth/qgsauthimportidentitydialog.cpp b/src/gui/auth/qgsauthimportidentitydialog.cpp
@@ -78,10 +78,6 @@ QgsAuthImportIdentityDialog::QgsAuthImportIdentityDialog( QgsAuthImportIdentityD
   }
 }
 
-QgsAuthImportIdentityDialog::~QgsAuthImportIdentityDialog()
-{
-}
-
 QgsAuthImportIdentityDialog::IdentityType QgsAuthImportIdentityDialog::identityType()
 {
   if ( mDisabled )

diff --git a/src/gui/auth/qgsauthimportidentitydialog.h b/src/gui/auth/qgsauthimportidentitydialog.h
@@ -61,7 +61,6 @@ class GUI_EXPORT QgsAuthImportIdentityDialog : public QDialog, private Ui::QgsAu
      */
     explicit QgsAuthImportIdentityDialog( QgsAuthImportIdentityDialog::IdentityType identitytype,
                                           QWidget *parent = nullptr );
-    ~QgsAuthImportIdentityDialog();
 
     //! Get identity type
     QgsAuthImportIdentityDialog::IdentityType identityType();

diff --git a/src/gui/auth/qgsauthmasterpassresetdialog.cpp b/src/gui/auth/qgsauthmasterpassresetdialog.cpp
@@ -44,10 +44,6 @@ QgsMasterPasswordResetDialog::QgsMasterPasswordResetDialog( QWidget *parent )
   }
 }
 
-QgsMasterPasswordResetDialog::~QgsMasterPasswordResetDialog()
-{
-}
-
 bool QgsMasterPasswordResetDialog::requestMasterPasswordReset( QString *newpass, QString *oldpass, bool *keepbackup )
 {
   if ( !QgsAuthManager::instance()->isDisabled() )

diff --git a/src/gui/auth/qgsauthmasterpassresetdialog.h b/src/gui/auth/qgsauthmasterpassresetdialog.h
@@ -37,7 +37,6 @@ class GUI_EXPORT QgsMasterPasswordResetDialog : public QDialog, private Ui::QgsM
 
   public:
     explicit QgsMasterPasswordResetDialog( QWidget *parent = nullptr );
-    ~QgsMasterPasswordResetDialog();
 
     bool requestMasterPasswordReset( QString *newpass, QString *oldpass, bool *keepbackup );
 

diff --git a/src/gui/auth/qgsauthserverseditor.cpp b/src/gui/auth/qgsauthserverseditor.cpp
@@ -73,10 +73,6 @@ QgsAuthServersEditor::QgsAuthServersEditor( QWidget *parent )
   }
 }
 
-QgsAuthServersEditor::~QgsAuthServersEditor()
-{
-}
-
 static void setItemBold_( QTreeWidgetItem* item )
 {
   item->setFirstColumnSpanned( true );

diff --git a/src/gui/auth/qgsauthserverseditor.h b/src/gui/auth/qgsauthserverseditor.h
@@ -38,7 +38,6 @@ class GUI_EXPORT QgsAuthServersEditor : public QWidget, private Ui::QgsAuthServe
      * @param parent Parent Widget
      */
     explicit QgsAuthServersEditor( QWidget *parent = nullptr );
-    ~QgsAuthServersEditor();
 
   private slots:
     void populateSslConfigsView();

diff --git a/src/gui/auth/qgsauthsslconfigwidget.cpp b/src/gui/auth/qgsauthsslconfigwidget.cpp
@@ -88,10 +88,6 @@ QgsAuthSslConfigWidget::QgsAuthSslConfigWidget( QWidget *parent,
   }
 }
 
-QgsAuthSslConfigWidget::~QgsAuthSslConfigWidget()
-{
-}
-
 QGroupBox *QgsAuthSslConfigWidget::certificateGroupBox()
 {
   if ( mDisabled )
@@ -621,10 +617,6 @@ QgsAuthSslConfigDialog::QgsAuthSslConfigDialog( QWidget *parent , const QSslCert
   mSaveButton->setEnabled( mSslConfigWdgt->readyToSave() );
 }
 
-QgsAuthSslConfigDialog::~QgsAuthSslConfigDialog()
-{
-}
-
 void QgsAuthSslConfigDialog::accept()
 {
   mSslConfigWdgt->saveSslCertConfig();