diff --git a/python/core/qgsdiagramrenderer.sip b/python/core/qgsdiagramrenderer.sip index 91d9c7ba98b..86e788a2f57 100644 --- a/python/core/qgsdiagramrenderer.sip +++ b/python/core/qgsdiagramrenderer.sip @@ -11,7 +11,6 @@ - class QgsDiagramLayerSettings { %Docstring diff --git a/python/core/qgspropertytransformer.sip b/python/core/qgspropertytransformer.sip index 1d22fa07f83..1d1e1d59b7a 100644 --- a/python/core/qgspropertytransformer.sip +++ b/python/core/qgspropertytransformer.sip @@ -339,11 +339,6 @@ class QgsGenericNumericTransformer : QgsPropertyTransformer \param exponent optional exponential for non-linear scaling %End - QgsGenericNumericTransformer( const QgsGenericNumericTransformer &other ); -%Docstring - Copy constructor. -%End - virtual Type transformerType() const; virtual QgsGenericNumericTransformer *clone() const /Factory/; virtual QVariant toVariant() const; @@ -475,11 +470,6 @@ class QgsSizeScaleTransformer : QgsPropertyTransformer \param exponent exponent for Exponential scaling method %End - QgsSizeScaleTransformer( const QgsSizeScaleTransformer &other ); -%Docstring - Copy constructor. -%End - virtual Type transformerType() const; virtual QgsSizeScaleTransformer *clone() const /Factory/; virtual QVariant toVariant() const; diff --git a/python/core/symbology/qgscategorizedsymbolrenderer.sip b/python/core/symbology/qgscategorizedsymbolrenderer.sip index 0fd0d34dbae..10e4a2cc31f 100644 --- a/python/core/symbology/qgscategorizedsymbolrenderer.sip +++ b/python/core/symbology/qgscategorizedsymbolrenderer.sip @@ -78,7 +78,6 @@ class QgsCategorizedSymbolRenderer : QgsFeatureRenderer public: QgsCategorizedSymbolRenderer( const QString &attrName = QString(), const QgsCategoryList &categories = QgsCategoryList() ); - ~QgsCategorizedSymbolRenderer(); virtual QgsSymbol *symbolForFeature( QgsFeature &feature, QgsRenderContext &context ); virtual QgsSymbol *originalSymbolForFeature( QgsFeature &feature, QgsRenderContext &context ); diff --git a/python/core/symbology/qgssinglesymbolrenderer.sip b/python/core/symbology/qgssinglesymbolrenderer.sip index 622bfbb576d..4a3118fa20a 100644 --- a/python/core/symbology/qgssinglesymbolrenderer.sip +++ b/python/core/symbology/qgssinglesymbolrenderer.sip @@ -17,7 +17,6 @@ class QgsSingleSymbolRenderer : QgsFeatureRenderer public: QgsSingleSymbolRenderer( QgsSymbol *symbol /Transfer/ ); - ~QgsSingleSymbolRenderer(); virtual QgsSymbol *symbolForFeature( QgsFeature &feature, QgsRenderContext &context ); virtual QgsSymbol *originalSymbolForFeature( QgsFeature &feature, QgsRenderContext &context ); diff --git a/python/gui/attributetable/qgsfeaturelistmodel.sip b/python/gui/attributetable/qgsfeaturelistmodel.sip index 64c048cade2..21158c08896 100644 --- a/python/gui/attributetable/qgsfeaturelistmodel.sip +++ b/python/gui/attributetable/qgsfeaturelistmodel.sip @@ -34,7 +34,6 @@ class QgsFeatureListModel : QAbstractProxyModel, QgsFeatureModel public: explicit QgsFeatureListModel( QgsAttributeTableFilterModel *sourceModel, QObject *parent /TransferThis/ = 0 ); - virtual ~QgsFeatureListModel(); virtual void setSourceModel( QgsAttributeTableFilterModel *sourceModel ); QgsVectorLayerCache *layerCache(); diff --git a/python/gui/attributetable/qgsfieldconditionalformatwidget.sip b/python/gui/attributetable/qgsfieldconditionalformatwidget.sip index aee3cc4ffdf..195d7f63bd6 100644 --- a/python/gui/attributetable/qgsfieldconditionalformatwidget.sip +++ b/python/gui/attributetable/qgsfieldconditionalformatwidget.sip @@ -28,8 +28,6 @@ class QgsFieldConditionalFormatWidget : QWidget \param parent parent widget %End - ~QgsFieldConditionalFormatWidget(); - void viewRules(); %Docstring Switches the widget to the rules page. diff --git a/python/gui/symbology/qgssvgselectorwidget.sip b/python/gui/symbology/qgssvgselectorwidget.sip index 4afbab21f4d..ec430d4e64f 100644 --- a/python/gui/symbology/qgssvgselectorwidget.sip +++ b/python/gui/symbology/qgssvgselectorwidget.sip @@ -75,7 +75,6 @@ class QgsSvgSelectorWidget : QWidget %End public: QgsSvgSelectorWidget( QWidget *parent /TransferThis/ = 0 ); - ~QgsSvgSelectorWidget(); QString currentSvgPath() const; %Docstring diff --git a/src/analysis/network/qgsgraph.cpp b/src/analysis/network/qgsgraph.cpp index 07b072d22db..2ce1b5636d2 100644 --- a/src/analysis/network/qgsgraph.cpp +++ b/src/analysis/network/qgsgraph.cpp @@ -20,10 +20,6 @@ #include "qgsgraph.h" -QgsGraph::QgsGraph() -{ -} - int QgsGraph::addVertex( const QgsPointXY &pt ) { mGraphVertexes.append( QgsGraphVertex( pt ) ); diff --git a/src/analysis/network/qgsgraph.h b/src/analysis/network/qgsgraph.h index b30df6dceae..bfef5bd7ae0 100644 --- a/src/analysis/network/qgsgraph.h +++ b/src/analysis/network/qgsgraph.h @@ -131,7 +131,7 @@ class ANALYSIS_EXPORT QgsGraphVertex class ANALYSIS_EXPORT QgsGraph { public: - QgsGraph(); + QgsGraph() = default; // Graph constructing methods diff --git a/src/app/composer/qgsatlascompositionwidget.cpp b/src/app/composer/qgsatlascompositionwidget.cpp index cda2b9cd105..a6ca9c05098 100644 --- a/src/app/composer/qgsatlascompositionwidget.cpp +++ b/src/app/composer/qgsatlascompositionwidget.cpp @@ -59,10 +59,6 @@ QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget *parent, QgsCompos updateGuiElements(); } -QgsAtlasCompositionWidget::~QgsAtlasCompositionWidget() -{ -} - void QgsAtlasCompositionWidget::on_mUseAtlasCheckBox_stateChanged( int state ) { QgsAtlasComposition *atlasMap = &mComposition->atlasComposition(); diff --git a/src/app/composer/qgsatlascompositionwidget.h b/src/app/composer/qgsatlascompositionwidget.h index 478bbc70fdc..d6cfd56d634 100644 --- a/src/app/composer/qgsatlascompositionwidget.h +++ b/src/app/composer/qgsatlascompositionwidget.h @@ -31,7 +31,6 @@ class QgsAtlasCompositionWidget: Q_OBJECT public: QgsAtlasCompositionWidget( QWidget *parent, QgsComposition *c ); - ~QgsAtlasCompositionWidget(); public slots: void on_mUseAtlasCheckBox_stateChanged( int state ); diff --git a/src/app/composer/qgscomposerarrowwidget.cpp b/src/app/composer/qgscomposerarrowwidget.cpp index dcd41284edc..75783625ecd 100644 --- a/src/app/composer/qgscomposerarrowwidget.cpp +++ b/src/app/composer/qgscomposerarrowwidget.cpp @@ -61,11 +61,6 @@ QgsComposerArrowWidget::QgsComposerArrowWidget( QgsComposerArrow *arrow ): QgsCo } } -QgsComposerArrowWidget::~QgsComposerArrowWidget() -{ - -} - void QgsComposerArrowWidget::on_mStrokeWidthSpinBox_valueChanged( double d ) { if ( !mArrow ) diff --git a/src/app/composer/qgscomposerarrowwidget.h b/src/app/composer/qgscomposerarrowwidget.h index cf860679e15..a9af12e2326 100644 --- a/src/app/composer/qgscomposerarrowwidget.h +++ b/src/app/composer/qgscomposerarrowwidget.h @@ -28,7 +28,6 @@ class QgsComposerArrowWidget: public QgsComposerItemBaseWidget, private Ui::QgsC Q_OBJECT public: explicit QgsComposerArrowWidget( QgsComposerArrow *arrow ); - ~QgsComposerArrowWidget(); private: QgsComposerArrow *mArrow = nullptr; diff --git a/src/app/composer/qgscomposerattributetablewidget.cpp b/src/app/composer/qgscomposerattributetablewidget.cpp index e6ee10fd56f..657a4b31603 100644 --- a/src/app/composer/qgscomposerattributetablewidget.cpp +++ b/src/app/composer/qgscomposerattributetablewidget.cpp @@ -114,10 +114,6 @@ QgsComposerAttributeTableWidget::QgsComposerAttributeTableWidget( QgsComposerAtt connect( mContentFontToolButton, &QgsFontButton::changed, this, &QgsComposerAttributeTableWidget::contentFontChanged ); } -QgsComposerAttributeTableWidget::~QgsComposerAttributeTableWidget() -{ -} - void QgsComposerAttributeTableWidget::on_mRefreshPushButton_clicked() { if ( !mComposerTable ) diff --git a/src/app/composer/qgscomposerattributetablewidget.h b/src/app/composer/qgscomposerattributetablewidget.h index a7ee59de767..b0652c0ce36 100644 --- a/src/app/composer/qgscomposerattributetablewidget.h +++ b/src/app/composer/qgscomposerattributetablewidget.h @@ -29,7 +29,6 @@ class QgsComposerAttributeTableWidget: public QgsComposerItemBaseWidget, private Q_OBJECT public: QgsComposerAttributeTableWidget( QgsComposerAttributeTableV2 *table, QgsComposerFrame *frame ); - ~QgsComposerAttributeTableWidget(); private: QgsComposerAttributeTableV2 *mComposerTable = nullptr; diff --git a/src/app/composer/qgscomposerhtmlwidget.cpp b/src/app/composer/qgscomposerhtmlwidget.cpp index a8fd322b0bf..975a6b4c337 100644 --- a/src/app/composer/qgscomposerhtmlwidget.cpp +++ b/src/app/composer/qgscomposerhtmlwidget.cpp @@ -76,10 +76,6 @@ QgsComposerHtmlWidget::QgsComposerHtmlWidget() { } -QgsComposerHtmlWidget::~QgsComposerHtmlWidget() -{ -} - void QgsComposerHtmlWidget::blockSignals( bool block ) { mUrlLineEdit->blockSignals( block ); diff --git a/src/app/composer/qgscomposerhtmlwidget.h b/src/app/composer/qgscomposerhtmlwidget.h index 147402b56b0..8e1da7b03fa 100644 --- a/src/app/composer/qgscomposerhtmlwidget.h +++ b/src/app/composer/qgscomposerhtmlwidget.h @@ -28,7 +28,6 @@ class QgsComposerHtmlWidget: public QgsComposerItemBaseWidget, private Ui::QgsCo Q_OBJECT public: QgsComposerHtmlWidget( QgsComposerHtml *html, QgsComposerFrame *frame ); - ~QgsComposerHtmlWidget(); private slots: void on_mUrlLineEdit_editingFinished(); diff --git a/src/app/composer/qgscomposeritemwidget.cpp b/src/app/composer/qgscomposeritemwidget.cpp index b5418637efb..cb19f445962 100644 --- a/src/app/composer/qgscomposeritemwidget.cpp +++ b/src/app/composer/qgscomposeritemwidget.cpp @@ -40,10 +40,6 @@ QgsComposerConfigObject::QgsComposerConfigObject( QWidget *parent, QgsComposerOb connect( atlasComposition(), &QgsAtlasComposition::toggled, this, &QgsComposerConfigObject::updateDataDefinedButtons ); } -QgsComposerConfigObject::~QgsComposerConfigObject() -{ -} - void QgsComposerConfigObject::updateDataDefinedProperty() { //match data defined button to item's data defined property @@ -183,11 +179,6 @@ QgsComposerItemWidget::QgsComposerItemWidget( QWidget *parent, QgsComposerItem * connect( mItem->composition(), &QgsComposition::variablesChanged, this, &QgsComposerItemWidget::updateVariables ); } -QgsComposerItemWidget::~QgsComposerItemWidget() -{ - -} - void QgsComposerItemWidget::showBackgroundGroup( bool showGroup ) { mBackgroundGroupBox->setVisible( showGroup ); diff --git a/src/app/composer/qgscomposeritemwidget.h b/src/app/composer/qgscomposeritemwidget.h index 34d25b38cde..703fbb94620 100644 --- a/src/app/composer/qgscomposeritemwidget.h +++ b/src/app/composer/qgscomposeritemwidget.h @@ -53,7 +53,6 @@ class QgsComposerConfigObject: public QObject Q_OBJECT public: QgsComposerConfigObject( QWidget *parent, QgsComposerObject *composerObject ); - ~QgsComposerConfigObject(); /** Registers a data defined button, setting up its initial value, connections and description. * \param button button to register @@ -126,7 +125,6 @@ class QgsComposerItemWidget: public QWidget, private Ui::QgsComposerItemWidgetBa Q_OBJECT public: QgsComposerItemWidget( QWidget *parent, QgsComposerItem *item ); - ~QgsComposerItemWidget(); //! A combination of upper/middle/lower and left/middle/right QgsComposerItem::ItemPositionMode positionMode() const; diff --git a/src/app/composer/qgscomposerlegendlayersdialog.cpp b/src/app/composer/qgscomposerlegendlayersdialog.cpp index 2462ae0a759..bd5c9e7768a 100644 --- a/src/app/composer/qgscomposerlegendlayersdialog.cpp +++ b/src/app/composer/qgscomposerlegendlayersdialog.cpp @@ -29,14 +29,9 @@ QgsComposerLegendLayersDialog::QgsComposerLegendLayersDialog( QList layers, QWidget *parent = nullptr ); - ~QgsComposerLegendLayersDialog(); + QgsMapLayer *selectedLayer(); private: diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp index 4f1d8c7efbc..5dde0a68de3 100644 --- a/src/app/composer/qgscomposerlegendwidget.cpp +++ b/src/app/composer/qgscomposerlegendwidget.cpp @@ -124,11 +124,6 @@ QgsComposerLegendWidget::QgsComposerLegendWidget(): QgsComposerItemBaseWidget( n setupUi( this ); } -QgsComposerLegendWidget::~QgsComposerLegendWidget() -{ - -} - void QgsComposerLegendWidget::setGuiElements() { if ( !mLegend ) diff --git a/src/app/composer/qgscomposerlegendwidget.h b/src/app/composer/qgscomposerlegendwidget.h index 7f2fc9eff5d..ebbaa843e91 100644 --- a/src/app/composer/qgscomposerlegendwidget.h +++ b/src/app/composer/qgscomposerlegendwidget.h @@ -35,7 +35,6 @@ class QgsComposerLegendWidget: public QgsComposerItemBaseWidget, private Ui::Qgs public: explicit QgsComposerLegendWidget( QgsComposerLegend *legend ); - ~QgsComposerLegendWidget(); //! Updates the legend layers and groups void updateLegend(); diff --git a/src/app/composer/qgscomposermapgridwidget.cpp b/src/app/composer/qgscomposermapgridwidget.cpp index 0435dcf3bca..a45d01aac75 100644 --- a/src/app/composer/qgscomposermapgridwidget.cpp +++ b/src/app/composer/qgscomposermapgridwidget.cpp @@ -105,10 +105,6 @@ QgsComposerMapGridWidget::QgsComposerMapGridWidget( QgsComposerMapGrid *mapGrid, connect( mAnnotationFontButton, &QgsFontButton::changed, this, &QgsComposerMapGridWidget::annotationFontChanged ); } -QgsComposerMapGridWidget::~QgsComposerMapGridWidget() -{ -} - void QgsComposerMapGridWidget::populateDataDefinedButtons() { // none for now diff --git a/src/app/composer/qgscomposermapgridwidget.h b/src/app/composer/qgscomposermapgridwidget.h index 165b71cef37..63aa348284f 100644 --- a/src/app/composer/qgscomposermapgridwidget.h +++ b/src/app/composer/qgscomposermapgridwidget.h @@ -31,7 +31,6 @@ class QgsComposerMapGridWidget: public QgsComposerItemBaseWidget, private Ui::Qg public: explicit QgsComposerMapGridWidget( QgsComposerMapGrid *mapGrid, QgsComposerMap *composerMap ); - virtual ~QgsComposerMapGridWidget(); public slots: diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp index 8e657ae6ef0..f2abc09c185 100644 --- a/src/app/composer/qgscomposermapwidget.cpp +++ b/src/app/composer/qgscomposermapwidget.cpp @@ -122,10 +122,6 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap *composerMap ) blockAllSignals( false ); } -QgsComposerMapWidget::~QgsComposerMapWidget() -{ -} - void QgsComposerMapWidget::populateDataDefinedButtons() { updateDataDefinedButton( mScaleDDBtn ); diff --git a/src/app/composer/qgscomposermapwidget.h b/src/app/composer/qgscomposermapwidget.h index 176f6d492c0..d1ff0746c01 100644 --- a/src/app/composer/qgscomposermapwidget.h +++ b/src/app/composer/qgscomposermapwidget.h @@ -34,7 +34,6 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom public: explicit QgsComposerMapWidget( QgsComposerMap *composerMap ); - virtual ~QgsComposerMapWidget(); public slots: void on_mScaleLineEdit_editingFinished(); diff --git a/src/app/composer/qgscomposerpicturewidget.cpp b/src/app/composer/qgscomposerpicturewidget.cpp index cad5a2c7a97..0f739317929 100644 --- a/src/app/composer/qgscomposerpicturewidget.cpp +++ b/src/app/composer/qgscomposerpicturewidget.cpp @@ -85,11 +85,6 @@ QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture *picture registerDataDefinedButton( mStrokeWidthDDBtn, QgsComposerObject::PictureSvgStrokeWidth ); } -QgsComposerPictureWidget::~QgsComposerPictureWidget() -{ - -} - void QgsComposerPictureWidget::on_mPictureBrowseButton_clicked() { QgsSettings s; diff --git a/src/app/composer/qgscomposerpicturewidget.h b/src/app/composer/qgscomposerpicturewidget.h index d4fba1a19e8..dfffc5fb29d 100644 --- a/src/app/composer/qgscomposerpicturewidget.h +++ b/src/app/composer/qgscomposerpicturewidget.h @@ -32,7 +32,6 @@ class QgsComposerPictureWidget: public QgsComposerItemBaseWidget, private Ui::Qg public: explicit QgsComposerPictureWidget( QgsComposerPicture *picture ); - ~QgsComposerPictureWidget(); //! Add the icons of the standard directories to the preview void addStandardDirectoriesToPreview(); diff --git a/src/app/composer/qgscomposerpolygonwidget.cpp b/src/app/composer/qgscomposerpolygonwidget.cpp index d1393eec2d4..c26d85b90d4 100644 --- a/src/app/composer/qgscomposerpolygonwidget.cpp +++ b/src/app/composer/qgscomposerpolygonwidget.cpp @@ -45,10 +45,6 @@ QgsComposerPolygonWidget::QgsComposerPolygonWidget( QgsComposerPolygon *composer } } -QgsComposerPolygonWidget::~QgsComposerPolygonWidget() -{ -} - void QgsComposerPolygonWidget::on_mPolygonStyleButton_clicked() { if ( !mComposerPolygon ) diff --git a/src/app/composer/qgscomposerpolygonwidget.h b/src/app/composer/qgscomposerpolygonwidget.h index 8991306055f..96032206b68 100644 --- a/src/app/composer/qgscomposerpolygonwidget.h +++ b/src/app/composer/qgscomposerpolygonwidget.h @@ -31,7 +31,6 @@ class QgsComposerPolygonWidget: public QgsComposerItemBaseWidget, private Ui::Qg Q_OBJECT public: explicit QgsComposerPolygonWidget( QgsComposerPolygon *composerPolygon ); - ~QgsComposerPolygonWidget(); private: QgsComposerPolygon *mComposerPolygon = nullptr; diff --git a/src/app/composer/qgscomposerpolylinewidget.cpp b/src/app/composer/qgscomposerpolylinewidget.cpp index 43f0f2bbf12..a511677b554 100644 --- a/src/app/composer/qgscomposerpolylinewidget.cpp +++ b/src/app/composer/qgscomposerpolylinewidget.cpp @@ -42,10 +42,6 @@ QgsComposerPolylineWidget::QgsComposerPolylineWidget( QgsComposerPolyline *compo connect( mComposerPolyline, &QgsComposerObject::itemChanged, this, &QgsComposerPolylineWidget::setGuiElementValues ); } -QgsComposerPolylineWidget::~QgsComposerPolylineWidget() -{ -} - void QgsComposerPolylineWidget::on_mLineStyleButton_clicked() { if ( !mComposerPolyline ) diff --git a/src/app/composer/qgscomposerpolylinewidget.h b/src/app/composer/qgscomposerpolylinewidget.h index 5bec35baea1..ba0a4f7dc43 100644 --- a/src/app/composer/qgscomposerpolylinewidget.h +++ b/src/app/composer/qgscomposerpolylinewidget.h @@ -31,7 +31,6 @@ class QgsComposerPolylineWidget: public QgsComposerItemBaseWidget, private Ui::Q Q_OBJECT public: explicit QgsComposerPolylineWidget( QgsComposerPolyline *composerPolyline ); - ~QgsComposerPolylineWidget(); private: QgsComposerPolyline *mComposerPolyline = nullptr; diff --git a/src/app/composer/qgscomposerscalebarwidget.cpp b/src/app/composer/qgscomposerscalebarwidget.cpp index d10eda3731e..ae594315d1e 100644 --- a/src/app/composer/qgscomposerscalebarwidget.cpp +++ b/src/app/composer/qgscomposerscalebarwidget.cpp @@ -104,11 +104,6 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar *scale connect( mFontButton, &QgsFontButton::changed, this, &QgsComposerScaleBarWidget::fontChanged ); } -QgsComposerScaleBarWidget::~QgsComposerScaleBarWidget() -{ - -} - void QgsComposerScaleBarWidget::setGuiElements() { if ( !mComposerScaleBar ) diff --git a/src/app/composer/qgscomposerscalebarwidget.h b/src/app/composer/qgscomposerscalebarwidget.h index 7e59655be0c..b3f3586589d 100644 --- a/src/app/composer/qgscomposerscalebarwidget.h +++ b/src/app/composer/qgscomposerscalebarwidget.h @@ -31,7 +31,6 @@ class QgsComposerScaleBarWidget: public QgsComposerItemBaseWidget, private Ui::Q public: explicit QgsComposerScaleBarWidget( QgsComposerScaleBar *scaleBar ); - ~QgsComposerScaleBarWidget(); public slots: diff --git a/src/app/composer/qgscomposershapewidget.cpp b/src/app/composer/qgscomposershapewidget.cpp index ec928db0ef3..13e186d3f3a 100644 --- a/src/app/composer/qgscomposershapewidget.cpp +++ b/src/app/composer/qgscomposershapewidget.cpp @@ -60,11 +60,6 @@ QgsComposerShapeWidget::QgsComposerShapeWidget( QgsComposerShape *composerShape mShapeStyleButton->setLayer( atlasCoverageLayer() ); } -QgsComposerShapeWidget::~QgsComposerShapeWidget() -{ - -} - void QgsComposerShapeWidget::blockAllSignals( bool block ) { mShapeComboBox->blockSignals( block ); diff --git a/src/app/composer/qgscomposershapewidget.h b/src/app/composer/qgscomposershapewidget.h index 21aaccefdd7..9429937c8ef 100644 --- a/src/app/composer/qgscomposershapewidget.h +++ b/src/app/composer/qgscomposershapewidget.h @@ -29,7 +29,6 @@ class QgsComposerShapeWidget: public QgsComposerItemBaseWidget, private Ui::QgsC Q_OBJECT public: explicit QgsComposerShapeWidget( QgsComposerShape *composerShape ); - ~QgsComposerShapeWidget(); private: QgsComposerShape *mComposerShape = nullptr; diff --git a/src/app/composer/qgscompositionwidget.cpp b/src/app/composer/qgscompositionwidget.cpp index c1f1d2b896f..55a3fb6c38d 100644 --- a/src/app/composer/qgscompositionwidget.cpp +++ b/src/app/composer/qgscompositionwidget.cpp @@ -130,11 +130,6 @@ QgsCompositionWidget::QgsCompositionWidget() setupUi( this ); } -QgsCompositionWidget::~QgsCompositionWidget() -{ - -} - void QgsCompositionWidget::populateDataDefinedButtons() { if ( !mComposition ) diff --git a/src/app/composer/qgscompositionwidget.h b/src/app/composer/qgscompositionwidget.h index c97088ca71b..ab918da6db5 100644 --- a/src/app/composer/qgscompositionwidget.h +++ b/src/app/composer/qgscompositionwidget.h @@ -39,7 +39,6 @@ class QgsCompositionWidget: public QgsPanelWidget, private Ui::QgsCompositionWid Q_OBJECT public: QgsCompositionWidget( QWidget *parent, QgsComposition *c ); - ~QgsCompositionWidget(); public slots: void on_mPaperSizeComboBox_currentIndexChanged( const QString &text ); diff --git a/src/app/pluginmanager/qgsapppluginmanagerinterface.cpp b/src/app/pluginmanager/qgsapppluginmanagerinterface.cpp index a7c68601b08..9a6c6210979 100644 --- a/src/app/pluginmanager/qgsapppluginmanagerinterface.cpp +++ b/src/app/pluginmanager/qgsapppluginmanagerinterface.cpp @@ -24,11 +24,6 @@ QgsAppPluginManagerInterface::QgsAppPluginManagerInterface( QgsPluginManager *pl { } - -QgsAppPluginManagerInterface::~QgsAppPluginManagerInterface() -{ -} - void QgsAppPluginManagerInterface::showPluginManager( int tabIndex ) { mPluginManager->getCppPluginsMetadata(); diff --git a/src/app/pluginmanager/qgsapppluginmanagerinterface.h b/src/app/pluginmanager/qgsapppluginmanagerinterface.h index a4e64a7e1f3..f27b504f310 100644 --- a/src/app/pluginmanager/qgsapppluginmanagerinterface.h +++ b/src/app/pluginmanager/qgsapppluginmanagerinterface.h @@ -34,8 +34,6 @@ class QgsAppPluginManagerInterface : public QgsPluginManagerInterface //! Constructor explicit QgsAppPluginManagerInterface( QgsPluginManager *pluginManager ); - ~QgsAppPluginManagerInterface(); - //! remove Python plugins from the metadata registry (c++ plugins stay) void clearPythonPluginMetadata() override; diff --git a/src/app/qgisappstylesheet.cpp b/src/app/qgisappstylesheet.cpp index 84ea4cd13dd..9e3aff71479 100644 --- a/src/app/qgisappstylesheet.cpp +++ b/src/app/qgisappstylesheet.cpp @@ -31,10 +31,6 @@ QgisAppStyleSheet::QgisAppStyleSheet( QObject *parent ) setActiveValues(); } -QgisAppStyleSheet::~QgisAppStyleSheet() -{ -} - QMap QgisAppStyleSheet::defaultOptions() { QMap opts; diff --git a/src/app/qgisappstylesheet.h b/src/app/qgisappstylesheet.h index cb1dc23450a..8ef057df773 100644 --- a/src/app/qgisappstylesheet.h +++ b/src/app/qgisappstylesheet.h @@ -32,7 +32,6 @@ class APP_EXPORT QgisAppStyleSheet: public QObject public: QgisAppStyleSheet( QObject *parent = nullptr ); - ~QgisAppStyleSheet(); //! Return changeable options built from settings and/or defaults QMap defaultOptions(); diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp index 23d0c080361..a263a1fd5e6 100644 --- a/src/app/qgsabout.cpp +++ b/src/app/qgsabout.cpp @@ -40,10 +40,6 @@ QgsAbout::QgsAbout( QWidget * parent ) init(); } -QgsAbout::~QgsAbout() -{ -} - void QgsAbout::init() { setPluginInfo(); diff --git a/src/app/qgsabout.h b/src/app/qgsabout.h index e020fb24282..0940d759147 100644 --- a/src/app/qgsabout.h +++ b/src/app/qgsabout.h @@ -26,7 +26,7 @@ class APP_EXPORT QgsAbout : public QgsOptionsDialogBase, private Ui::QgsAbout Q_OBJECT public: QgsAbout( QWidget *parent ); - ~QgsAbout(); + void setVersion( const QString &v ); static QString fileSystemSafe( const QString &string ); diff --git a/src/app/qgsaddtaborgroup.cpp b/src/app/qgsaddtaborgroup.cpp index a1df918e4ca..3737caa2a37 100644 --- a/src/app/qgsaddtaborgroup.cpp +++ b/src/app/qgsaddtaborgroup.cpp @@ -56,10 +56,6 @@ QgsAddTabOrGroup::QgsAddTabOrGroup( QgsVectorLayer *lyr, const QList < TabPair > mColumnCountSpinBox->setValue( QgsSettings().value( QStringLiteral( "/qgis/attributeForm/defaultTabColumnCount" ), 1 ).toInt() ); setWindowTitle( tr( "Add Tab or Group for %1" ).arg( mLayer->name() ) ); -} // QgsVectorLayerProperties ctor - -QgsAddTabOrGroup::~QgsAddTabOrGroup() -{ } QString QgsAddTabOrGroup::name() diff --git a/src/app/qgsaddtaborgroup.h b/src/app/qgsaddtaborgroup.h index 7f955def035..ea9f5bf716f 100644 --- a/src/app/qgsaddtaborgroup.h +++ b/src/app/qgsaddtaborgroup.h @@ -36,7 +36,6 @@ class APP_EXPORT QgsAddTabOrGroup : public QDialog, private Ui::QgsAddTabOrGroup public: QgsAddTabOrGroup( QgsVectorLayer *lyr, const QList &tabList, QWidget *parent = nullptr ); - ~QgsAddTabOrGroup(); QString name(); diff --git a/src/app/qgsannotationwidget.cpp b/src/app/qgsannotationwidget.cpp index 6b4a32901a7..e568449f5a9 100644 --- a/src/app/qgsannotationwidget.cpp +++ b/src/app/qgsannotationwidget.cpp @@ -74,10 +74,6 @@ QgsAnnotationWidget::QgsAnnotationWidget( QgsMapCanvasAnnotationItem *item, QWid mFrameStyleButton->setMapCanvas( QgisApp::instance()->mapCanvas() ); } -QgsAnnotationWidget::~QgsAnnotationWidget() -{ -} - void QgsAnnotationWidget::apply() { if ( mItem ) diff --git a/src/app/qgsannotationwidget.h b/src/app/qgsannotationwidget.h index 2e499165ce3..76b9d67367a 100644 --- a/src/app/qgsannotationwidget.h +++ b/src/app/qgsannotationwidget.h @@ -33,7 +33,6 @@ class APP_EXPORT QgsAnnotationWidget: public QWidget, private Ui::QgsAnnotationW Q_OBJECT public: QgsAnnotationWidget( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = 0 ); - ~QgsAnnotationWidget(); void apply(); diff --git a/src/app/qgsclipboard.cpp b/src/app/qgsclipboard.cpp index 7fb7aa9f0f9..fb29a2b858c 100644 --- a/src/app/qgsclipboard.cpp +++ b/src/app/qgsclipboard.cpp @@ -48,10 +48,6 @@ QgsClipboard::QgsClipboard() connect( QApplication::clipboard(), &QClipboard::dataChanged, this, &QgsClipboard::systemClipboardChanged ); } -QgsClipboard::~QgsClipboard() -{ -} - void QgsClipboard::replaceWithCopyOf( QgsVectorLayer *src ) { if ( !src ) diff --git a/src/app/qgsclipboard.h b/src/app/qgsclipboard.h index 7237aa6cbd7..3edcabfc437 100644 --- a/src/app/qgsclipboard.h +++ b/src/app/qgsclipboard.h @@ -69,8 +69,6 @@ class APP_EXPORT QgsClipboard : public QObject */ QgsClipboard(); - virtual ~QgsClipboard(); - /** * Place a copy of the selected features from the specified layer on * the internal clipboard, destroying the previous contents. diff --git a/src/app/qgscustomization.cpp b/src/app/qgscustomization.cpp index 89b0f843b10..e196e5453e2 100644 --- a/src/app/qgscustomization.cpp +++ b/src/app/qgscustomization.cpp @@ -644,10 +644,6 @@ QgsCustomization::QgsCustomization() mEnabled = settings.value( QStringLiteral( "UI/Customization/enabled" ), "false" ).toString() == QLatin1String( "true" ); } -QgsCustomization::~QgsCustomization() -{ -} - void QgsCustomization::updateMainWindow( QMenu *toolBarMenu ) { // collect tree items even if the customization is disabled diff --git a/src/app/qgscustomization.h b/src/app/qgscustomization.h index 1846779f8b6..ab2827c0802 100644 --- a/src/app/qgscustomization.h +++ b/src/app/qgscustomization.h @@ -148,7 +148,7 @@ class APP_EXPORT QgsCustomization : public QObject protected: QgsCustomization(); - ~QgsCustomization(); + ~QgsCustomization() = default; QgsCustomizationDialog *pDialog = nullptr; bool mEnabled; diff --git a/src/app/qgsdecorationitem.cpp b/src/app/qgsdecorationitem.cpp index d25145e54b4..63770efb1cb 100644 --- a/src/app/qgsdecorationitem.cpp +++ b/src/app/qgsdecorationitem.cpp @@ -52,11 +52,6 @@ QgsDecorationItem::QgsDecorationItem( QObject *parent ) { } -QgsDecorationItem::~QgsDecorationItem() -{ - -} - void QgsDecorationItem::update() { saveToProject(); diff --git a/src/app/qgsdecorationitem.h b/src/app/qgsdecorationitem.h index 2e716947af4..e9e368ccff3 100644 --- a/src/app/qgsdecorationitem.h +++ b/src/app/qgsdecorationitem.h @@ -46,8 +46,6 @@ class APP_EXPORT QgsDecorationItem : public QObject, public QgsMapDecoration //! Constructor QgsDecorationItem( QObject *parent = nullptr ); - virtual ~ QgsDecorationItem(); - void setEnabled( bool enabled ) { mEnabled = enabled; } bool enabled() const { return mEnabled; } diff --git a/src/app/qgsdecorationnortharrow.cpp b/src/app/qgsdecorationnortharrow.cpp index 642010bab2a..34e20667ec7 100644 --- a/src/app/qgsdecorationnortharrow.cpp +++ b/src/app/qgsdecorationnortharrow.cpp @@ -69,10 +69,6 @@ QgsDecorationNorthArrow::QgsDecorationNorthArrow( QObject *parent ) projectRead(); } -QgsDecorationNorthArrow::~QgsDecorationNorthArrow() -{ -} - void QgsDecorationNorthArrow::projectRead() { QgsDecorationItem::projectRead(); diff --git a/src/app/qgsdecorationnortharrow.h b/src/app/qgsdecorationnortharrow.h index c5f655ff0c2..fa5ab477239 100644 --- a/src/app/qgsdecorationnortharrow.h +++ b/src/app/qgsdecorationnortharrow.h @@ -36,8 +36,6 @@ class APP_EXPORT QgsDecorationNorthArrow: public QgsDecorationItem //! Constructor QgsDecorationNorthArrow( QObject *parent = nullptr ); - virtual ~QgsDecorationNorthArrow(); - public slots: //! set values on the gui when a project is read or the gui first loaded void projectRead() override; diff --git a/src/app/qgsdecorationscalebar.cpp b/src/app/qgsdecorationscalebar.cpp index a0b65f5d546..254750be725 100644 --- a/src/app/qgsdecorationscalebar.cpp +++ b/src/app/qgsdecorationscalebar.cpp @@ -65,11 +65,6 @@ QgsDecorationScaleBar::QgsDecorationScaleBar( QObject *parent ) projectRead(); } -QgsDecorationScaleBar::~QgsDecorationScaleBar() -{ - -} - void QgsDecorationScaleBar::projectRead() { QgsDecorationItem::projectRead(); diff --git a/src/app/qgsdecorationscalebar.h b/src/app/qgsdecorationscalebar.h index c2d7baad0a4..467a331b0c5 100644 --- a/src/app/qgsdecorationscalebar.h +++ b/src/app/qgsdecorationscalebar.h @@ -36,8 +36,6 @@ class APP_EXPORT QgsDecorationScaleBar: public QgsDecorationItem //! Constructor QgsDecorationScaleBar( QObject *parent = nullptr ); - virtual ~ QgsDecorationScaleBar(); - public slots: //! set values on the gui when a project is read or the gui first loaded void projectRead() override; diff --git a/src/app/qgsdisplayangle.cpp b/src/app/qgsdisplayangle.cpp index 5b6783531fe..52c41215f20 100644 --- a/src/app/qgsdisplayangle.cpp +++ b/src/app/qgsdisplayangle.cpp @@ -30,10 +30,6 @@ QgsDisplayAngle::QgsDisplayAngle( QgsMapToolMeasureAngle *tool, Qt::WindowFlags setupUi( this ); } -QgsDisplayAngle::~QgsDisplayAngle() -{ -} - void QgsDisplayAngle::setValueInRadians( double value ) { mValue = value; diff --git a/src/app/qgsdisplayangle.h b/src/app/qgsdisplayangle.h index 0317ba6b772..de1069e42c9 100644 --- a/src/app/qgsdisplayangle.h +++ b/src/app/qgsdisplayangle.h @@ -28,7 +28,6 @@ class APP_EXPORT QgsDisplayAngle: public QDialog, private Ui::QgsDisplayAngleBas public: QgsDisplayAngle( QgsMapToolMeasureAngle *tool = nullptr, Qt::WindowFlags f = 0 ); - ~QgsDisplayAngle(); /** Sets the measured angle value (in radians). The value is going to be converted to degrees / gon automatically if necessary*/ diff --git a/src/app/qgsdxfexportdialog.cpp b/src/app/qgsdxfexportdialog.cpp index 350375b38de..58c9482adda 100644 --- a/src/app/qgsdxfexportdialog.cpp +++ b/src/app/qgsdxfexportdialog.cpp @@ -99,10 +99,6 @@ QgsVectorLayerAndAttributeModel::QgsVectorLayerAndAttributeModel( QgsLayerTree * { } -QgsVectorLayerAndAttributeModel::~QgsVectorLayerAndAttributeModel() -{ -} - int QgsVectorLayerAndAttributeModel::columnCount( const QModelIndex &parent ) const { Q_UNUSED( parent ); diff --git a/src/app/qgsdxfexportdialog.h b/src/app/qgsdxfexportdialog.h index c3ea3fce305..9923b0372cc 100644 --- a/src/app/qgsdxfexportdialog.h +++ b/src/app/qgsdxfexportdialog.h @@ -47,7 +47,6 @@ class QgsVectorLayerAndAttributeModel : public QgsLayerTreeModel Q_OBJECT public: QgsVectorLayerAndAttributeModel( QgsLayerTree *rootNode, QObject *parent = nullptr ); - ~QgsVectorLayerAndAttributeModel(); int columnCount( const QModelIndex &parent = QModelIndex() ) const override; QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override; diff --git a/src/app/qgsformannotationdialog.cpp b/src/app/qgsformannotationdialog.cpp index 142416087ac..7cc9a63963c 100644 --- a/src/app/qgsformannotationdialog.cpp +++ b/src/app/qgsformannotationdialog.cpp @@ -46,11 +46,6 @@ QgsFormAnnotationDialog::QgsFormAnnotationDialog( QgsMapCanvasAnnotationItem *it mButtonBox->addButton( deleteButton, QDialogButtonBox::RejectRole ); } -QgsFormAnnotationDialog::~QgsFormAnnotationDialog() -{ - -} - void QgsFormAnnotationDialog::applySettingsToItem() { //apply settings from embedded item widget diff --git a/src/app/qgsformannotationdialog.h b/src/app/qgsformannotationdialog.h index 1164643f4eb..55d89f76080 100644 --- a/src/app/qgsformannotationdialog.h +++ b/src/app/qgsformannotationdialog.h @@ -26,7 +26,6 @@ class APP_EXPORT QgsFormAnnotationDialog: public QDialog, private Ui::QgsFormAnn Q_OBJECT public: QgsFormAnnotationDialog( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = 0 ); - ~QgsFormAnnotationDialog(); private: QgsMapCanvasAnnotationItem *mItem = nullptr; diff --git a/src/app/qgshandlebadlayers.cpp b/src/app/qgshandlebadlayers.cpp index 3856718da93..86e1426d96f 100644 --- a/src/app/qgshandlebadlayers.cpp +++ b/src/app/qgshandlebadlayers.cpp @@ -34,10 +34,6 @@ #include #include -QgsHandleBadLayersHandler::QgsHandleBadLayersHandler() -{ -} - void QgsHandleBadLayersHandler::handleBadLayers( const QList &layers ) { QApplication::setOverrideCursor( Qt::ArrowCursor ); @@ -151,10 +147,6 @@ QgsHandleBadLayers::QgsHandleBadLayers( const QList &layers ) // mLayerList->resizeColumnsToContents(); } -QgsHandleBadLayers::~QgsHandleBadLayers() -{ -} - void QgsHandleBadLayers::selectionChanged() { diff --git a/src/app/qgshandlebadlayers.h b/src/app/qgshandlebadlayers.h index 9c3a61c3a6c..988dee46f9c 100644 --- a/src/app/qgshandlebadlayers.h +++ b/src/app/qgshandlebadlayers.h @@ -29,7 +29,7 @@ class APP_EXPORT QgsHandleBadLayersHandler Q_OBJECT public: - QgsHandleBadLayersHandler(); + QgsHandleBadLayersHandler() = default; //! Implementation of the handler virtual void handleBadLayers( const QList &layers ) override; @@ -46,7 +46,6 @@ class APP_EXPORT QgsHandleBadLayers public: QgsHandleBadLayers( const QList &layers ); - ~QgsHandleBadLayers(); int layerCount(); diff --git a/src/app/qgshtmlannotationdialog.cpp b/src/app/qgshtmlannotationdialog.cpp index 1f81c7b6ff2..a06268d5f88 100644 --- a/src/app/qgshtmlannotationdialog.cpp +++ b/src/app/qgshtmlannotationdialog.cpp @@ -47,11 +47,6 @@ QgsHtmlAnnotationDialog::QgsHtmlAnnotationDialog( QgsMapCanvasAnnotationItem *it mButtonBox->addButton( deleteButton, QDialogButtonBox::RejectRole ); } -QgsHtmlAnnotationDialog::~QgsHtmlAnnotationDialog() -{ - -} - void QgsHtmlAnnotationDialog::applySettingsToItem() { //apply settings from embedded item widget diff --git a/src/app/qgshtmlannotationdialog.h b/src/app/qgshtmlannotationdialog.h index ad43898bf66..b64a4ea2faa 100644 --- a/src/app/qgshtmlannotationdialog.h +++ b/src/app/qgshtmlannotationdialog.h @@ -26,7 +26,6 @@ class APP_EXPORT QgsHtmlAnnotationDialog: public QDialog, private Ui::QgsFormAnn Q_OBJECT public: QgsHtmlAnnotationDialog( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = 0 ); - ~QgsHtmlAnnotationDialog(); private: QgsMapCanvasAnnotationItem *mItem = nullptr; diff --git a/src/app/qgsjoindialog.cpp b/src/app/qgsjoindialog.cpp index 7633b3093ef..f7ebf9f9c5e 100644 --- a/src/app/qgsjoindialog.cpp +++ b/src/app/qgsjoindialog.cpp @@ -69,10 +69,6 @@ QgsJoinDialog::QgsJoinDialog( QgsVectorLayer *layer, QList alread checkDefinitionValid(); } -QgsJoinDialog::~QgsJoinDialog() -{ -} - void QgsJoinDialog::setJoinInfo( const QgsVectorLayerJoinInfo &joinInfo ) { mJoinLayerComboBox->setLayer( joinInfo.joinLayer() ); diff --git a/src/app/qgsjoindialog.h b/src/app/qgsjoindialog.h index 97abdd0f7c3..4508631187b 100644 --- a/src/app/qgsjoindialog.h +++ b/src/app/qgsjoindialog.h @@ -29,7 +29,6 @@ class APP_EXPORT QgsJoinDialog: public QDialog, private Ui::QgsJoinDialogBase Q_OBJECT public: QgsJoinDialog( QgsVectorLayer *layer, QList alreadyJoinedLayers, QWidget *parent = nullptr, Qt::WindowFlags f = 0 ); - ~QgsJoinDialog(); //! Configure the dialog for an existing join void setJoinInfo( const QgsVectorLayerJoinInfo &joinInfo ); diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp index a0d5bd0fe1d..848009441c1 100644 --- a/src/app/qgsmaptooladdfeature.cpp +++ b/src/app/qgsmaptooladdfeature.cpp @@ -45,10 +45,6 @@ QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas *canvas, CaptureMode mo connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddFeature::stopCapturing ); } -QgsMapToolAddFeature::~QgsMapToolAddFeature() -{ -} - bool QgsMapToolAddFeature::addFeature( QgsVectorLayer *vlayer, QgsFeature *f, bool showModal ) { QgsExpressionContextScope *scope = QgsExpressionContextUtils::mapToolCaptureScope( snappingMatches() ); diff --git a/src/app/qgsmaptooladdfeature.h b/src/app/qgsmaptooladdfeature.h index dec83cd2b9e..fff4a79af24 100644 --- a/src/app/qgsmaptooladdfeature.h +++ b/src/app/qgsmaptooladdfeature.h @@ -23,7 +23,7 @@ class APP_EXPORT QgsMapToolAddFeature : public QgsMapToolCapture public: //! \since QGIS 2.12 QgsMapToolAddFeature( QgsMapCanvas *canvas, CaptureMode mode ); - virtual ~QgsMapToolAddFeature(); + void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override; bool addFeature( QgsVectorLayer *vlayer, QgsFeature *f, bool showModal = true ); diff --git a/src/app/qgsmaptooladdpart.cpp b/src/app/qgsmaptooladdpart.cpp index 6ed526c1767..9fe9b30c0b6 100644 --- a/src/app/qgsmaptooladdpart.cpp +++ b/src/app/qgsmaptooladdpart.cpp @@ -35,10 +35,6 @@ QgsMapToolAddPart::QgsMapToolAddPart( QgsMapCanvas *canvas ) connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddPart::stopCapturing ); } -QgsMapToolAddPart::~QgsMapToolAddPart() -{ -} - void QgsMapToolAddPart::canvasReleaseEvent( QgsMapMouseEvent *e ) { if ( checkSelection() ) diff --git a/src/app/qgsmaptooladdpart.h b/src/app/qgsmaptooladdpart.h index 5f8ce14b7f5..8e82d7c5f4c 100644 --- a/src/app/qgsmaptooladdpart.h +++ b/src/app/qgsmaptooladdpart.h @@ -22,7 +22,7 @@ class APP_EXPORT QgsMapToolAddPart : public QgsMapToolCapture Q_OBJECT public: QgsMapToolAddPart( QgsMapCanvas *canvas ); - virtual ~QgsMapToolAddPart(); + void canvasReleaseEvent( QgsMapMouseEvent *e ) override; void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override; diff --git a/src/app/qgsmaptooladdring.cpp b/src/app/qgsmaptooladdring.cpp index 99f44dffd0c..aca5e2a489a 100644 --- a/src/app/qgsmaptooladdring.cpp +++ b/src/app/qgsmaptooladdring.cpp @@ -33,10 +33,6 @@ QgsMapToolAddRing::QgsMapToolAddRing( QgsMapCanvas *canvas ) connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddRing::stopCapturing ); } -QgsMapToolAddRing::~QgsMapToolAddRing() -{ -} - void QgsMapToolAddRing::cadCanvasReleaseEvent( QgsMapMouseEvent *e ) { diff --git a/src/app/qgsmaptooladdring.h b/src/app/qgsmaptooladdring.h index a78c9240dc3..172d5bea600 100644 --- a/src/app/qgsmaptooladdring.h +++ b/src/app/qgsmaptooladdring.h @@ -22,6 +22,5 @@ class APP_EXPORT QgsMapToolAddRing: public QgsMapToolCapture Q_OBJECT public: QgsMapToolAddRing( QgsMapCanvas *canvas ); - virtual ~QgsMapToolAddRing(); void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override; }; diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp index e358c28efbc..bdfc0065775 100644 --- a/src/app/qgsmaptoolannotation.cpp +++ b/src/app/qgsmaptoolannotation.cpp @@ -39,10 +39,6 @@ QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas *canvas ) mCursor = QCursor( Qt::ArrowCursor ); } -QgsMapToolAnnotation::~QgsMapToolAnnotation() -{ -} - QDialog *QgsMapToolAnnotation::createItemEditor( QgsMapCanvasAnnotationItem *item ) { if ( !item || !item->annotation() ) diff --git a/src/app/qgsmaptoolannotation.h b/src/app/qgsmaptoolannotation.h index 79e6fd0ff0d..3e862ce26eb 100644 --- a/src/app/qgsmaptoolannotation.h +++ b/src/app/qgsmaptoolannotation.h @@ -30,7 +30,6 @@ class APP_EXPORT QgsMapToolAnnotation: public QgsMapTool public: QgsMapToolAnnotation( QgsMapCanvas *canvas ); - ~QgsMapToolAnnotation(); void canvasPressEvent( QgsMapMouseEvent *e ) override; void canvasReleaseEvent( QgsMapMouseEvent *e ) override; diff --git a/src/app/qgsmaptoolchangelabelproperties.cpp b/src/app/qgsmaptoolchangelabelproperties.cpp index 938808b05d6..60eeb2e16fc 100644 --- a/src/app/qgsmaptoolchangelabelproperties.cpp +++ b/src/app/qgsmaptoolchangelabelproperties.cpp @@ -25,10 +25,6 @@ QgsMapToolChangeLabelProperties::QgsMapToolChangeLabelProperties( QgsMapCanvas * { } -QgsMapToolChangeLabelProperties::~QgsMapToolChangeLabelProperties() -{ -} - void QgsMapToolChangeLabelProperties::canvasPressEvent( QgsMapMouseEvent *e ) { deleteRubberBands(); diff --git a/src/app/qgsmaptoolchangelabelproperties.h b/src/app/qgsmaptoolchangelabelproperties.h index 38b271c4651..09eba08ec75 100644 --- a/src/app/qgsmaptoolchangelabelproperties.h +++ b/src/app/qgsmaptoolchangelabelproperties.h @@ -27,7 +27,6 @@ class APP_EXPORT QgsMapToolChangeLabelProperties: public QgsMapToolLabel public: QgsMapToolChangeLabelProperties( QgsMapCanvas *canvas ); - ~QgsMapToolChangeLabelProperties(); virtual void canvasPressEvent( QgsMapMouseEvent *e ) override; virtual void canvasReleaseEvent( QgsMapMouseEvent *e ) override; diff --git a/src/app/qgsmaptoolcircularstringcurvepoint.cpp b/src/app/qgsmaptoolcircularstringcurvepoint.cpp index ba1124bde8a..725ae798771 100644 --- a/src/app/qgsmaptoolcircularstringcurvepoint.cpp +++ b/src/app/qgsmaptoolcircularstringcurvepoint.cpp @@ -27,10 +27,6 @@ QgsMapToolCircularStringCurvePoint::QgsMapToolCircularStringCurvePoint( QgsMapTo } -QgsMapToolCircularStringCurvePoint::~QgsMapToolCircularStringCurvePoint() -{ -} - void QgsMapToolCircularStringCurvePoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e ) { QgsPoint mapPoint( e->mapPoint() ); diff --git a/src/app/qgsmaptoolcircularstringcurvepoint.h b/src/app/qgsmaptoolcircularstringcurvepoint.h index a734dcb4048..bf4accaa099 100644 --- a/src/app/qgsmaptoolcircularstringcurvepoint.h +++ b/src/app/qgsmaptoolcircularstringcurvepoint.h @@ -25,7 +25,6 @@ class QgsMapToolCircularStringCurvePoint: public QgsMapToolAddCircularString public: QgsMapToolCircularStringCurvePoint( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode = CaptureLine ); - ~QgsMapToolCircularStringCurvePoint(); void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override; void cadCanvasMoveEvent( QgsMapMouseEvent *e ) override; diff --git a/src/app/qgsmaptoolcircularstringradius.cpp b/src/app/qgsmaptoolcircularstringradius.cpp index ed7412070c0..39850c17058 100644 --- a/src/app/qgsmaptoolcircularstringradius.cpp +++ b/src/app/qgsmaptoolcircularstringradius.cpp @@ -35,11 +35,6 @@ QgsMapToolCircularStringRadius::QgsMapToolCircularStringRadius( QgsMapToolCaptur } -QgsMapToolCircularStringRadius::~QgsMapToolCircularStringRadius() -{ - -} - void QgsMapToolCircularStringRadius::deactivate() { deleteRadiusSpinBox(); diff --git a/src/app/qgsmaptoolcircularstringradius.h b/src/app/qgsmaptoolcircularstringradius.h index aa3fb0462f8..ea02ea08bea 100644 --- a/src/app/qgsmaptoolcircularstringradius.h +++ b/src/app/qgsmaptoolcircularstringradius.h @@ -27,7 +27,6 @@ class QgsMapToolCircularStringRadius: public QgsMapToolAddCircularString Q_OBJECT public: QgsMapToolCircularStringRadius( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode = CaptureLine ); - ~QgsMapToolCircularStringRadius(); virtual void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override; virtual void cadCanvasMoveEvent( QgsMapMouseEvent *e ) override; diff --git a/src/app/qgsmaptoolfeatureaction.cpp b/src/app/qgsmaptoolfeatureaction.cpp index 4aabf44698b..a63e1804594 100644 --- a/src/app/qgsmaptoolfeatureaction.cpp +++ b/src/app/qgsmaptoolfeatureaction.cpp @@ -43,10 +43,6 @@ QgsMapToolFeatureAction::QgsMapToolFeatureAction( QgsMapCanvas *canvas ) { } -QgsMapToolFeatureAction::~QgsMapToolFeatureAction() -{ -} - void QgsMapToolFeatureAction::canvasMoveEvent( QgsMapMouseEvent *e ) { Q_UNUSED( e ); diff --git a/src/app/qgsmaptoolfeatureaction.h b/src/app/qgsmaptoolfeatureaction.h index f75ff949da1..f804834eff8 100644 --- a/src/app/qgsmaptoolfeatureaction.h +++ b/src/app/qgsmaptoolfeatureaction.h @@ -35,8 +35,6 @@ class APP_EXPORT QgsMapToolFeatureAction : public QgsMapTool public: QgsMapToolFeatureAction( QgsMapCanvas *canvas ); - ~QgsMapToolFeatureAction(); - virtual Flags flags() const override { return QgsMapTool::AllowZoomRect; } //! Overridden mouse move event diff --git a/src/app/qgsmaptoolfillring.cpp b/src/app/qgsmaptoolfillring.cpp index ce4825efbc6..5a298b06101 100644 --- a/src/app/qgsmaptoolfillring.cpp +++ b/src/app/qgsmaptoolfillring.cpp @@ -31,10 +31,6 @@ QgsMapToolFillRing::QgsMapToolFillRing( QgsMapCanvas *canvas ) { } -QgsMapToolFillRing::~QgsMapToolFillRing() -{ -} - void QgsMapToolFillRing::cadCanvasReleaseEvent( QgsMapMouseEvent *e ) { //check if we operate on a vector layer diff --git a/src/app/qgsmaptoolfillring.h b/src/app/qgsmaptoolfillring.h index a4cc066ab79..0729a7f6909 100644 --- a/src/app/qgsmaptoolfillring.h +++ b/src/app/qgsmaptoolfillring.h @@ -25,7 +25,6 @@ class APP_EXPORT QgsMapToolFillRing: public QgsMapToolCapture Q_OBJECT public: QgsMapToolFillRing( QgsMapCanvas *canvas ); - virtual ~QgsMapToolFillRing(); void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override; private: diff --git a/src/app/qgsmaptoolformannotation.cpp b/src/app/qgsmaptoolformannotation.cpp index 66fb4d8c464..7b173965ca4 100644 --- a/src/app/qgsmaptoolformannotation.cpp +++ b/src/app/qgsmaptoolformannotation.cpp @@ -27,11 +27,6 @@ QgsMapToolFormAnnotation::QgsMapToolFormAnnotation( QgsMapCanvas *canvas ): QgsM } -QgsMapToolFormAnnotation::~QgsMapToolFormAnnotation() -{ - -} - QgsAnnotation *QgsMapToolFormAnnotation::createItem() const { return new QgsFormAnnotation(); diff --git a/src/app/qgsmaptoolformannotation.h b/src/app/qgsmaptoolformannotation.h index 48dfcb836c9..039843dec57 100644 --- a/src/app/qgsmaptoolformannotation.h +++ b/src/app/qgsmaptoolformannotation.h @@ -27,7 +27,6 @@ class APP_EXPORT QgsMapToolFormAnnotation: public QgsMapToolAnnotation public: QgsMapToolFormAnnotation( QgsMapCanvas *canvas ); - ~QgsMapToolFormAnnotation(); protected: QgsAnnotation *createItem() const override; diff --git a/src/app/qgsmaptoolhtmlannotation.cpp b/src/app/qgsmaptoolhtmlannotation.cpp index ac95f26bfa9..567003eb700 100644 --- a/src/app/qgsmaptoolhtmlannotation.cpp +++ b/src/app/qgsmaptoolhtmlannotation.cpp @@ -27,11 +27,6 @@ QgsMapToolHtmlAnnotation::QgsMapToolHtmlAnnotation( QgsMapCanvas *canvas ): QgsM } -QgsMapToolHtmlAnnotation::~QgsMapToolHtmlAnnotation() -{ - -} - QgsAnnotation *QgsMapToolHtmlAnnotation::createItem() const { return new QgsHtmlAnnotation(); diff --git a/src/app/qgsmaptoolhtmlannotation.h b/src/app/qgsmaptoolhtmlannotation.h index 3369cd38fdd..4c3ae209cc9 100644 --- a/src/app/qgsmaptoolhtmlannotation.h +++ b/src/app/qgsmaptoolhtmlannotation.h @@ -27,7 +27,6 @@ class APP_EXPORT QgsMapToolHtmlAnnotation: public QgsMapToolAnnotation public: QgsMapToolHtmlAnnotation( QgsMapCanvas *canvas ); - ~QgsMapToolHtmlAnnotation(); protected: QgsAnnotation *createItem() const override; diff --git a/src/app/qgsmaptoolmovelabel.cpp b/src/app/qgsmaptoolmovelabel.cpp index 3e571bd456e..95af8dfa04c 100644 --- a/src/app/qgsmaptoolmovelabel.cpp +++ b/src/app/qgsmaptoolmovelabel.cpp @@ -29,10 +29,6 @@ QgsMapToolMoveLabel::QgsMapToolMoveLabel( QgsMapCanvas *canvas ) mToolName = tr( "Move label" ); } -QgsMapToolMoveLabel::~QgsMapToolMoveLabel() -{ -} - void QgsMapToolMoveLabel::canvasPressEvent( QgsMapMouseEvent *e ) { deleteRubberBands(); diff --git a/src/app/qgsmaptoolmovelabel.h b/src/app/qgsmaptoolmovelabel.h index abbea8506f1..97c0883034c 100644 --- a/src/app/qgsmaptoolmovelabel.h +++ b/src/app/qgsmaptoolmovelabel.h @@ -28,7 +28,6 @@ class APP_EXPORT QgsMapToolMoveLabel: public QgsMapToolLabel public: QgsMapToolMoveLabel( QgsMapCanvas *canvas ); - ~QgsMapToolMoveLabel(); virtual void canvasPressEvent( QgsMapMouseEvent *e ) override; diff --git a/src/app/qgsmaptoolreshape.cpp b/src/app/qgsmaptoolreshape.cpp index 392e651edeb..d0ee9730146 100644 --- a/src/app/qgsmaptoolreshape.cpp +++ b/src/app/qgsmaptoolreshape.cpp @@ -29,10 +29,6 @@ QgsMapToolReshape::QgsMapToolReshape( QgsMapCanvas *canvas ) { } -QgsMapToolReshape::~QgsMapToolReshape() -{ -} - void QgsMapToolReshape::cadCanvasReleaseEvent( QgsMapMouseEvent *e ) { //check if we operate on a vector layer //todo: move this to a function in parent class to avoid duplication diff --git a/src/app/qgsmaptoolreshape.h b/src/app/qgsmaptoolreshape.h index 54a18d0f4d9..875a97828aa 100644 --- a/src/app/qgsmaptoolreshape.h +++ b/src/app/qgsmaptoolreshape.h @@ -26,7 +26,6 @@ class APP_EXPORT QgsMapToolReshape: public QgsMapToolCapture public: QgsMapToolReshape( QgsMapCanvas *canvas ); - virtual ~QgsMapToolReshape(); void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override; }; diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp index 14599f11153..fdecfa9e265 100644 --- a/src/app/qgsmaptoolrotatefeature.cpp +++ b/src/app/qgsmaptoolrotatefeature.cpp @@ -78,10 +78,6 @@ QgsAngleMagnetWidget::QgsAngleMagnetWidget( const QString &label, QWidget *paren setFocusProxy( mAngleSpinBox ); } -QgsAngleMagnetWidget::~QgsAngleMagnetWidget() -{ -} - void QgsAngleMagnetWidget::setAngle( double angle ) { const int magnet = mMagnetSpinBox->value(); diff --git a/src/app/qgsmaptoolrotatefeature.h b/src/app/qgsmaptoolrotatefeature.h index 9c276965129..c934c81403a 100644 --- a/src/app/qgsmaptoolrotatefeature.h +++ b/src/app/qgsmaptoolrotatefeature.h @@ -34,8 +34,6 @@ class APP_EXPORT QgsAngleMagnetWidget : public QWidget explicit QgsAngleMagnetWidget( const QString &label = QString(), QWidget *parent = nullptr ); - ~QgsAngleMagnetWidget(); - void setAngle( double angle ); double angle(); diff --git a/src/app/qgsmaptoolsplitfeatures.cpp b/src/app/qgsmaptoolsplitfeatures.cpp index 0ce0c91ba2f..9c48bc085f2 100644 --- a/src/app/qgsmaptoolsplitfeatures.cpp +++ b/src/app/qgsmaptoolsplitfeatures.cpp @@ -29,11 +29,6 @@ QgsMapToolSplitFeatures::QgsMapToolSplitFeatures( QgsMapCanvas *canvas ) mToolName = tr( "Split features" ); } -QgsMapToolSplitFeatures::~QgsMapToolSplitFeatures() -{ - -} - void QgsMapToolSplitFeatures::cadCanvasReleaseEvent( QgsMapMouseEvent *e ) { //check if we operate on a vector layer diff --git a/src/app/qgsmaptoolsplitfeatures.h b/src/app/qgsmaptoolsplitfeatures.h index aea06d115ae..9fee2c5d775 100644 --- a/src/app/qgsmaptoolsplitfeatures.h +++ b/src/app/qgsmaptoolsplitfeatures.h @@ -25,7 +25,6 @@ class APP_EXPORT QgsMapToolSplitFeatures: public QgsMapToolCapture Q_OBJECT public: QgsMapToolSplitFeatures( QgsMapCanvas *canvas ); - virtual ~QgsMapToolSplitFeatures(); void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override; }; diff --git a/src/app/qgsmaptoolsplitparts.cpp b/src/app/qgsmaptoolsplitparts.cpp index 1d1238e3655..c70630ffed4 100644 --- a/src/app/qgsmaptoolsplitparts.cpp +++ b/src/app/qgsmaptoolsplitparts.cpp @@ -29,11 +29,6 @@ QgsMapToolSplitParts::QgsMapToolSplitParts( QgsMapCanvas *canvas ) mToolName = tr( "Split parts" ); } -QgsMapToolSplitParts::~QgsMapToolSplitParts() -{ - -} - void QgsMapToolSplitParts::cadCanvasReleaseEvent( QgsMapMouseEvent *e ) { //check if we operate on a vector layer diff --git a/src/app/qgsmaptoolsplitparts.h b/src/app/qgsmaptoolsplitparts.h index 1c0ec0e170e..0f5ca3065e4 100644 --- a/src/app/qgsmaptoolsplitparts.h +++ b/src/app/qgsmaptoolsplitparts.h @@ -24,7 +24,6 @@ class QgsMapToolSplitParts: public QgsMapToolCapture Q_OBJECT public: explicit QgsMapToolSplitParts( QgsMapCanvas *canvas ); - virtual ~QgsMapToolSplitParts(); void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override; }; diff --git a/src/app/qgsmaptoolsvgannotation.cpp b/src/app/qgsmaptoolsvgannotation.cpp index 3fa3eda40aa..0b21321d37e 100644 --- a/src/app/qgsmaptoolsvgannotation.cpp +++ b/src/app/qgsmaptoolsvgannotation.cpp @@ -25,11 +25,6 @@ QgsMapToolSvgAnnotation::QgsMapToolSvgAnnotation( QgsMapCanvas *canvas ): QgsMap } -QgsMapToolSvgAnnotation::~QgsMapToolSvgAnnotation() -{ - -} - QgsAnnotation *QgsMapToolSvgAnnotation::createItem() const { return new QgsSvgAnnotation(); diff --git a/src/app/qgsmaptoolsvgannotation.h b/src/app/qgsmaptoolsvgannotation.h index a61ac1d3dda..3f2041c369e 100644 --- a/src/app/qgsmaptoolsvgannotation.h +++ b/src/app/qgsmaptoolsvgannotation.h @@ -27,7 +27,6 @@ class APP_EXPORT QgsMapToolSvgAnnotation: public QgsMapToolAnnotation public: QgsMapToolSvgAnnotation( QgsMapCanvas *canvas ); - ~QgsMapToolSvgAnnotation(); protected: QgsAnnotation *createItem() const override; }; diff --git a/src/app/qgsmaptooltextannotation.cpp b/src/app/qgsmaptooltextannotation.cpp index f24c9b2393c..b52274b078d 100644 --- a/src/app/qgsmaptooltextannotation.cpp +++ b/src/app/qgsmaptooltextannotation.cpp @@ -25,11 +25,6 @@ QgsMapToolTextAnnotation::QgsMapToolTextAnnotation( QgsMapCanvas *canvas ): QgsM } -QgsMapToolTextAnnotation::~QgsMapToolTextAnnotation() -{ - -} - QgsAnnotation *QgsMapToolTextAnnotation::createItem() const { return new QgsTextAnnotation(); diff --git a/src/app/qgsmaptooltextannotation.h b/src/app/qgsmaptooltextannotation.h index a7e1a503616..55762fd15b5 100644 --- a/src/app/qgsmaptooltextannotation.h +++ b/src/app/qgsmaptooltextannotation.h @@ -27,7 +27,6 @@ class APP_EXPORT QgsMapToolTextAnnotation: public QgsMapToolAnnotation public: QgsMapToolTextAnnotation( QgsMapCanvas *canvas ); - ~QgsMapToolTextAnnotation(); protected: QgsAnnotation *createItem() const override; diff --git a/src/app/qgspointrotationitem.cpp b/src/app/qgspointrotationitem.cpp index 5e7897a3c9d..7edc839de3c 100644 --- a/src/app/qgspointrotationitem.cpp +++ b/src/app/qgspointrotationitem.cpp @@ -31,11 +31,6 @@ QgsPointRotationItem::QgsPointRotationItem( QgsMapCanvas *canvas ) setSymbol( im ); } -QgsPointRotationItem::~QgsPointRotationItem() -{ - -} - void QgsPointRotationItem::paint( QPainter *painter ) { if ( !painter ) diff --git a/src/app/qgspointrotationitem.h b/src/app/qgspointrotationitem.h index 148613e3af7..70680d454b4 100644 --- a/src/app/qgspointrotationitem.h +++ b/src/app/qgspointrotationitem.h @@ -33,7 +33,6 @@ class APP_EXPORT QgsPointRotationItem: public QgsMapCanvasItem }; QgsPointRotationItem( QgsMapCanvas *canvas ); - ~QgsPointRotationItem(); void paint( QPainter *painter ) override; diff --git a/src/app/qgsrelationmanagerdialog.cpp b/src/app/qgsrelationmanagerdialog.cpp index fe6b99f7f4b..b84d554d577 100644 --- a/src/app/qgsrelationmanagerdialog.cpp +++ b/src/app/qgsrelationmanagerdialog.cpp @@ -30,10 +30,6 @@ QgsRelationManagerDialog::QgsRelationManagerDialog( QgsRelationManager *relation connect( mRelationsTable->selectionModel(), &QItemSelectionModel::selectionChanged, this, &QgsRelationManagerDialog::onSelectionChanged ); } -QgsRelationManagerDialog::~QgsRelationManagerDialog() -{ -} - void QgsRelationManagerDialog::setLayers( const QList< QgsVectorLayer * > &layers ) { mLayers = layers; diff --git a/src/app/qgsrelationmanagerdialog.h b/src/app/qgsrelationmanagerdialog.h index 4e7d6e8a942..949f0f7eafd 100644 --- a/src/app/qgsrelationmanagerdialog.h +++ b/src/app/qgsrelationmanagerdialog.h @@ -31,7 +31,6 @@ class APP_EXPORT QgsRelationManagerDialog : public QWidget, private Ui::QgsRelat public: explicit QgsRelationManagerDialog( QgsRelationManager *relationMgr, QWidget *parent = nullptr ); - ~QgsRelationManagerDialog(); void setLayers( const QList & ); diff --git a/src/app/qgssnappinglayertreemodel.cpp b/src/app/qgssnappinglayertreemodel.cpp index e3adf7e5a20..1a39037fb60 100644 --- a/src/app/qgssnappinglayertreemodel.cpp +++ b/src/app/qgssnappinglayertreemodel.cpp @@ -147,10 +147,6 @@ QgsSnappingLayerTreeModel::QgsSnappingLayerTreeModel( QgsProject *project, QObje connect( project, &QgsProject::avoidIntersectionsLayersChanged, this, &QgsSnappingLayerTreeModel::onSnappingSettingsChanged ); } -QgsSnappingLayerTreeModel::~QgsSnappingLayerTreeModel() -{ -} - int QgsSnappingLayerTreeModel::columnCount( const QModelIndex &parent ) const { Q_UNUSED( parent ); diff --git a/src/app/qgssnappinglayertreemodel.h b/src/app/qgssnappinglayertreemodel.h index f81a3e5e17b..f50e9dfb767 100644 --- a/src/app/qgssnappinglayertreemodel.h +++ b/src/app/qgssnappinglayertreemodel.h @@ -60,7 +60,6 @@ class APP_EXPORT QgsSnappingLayerTreeModel : public QSortFilterProxyModel }; QgsSnappingLayerTreeModel( QgsProject *project, QObject *parent = nullptr ); - ~QgsSnappingLayerTreeModel(); int columnCount( const QModelIndex &parent ) const override; QVariant headerData( int section, Qt::Orientation orientation, int role ) const override; diff --git a/src/app/qgsstatisticalsummarydockwidget.cpp b/src/app/qgsstatisticalsummarydockwidget.cpp index 9de8930bcad..176da8d6aa4 100644 --- a/src/app/qgsstatisticalsummarydockwidget.cpp +++ b/src/app/qgsstatisticalsummarydockwidget.cpp @@ -101,11 +101,6 @@ QgsStatisticalSummaryDockWidget::QgsStatisticalSummaryDockWidget( QWidget *paren refreshStatisticsMenu(); } -QgsStatisticalSummaryDockWidget::~QgsStatisticalSummaryDockWidget() -{ - -} - void QgsStatisticalSummaryDockWidget::refreshStatistics() { if ( !mLayer || ( mFieldExpressionWidget->isExpression() && !mFieldExpressionWidget->isValidExpression() ) ) diff --git a/src/app/qgsstatisticalsummarydockwidget.h b/src/app/qgsstatisticalsummarydockwidget.h index b2e5f90db8c..21c3d1e1332 100644 --- a/src/app/qgsstatisticalsummarydockwidget.h +++ b/src/app/qgsstatisticalsummarydockwidget.h @@ -40,7 +40,6 @@ class APP_EXPORT QgsStatisticalSummaryDockWidget : public QgsDockWidget, private public: QgsStatisticalSummaryDockWidget( QWidget *parent = nullptr ); - ~QgsStatisticalSummaryDockWidget(); /** Returns the currently active layer for the widget * \since QGIS 2.12 diff --git a/src/app/qgsstatusbarmagnifierwidget.cpp b/src/app/qgsstatusbarmagnifierwidget.cpp index e4d74432396..4e5dd5584f8 100644 --- a/src/app/qgsstatusbarmagnifierwidget.cpp +++ b/src/app/qgsstatusbarmagnifierwidget.cpp @@ -66,10 +66,6 @@ QgsStatusBarMagnifierWidget::QgsStatusBarMagnifierWidget( QWidget *parent ) setLayout( mLayout ); } -QgsStatusBarMagnifierWidget::~QgsStatusBarMagnifierWidget() -{ -} - void QgsStatusBarMagnifierWidget::setDefaultFactor( double factor ) { mSpinBox->setClearValue( ( int )100 * factor ); diff --git a/src/app/qgsstatusbarmagnifierwidget.h b/src/app/qgsstatusbarmagnifierwidget.h index f291191ccc0..7118c7d5ec9 100644 --- a/src/app/qgsstatusbarmagnifierwidget.h +++ b/src/app/qgsstatusbarmagnifierwidget.h @@ -41,9 +41,6 @@ class APP_EXPORT QgsStatusBarMagnifierWidget : public QWidget */ QgsStatusBarMagnifierWidget( QWidget *parent = nullptr ); - - virtual ~QgsStatusBarMagnifierWidget(); - void setDefaultFactor( double factor ); /** Set the font of the text diff --git a/src/app/qgsstatusbarscalewidget.cpp b/src/app/qgsstatusbarscalewidget.cpp index 10091f56001..b7673d075c0 100644 --- a/src/app/qgsstatusbarscalewidget.cpp +++ b/src/app/qgsstatusbarscalewidget.cpp @@ -73,10 +73,6 @@ QgsStatusBarScaleWidget::QgsStatusBarScaleWidget( QgsMapCanvas *canvas, QWidget connect( mLockButton, &QAbstractButton::toggled, mScale, &QWidget::setDisabled ); } -QgsStatusBarScaleWidget::~QgsStatusBarScaleWidget() -{ -} - void QgsStatusBarScaleWidget::setScale( double scale ) { mScale->blockSignals( true ); diff --git a/src/app/qgsstatusbarscalewidget.h b/src/app/qgsstatusbarscalewidget.h index dac2bf7fa67..b5402e78131 100644 --- a/src/app/qgsstatusbarscalewidget.h +++ b/src/app/qgsstatusbarscalewidget.h @@ -40,9 +40,6 @@ class APP_EXPORT QgsStatusBarScaleWidget : public QWidget public: explicit QgsStatusBarScaleWidget( QgsMapCanvas *canvas, QWidget *parent = 0 ); - - virtual ~QgsStatusBarScaleWidget(); - /** * Set the selected \a scale from double. * The \a scale value indicates the scale denominator, e.g. 1000.0 for a 1:1000 map. diff --git a/src/app/qgssvgannotationdialog.cpp b/src/app/qgssvgannotationdialog.cpp index c5b68b27179..84250fb3513 100644 --- a/src/app/qgssvgannotationdialog.cpp +++ b/src/app/qgssvgannotationdialog.cpp @@ -56,11 +56,6 @@ QgsSvgAnnotationDialog::QgsSvgAnnotationDialog() } -QgsSvgAnnotationDialog::~QgsSvgAnnotationDialog() -{ - -} - void QgsSvgAnnotationDialog::on_mBrowseToolButton_clicked() { QString directory; diff --git a/src/app/qgssvgannotationdialog.h b/src/app/qgssvgannotationdialog.h index bf51298d5a0..c75a6fdd205 100644 --- a/src/app/qgssvgannotationdialog.h +++ b/src/app/qgssvgannotationdialog.h @@ -29,7 +29,6 @@ class APP_EXPORT QgsSvgAnnotationDialog: public QDialog, private Ui::QgsFormAnno Q_OBJECT public: QgsSvgAnnotationDialog( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = 0 ); - ~QgsSvgAnnotationDialog(); private slots: void on_mBrowseToolButton_clicked(); diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index 305e1641dba..3237ee41bb9 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -332,11 +332,6 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( connect( mRefreshLayerCheckBox, &QCheckBox::toggled, mRefreshLayerIntervalSpinBox, &QDoubleSpinBox::setEnabled ); -} // QgsVectorLayerProperties ctor - - -QgsVectorLayerProperties::~QgsVectorLayerProperties() -{ } void QgsVectorLayerProperties::toggleEditing() diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h index d2cb7c213bd..073f8e084ce 100644 --- a/src/app/qgsvectorlayerproperties.h +++ b/src/app/qgsvectorlayerproperties.h @@ -55,7 +55,7 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private }; QgsVectorLayerProperties( QgsVectorLayer *lyr = nullptr, QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags ); - ~QgsVectorLayerProperties(); + //! Returns the display name entered in the dialog QString displayName(); void setRendererDirty( bool ) {} diff --git a/src/core/diagram/qgsdiagram.cpp b/src/core/diagram/qgsdiagram.cpp index 4b0aa088dd5..5c232248185 100644 --- a/src/core/diagram/qgsdiagram.cpp +++ b/src/core/diagram/qgsdiagram.cpp @@ -20,13 +20,6 @@ #include - - -QgsDiagram::QgsDiagram() -{ - -} - QgsDiagram::QgsDiagram( const QgsDiagram &other ) { Q_UNUSED( other ); diff --git a/src/core/diagram/qgsdiagram.h b/src/core/diagram/qgsdiagram.h index afce3152a4e..50634f6baa4 100644 --- a/src/core/diagram/qgsdiagram.h +++ b/src/core/diagram/qgsdiagram.h @@ -73,7 +73,7 @@ class CORE_EXPORT QgsDiagram virtual double legendSize( double value, const QgsDiagramSettings &s, const QgsDiagramInterpolationSettings &is ) const = 0; protected: - QgsDiagram(); + QgsDiagram() = default; QgsDiagram( const QgsDiagram &other ); /** Changes the pen width to match the current settings and rendering context diff --git a/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp b/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp index f6fbb741467..d8050fed636 100644 --- a/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp +++ b/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp @@ -31,12 +31,6 @@ bool orderByValueLessThan( const QgsValueRelationFieldFormatter::ValueRelationIt return qgsVariantLessThan( p1.value, p2.value ); } - -QgsValueRelationFieldFormatter::QgsValueRelationFieldFormatter() -{ - -} - QString QgsValueRelationFieldFormatter::id() const { return QStringLiteral( "ValueRelation" ); diff --git a/src/core/fieldformatter/qgsvaluerelationfieldformatter.h b/src/core/fieldformatter/qgsvaluerelationfieldformatter.h index be183d6cfc9..ea42d30203d 100644 --- a/src/core/fieldformatter/qgsvaluerelationfieldformatter.h +++ b/src/core/fieldformatter/qgsvaluerelationfieldformatter.h @@ -49,7 +49,7 @@ class CORE_EXPORT QgsValueRelationFieldFormatter : public QgsFieldFormatter typedef QVector < QgsValueRelationFieldFormatter::ValueRelationItem > ValueRelationCache; - QgsValueRelationFieldFormatter(); + QgsValueRelationFieldFormatter() = default; QString id() const override; QString representValue( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config, const QVariant &cache, const QVariant &value ) const override; diff --git a/src/core/gps/qgsgpsconnectionregistry.cpp b/src/core/gps/qgsgpsconnectionregistry.cpp index 3b84fbb1bf8..d0a46b342d7 100644 --- a/src/core/gps/qgsgpsconnectionregistry.cpp +++ b/src/core/gps/qgsgpsconnectionregistry.cpp @@ -18,10 +18,6 @@ #include "qgsgpsconnectionregistry.h" #include "qgsgpsconnection.h" -QgsGPSConnectionRegistry::QgsGPSConnectionRegistry() -{ -} - QgsGPSConnectionRegistry::~QgsGPSConnectionRegistry() { qDeleteAll( mConnections ); diff --git a/src/core/gps/qgsgpsconnectionregistry.h b/src/core/gps/qgsgpsconnectionregistry.h index f237624834c..936319aca67 100644 --- a/src/core/gps/qgsgpsconnectionregistry.h +++ b/src/core/gps/qgsgpsconnectionregistry.h @@ -35,7 +35,7 @@ class QgsGPSConnection; class CORE_EXPORT QgsGPSConnectionRegistry { public: - QgsGPSConnectionRegistry(); + QgsGPSConnectionRegistry() = default; ~QgsGPSConnectionRegistry(); //! QgsGPSConnectionRegistry cannot be copied. diff --git a/src/core/qgscolorscheme.cpp b/src/core/qgscolorscheme.cpp index 94414700d87..17bda399667 100644 --- a/src/core/qgscolorscheme.cpp +++ b/src/core/qgscolorscheme.cpp @@ -198,11 +198,6 @@ QgsCustomColorScheme *QgsCustomColorScheme::clone() const } -QgsProjectColorScheme::QgsProjectColorScheme() -{ - -} - QgsNamedColorList QgsProjectColorScheme::fetchColors( const QString &context, const QColor &baseColor ) { Q_UNUSED( context ); diff --git a/src/core/qgscolorscheme.h b/src/core/qgscolorscheme.h index 5101de177cf..0b897f8c289 100644 --- a/src/core/qgscolorscheme.h +++ b/src/core/qgscolorscheme.h @@ -268,7 +268,7 @@ class CORE_EXPORT QgsProjectColorScheme : public QgsColorScheme { public: - QgsProjectColorScheme(); + QgsProjectColorScheme() = default; virtual QString schemeName() const override { return QObject::tr( "Project colors" ); } diff --git a/src/core/qgscolorschemeregistry.cpp b/src/core/qgscolorschemeregistry.cpp index 17f843d4168..50280edd577 100644 --- a/src/core/qgscolorschemeregistry.cpp +++ b/src/core/qgscolorschemeregistry.cpp @@ -22,10 +22,6 @@ #include -QgsColorSchemeRegistry::QgsColorSchemeRegistry() -{ -} - QgsColorSchemeRegistry::~QgsColorSchemeRegistry() { qDeleteAll( mColorSchemeList ); diff --git a/src/core/qgscolorschemeregistry.h b/src/core/qgscolorschemeregistry.h index 852ecf503cc..dc5afc68ab5 100644 --- a/src/core/qgscolorschemeregistry.h +++ b/src/core/qgscolorschemeregistry.h @@ -37,7 +37,7 @@ class CORE_EXPORT QgsColorSchemeRegistry /** Constructor for an empty color scheme registry */ - QgsColorSchemeRegistry(); + QgsColorSchemeRegistry() = default; virtual ~QgsColorSchemeRegistry(); diff --git a/src/core/qgscredentials.cpp b/src/core/qgscredentials.cpp index f197f8775cf..7fb82da6f51 100644 --- a/src/core/qgscredentials.cpp +++ b/src/core/qgscredentials.cpp @@ -38,10 +38,6 @@ QgsCredentials *QgsCredentials::instance() return new QgsCredentialsNone(); } -QgsCredentials::QgsCredentials() -{ -} - bool QgsCredentials::get( const QString &realm, QString &username, QString &password, const QString &message ) { if ( mCredentialCache.contains( realm ) ) diff --git a/src/core/qgscredentials.h b/src/core/qgscredentials.h index 161c876a0eb..8f6f230d2a1 100644 --- a/src/core/qgscredentials.h +++ b/src/core/qgscredentials.h @@ -72,7 +72,7 @@ class CORE_EXPORT QgsCredentials QMutex *mutex() { return &mMutex; } protected: - QgsCredentials(); + QgsCredentials() = default; //! request a password virtual bool request( const QString &realm, QString &username SIP_INOUT, QString &password SIP_INOUT, const QString &message = QString() ) = 0; diff --git a/src/core/qgscrscache.cpp b/src/core/qgscrscache.cpp index efdd8f79443..11deb3c5c9e 100644 --- a/src/core/qgscrscache.cpp +++ b/src/core/qgscrscache.cpp @@ -25,10 +25,6 @@ QgsCoordinateTransformCache *QgsCoordinateTransformCache::instance() return &sInstance; } -QgsCoordinateTransformCache::QgsCoordinateTransformCache() -{ -} - QgsCoordinateTransform QgsCoordinateTransformCache::transform( const QString &srcAuthId, const QString &destAuthId, int srcDatumTransform, int destDatumTransform ) { QList< QgsCoordinateTransform > values = diff --git a/src/core/qgscrscache.h b/src/core/qgscrscache.h index 9946106034e..0c04df6e967 100644 --- a/src/core/qgscrscache.h +++ b/src/core/qgscrscache.h @@ -53,7 +53,7 @@ class CORE_EXPORT QgsCoordinateTransformCache private: QMultiHash< QPair< QString, QString >, QgsCoordinateTransform > mTransforms; //same auth_id pairs might have different datum transformations - QgsCoordinateTransformCache(); + QgsCoordinateTransformCache() = default; #ifdef SIP_RUN QgsCoordinateTransformCache( const QgsCoordinateTransformCache &rh ); diff --git a/src/core/qgsdatadefinedsizelegend.cpp b/src/core/qgsdatadefinedsizelegend.cpp index 8b221572a52..cff5d55fd7d 100644 --- a/src/core/qgsdatadefinedsizelegend.cpp +++ b/src/core/qgsdatadefinedsizelegend.cpp @@ -20,9 +20,6 @@ #include "qgssymbollayerutils.h" #include "qgsxmlutils.h" -QgsDataDefinedSizeLegend::QgsDataDefinedSizeLegend() -{ -} QgsDataDefinedSizeLegend::QgsDataDefinedSizeLegend( const QgsDataDefinedSizeLegend &other ) : mType( other.mType ) diff --git a/src/core/qgsdatadefinedsizelegend.h b/src/core/qgsdatadefinedsizelegend.h index c7436274f55..f8e5f796f58 100644 --- a/src/core/qgsdatadefinedsizelegend.h +++ b/src/core/qgsdatadefinedsizelegend.h @@ -39,7 +39,7 @@ class QgsSizeScaleTransformer; class CORE_EXPORT QgsDataDefinedSizeLegend { public: - QgsDataDefinedSizeLegend(); + QgsDataDefinedSizeLegend() = default; //! Copy constructor QgsDataDefinedSizeLegend( const QgsDataDefinedSizeLegend &other ); diff --git a/src/core/qgsdiagramrenderer.h b/src/core/qgsdiagramrenderer.h index dab887aaa5f..11dd64f2cfa 100644 --- a/src/core/qgsdiagramrenderer.h +++ b/src/core/qgsdiagramrenderer.h @@ -30,9 +30,8 @@ #include "qgssymbol.h" #include "qgsproperty.h" #include "qgspropertycollection.h" +#include "qgsdatadefinedsizelegend.h" - -class QgsDataDefinedSizeLegend; class QgsDiagram; class QgsDiagramRenderer; class QgsFeature; diff --git a/src/core/qgsexpressionfieldbuffer.cpp b/src/core/qgsexpressionfieldbuffer.cpp index 9783aa277fd..0dd8cfdfeab 100644 --- a/src/core/qgsexpressionfieldbuffer.cpp +++ b/src/core/qgsexpressionfieldbuffer.cpp @@ -19,9 +19,6 @@ #include "qgsvectorlayer.h" -QgsExpressionFieldBuffer::QgsExpressionFieldBuffer() -{ -} void QgsExpressionFieldBuffer::addExpression( const QString &exp, const QgsField &fld ) { diff --git a/src/core/qgsexpressionfieldbuffer.h b/src/core/qgsexpressionfieldbuffer.h index c10e9162b4b..6c78ea07c51 100644 --- a/src/core/qgsexpressionfieldbuffer.h +++ b/src/core/qgsexpressionfieldbuffer.h @@ -45,7 +45,7 @@ class CORE_EXPORT QgsExpressionFieldBuffer QgsField field; }; - QgsExpressionFieldBuffer(); + QgsExpressionFieldBuffer() = default; /** * Add an expression to the buffer diff --git a/src/core/qgsfeaturestore.cpp b/src/core/qgsfeaturestore.cpp index 3fdcf8da532..6bd34070ac7 100644 --- a/src/core/qgsfeaturestore.cpp +++ b/src/core/qgsfeaturestore.cpp @@ -15,9 +15,6 @@ #include "qgsfeaturestore.h" -QgsFeatureStore::QgsFeatureStore() -{ -} QgsFeatureStore::QgsFeatureStore( const QgsFields &fields, const QgsCoordinateReferenceSystem &crs ) : mFields( fields ) diff --git a/src/core/qgsfeaturestore.h b/src/core/qgsfeaturestore.h index e788bb613ad..177e6862cce 100644 --- a/src/core/qgsfeaturestore.h +++ b/src/core/qgsfeaturestore.h @@ -32,7 +32,7 @@ class CORE_EXPORT QgsFeatureStore : public QgsFeatureSink { public: //! Constructor - QgsFeatureStore(); + QgsFeatureStore() = default; //! Constructor QgsFeatureStore( const QgsFields &fields, const QgsCoordinateReferenceSystem &crs ); diff --git a/src/core/qgsgmlschema.cpp b/src/core/qgsgmlschema.cpp index 6ad4ab136c7..138c0b01f83 100644 --- a/src/core/qgsgmlschema.cpp +++ b/src/core/qgsgmlschema.cpp @@ -33,9 +33,6 @@ const char NS_SEPARATOR = '?'; const QString GML_NAMESPACE = QStringLiteral( "http://www.opengis.net/gml" ); -QgsGmlFeatureClass::QgsGmlFeatureClass() -{ -} QgsGmlFeatureClass::QgsGmlFeatureClass( const QString &name, const QString &path ) : mName( name ) diff --git a/src/core/qgsgmlschema.h b/src/core/qgsgmlschema.h index 7b81f2cb53f..24ecaa18d12 100644 --- a/src/core/qgsgmlschema.h +++ b/src/core/qgsgmlschema.h @@ -39,7 +39,7 @@ class QgsFeature; class CORE_EXPORT QgsGmlFeatureClass { public: - QgsGmlFeatureClass(); + QgsGmlFeatureClass() = default; QgsGmlFeatureClass( const QString &name, const QString &path ); QList &fields() { return mFields; } diff --git a/src/core/qgslabelsearchtree.cpp b/src/core/qgslabelsearchtree.cpp index 15acc6b7e13..b09d2cc4eb3 100644 --- a/src/core/qgslabelsearchtree.cpp +++ b/src/core/qgslabelsearchtree.cpp @@ -22,10 +22,6 @@ bool searchCallback( QgsLabelPosition *pos, void *context ) return true; } -QgsLabelSearchTree::QgsLabelSearchTree() -{ -} - QgsLabelSearchTree::~QgsLabelSearchTree() { clear(); diff --git a/src/core/qgslabelsearchtree.h b/src/core/qgslabelsearchtree.h index f9577a95c05..6ff74f32e74 100644 --- a/src/core/qgslabelsearchtree.h +++ b/src/core/qgslabelsearchtree.h @@ -36,7 +36,7 @@ class QgsPointXY; class CORE_EXPORT QgsLabelSearchTree { public: - QgsLabelSearchTree(); + QgsLabelSearchTree() = default; ~QgsLabelSearchTree(); //! QgsLabelSearchTree cannot be copied. diff --git a/src/core/qgsmapdecoration.cpp b/src/core/qgsmapdecoration.cpp index e3039bc8ebb..e1cda8321f7 100644 --- a/src/core/qgsmapdecoration.cpp +++ b/src/core/qgsmapdecoration.cpp @@ -16,7 +16,3 @@ ***************************************************************************/ #include "qgsmapdecoration.h" - -QgsMapDecoration::QgsMapDecoration() -{ -} diff --git a/src/core/qgsmapdecoration.h b/src/core/qgsmapdecoration.h index e15508e6ee1..4e919604807 100644 --- a/src/core/qgsmapdecoration.h +++ b/src/core/qgsmapdecoration.h @@ -37,7 +37,7 @@ class CORE_EXPORT QgsMapDecoration /** * Constructor for QgsMapDecoration. */ - QgsMapDecoration(); + QgsMapDecoration() = default; virtual ~QgsMapDecoration() = default; diff --git a/src/core/qgsmaplayerstylemanager.cpp b/src/core/qgsmaplayerstylemanager.cpp index 5ccdd4d6039..2dff6c0e6df 100644 --- a/src/core/qgsmaplayerstylemanager.cpp +++ b/src/core/qgsmaplayerstylemanager.cpp @@ -227,10 +227,6 @@ bool QgsMapLayerStyleManager::restoreOverrideStyle() // ----- -QgsMapLayerStyle::QgsMapLayerStyle() -{ -} - QgsMapLayerStyle::QgsMapLayerStyle( const QString &xmlData ) : mXmlData( xmlData ) { diff --git a/src/core/qgsmaplayerstylemanager.h b/src/core/qgsmaplayerstylemanager.h index 4edd06df437..17673c53f1f 100644 --- a/src/core/qgsmaplayerstylemanager.h +++ b/src/core/qgsmaplayerstylemanager.h @@ -40,7 +40,7 @@ class CORE_EXPORT QgsMapLayerStyle { public: //! construct invalid style - QgsMapLayerStyle(); + QgsMapLayerStyle() = default; //! construct style from QML definition (XML) explicit QgsMapLayerStyle( const QString &xmlData ); diff --git a/src/core/qgsmimedatautils.cpp b/src/core/qgsmimedatautils.cpp index 7c625efc003..a0ca32fb5bf 100644 --- a/src/core/qgsmimedatautils.cpp +++ b/src/core/qgsmimedatautils.cpp @@ -27,10 +27,6 @@ static const char *QGIS_URILIST_MIMETYPE = "application/x-vnd.qgis.qgis.uri"; -QgsMimeDataUtils::Uri::Uri() -{ -} - QgsMimeDataUtils::Uri::Uri( QString &encData ) { QgsDebugMsg( "encData: " + encData ); diff --git a/src/core/qgsmimedatautils.h b/src/core/qgsmimedatautils.h index 93eaeaf4736..af85d6afcc2 100644 --- a/src/core/qgsmimedatautils.h +++ b/src/core/qgsmimedatautils.h @@ -35,7 +35,7 @@ class CORE_EXPORT QgsMimeDataUtils struct CORE_EXPORT Uri { //! Constructs invalid URI - Uri(); + Uri() = default; //! Constructs URI from encoded data explicit Uri( QString &encData ); diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp index 9ae15e44b3a..1d32abc955b 100644 --- a/src/core/qgsnetworkaccessmanager.cpp +++ b/src/core/qgsnetworkaccessmanager.cpp @@ -48,7 +48,7 @@ QgsNetworkAccessManager *QgsNetworkAccessManager::sMainNAM = nullptr; class QgsNetworkProxyFactory : public QNetworkProxyFactory { public: - QgsNetworkProxyFactory() {} + QgsNetworkProxyFactory() = default; QList queryProxy( const QNetworkProxyQuery &query = QNetworkProxyQuery() ) override { diff --git a/src/core/qgsobjectcustomproperties.cpp b/src/core/qgsobjectcustomproperties.cpp index 0f4d1ccbef4..6e7e401c50c 100644 --- a/src/core/qgsobjectcustomproperties.cpp +++ b/src/core/qgsobjectcustomproperties.cpp @@ -21,10 +21,6 @@ #include -QgsObjectCustomProperties::QgsObjectCustomProperties() -{ -} - QStringList QgsObjectCustomProperties::keys() const { return mMap.keys(); diff --git a/src/core/qgsobjectcustomproperties.h b/src/core/qgsobjectcustomproperties.h index 87d03161891..70790cd8ea5 100644 --- a/src/core/qgsobjectcustomproperties.h +++ b/src/core/qgsobjectcustomproperties.h @@ -34,7 +34,7 @@ class QDomNode; class CORE_EXPORT QgsObjectCustomProperties { public: - QgsObjectCustomProperties(); + QgsObjectCustomProperties() = default; //! Return list of stored keys QStringList keys() const; diff --git a/src/core/qgspluginlayerregistry.cpp b/src/core/qgspluginlayerregistry.cpp index 8eabe2ff36a..3ebbffb6ae3 100644 --- a/src/core/qgspluginlayerregistry.cpp +++ b/src/core/qgspluginlayerregistry.cpp @@ -52,10 +52,6 @@ bool QgsPluginLayerType::showLayerProperties( QgsPluginLayer *layer ) // QgsPluginLayerRegistry // -QgsPluginLayerRegistry::QgsPluginLayerRegistry() -{ -} - QgsPluginLayerRegistry::~QgsPluginLayerRegistry() { if ( !mPluginLayerTypes.isEmpty() ) diff --git a/src/core/qgspluginlayerregistry.h b/src/core/qgspluginlayerregistry.h index ef77bde85e4..5dce55b93cb 100644 --- a/src/core/qgspluginlayerregistry.h +++ b/src/core/qgspluginlayerregistry.h @@ -66,7 +66,7 @@ class CORE_EXPORT QgsPluginLayerRegistry { public: - QgsPluginLayerRegistry(); + QgsPluginLayerRegistry() = default; ~QgsPluginLayerRegistry(); //! QgsPluginLayerRegistry cannot be copied. diff --git a/src/core/qgspropertycollection.cpp b/src/core/qgspropertycollection.cpp index b455409e3e8..7d3982fc80c 100644 --- a/src/core/qgspropertycollection.cpp +++ b/src/core/qgspropertycollection.cpp @@ -359,9 +359,6 @@ bool QgsPropertyCollection::loadVariant( const QVariant &collection, const QgsPr // QgsPropertyCollectionStack // -QgsPropertyCollectionStack::QgsPropertyCollectionStack() -{} - QgsPropertyCollectionStack::~QgsPropertyCollectionStack() { clear(); diff --git a/src/core/qgspropertycollection.h b/src/core/qgspropertycollection.h index 1a0be9d5133..0751bc23133 100644 --- a/src/core/qgspropertycollection.h +++ b/src/core/qgspropertycollection.h @@ -368,7 +368,7 @@ class CORE_EXPORT QgsPropertyCollectionStack : public QgsAbstractPropertyCollect { public: - QgsPropertyCollectionStack(); + QgsPropertyCollectionStack() = default; ~QgsPropertyCollectionStack(); diff --git a/src/core/qgspropertytransformer.cpp b/src/core/qgspropertytransformer.cpp index 0f62f7bc289..f8f2a868f3f 100644 --- a/src/core/qgspropertytransformer.cpp +++ b/src/core/qgspropertytransformer.cpp @@ -135,24 +135,6 @@ QgsGenericNumericTransformer::QgsGenericNumericTransformer( double minValue, dou , mExponent( exponent ) {} -QgsGenericNumericTransformer::QgsGenericNumericTransformer( const QgsGenericNumericTransformer &other ) - : QgsPropertyTransformer( other ) - , mMinOutput( other.mMinOutput ) - , mMaxOutput( other.mMaxOutput ) - , mNullOutput( other.mNullOutput ) - , mExponent( other.mExponent ) -{} - -QgsGenericNumericTransformer &QgsGenericNumericTransformer::operator=( const QgsGenericNumericTransformer &other ) -{ - QgsPropertyTransformer::operator=( other ); - mMinOutput = other.mMinOutput; - mMaxOutput = other.mMaxOutput; - mNullOutput = other.mNullOutput; - mExponent = other.mExponent; - return *this; -} - QgsGenericNumericTransformer *QgsGenericNumericTransformer::clone() const { std::unique_ptr< QgsGenericNumericTransformer > t( new QgsGenericNumericTransformer( mMinValue, @@ -325,26 +307,6 @@ QgsSizeScaleTransformer::QgsSizeScaleTransformer( ScaleType type, double minValu setType( type ); } -QgsSizeScaleTransformer::QgsSizeScaleTransformer( const QgsSizeScaleTransformer &other ) - : QgsPropertyTransformer( other ) - , mType( other.mType ) - , mMinSize( other.mMinSize ) - , mMaxSize( other.mMaxSize ) - , mNullSize( other.mNullSize ) - , mExponent( other.mExponent ) -{} - -QgsSizeScaleTransformer &QgsSizeScaleTransformer::operator=( const QgsSizeScaleTransformer &other ) -{ - QgsPropertyTransformer::operator=( other ); - mType = other.mType; - mMinSize = other.mMinSize; - mMaxSize = other.mMaxSize; - mNullSize = other.mNullSize; - mExponent = other.mExponent; - return *this; -} - QgsSizeScaleTransformer *QgsSizeScaleTransformer::clone() const { std::unique_ptr< QgsSizeScaleTransformer > t( new QgsSizeScaleTransformer( mType, diff --git a/src/core/qgspropertytransformer.h b/src/core/qgspropertytransformer.h index f23a11cc575..adc2e2cb269 100644 --- a/src/core/qgspropertytransformer.h +++ b/src/core/qgspropertytransformer.h @@ -360,12 +360,6 @@ class CORE_EXPORT QgsGenericNumericTransformer : public QgsPropertyTransformer double nullOutput = 0.0, double exponent = 1.0 ); - /** - * Copy constructor. - */ - QgsGenericNumericTransformer( const QgsGenericNumericTransformer &other ); - QgsGenericNumericTransformer &operator=( const QgsGenericNumericTransformer &other ); - virtual Type transformerType() const override { return GenericNumericTransformer; } virtual QgsGenericNumericTransformer *clone() const override SIP_FACTORY; virtual QVariant toVariant() const override; @@ -496,12 +490,6 @@ class CORE_EXPORT QgsSizeScaleTransformer : public QgsPropertyTransformer double nullSize = 0.0, double exponent = 1.0 ); - /** - * Copy constructor. - */ - QgsSizeScaleTransformer( const QgsSizeScaleTransformer &other ); - QgsSizeScaleTransformer &operator=( const QgsSizeScaleTransformer &other ); - virtual Type transformerType() const override { return SizeScaleTransformer; } virtual QgsSizeScaleTransformer *clone() const override SIP_FACTORY; virtual QVariant toVariant() const override; diff --git a/src/core/qgsreadwritecontext.cpp b/src/core/qgsreadwritecontext.cpp index 9e08f9525d6..d0259d57f84 100644 --- a/src/core/qgsreadwritecontext.cpp +++ b/src/core/qgsreadwritecontext.cpp @@ -1,6 +1 @@ #include "qgsreadwritecontext.h" - -QgsReadWriteContext::QgsReadWriteContext() -{ - -} diff --git a/src/core/qgsreadwritecontext.h b/src/core/qgsreadwritecontext.h index 056708879f5..e21a9c7c0f4 100644 --- a/src/core/qgsreadwritecontext.h +++ b/src/core/qgsreadwritecontext.h @@ -29,7 +29,7 @@ class CORE_EXPORT QgsReadWriteContext { public: - QgsReadWriteContext(); + QgsReadWriteContext() = default; //! Returns path resolver for conversion between relative and absolute paths const QgsPathResolver &pathResolver() const { return mPathResolver; } diff --git a/src/core/qgsruntimeprofiler.cpp b/src/core/qgsruntimeprofiler.cpp index 7dcf0f9cd9f..78f2991c46f 100644 --- a/src/core/qgsruntimeprofiler.cpp +++ b/src/core/qgsruntimeprofiler.cpp @@ -1,12 +1,6 @@ #include "qgsruntimeprofiler.h" #include "qgslogger.h" - -QgsRuntimeProfiler::QgsRuntimeProfiler() -{ - -} - void QgsRuntimeProfiler::beginGroup( const QString &name ) { mGroupStack.push( name ); diff --git a/src/core/qgsruntimeprofiler.h b/src/core/qgsruntimeprofiler.h index 4c7d26e14b6..55d12f0d837 100644 --- a/src/core/qgsruntimeprofiler.h +++ b/src/core/qgsruntimeprofiler.h @@ -18,7 +18,7 @@ class CORE_EXPORT QgsRuntimeProfiler /** * Constructor to create a new runtime profiler. */ - QgsRuntimeProfiler(); + QgsRuntimeProfiler() = default; /** * \brief Begin the group for the profiler. Groups will append {GroupName}/ to the diff --git a/src/core/qgssqlstatement.cpp b/src/core/qgssqlstatement.cpp index 5151be110f8..3665ecfb24b 100644 --- a/src/core/qgssqlstatement.cpp +++ b/src/core/qgssqlstatement.cpp @@ -198,7 +198,7 @@ class QgsSQLStatementCollectTableNames: public QgsSQLStatement::RecursiveVisitor public: typedef QPair TableColumnPair; - QgsSQLStatementCollectTableNames() {} + QgsSQLStatementCollectTableNames() = default; void visit( const QgsSQLStatement::NodeColumnRef &n ) override; void visit( const QgsSQLStatement::NodeTableDef &n ) override; diff --git a/src/core/qgsstacktrace.cpp b/src/core/qgsstacktrace.cpp index 3bb99fa8061..dae74a7cb7a 100644 --- a/src/core/qgsstacktrace.cpp +++ b/src/core/qgsstacktrace.cpp @@ -161,11 +161,6 @@ QVector QgsStackTrace::trace( unsigned int maxFrames ) } #endif -QgsStackTrace::QgsStackTrace() -{ - -} - bool QgsStackTrace::StackLine::isQgisModule() const { return moduleName.contains( "qgis", Qt::CaseInsensitive ); diff --git a/src/core/qgsstacktrace.h b/src/core/qgsstacktrace.h index e80a7699785..fde462a42ec 100644 --- a/src/core/qgsstacktrace.h +++ b/src/core/qgsstacktrace.h @@ -89,7 +89,7 @@ class CORE_EXPORT QgsStackTrace #endif private: - QgsStackTrace(); + QgsStackTrace() = default; static QString mSymbolPaths; }; diff --git a/src/core/qgstracer.cpp b/src/core/qgstracer.cpp index f269e97da5a..eff5038b14a 100644 --- a/src/core/qgstracer.cpp +++ b/src/core/qgstracer.cpp @@ -90,7 +90,7 @@ double closestSegment( const QgsPolyline &pl, const QgsPointXY &pt, int &vertexA //! Simple graph structure for shortest path search struct QgsTracerGraph { - QgsTracerGraph() {} + QgsTracerGraph() = default; struct E // bidirectional edge { diff --git a/src/core/qgstrackedvectorlayertools.cpp b/src/core/qgstrackedvectorlayertools.cpp index f3e586a1285..4e52d288c1e 100644 --- a/src/core/qgstrackedvectorlayertools.cpp +++ b/src/core/qgstrackedvectorlayertools.cpp @@ -16,10 +16,6 @@ #include "qgstrackedvectorlayertools.h" #include "qgsvectorlayer.h" -QgsTrackedVectorLayerTools::QgsTrackedVectorLayerTools() - -{ -} bool QgsTrackedVectorLayerTools::addFeature( QgsVectorLayer *layer, const QgsAttributeMap &defaultValues, const QgsGeometry &defaultGeometry, QgsFeature *feature ) const { diff --git a/src/core/qgstrackedvectorlayertools.h b/src/core/qgstrackedvectorlayertools.h index 6b93a823bde..d716160bf22 100644 --- a/src/core/qgstrackedvectorlayertools.h +++ b/src/core/qgstrackedvectorlayertools.h @@ -26,7 +26,7 @@ class CORE_EXPORT QgsTrackedVectorLayerTools : public QgsVectorLayerTools { Q_OBJECT public: - QgsTrackedVectorLayerTools(); + QgsTrackedVectorLayerTools() = default; bool addFeature( QgsVectorLayer *layer, const QgsAttributeMap &defaultValues, const QgsGeometry &defaultGeometry, QgsFeature *feature ) const override; bool startEditing( QgsVectorLayer *layer ) const override; diff --git a/src/core/raster/qgsbilinearrasterresampler.cpp b/src/core/raster/qgsbilinearrasterresampler.cpp index 16b9b332553..0bbf4ff38e2 100644 --- a/src/core/raster/qgsbilinearrasterresampler.cpp +++ b/src/core/raster/qgsbilinearrasterresampler.cpp @@ -19,10 +19,6 @@ #include #include -QgsBilinearRasterResampler::QgsBilinearRasterResampler() -{ -} - QgsBilinearRasterResampler *QgsBilinearRasterResampler::clone() const { return new QgsBilinearRasterResampler(); diff --git a/src/core/raster/qgsbilinearrasterresampler.h b/src/core/raster/qgsbilinearrasterresampler.h index 0a0a039a2fb..661187cb9fb 100644 --- a/src/core/raster/qgsbilinearrasterresampler.h +++ b/src/core/raster/qgsbilinearrasterresampler.h @@ -30,7 +30,7 @@ class CORE_EXPORT QgsBilinearRasterResampler: public QgsRasterResampler { public: - QgsBilinearRasterResampler(); + QgsBilinearRasterResampler() = default; void resample( const QImage &srcImage, QImage &dstImage ) override; QString type() const override { return QStringLiteral( "bilinear" ); } diff --git a/src/core/raster/qgsrasterpipe.cpp b/src/core/raster/qgsrasterpipe.cpp index 7dbbe1ddb16..8cdd8cf2dfa 100644 --- a/src/core/raster/qgsrasterpipe.cpp +++ b/src/core/raster/qgsrasterpipe.cpp @@ -29,10 +29,6 @@ #include "qgsrasterprojector.h" #include "qgsrasternuller.h" -QgsRasterPipe::QgsRasterPipe() -{ -} - QgsRasterPipe::QgsRasterPipe( const QgsRasterPipe &pipe ) { for ( int i = 0; i < pipe.size(); i++ ) diff --git a/src/core/raster/qgsrasterpipe.h b/src/core/raster/qgsrasterpipe.h index 135c019d0ad..e6ac56728cd 100644 --- a/src/core/raster/qgsrasterpipe.h +++ b/src/core/raster/qgsrasterpipe.h @@ -58,7 +58,7 @@ class CORE_EXPORT QgsRasterPipe HueSaturationRole = 7 }; - QgsRasterPipe(); + QgsRasterPipe() = default; QgsRasterPipe( const QgsRasterPipe &pipe ) SIP_SKIP; ~QgsRasterPipe(); diff --git a/src/core/raster/qgsrastertransparency.cpp b/src/core/raster/qgsrastertransparency.cpp index c7be553cb56..6602fbdf06c 100644 --- a/src/core/raster/qgsrastertransparency.cpp +++ b/src/core/raster/qgsrastertransparency.cpp @@ -24,11 +24,6 @@ email : ersts@amnh.org #include #include -QgsRasterTransparency::QgsRasterTransparency() -{ - -} - /** Accessor for transparentSingleValuePixelList */ diff --git a/src/core/raster/qgsrastertransparency.h b/src/core/raster/qgsrastertransparency.h index c2dca354fc9..2eb3d35b262 100644 --- a/src/core/raster/qgsrastertransparency.h +++ b/src/core/raster/qgsrastertransparency.h @@ -32,7 +32,7 @@ class CORE_EXPORT QgsRasterTransparency { public: - QgsRasterTransparency(); + QgsRasterTransparency() = default; // // Structs to hold transparent pixel vlaues diff --git a/src/core/symbology/qgscategorizedsymbolrenderer.cpp b/src/core/symbology/qgscategorizedsymbolrenderer.cpp index 96ba594ef07..3a6b4547cd9 100644 --- a/src/core/symbology/qgscategorizedsymbolrenderer.cpp +++ b/src/core/symbology/qgscategorizedsymbolrenderer.cpp @@ -168,10 +168,6 @@ QgsCategorizedSymbolRenderer::QgsCategorizedSymbolRenderer( const QString &attrN } } -QgsCategorizedSymbolRenderer::~QgsCategorizedSymbolRenderer() -{ -} - void QgsCategorizedSymbolRenderer::rebuildHash() { mSymbolHash.clear(); diff --git a/src/core/symbology/qgscategorizedsymbolrenderer.h b/src/core/symbology/qgscategorizedsymbolrenderer.h index 6e833cf504c..3546978c605 100644 --- a/src/core/symbology/qgscategorizedsymbolrenderer.h +++ b/src/core/symbology/qgscategorizedsymbolrenderer.h @@ -79,7 +79,6 @@ class CORE_EXPORT QgsCategorizedSymbolRenderer : public QgsFeatureRenderer public: QgsCategorizedSymbolRenderer( const QString &attrName = QString(), const QgsCategoryList &categories = QgsCategoryList() ); - ~QgsCategorizedSymbolRenderer(); virtual QgsSymbol *symbolForFeature( QgsFeature &feature, QgsRenderContext &context ) override; virtual QgsSymbol *originalSymbolForFeature( QgsFeature &feature, QgsRenderContext &context ) override; diff --git a/src/core/symbology/qgssinglesymbolrenderer.cpp b/src/core/symbology/qgssinglesymbolrenderer.cpp index 865f31f8b3a..6c8f303bbde 100644 --- a/src/core/symbology/qgssinglesymbolrenderer.cpp +++ b/src/core/symbology/qgssinglesymbolrenderer.cpp @@ -40,10 +40,6 @@ QgsSingleSymbolRenderer::QgsSingleSymbolRenderer( QgsSymbol *symbol ) Q_ASSERT( symbol ); } -QgsSingleSymbolRenderer::~QgsSingleSymbolRenderer() -{ -} - QgsSymbol *QgsSingleSymbolRenderer::symbolForFeature( QgsFeature &, QgsRenderContext & ) { return mSymbol.get(); diff --git a/src/core/symbology/qgssinglesymbolrenderer.h b/src/core/symbology/qgssinglesymbolrenderer.h index 891a2da60bc..17a56d5bcc4 100644 --- a/src/core/symbology/qgssinglesymbolrenderer.h +++ b/src/core/symbology/qgssinglesymbolrenderer.h @@ -31,7 +31,6 @@ class CORE_EXPORT QgsSingleSymbolRenderer : public QgsFeatureRenderer public: QgsSingleSymbolRenderer( QgsSymbol *symbol SIP_TRANSFER ); - ~QgsSingleSymbolRenderer(); virtual QgsSymbol *symbolForFeature( QgsFeature &feature, QgsRenderContext &context ) override; virtual QgsSymbol *originalSymbolForFeature( QgsFeature &feature, QgsRenderContext &context ) override; diff --git a/src/gui/attributetable/qgsfeaturelistmodel.cpp b/src/gui/attributetable/qgsfeaturelistmodel.cpp index a6f82614e43..84a68953523 100644 --- a/src/gui/attributetable/qgsfeaturelistmodel.cpp +++ b/src/gui/attributetable/qgsfeaturelistmodel.cpp @@ -29,10 +29,6 @@ QgsFeatureListModel::QgsFeatureListModel( QgsAttributeTableFilterModel *sourceMo setSourceModel( sourceModel ); } -QgsFeatureListModel::~QgsFeatureListModel() -{ -} - void QgsFeatureListModel::setSourceModel( QgsAttributeTableFilterModel *sourceModel ) { QAbstractProxyModel::setSourceModel( sourceModel ); diff --git a/src/gui/attributetable/qgsfeaturelistmodel.h b/src/gui/attributetable/qgsfeaturelistmodel.h index 2c23dd2ea8b..444d146bdb7 100644 --- a/src/gui/attributetable/qgsfeaturelistmodel.h +++ b/src/gui/attributetable/qgsfeaturelistmodel.h @@ -60,7 +60,6 @@ class GUI_EXPORT QgsFeatureListModel : public QAbstractProxyModel, public QgsFea public: explicit QgsFeatureListModel( QgsAttributeTableFilterModel *sourceModel, QObject *parent SIP_TRANSFERTHIS = 0 ); - virtual ~QgsFeatureListModel(); virtual void setSourceModel( QgsAttributeTableFilterModel *sourceModel ); QgsVectorLayerCache *layerCache(); diff --git a/src/gui/attributetable/qgsfieldconditionalformatwidget.cpp b/src/gui/attributetable/qgsfieldconditionalformatwidget.cpp index dff960be90e..97e709d50f2 100644 --- a/src/gui/attributetable/qgsfieldconditionalformatwidget.cpp +++ b/src/gui/attributetable/qgsfieldconditionalformatwidget.cpp @@ -52,10 +52,6 @@ QgsFieldConditionalFormatWidget::QgsFieldConditionalFormatWidget( QWidget *paren setPresets( defaultPresets() ); } -QgsFieldConditionalFormatWidget::~QgsFieldConditionalFormatWidget() -{ -} - void QgsFieldConditionalFormatWidget::setExpression() { QgsExpressionContext context( QgsExpressionContextUtils::globalProjectLayerScopes( mLayer ) ); diff --git a/src/gui/attributetable/qgsfieldconditionalformatwidget.h b/src/gui/attributetable/qgsfieldconditionalformatwidget.h index 26794335a24..2789a3019b9 100644 --- a/src/gui/attributetable/qgsfieldconditionalformatwidget.h +++ b/src/gui/attributetable/qgsfieldconditionalformatwidget.h @@ -42,8 +42,6 @@ class GUI_EXPORT QgsFieldConditionalFormatWidget : public QWidget, private Ui::Q */ explicit QgsFieldConditionalFormatWidget( QWidget *parent SIP_TRANSFERTHIS = 0 ); - ~QgsFieldConditionalFormatWidget(); - /** Switches the widget to the rules page. */ void viewRules(); diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp index fc33892196f..77df0d84f06 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp +++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp @@ -60,10 +60,6 @@ void QgsEditorWidgetRegistry::initEditors( QgsMapCanvas *mapCanvas, QgsMessageBa registerWidget( QStringLiteral( "List" ), new QgsListWidgetFactory( tr( "List" ) ) ); } -QgsEditorWidgetRegistry::QgsEditorWidgetRegistry() -{ -} - QgsEditorWidgetRegistry::~QgsEditorWidgetRegistry() { qDeleteAll( mWidgetFactories ); diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h index 68d716865b5..d8863006c88 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h +++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h @@ -51,7 +51,7 @@ class GUI_EXPORT QgsEditorWidgetRegistry : public QObject * Constructor for QgsEditorWidgetRegistry. QgsEditorWidgetRegistry is not usually directly created, but rather accessed through * QgsGui::editorWidgetRegistry(). */ - QgsEditorWidgetRegistry(); + QgsEditorWidgetRegistry() = default; /** * Registers all the default widgets. diff --git a/src/gui/qgisinterface.cpp b/src/gui/qgisinterface.cpp index afa767126f2..5e8f9895b44 100644 --- a/src/gui/qgisinterface.cpp +++ b/src/gui/qgisinterface.cpp @@ -17,9 +17,3 @@ ****************************************************************************/ #include "qgisinterface.h" - -QgisInterface::QgisInterface() -{ - - -} diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h index 8be12cb54aa..171cb5f68cc 100644 --- a/src/gui/qgisinterface.h +++ b/src/gui/qgisinterface.h @@ -77,7 +77,7 @@ class GUI_EXPORT QgisInterface : public QObject public: //! Constructor - QgisInterface(); + QgisInterface() = default; virtual QgsPluginManagerInterface *pluginManagerInterface() = 0; diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp index 32e2d2e676f..119fc201b6a 100644 --- a/src/gui/qgsmapcanvas.cpp +++ b/src/gui/qgsmapcanvas.cpp @@ -76,9 +76,7 @@ email : sherman at mrcc.com class QgsMapCanvas::CanvasProperties { public: - CanvasProperties() - - { } + CanvasProperties() = default; //!Flag to indicate status of mouse button bool mouseButtonDown{ false }; diff --git a/src/gui/qgspluginmanagerinterface.cpp b/src/gui/qgspluginmanagerinterface.cpp index df4c9146eed..88f5c44a543 100644 --- a/src/gui/qgspluginmanagerinterface.cpp +++ b/src/gui/qgspluginmanagerinterface.cpp @@ -15,7 +15,3 @@ ***************************************************************************/ #include "qgspluginmanagerinterface.h" - -QgsPluginManagerInterface::QgsPluginManagerInterface() -{ -} diff --git a/src/gui/qgspluginmanagerinterface.h b/src/gui/qgspluginmanagerinterface.h index 6724060f908..bc5ecfbc276 100644 --- a/src/gui/qgspluginmanagerinterface.h +++ b/src/gui/qgspluginmanagerinterface.h @@ -33,7 +33,7 @@ class GUI_EXPORT QgsPluginManagerInterface : public QObject public: //! Constructor - QgsPluginManagerInterface(); + QgsPluginManagerInterface() = default; //! remove Python plugins from the metadata registry (c++ plugins stay) virtual void clearPythonPluginMetadata() = 0; diff --git a/src/gui/symbology/qgssvgselectorwidget.cpp b/src/gui/symbology/qgssvgselectorwidget.cpp index 8ced3b98714..63b256ff375 100644 --- a/src/gui/symbology/qgssvgselectorwidget.cpp +++ b/src/gui/symbology/qgssvgselectorwidget.cpp @@ -389,10 +389,6 @@ QgsSvgSelectorWidget::QgsSvgSelectorWidget( QWidget *parent ) this, &QgsSvgSelectorWidget::populateIcons ); } -QgsSvgSelectorWidget::~QgsSvgSelectorWidget() -{ -} - void QgsSvgSelectorWidget::setSvgPath( const QString &svgPath ) { mCurrentSvgPath = svgPath; diff --git a/src/gui/symbology/qgssvgselectorwidget.h b/src/gui/symbology/qgssvgselectorwidget.h index 065cb9c50c0..7e3b233a9c3 100644 --- a/src/gui/symbology/qgssvgselectorwidget.h +++ b/src/gui/symbology/qgssvgselectorwidget.h @@ -239,7 +239,6 @@ class GUI_EXPORT QgsSvgSelectorWidget : public QWidget, private Ui::WidgetSvgSel public: QgsSvgSelectorWidget( QWidget *parent SIP_TRANSFERTHIS = 0 ); - ~QgsSvgSelectorWidget(); QString currentSvgPath() const; diff --git a/src/gui/symbology/qgssymbolwidgetcontext.cpp b/src/gui/symbology/qgssymbolwidgetcontext.cpp index 43e4df3213d..72f444544c3 100644 --- a/src/gui/symbology/qgssymbolwidgetcontext.cpp +++ b/src/gui/symbology/qgssymbolwidgetcontext.cpp @@ -16,10 +16,6 @@ #include "qgsmapcanvas.h" #include "qgsproject.h" -QgsSymbolWidgetContext::QgsSymbolWidgetContext() - -{} - QgsSymbolWidgetContext::QgsSymbolWidgetContext( const QgsSymbolWidgetContext &other ) : mMapCanvas( other.mMapCanvas ) , mAdditionalScopes( other.mAdditionalScopes ) diff --git a/src/gui/symbology/qgssymbolwidgetcontext.h b/src/gui/symbology/qgssymbolwidgetcontext.h index a8244d92ee5..c3e69da0202 100644 --- a/src/gui/symbology/qgssymbolwidgetcontext.h +++ b/src/gui/symbology/qgssymbolwidgetcontext.h @@ -35,7 +35,7 @@ class GUI_EXPORT QgsSymbolWidgetContext // clazy:exclude=rule-of-three { public: - QgsSymbolWidgetContext(); + QgsSymbolWidgetContext() = default; /** Copy constructor. * \param other source QgsSymbolWidgetContext diff --git a/src/providers/gdal/qgsgdalsourceselect.cpp b/src/providers/gdal/qgsgdalsourceselect.cpp index ff61dbcd856..6e0f9478df7 100644 --- a/src/providers/gdal/qgsgdalsourceselect.cpp +++ b/src/providers/gdal/qgsgdalsourceselect.cpp @@ -33,11 +33,6 @@ QgsGdalSourceSelect::QgsGdalSourceSelect( QWidget *parent, Qt::WindowFlags fl, Q } ); } -QgsGdalSourceSelect::~QgsGdalSourceSelect() -{ - -} - void QgsGdalSourceSelect::addButtonClicked() { Q_FOREACH ( const QString &path, QgsFileWidget::splitFilePaths( mRasterPath ) ) diff --git a/src/providers/gdal/qgsgdalsourceselect.h b/src/providers/gdal/qgsgdalsourceselect.h index 52544606b13..0ed51537078 100644 --- a/src/providers/gdal/qgsgdalsourceselect.h +++ b/src/providers/gdal/qgsgdalsourceselect.h @@ -32,8 +32,6 @@ class QgsGdalSourceSelect : public QgsAbstractDataSourceWidget, private Ui::QgsG //! Constructor QgsGdalSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None ); - ~QgsGdalSourceSelect(); - public slots: //! Determines the tables the user selected and closes the dialog void addButtonClicked() override; diff --git a/src/providers/ogr/qgsgeopackagedataitems.cpp b/src/providers/ogr/qgsgeopackagedataitems.cpp index 527bbd63685..d4846cdba2e 100644 --- a/src/providers/ogr/qgsgeopackagedataitems.cpp +++ b/src/providers/ogr/qgsgeopackagedataitems.cpp @@ -54,11 +54,6 @@ QgsGeoPackageRootItem::QgsGeoPackageRootItem( QgsDataItem *parent, QString name, populate(); } -QgsGeoPackageRootItem::~QgsGeoPackageRootItem() -{ - -} - QVector QgsGeoPackageRootItem::createChildren() { QVector connections; diff --git a/src/providers/ogr/qgsgeopackagedataitems.h b/src/providers/ogr/qgsgeopackagedataitems.h index 4e3e54472ee..78011c0d1ab 100644 --- a/src/providers/ogr/qgsgeopackagedataitems.h +++ b/src/providers/ogr/qgsgeopackagedataitems.h @@ -103,7 +103,6 @@ class QgsGeoPackageRootItem : public QgsDataCollectionItem public: QgsGeoPackageRootItem( QgsDataItem *parent, QString name, QString path ); - ~QgsGeoPackageRootItem(); QVector createChildren() override; diff --git a/src/providers/postgres/qgspgnewconnection.cpp b/src/providers/postgres/qgspgnewconnection.cpp index 42e9c8fae6d..cda59980458 100644 --- a/src/providers/postgres/qgspgnewconnection.cpp +++ b/src/providers/postgres/qgspgnewconnection.cpp @@ -106,11 +106,6 @@ QgsPgNewConnection::QgsPgNewConnection( QWidget *parent, const QString &connName txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]*" ), txtName ) ); } -QgsPgNewConnection::~QgsPgNewConnection() -{ - -} - //! Autoconnected SLOTS * void QgsPgNewConnection::accept() { @@ -224,4 +219,4 @@ void QgsPgNewConnection::testConnection() void QgsPgNewConnection::showHelp() { QgsHelp::openHelp( QStringLiteral( "managing_data_source/opening_data.html#creating-a-stored-connection" ) ); -} \ No newline at end of file +} diff --git a/src/providers/postgres/qgspgnewconnection.h b/src/providers/postgres/qgspgnewconnection.h index 7a894bec777..d6930f3975b 100644 --- a/src/providers/postgres/qgspgnewconnection.h +++ b/src/providers/postgres/qgspgnewconnection.h @@ -32,8 +32,6 @@ class QgsPgNewConnection : public QDialog, private Ui::QgsPgNewConnectionBase //! Constructor QgsPgNewConnection( QWidget *parent = nullptr, const QString &connName = QString(), Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags ); - ~QgsPgNewConnection(); - //! Tests the connection using the parameters supplied void testConnection(); public slots: