Skip to content

Commit

Permalink
Optimise destructors (pt 3)
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jan 1, 2017
1 parent 6579c4c commit ef0131d
Show file tree
Hide file tree
Showing 230 changed files with 16 additions and 712 deletions.
4 changes: 0 additions & 4 deletions src/app/qgisappinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ QgisAppInterface::QgisAppInterface( QgisApp * _qgis )
this, SIGNAL( layerSavedAs( QgsMapLayer*, QString ) ) );
}

QgisAppInterface::~QgisAppInterface()
{
}

QgsPluginManagerInterface* QgisAppInterface::pluginManagerInterface()
{
return &pluginManagerIface;
Expand Down
1 change: 0 additions & 1 deletion src/app/qgisappinterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions src/core/symbology-ng/qgsrendererregistry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ QgsRendererAbstractMetadata* QgsRendererRegistry::rendererMetadata( const QStrin
return mRenderers.value( rendererName );
}

QgsRendererMetadata::~QgsRendererMetadata() {}

QStringList QgsRendererRegistry::renderersList( QgsRendererAbstractMetadata::LayerTypes layerTypes ) const
{
QStringList renderers;
Expand Down
2 changes: 1 addition & 1 deletion src/core/symbology-ng/qgsrendererregistry.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions src/gui/auth/qgsauthauthoritieseditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@ QgsAuthAuthoritiesEditor::QgsAuthAuthoritiesEditor( QWidget *parent )
}
}

QgsAuthAuthoritiesEditor::~QgsAuthAuthoritiesEditor()
{
}

static void setItemBold_( QTreeWidgetItem* item )
{
item->setFirstColumnSpanned( true );
Expand Down
1 change: 0 additions & 1 deletion src/gui/auth/qgsauthauthoritieseditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
7 changes: 0 additions & 7 deletions src/gui/auth/qgsauthcertificateinfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,6 @@ QgsAuthCertInfo::QgsAuthCertInfo( const QSslCertificate& cert,
}
}

QgsAuthCertInfo::~QgsAuthCertInfo()
{
}

void QgsAuthCertInfo::setupError( const QString &msg )
{
lblError->setVisible( true );
Expand Down Expand Up @@ -939,6 +935,3 @@ QgsAuthCertInfoDialog::QgsAuthCertInfoDialog( const QSslCertificate& cert,
setLayout( layout );
}

QgsAuthCertInfoDialog::~QgsAuthCertInfoDialog()
{
}
2 changes: 0 additions & 2 deletions src/gui/auth/qgsauthcertificateinfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down Expand Up @@ -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; }
Expand Down
9 changes: 0 additions & 9 deletions src/gui/auth/qgsauthcertificatemanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ QgsAuthCertEditors::QgsAuthCertEditors( QWidget *parent )
setupUi( this );
}

QgsAuthCertEditors::~QgsAuthCertEditors()
{
}



QgsAuthCertManager::QgsAuthCertManager( QWidget *parent )
: QDialog( parent )
Expand All @@ -50,7 +45,3 @@ QgsAuthCertManager::QgsAuthCertManager( QWidget *parent )

setLayout( layout );
}

QgsAuthCertManager::~QgsAuthCertManager()
{
}
3 changes: 0 additions & 3 deletions src/gui/auth/qgsauthcertificatemanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ class GUI_EXPORT QgsAuthCertEditors : public QWidget, private Ui::QgsAuthCertMan
*/
explicit QgsAuthCertEditors( QWidget *parent = nullptr );

~QgsAuthCertEditors();
};


Expand All @@ -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; }

Expand Down
4 changes: 0 additions & 4 deletions src/gui/auth/qgsauthcerttrustpolicycombobox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ QgsAuthCertTrustPolicyComboBox::QgsAuthCertTrustPolicyComboBox( QWidget *parent,
setDefaultTrustPolicy( defaultpolicy );
}

QgsAuthCertTrustPolicyComboBox::~QgsAuthCertTrustPolicyComboBox()
{
}

QgsAuthCertUtils::CertTrustPolicy QgsAuthCertTrustPolicyComboBox::trustPolicy()
{
return ( QgsAuthCertUtils::CertTrustPolicy )itemData( currentIndex() ).toInt();
Expand Down
1 change: 0 additions & 1 deletion src/gui/auth/qgsauthcerttrustpolicycombobox.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 0 additions & 4 deletions src/gui/auth/qgsauthconfigedit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ QgsAuthConfigEdit::QgsAuthConfigEdit( QWidget *parent , const QString& authcfg ,
}
}

QgsAuthConfigEdit::~QgsAuthConfigEdit()
{
}

void QgsAuthConfigEdit::populateAuthMethods()
{
QStringList authMethodKeys = QgsAuthManager::instance()->authMethodsKeys( mDataProvider );