Optimise destructors (pt 2)

qgis · Dec 30, 2016 · 2a34af8bd1fece9b577713d7d7c0c6c57e135bc6 · 2a34af8
1 parent 2daaff3
commit 2a34af8bd1fece9b577713d7d7c0c6c57e135bc6
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -48,10 +48,6 @@ QgsAtlasComposition::QgsAtlasComposition( QgsComposition* composition )
   connect( QgsProject::instance(), SIGNAL( layersWillBeRemoved( QStringList ) ), this, SLOT( removeLayers( QStringList ) ) );
 }
 
-QgsAtlasComposition::~QgsAtlasComposition()
-{
-}
-
 void QgsAtlasComposition::setEnabled( bool enabled )
 {
   if ( enabled == mEnabled )

diff --git a/src/core/composer/qgsatlascomposition.h b/src/core/composer/qgsatlascomposition.h
@@ -45,7 +45,6 @@ class CORE_EXPORT QgsAtlasComposition : public QObject
     Q_OBJECT
   public:
     QgsAtlasComposition( QgsComposition* composition );
-    ~QgsAtlasComposition();
 
     /** Returns whether the atlas generation is enabled
      * @returns true if atlas is enabled

diff --git a/src/core/composer/qgscomposerattributetablemodelv2.cpp b/src/core/composer/qgscomposerattributetablemodelv2.cpp
@@ -26,12 +26,6 @@
 QgsComposerAttributeTableColumnModelV2::QgsComposerAttributeTableColumnModelV2( QgsComposerAttributeTableV2 *composerTable, QObject *parent ) : QAbstractTableModel( parent )
     , mComposerTable( composerTable )
 {
-
-}
-
-QgsComposerAttributeTableColumnModelV2::~QgsComposerAttributeTableColumnModelV2()
-{
-
 }
 
 QModelIndex QgsComposerAttributeTableColumnModelV2::index( int row, int column, const QModelIndex &parent ) const
@@ -451,11 +445,6 @@ QgsComposerTableSortColumnsProxyModelV2::QgsComposerTableSortColumnsProxyModelV2
   setDynamicSortFilter( true );
 }
 
-QgsComposerTableSortColumnsProxyModelV2::~QgsComposerTableSortColumnsProxyModelV2()
-{
-
-}
-
 bool QgsComposerTableSortColumnsProxyModelV2::filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const
 {
   //get QgsComposerTableColumn corresponding to row

diff --git a/src/core/composer/qgscomposerattributetablemodelv2.h b/src/core/composer/qgscomposerattributetablemodelv2.h
@@ -48,7 +48,6 @@ class CORE_EXPORT QgsComposerAttributeTableColumnModelV2: public QAbstractTableM
      * @param parent optional parent
      */
     QgsComposerAttributeTableColumnModelV2( QgsComposerAttributeTableV2 *composerTable, QObject *parent = nullptr );
-    virtual ~QgsComposerAttributeTableColumnModelV2();
 
     virtual int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
     int columnCount( const QModelIndex &parent = QModelIndex() ) const override;
@@ -150,8 +149,6 @@ class CORE_EXPORT QgsComposerTableSortColumnsProxyModelV2: public QSortFilterPro
      */
     QgsComposerTableSortColumnsProxyModelV2( QgsComposerAttributeTableV2 *composerTable, ColumnFilterType filterType, QObject *parent = nullptr );
 
-    virtual ~QgsComposerTableSortColumnsProxyModelV2();
-
     bool lessThan( const QModelIndex &left, const QModelIndex &right ) const override;
     int columnCount( const QModelIndex &parent = QModelIndex() ) const override;
     virtual QVariant data( const QModelIndex &index, int role ) const override;

diff --git a/src/core/composer/qgscomposerattributetablev2.cpp b/src/core/composer/qgscomposerattributetablev2.cpp
@@ -95,10 +95,6 @@ QgsComposerAttributeTableV2::QgsComposerAttributeTableV2( QgsComposition* compos
   refreshAttributes();
 }
 
-QgsComposerAttributeTableV2::~QgsComposerAttributeTableV2()
-{
-}
-
 QString QgsComposerAttributeTableV2::displayName() const
 {
   return tr( "<attribute table>" );

diff --git a/src/core/composer/qgscomposerattributetablev2.h b/src/core/composer/qgscomposerattributetablev2.h
@@ -67,7 +67,6 @@ class CORE_EXPORT QgsComposerAttributeTableV2: public QgsComposerTableV2
     };
 
     QgsComposerAttributeTableV2( QgsComposition* composition, bool createUndoCommands );
-    ~QgsComposerAttributeTableV2();
 
     virtual QString displayName() const override;
 

diff --git a/src/core/composer/qgscomposereffect.cpp b/src/core/composer/qgscomposereffect.cpp
@@ -24,10 +24,6 @@ QgsComposerEffect::QgsComposerEffect()
 {
 }
 
-QgsComposerEffect::~QgsComposerEffect()
-{
-}
-
 void QgsComposerEffect::draw( QPainter *painter )
 {
   QPoint offset;

diff --git a/src/core/composer/qgscomposereffect.h b/src/core/composer/qgscomposereffect.h
@@ -30,7 +30,6 @@ class CORE_EXPORT QgsComposerEffect : public QGraphicsEffect
 
   public:
     QgsComposerEffect();
-    ~QgsComposerEffect();
 
     void setCompositionMode( QPainter::CompositionMode compositionMode );
 

diff --git a/src/core/composer/qgscomposerframe.cpp b/src/core/composer/qgscomposerframe.cpp
@@ -46,10 +46,6 @@ QgsComposerFrame::QgsComposerFrame()
   setBackgroundEnabled( false );
 }
 
-QgsComposerFrame::~QgsComposerFrame()
-{
-}
-
 bool QgsComposerFrame::writeXml( QDomElement& elem, QDomDocument & doc ) const
 {
   QDomElement frameElem = doc.createElement( QStringLiteral( "ComposerFrame" ) );

diff --git a/src/core/composer/qgscomposerframe.h b/src/core/composer/qgscomposerframe.h
@@ -31,8 +31,6 @@ class CORE_EXPORT QgsComposerFrame: public QgsComposerItem
   public:
     QgsComposerFrame( QgsComposition* c, QgsComposerMultiFrame* mf, qreal x, qreal y, qreal width, qreal height );
 
-    ~QgsComposerFrame();
-
     /** Sets the visible part of the multiframe's content which is visible within
      * this frame (relative to the total multiframe extent in mm).
      * @param section visible portion of content

diff --git a/src/core/composer/qgscomposeritemcommand.cpp b/src/core/composer/qgscomposeritemcommand.cpp
@@ -39,10 +39,6 @@ QgsComposerItemCommand::QgsComposerItemCommand( QgsComposerItem* item, const QSt
   }
 }
 
-QgsComposerItemCommand::~QgsComposerItemCommand()
-{
-}
-
 void QgsComposerItemCommand::undo()
 {
   restoreState( mPreviousState );
@@ -131,10 +127,6 @@ QgsComposerMergeCommand::QgsComposerMergeCommand( Context c, QgsComposerItem* it
 {
 }
 
-QgsComposerMergeCommand::~QgsComposerMergeCommand()
-{
-}
-
 bool QgsComposerMergeCommand::mergeWith( const QUndoCommand * command )
 {
   QgsComposerItem* thisItem = item();

diff --git a/src/core/composer/qgscomposeritemcommand.h b/src/core/composer/qgscomposeritemcommand.h
@@ -31,7 +31,6 @@ class CORE_EXPORT QgsComposerItemCommand: public QUndoCommand
 {
   public:
     QgsComposerItemCommand( QgsComposerItem* item, const QString& text, QUndoCommand* parent = nullptr );
-    virtual ~QgsComposerItemCommand();
 
     //! Reverses the command
     void undo() override;
@@ -157,7 +156,6 @@ class CORE_EXPORT QgsComposerMergeCommand: public QgsComposerItemCommand
     };
 
     QgsComposerMergeCommand( Context c, QgsComposerItem* item, const QString& text );
-    ~QgsComposerMergeCommand();
 
     bool mergeWith( const QUndoCommand * command ) override;
     int id() const override { return static_cast< int >( mContext ); }

diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp
@@ -42,10 +42,6 @@ QgsComposerMapGridStack::QgsComposerMapGridStack( QgsComposerMap* map )
 
 }
 
-QgsComposerMapGridStack::~QgsComposerMapGridStack()
-{
-}
-
 void QgsComposerMapGridStack::addGrid( QgsComposerMapGrid* grid )
 {
   QgsComposerMapItemStack::addItem( grid );

diff --git a/src/core/composer/qgscomposermapgrid.h b/src/core/composer/qgscomposermapgrid.h
@@ -51,8 +51,6 @@ class CORE_EXPORT QgsComposerMapGridStack : public QgsComposerMapItemStack
      */
     QgsComposerMapGridStack( QgsComposerMap* map );
 
-    virtual ~QgsComposerMapGridStack();
-
     /** Adds a new map grid to the stack and takes ownership of the grid.
      * The grid will be added to the end of the stack, and rendered
      * above any existing map grids already present in the stack.

diff --git a/src/core/composer/qgscomposermapitem.cpp b/src/core/composer/qgscomposermapitem.cpp
@@ -29,11 +29,6 @@ QgsComposerMapItem::QgsComposerMapItem( const QString &name, QgsComposerMap *map
 
 }
 
-QgsComposerMapItem::~QgsComposerMapItem()
-{
-
-}
-
 bool QgsComposerMapItem::writeXml( QDomElement &elem, QDomDocument &doc ) const
 {
   Q_UNUSED( doc );

diff --git a/src/core/composer/qgscomposermapitem.h b/src/core/composer/qgscomposermapitem.h
@@ -37,8 +37,6 @@ class CORE_EXPORT QgsComposerMapItem : public QgsComposerObject
      */
     QgsComposerMapItem( const QString& name, QgsComposerMap* map );
 
-    virtual ~QgsComposerMapItem();
-
     /** Draws the item on to a painter
      * @param painter destination QPainter
      */

diff --git a/src/core/composer/qgscomposermapoverview.cpp b/src/core/composer/qgscomposermapoverview.cpp
@@ -314,11 +314,6 @@ QgsComposerMapOverviewStack::QgsComposerMapOverviewStack( QgsComposerMap *map )
 
 }
 
-QgsComposerMapOverviewStack::~QgsComposerMapOverviewStack()
-{
-
-}
-
 void QgsComposerMapOverviewStack::addOverview( QgsComposerMapOverview *overview )
 {
   QgsComposerMapItemStack::addItem( overview );

diff --git a/src/core/composer/qgscomposermapoverview.h b/src/core/composer/qgscomposermapoverview.h
@@ -45,8 +45,6 @@ class CORE_EXPORT QgsComposerMapOverviewStack : public QgsComposerMapItemStack
      */
     QgsComposerMapOverviewStack( QgsComposerMap* map );
 
-    virtual ~QgsComposerMapOverviewStack();
-
     /** Adds a new map overview to the stack and takes ownership of the overview.
      * The overview will be added to the end of the stack, and rendered
      * above any existing map overviews already present in the stack.

diff --git a/src/core/composer/qgscomposermodel.cpp b/src/core/composer/qgscomposermodel.cpp
@@ -36,10 +36,6 @@ QgsComposerModel::QgsComposerModel( QgsComposition* composition, QObject *parent
 
 }
 
-QgsComposerModel::~QgsComposerModel()
-{
-}
-
 QgsComposerItem* QgsComposerModel::itemFromIndex( const QModelIndex &index ) const
 {
   //try to return the QgsComposerItem corresponding to a QModelIndex

diff --git a/src/core/composer/qgscomposermodel.h b/src/core/composer/qgscomposermodel.h
@@ -65,8 +65,6 @@ class CORE_EXPORT QgsComposerModel: public QAbstractItemModel
      */
     explicit QgsComposerModel( QgsComposition* composition, QObject* parent = nullptr );
 
-    ~QgsComposerModel();
-
     //reimplemented QAbstractItemModel methods
     QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const override;
     QModelIndex parent( const QModelIndex &index ) const override;

diff --git a/src/core/composer/qgscomposermousehandles.cpp b/src/core/composer/qgscomposermousehandles.cpp
@@ -52,11 +52,6 @@ QgsComposerMouseHandles::QgsComposerMouseHandles( QgsComposition *composition )
   setAcceptHoverEvents( true );
 }
 
-QgsComposerMouseHandles::~QgsComposerMouseHandles()
-{
-
-}
-
 QGraphicsView* QgsComposerMouseHandles::graphicsView()
 {
   //have we already found the current view?

diff --git a/src/core/composer/qgscomposermousehandles.h b/src/core/composer/qgscomposermousehandles.h
@@ -70,7 +70,6 @@ class CORE_EXPORT QgsComposerMouseHandles: public QObject, public QGraphicsRectI
     };
 
     QgsComposerMouseHandles( QgsComposition *composition );
-    virtual ~QgsComposerMouseHandles();
 
     void setComposition( QgsComposition* c ) { mComposition = c; }
     QgsComposition* composition() { return mComposition; }

diff --git a/src/core/composer/qgscomposermultiframecommand.cpp b/src/core/composer/qgscomposermultiframecommand.cpp
@@ -28,10 +28,6 @@ QgsComposerMultiFrameCommand::QgsComposerMultiFrameCommand(): QUndoCommand( QLat
 {
 }
 
-QgsComposerMultiFrameCommand::~QgsComposerMultiFrameCommand()
-{
-}
-
 void QgsComposerMultiFrameCommand::undo()
 {
   restoreState( mPreviousState );
@@ -99,11 +95,6 @@ QgsComposerMultiFrameMergeCommand::QgsComposerMultiFrameMergeCommand( QgsCompose
 
 }
 
-QgsComposerMultiFrameMergeCommand::~QgsComposerMultiFrameMergeCommand()
-{
-
-}
-
 bool QgsComposerMultiFrameMergeCommand::mergeWith( const QUndoCommand *command )
 {
   const QgsComposerMultiFrameCommand* c = dynamic_cast<const QgsComposerMultiFrameCommand*>( command );

diff --git a/src/core/composer/qgscomposermultiframecommand.h b/src/core/composer/qgscomposermultiframecommand.h
@@ -30,7 +30,6 @@ class CORE_EXPORT QgsComposerMultiFrameCommand: public QUndoCommand
 {
   public:
     QgsComposerMultiFrameCommand( QgsComposerMultiFrame* multiFrame, const QString& text, QUndoCommand* parent = nullptr );
-    ~QgsComposerMultiFrameCommand();
 
     void undo() override;
     void redo() override;
@@ -86,7 +85,6 @@ class CORE_EXPORT QgsComposerMultiFrameMergeCommand: public QgsComposerMultiFram
     };
 
     QgsComposerMultiFrameMergeCommand( Context c, QgsComposerMultiFrame* multiFrame, const QString& text );
-    ~QgsComposerMultiFrameMergeCommand();
 
     bool mergeWith( const QUndoCommand * command ) override;
     int id() const override { return static_cast< int >( mContext ); }

diff --git a/src/core/composer/qgscomposernodesitem.cpp b/src/core/composer/qgscomposernodesitem.cpp
@@ -47,10 +47,6 @@ QgsComposerNodesItem::QgsComposerNodesItem( const QString& tagName,
   mPolygon = polygon.translated( -topLeft );
 }
 
-QgsComposerNodesItem::~QgsComposerNodesItem()
-{
-}
-
 double QgsComposerNodesItem::computeDistance( QPointF pt1,
     QPointF pt2 ) const
 {

diff --git a/src/core/composer/qgscomposernodesitem.h b/src/core/composer/qgscomposernodesitem.h
@@ -45,9 +45,6 @@ class CORE_EXPORT QgsComposerNodesItem: public QgsComposerItem
      */
     QgsComposerNodesItem( const QString &mTagName, const QPolygonF &polygon, QgsComposition* c );
 
-
-    ~QgsComposerNodesItem();
-
     /** Add a node in current shape.
      * @param pt is the location of the new node
      * @param checkArea is a flag to indicate if there's a space constraint.

diff --git a/src/core/composer/qgscomposerpicture.cpp b/src/core/composer/qgscomposerpicture.cpp
@@ -99,11 +99,6 @@ void QgsComposerPicture::init()
   connect( mComposition, SIGNAL( printResolutionChanged() ), this, SLOT( recalculateSize() ) );
 }
 
-QgsComposerPicture::~QgsComposerPicture()
-{
-
-}
-
 void QgsComposerPicture::paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget )
 {
   Q_UNUSED( itemStyle );

diff --git a/src/core/composer/qgscomposerpicture.h b/src/core/composer/qgscomposerpicture.h
@@ -61,7 +61,6 @@ class CORE_EXPORT QgsComposerPicture: public QgsComposerItem
     };
 
     QgsComposerPicture( QgsComposition *composition );
-    ~QgsComposerPicture();
 
     //! Return correct graphics item type.
     virtual int type() const override { return ComposerPicture; }

diff --git a/src/core/composer/qgscomposerpolygon.cpp b/src/core/composer/qgscomposerpolygon.cpp
@@ -36,10 +36,6 @@ QgsComposerPolygon::QgsComposerPolygon( const QPolygonF& polygon, QgsComposition
   createDefaultPolygonStyleSymbol();
 }
 
-QgsComposerPolygon::~QgsComposerPolygon()
-{
-}
-
 bool QgsComposerPolygon::_addNode( const int indexPoint,
                                    QPointF newPoint,
                                    const double radius )

diff --git a/src/core/composer/qgscomposerpolygon.h b/src/core/composer/qgscomposerpolygon.h
@@ -18,6 +18,7 @@
 #define QGSCOMPOSERPOLYGON_H
 
 #include "qgscomposernodesitem.h"
+#include "qgssymbol.h"
 #include <QBrush>
 #include <QPen>
 
@@ -45,9 +46,6 @@ class CORE_EXPORT QgsComposerPolygon: public QgsComposerNodesItem
      */
     QgsComposerPolygon( const QPolygonF &polygon, QgsComposition* c );
 
-
-    ~QgsComposerPolygon();
-
     //! Overridden to return shape name
     virtual QString displayName() const override;
 

diff --git a/src/core/composer/qgscomposerpolyline.cpp b/src/core/composer/qgscomposerpolyline.cpp
@@ -36,10 +36,6 @@ QgsComposerPolyline::QgsComposerPolyline( const QPolygonF& polyline, QgsComposit
   createDefaultPolylineStyleSymbol();
 }
 
-QgsComposerPolyline::~QgsComposerPolyline()
-{
-}
-
 bool QgsComposerPolyline::_addNode( const int indexPoint,
                                     QPointF newPoint,
                                     const double radius )

diff --git a/src/core/composer/qgscomposerpolyline.h b/src/core/composer/qgscomposerpolyline.h
@@ -18,6 +18,7 @@
 #define QGSCOMPOSERPOLYLINE_H
 
 #include "qgscomposernodesitem.h"
+#include "qgssymbol.h"
 #include <QBrush>
 #include <QPen>
 
@@ -44,9 +45,6 @@ class CORE_EXPORT QgsComposerPolyline: public QgsComposerNodesItem
      */
     QgsComposerPolyline( const QPolygonF &polyline, QgsComposition* c );
 
-
-    ~QgsComposerPolyline();
-
     //! Overridden to return shape name
     virtual QString displayName() const override;