Skip to content

Commit 2a34af8

Browse files
committed
Optimise destructors (pt 2)
1 parent 2daaff3 commit 2a34af8

File tree

181 files changed

+35
-668
lines changed

Some content is hidden

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

181 files changed

+35
-668
lines changed

src/core/composer/qgsatlascomposition.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ QgsAtlasComposition::QgsAtlasComposition( QgsComposition* composition )
4848
connect( QgsProject::instance(), SIGNAL( layersWillBeRemoved( QStringList ) ), this, SLOT( removeLayers( QStringList ) ) );
4949
}
5050

51-
QgsAtlasComposition::~QgsAtlasComposition()
52-
{
53-
}
54-
5551
void QgsAtlasComposition::setEnabled( bool enabled )
5652
{
5753
if ( enabled == mEnabled )

src/core/composer/qgsatlascomposition.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class CORE_EXPORT QgsAtlasComposition : public QObject
4545
Q_OBJECT
4646
public:
4747
QgsAtlasComposition( QgsComposition* composition );
48-
~QgsAtlasComposition();
4948

5049
/** Returns whether the atlas generation is enabled
5150
* @returns true if atlas is enabled

src/core/composer/qgscomposerattributetablemodelv2.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
QgsComposerAttributeTableColumnModelV2::QgsComposerAttributeTableColumnModelV2( QgsComposerAttributeTableV2 *composerTable, QObject *parent ) : QAbstractTableModel( parent )
2727
, mComposerTable( composerTable )
2828
{
29-
30-
}
31-
32-
QgsComposerAttributeTableColumnModelV2::~QgsComposerAttributeTableColumnModelV2()
33-
{
34-
3529
}
3630

3731
QModelIndex QgsComposerAttributeTableColumnModelV2::index( int row, int column, const QModelIndex &parent ) const
@@ -451,11 +445,6 @@ QgsComposerTableSortColumnsProxyModelV2::QgsComposerTableSortColumnsProxyModelV2
451445
setDynamicSortFilter( true );
452446
}
453447

454-
QgsComposerTableSortColumnsProxyModelV2::~QgsComposerTableSortColumnsProxyModelV2()
455-
{
456-
457-
}
458-
459448
bool QgsComposerTableSortColumnsProxyModelV2::filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const
460449
{
461450
//get QgsComposerTableColumn corresponding to row

src/core/composer/qgscomposerattributetablemodelv2.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ class CORE_EXPORT QgsComposerAttributeTableColumnModelV2: public QAbstractTableM
4848
* @param parent optional parent
4949
*/
5050
QgsComposerAttributeTableColumnModelV2( QgsComposerAttributeTableV2 *composerTable, QObject *parent = nullptr );
51-
virtual ~QgsComposerAttributeTableColumnModelV2();
5251

5352
virtual int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
5453
int columnCount( const QModelIndex &parent = QModelIndex() ) const override;
@@ -150,8 +149,6 @@ class CORE_EXPORT QgsComposerTableSortColumnsProxyModelV2: public QSortFilterPro
150149
*/
151150
QgsComposerTableSortColumnsProxyModelV2( QgsComposerAttributeTableV2 *composerTable, ColumnFilterType filterType, QObject *parent = nullptr );
152151

153-
virtual ~QgsComposerTableSortColumnsProxyModelV2();
154-
155152
bool lessThan( const QModelIndex &left, const QModelIndex &right ) const override;
156153
int columnCount( const QModelIndex &parent = QModelIndex() ) const override;
157154
virtual QVariant data( const QModelIndex &index, int role ) const override;

src/core/composer/qgscomposerattributetablev2.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,6 @@ QgsComposerAttributeTableV2::QgsComposerAttributeTableV2( QgsComposition* compos
9595
refreshAttributes();
9696
}
9797

98-
QgsComposerAttributeTableV2::~QgsComposerAttributeTableV2()
99-
{
100-
}
101-
10298
QString QgsComposerAttributeTableV2::displayName() const
10399
{
104100
return tr( "<attribute table>" );

src/core/composer/qgscomposerattributetablev2.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ class CORE_EXPORT QgsComposerAttributeTableV2: public QgsComposerTableV2
6767
};
6868

6969
QgsComposerAttributeTableV2( QgsComposition* composition, bool createUndoCommands );
70-
~QgsComposerAttributeTableV2();
7170

7271
virtual QString displayName() const override;
7372

src/core/composer/qgscomposereffect.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ QgsComposerEffect::QgsComposerEffect()
2424
{
2525
}
2626

27-
QgsComposerEffect::~QgsComposerEffect()
28-
{
29-
}
30-
3127
void QgsComposerEffect::draw( QPainter *painter )
3228
{
3329
QPoint offset;

src/core/composer/qgscomposereffect.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class CORE_EXPORT QgsComposerEffect : public QGraphicsEffect
3030

3131
public:
3232
QgsComposerEffect();
33-
~QgsComposerEffect();
3433

3534
void setCompositionMode( QPainter::CompositionMode compositionMode );
3635

src/core/composer/qgscomposerframe.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ QgsComposerFrame::QgsComposerFrame()
4646
setBackgroundEnabled( false );
4747
}
4848

49-
QgsComposerFrame::~QgsComposerFrame()
50-
{
51-
}
52-
5349
bool QgsComposerFrame::writeXml( QDomElement& elem, QDomDocument & doc ) const
5450
{
5551
QDomElement frameElem = doc.createElement( QStringLiteral( "ComposerFrame" ) );

src/core/composer/qgscomposerframe.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class CORE_EXPORT QgsComposerFrame: public QgsComposerItem
3131
public:
3232
QgsComposerFrame( QgsComposition* c, QgsComposerMultiFrame* mf, qreal x, qreal y, qreal width, qreal height );
3333

34-
~QgsComposerFrame();
35-
3634
/** Sets the visible part of the multiframe's content which is visible within
3735
* this frame (relative to the total multiframe extent in mm).
3836
* @param section visible portion of content

0 commit comments

Comments
 (0)