Skip to content

Commit 07e12e2

Browse files
committed
Replace reimplemented default methods by = default
Using clang-tidy modernize-use-equals-default
1 parent ba64e3e commit 07e12e2

File tree

204 files changed

+45
-612
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+45
-612
lines changed

python/core/qgsdiagramrenderer.sip

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212

1313

14-
1514
class QgsDiagramLayerSettings
1615
{
1716
%Docstring

python/core/qgspropertytransformer.sip

-10
Original file line numberDiff line numberDiff line change
@@ -339,11 +339,6 @@ class QgsGenericNumericTransformer : QgsPropertyTransformer
339339
\param exponent optional exponential for non-linear scaling
340340
%End
341341

342-
QgsGenericNumericTransformer( const QgsGenericNumericTransformer &other );
343-
%Docstring
344-
Copy constructor.
345-
%End
346-
347342
virtual Type transformerType() const;
348343
virtual QgsGenericNumericTransformer *clone() const /Factory/;
349344
virtual QVariant toVariant() const;
@@ -475,11 +470,6 @@ class QgsSizeScaleTransformer : QgsPropertyTransformer
475470
\param exponent exponent for Exponential scaling method
476471
%End
477472

478-
QgsSizeScaleTransformer( const QgsSizeScaleTransformer &other );
479-
%Docstring
480-
Copy constructor.
481-
%End
482-
483473
virtual Type transformerType() const;
484474
virtual QgsSizeScaleTransformer *clone() const /Factory/;
485475
virtual QVariant toVariant() const;

python/core/symbology/qgscategorizedsymbolrenderer.sip

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ class QgsCategorizedSymbolRenderer : QgsFeatureRenderer
7878
public:
7979

8080
QgsCategorizedSymbolRenderer( const QString &attrName = QString(), const QgsCategoryList &categories = QgsCategoryList() );
81-
~QgsCategorizedSymbolRenderer();
8281

8382
virtual QgsSymbol *symbolForFeature( QgsFeature &feature, QgsRenderContext &context );
8483
virtual QgsSymbol *originalSymbolForFeature( QgsFeature &feature, QgsRenderContext &context );

python/core/symbology/qgssinglesymbolrenderer.sip

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class QgsSingleSymbolRenderer : QgsFeatureRenderer
1717
public:
1818

1919
QgsSingleSymbolRenderer( QgsSymbol *symbol /Transfer/ );
20-
~QgsSingleSymbolRenderer();
2120

2221
virtual QgsSymbol *symbolForFeature( QgsFeature &feature, QgsRenderContext &context );
2322
virtual QgsSymbol *originalSymbolForFeature( QgsFeature &feature, QgsRenderContext &context );

python/gui/attributetable/qgsfeaturelistmodel.sip

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class QgsFeatureListModel : QAbstractProxyModel, QgsFeatureModel
3434

3535
public:
3636
explicit QgsFeatureListModel( QgsAttributeTableFilterModel *sourceModel, QObject *parent /TransferThis/ = 0 );
37-
virtual ~QgsFeatureListModel();
3837

3938
virtual void setSourceModel( QgsAttributeTableFilterModel *sourceModel );
4039
QgsVectorLayerCache *layerCache();

python/gui/attributetable/qgsfieldconditionalformatwidget.sip

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ class QgsFieldConditionalFormatWidget : QWidget
2828
\param parent parent widget
2929
%End
3030

31-
~QgsFieldConditionalFormatWidget();
32-
3331
void viewRules();
3432
%Docstring
3533
Switches the widget to the rules page.

python/gui/symbology/qgssvgselectorwidget.sip

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ class QgsSvgSelectorWidget : QWidget
7575
%End
7676
public:
7777
QgsSvgSelectorWidget( QWidget *parent /TransferThis/ = 0 );
78-
~QgsSvgSelectorWidget();
7978

8079
QString currentSvgPath() const;
8180
%Docstring

src/analysis/network/qgsgraph.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020

2121
#include "qgsgraph.h"
2222

23-
QgsGraph::QgsGraph()
24-
{
25-
}
26-
2723
int QgsGraph::addVertex( const QgsPointXY &pt )
2824
{
2925
mGraphVertexes.append( QgsGraphVertex( pt ) );

src/analysis/network/qgsgraph.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class ANALYSIS_EXPORT QgsGraphVertex
131131
class ANALYSIS_EXPORT QgsGraph
132132
{
133133
public:
134-
QgsGraph();
134+
QgsGraph() = default;
135135

136136
// Graph constructing methods
137137

src/app/composer/qgsatlascompositionwidget.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget *parent, QgsCompos
5959
updateGuiElements();
6060
}
6161

62-
QgsAtlasCompositionWidget::~QgsAtlasCompositionWidget()
63-
{
64-
}
65-
6662
void QgsAtlasCompositionWidget::on_mUseAtlasCheckBox_stateChanged( int state )
6763
{
6864
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();

src/app/composer/qgsatlascompositionwidget.h

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class QgsAtlasCompositionWidget:
3131
Q_OBJECT
3232
public:
3333
QgsAtlasCompositionWidget( QWidget *parent, QgsComposition *c );
34-
~QgsAtlasCompositionWidget();
3534

3635
public slots:
3736
void on_mUseAtlasCheckBox_stateChanged( int state );

src/app/composer/qgscomposerarrowwidget.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@ QgsComposerArrowWidget::QgsComposerArrowWidget( QgsComposerArrow *arrow ): QgsCo
6161
}
6262
}
6363

64-
QgsComposerArrowWidget::~QgsComposerArrowWidget()
65-
{
66-
67-
}
68-
6964
void QgsComposerArrowWidget::on_mStrokeWidthSpinBox_valueChanged( double d )
7065
{
7166
if ( !mArrow )

src/app/composer/qgscomposerarrowwidget.h

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class QgsComposerArrowWidget: public QgsComposerItemBaseWidget, private Ui::QgsC
2828
Q_OBJECT
2929
public:
3030
explicit QgsComposerArrowWidget( QgsComposerArrow *arrow );
31-
~QgsComposerArrowWidget();
3231

3332
private:
3433
QgsComposerArrow *mArrow = nullptr;

src/app/composer/qgscomposerattributetablewidget.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@ QgsComposerAttributeTableWidget::QgsComposerAttributeTableWidget( QgsComposerAtt
114114
connect( mContentFontToolButton, &QgsFontButton::changed, this, &QgsComposerAttributeTableWidget::contentFontChanged );
115115
}
116116

117-
QgsComposerAttributeTableWidget::~QgsComposerAttributeTableWidget()
118-
{
119-
}
120-
121117
void QgsComposerAttributeTableWidget::on_mRefreshPushButton_clicked()
122118
{
123119
if ( !mComposerTable )

src/app/composer/qgscomposerattributetablewidget.h

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class QgsComposerAttributeTableWidget: public QgsComposerItemBaseWidget, private
2929
Q_OBJECT
3030
public:
3131
QgsComposerAttributeTableWidget( QgsComposerAttributeTableV2 *table, QgsComposerFrame *frame );
32-
~QgsComposerAttributeTableWidget();
3332

3433
private:
3534
QgsComposerAttributeTableV2 *mComposerTable = nullptr;

src/app/composer/qgscomposerhtmlwidget.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ QgsComposerHtmlWidget::QgsComposerHtmlWidget()
7676
{
7777
}
7878

79-
QgsComposerHtmlWidget::~QgsComposerHtmlWidget()
80-
{
81-
}
82-
8379
void QgsComposerHtmlWidget::blockSignals( bool block )
8480
{
8581
mUrlLineEdit->blockSignals( block );

src/app/composer/qgscomposerhtmlwidget.h

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class QgsComposerHtmlWidget: public QgsComposerItemBaseWidget, private Ui::QgsCo
2828
Q_OBJECT
2929
public:
3030
QgsComposerHtmlWidget( QgsComposerHtml *html, QgsComposerFrame *frame );
31-
~QgsComposerHtmlWidget();
3231

3332
private slots:
3433
void on_mUrlLineEdit_editingFinished();

src/app/composer/qgscomposeritemwidget.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ QgsComposerConfigObject::QgsComposerConfigObject( QWidget *parent, QgsComposerOb
4040
connect( atlasComposition(), &QgsAtlasComposition::toggled, this, &QgsComposerConfigObject::updateDataDefinedButtons );
4141
}
4242

43-
QgsComposerConfigObject::~QgsComposerConfigObject()
44-
{
45-
}
46-
4743
void QgsComposerConfigObject::updateDataDefinedProperty()
4844
{
4945
//match data defined button to item's data defined property
@@ -183,11 +179,6 @@ QgsComposerItemWidget::QgsComposerItemWidget( QWidget *parent, QgsComposerItem *
183179
connect( mItem->composition(), &QgsComposition::variablesChanged, this, &QgsComposerItemWidget::updateVariables );
184180
}
185181

186-
QgsComposerItemWidget::~QgsComposerItemWidget()
187-
{
188-
189-
}
190-
191182
void QgsComposerItemWidget::showBackgroundGroup( bool showGroup )
192183
{
193184
mBackgroundGroupBox->setVisible( showGroup );

src/app/composer/qgscomposeritemwidget.h

-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ class QgsComposerConfigObject: public QObject
5353
Q_OBJECT
5454
public:
5555
QgsComposerConfigObject( QWidget *parent, QgsComposerObject *composerObject );
56-
~QgsComposerConfigObject();
5756

5857
/** Registers a data defined button, setting up its initial value, connections and description.
5958
* \param button button to register
@@ -126,7 +125,6 @@ class QgsComposerItemWidget: public QWidget, private Ui::QgsComposerItemWidgetBa
126125
Q_OBJECT
127126
public:
128127
QgsComposerItemWidget( QWidget *parent, QgsComposerItem *item );
129-
~QgsComposerItemWidget();
130128

131129
//! A combination of upper/middle/lower and left/middle/right
132130
QgsComposerItem::ItemPositionMode positionMode() const;

src/app/composer/qgscomposerlegendlayersdialog.cpp

+2-7
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,9 @@ QgsComposerLegendLayersDialog::QgsComposerLegendLayersDialog( QList<QgsMapLayer
2929
}
3030
}
3131

32-
QgsComposerLegendLayersDialog::QgsComposerLegendLayersDialog(): QDialog( nullptr )
32+
QgsComposerLegendLayersDialog::QgsComposerLegendLayersDialog()
33+
: QDialog( nullptr )
3334
{
34-
35-
}
36-
37-
QgsComposerLegendLayersDialog::~QgsComposerLegendLayersDialog()
38-
{
39-
4035
}
4136

4237
QgsMapLayer *QgsComposerLegendLayersDialog::selectedLayer()

src/app/composer/qgscomposerlegendlayersdialog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class QgsComposerLegendLayersDialog: public QDialog, private Ui::QgsComposerLege
2828

2929
public:
3030
QgsComposerLegendLayersDialog( QList<QgsMapLayer *> layers, QWidget *parent = nullptr );
31-
~QgsComposerLegendLayersDialog();
31+
3232
QgsMapLayer *selectedLayer();
3333

3434
private:

src/app/composer/qgscomposerlegendwidget.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,6 @@ QgsComposerLegendWidget::QgsComposerLegendWidget(): QgsComposerItemBaseWidget( n
124124
setupUi( this );
125125
}
126126

127-
QgsComposerLegendWidget::~QgsComposerLegendWidget()
128-
{
129-
130-
}
131-
132127
void QgsComposerLegendWidget::setGuiElements()
133128
{
134129
if ( !mLegend )

src/app/composer/qgscomposerlegendwidget.h

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class QgsComposerLegendWidget: public QgsComposerItemBaseWidget, private Ui::Qgs
3535

3636
public:
3737
explicit QgsComposerLegendWidget( QgsComposerLegend *legend );
38-
~QgsComposerLegendWidget();
3938

4039
//! Updates the legend layers and groups
4140
void updateLegend();

src/app/composer/qgscomposermapgridwidget.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,6 @@ QgsComposerMapGridWidget::QgsComposerMapGridWidget( QgsComposerMapGrid *mapGrid,
105105
connect( mAnnotationFontButton, &QgsFontButton::changed, this, &QgsComposerMapGridWidget::annotationFontChanged );
106106
}
107107

108-
QgsComposerMapGridWidget::~QgsComposerMapGridWidget()
109-
{
110-
}
111-
112108
void QgsComposerMapGridWidget::populateDataDefinedButtons()
113109
{
114110
// none for now

src/app/composer/qgscomposermapgridwidget.h

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class QgsComposerMapGridWidget: public QgsComposerItemBaseWidget, private Ui::Qg
3131

3232
public:
3333
explicit QgsComposerMapGridWidget( QgsComposerMapGrid *mapGrid, QgsComposerMap *composerMap );
34-
virtual ~QgsComposerMapGridWidget();
3534

3635
public slots:
3736

src/app/composer/qgscomposermapwidget.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap *composerMap )
122122
blockAllSignals( false );
123123
}
124124

125-
QgsComposerMapWidget::~QgsComposerMapWidget()
126-
{
127-
}
128-
129125
void QgsComposerMapWidget::populateDataDefinedButtons()
130126
{
131127
updateDataDefinedButton( mScaleDDBtn );

src/app/composer/qgscomposermapwidget.h

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
3434

3535
public:
3636
explicit QgsComposerMapWidget( QgsComposerMap *composerMap );
37-
virtual ~QgsComposerMapWidget();
3837

3938
public slots:
4039
void on_mScaleLineEdit_editingFinished();

src/app/composer/qgscomposerpicturewidget.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@ QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture *picture
8585
registerDataDefinedButton( mStrokeWidthDDBtn, QgsComposerObject::PictureSvgStrokeWidth );
8686
}
8787

88-
QgsComposerPictureWidget::~QgsComposerPictureWidget()
89-
{
90-
91-
}
92-
9388
void QgsComposerPictureWidget::on_mPictureBrowseButton_clicked()
9489
{
9590
QgsSettings s;

src/app/composer/qgscomposerpicturewidget.h

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class QgsComposerPictureWidget: public QgsComposerItemBaseWidget, private Ui::Qg
3232

3333
public:
3434
explicit QgsComposerPictureWidget( QgsComposerPicture *picture );
35-
~QgsComposerPictureWidget();
3635

3736
//! Add the icons of the standard directories to the preview
3837
void addStandardDirectoriesToPreview();

src/app/composer/qgscomposerpolygonwidget.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ QgsComposerPolygonWidget::QgsComposerPolygonWidget( QgsComposerPolygon *composer
4545
}
4646
}
4747

48-
QgsComposerPolygonWidget::~QgsComposerPolygonWidget()
49-
{
50-
}
51-
5248
void QgsComposerPolygonWidget::on_mPolygonStyleButton_clicked()
5349
{
5450
if ( !mComposerPolygon )

src/app/composer/qgscomposerpolygonwidget.h

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class QgsComposerPolygonWidget: public QgsComposerItemBaseWidget, private Ui::Qg
3131
Q_OBJECT
3232
public:
3333
explicit QgsComposerPolygonWidget( QgsComposerPolygon *composerPolygon );
34-
~QgsComposerPolygonWidget();
3534

3635
private:
3736
QgsComposerPolygon *mComposerPolygon = nullptr;

src/app/composer/qgscomposerpolylinewidget.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ QgsComposerPolylineWidget::QgsComposerPolylineWidget( QgsComposerPolyline *compo
4242
connect( mComposerPolyline, &QgsComposerObject::itemChanged, this, &QgsComposerPolylineWidget::setGuiElementValues );
4343
}
4444

45-
QgsComposerPolylineWidget::~QgsComposerPolylineWidget()
46-
{
47-
}
48-
4945
void QgsComposerPolylineWidget::on_mLineStyleButton_clicked()
5046
{
5147
if ( !mComposerPolyline )

src/app/composer/qgscomposerpolylinewidget.h

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class QgsComposerPolylineWidget: public QgsComposerItemBaseWidget, private Ui::Q
3131
Q_OBJECT
3232
public:
3333
explicit QgsComposerPolylineWidget( QgsComposerPolyline *composerPolyline );
34-
~QgsComposerPolylineWidget();
3534

3635
private:
3736
QgsComposerPolyline *mComposerPolyline = nullptr;

src/app/composer/qgscomposerscalebarwidget.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,6 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar *scale
104104
connect( mFontButton, &QgsFontButton::changed, this, &QgsComposerScaleBarWidget::fontChanged );
105105
}
106106

107-
QgsComposerScaleBarWidget::~QgsComposerScaleBarWidget()
108-
{
109-
110-
}
111-
112107
void QgsComposerScaleBarWidget::setGuiElements()
113108
{
114109
if ( !mComposerScaleBar )

src/app/composer/qgscomposerscalebarwidget.h

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class QgsComposerScaleBarWidget: public QgsComposerItemBaseWidget, private Ui::Q
3131

3232
public:
3333
explicit QgsComposerScaleBarWidget( QgsComposerScaleBar *scaleBar );
34-
~QgsComposerScaleBarWidget();
3534

3635
public slots:
3736

src/app/composer/qgscomposershapewidget.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ QgsComposerShapeWidget::QgsComposerShapeWidget( QgsComposerShape *composerShape
6060
mShapeStyleButton->setLayer( atlasCoverageLayer() );
6161
}
6262

63-
QgsComposerShapeWidget::~QgsComposerShapeWidget()
64-
{
65-
66-
}
67-
6863
void QgsComposerShapeWidget::blockAllSignals( bool block )
6964
{
7065
mShapeComboBox->blockSignals( block );

src/app/composer/qgscomposershapewidget.h

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class QgsComposerShapeWidget: public QgsComposerItemBaseWidget, private Ui::QgsC
2929
Q_OBJECT
3030
public:
3131
explicit QgsComposerShapeWidget( QgsComposerShape *composerShape );
32-
~QgsComposerShapeWidget();
3332

3433
private:
3534
QgsComposerShape *mComposerShape = nullptr;

0 commit comments

Comments
 (0)