Skip to content
Permalink
Browse files

Optimise destructors (pt 2)

  • Loading branch information
nyalldawson committed Dec 30, 2016
1 parent 2daaff3 commit 2a34af8bd1fece9b577713d7d7c0c6c57e135bc6
Showing with 35 additions and 668 deletions.
  1. +0 −4 src/core/composer/qgsatlascomposition.cpp
  2. +0 −1 src/core/composer/qgsatlascomposition.h
  3. +0 −11 src/core/composer/qgscomposerattributetablemodelv2.cpp
  4. +0 −3 src/core/composer/qgscomposerattributetablemodelv2.h
  5. +0 −4 src/core/composer/qgscomposerattributetablev2.cpp
  6. +0 −1 src/core/composer/qgscomposerattributetablev2.h
  7. +0 −4 src/core/composer/qgscomposereffect.cpp
  8. +0 −1 src/core/composer/qgscomposereffect.h
  9. +0 −4 src/core/composer/qgscomposerframe.cpp
  10. +0 −2 src/core/composer/qgscomposerframe.h
  11. +0 −8 src/core/composer/qgscomposeritemcommand.cpp
  12. +0 −2 src/core/composer/qgscomposeritemcommand.h
  13. +0 −4 src/core/composer/qgscomposermapgrid.cpp
  14. +0 −2 src/core/composer/qgscomposermapgrid.h
  15. +0 −5 src/core/composer/qgscomposermapitem.cpp
  16. +0 −2 src/core/composer/qgscomposermapitem.h
  17. +0 −5 src/core/composer/qgscomposermapoverview.cpp
  18. +0 −2 src/core/composer/qgscomposermapoverview.h
  19. +0 −4 src/core/composer/qgscomposermodel.cpp
  20. +0 −2 src/core/composer/qgscomposermodel.h
  21. +0 −5 src/core/composer/qgscomposermousehandles.cpp
  22. +0 −1 src/core/composer/qgscomposermousehandles.h
  23. +0 −9 src/core/composer/qgscomposermultiframecommand.cpp
  24. +0 −2 src/core/composer/qgscomposermultiframecommand.h
  25. +0 −4 src/core/composer/qgscomposernodesitem.cpp
  26. +0 −3 src/core/composer/qgscomposernodesitem.h
  27. +0 −5 src/core/composer/qgscomposerpicture.cpp
  28. +0 −1 src/core/composer/qgscomposerpicture.h
  29. +0 −4 src/core/composer/qgscomposerpolygon.cpp
  30. +1 −3 src/core/composer/qgscomposerpolygon.h
  31. +0 −4 src/core/composer/qgscomposerpolyline.cpp
  32. +1 −3 src/core/composer/qgscomposerpolyline.h
  33. +0 −6 src/core/composer/qgscomposertablecolumn.cpp
  34. +0 −2 src/core/composer/qgscomposertablecolumn.h
  35. +0 −5 src/core/composer/qgscomposertexttable.cpp
  36. +0 −1 src/core/composer/qgscomposertexttable.h
  37. +0 −5 src/core/composer/qgsdoubleboxscalebarstyle.cpp
  38. +0 −1 src/core/composer/qgsdoubleboxscalebarstyle.h
  39. +0 −5 src/core/composer/qgsnumericscalebarstyle.cpp
  40. +0 −1 src/core/composer/qgsnumericscalebarstyle.h
  41. +0 −4 src/core/composer/qgspaperitem.cpp
  42. +0 −1 src/core/composer/qgspaperitem.h
  43. +0 −5 src/core/composer/qgsscalebarstyle.cpp
  44. +1 −1 src/core/composer/qgsscalebarstyle.h
  45. +0 −5 src/core/composer/qgsticksscalebarstyle.cpp
  46. +0 −1 src/core/composer/qgsticksscalebarstyle.h
  47. +0 −4 src/core/diagram/qgshistogramdiagram.cpp
  48. +0 −1 src/core/diagram/qgshistogramdiagram.h
  49. +0 −4 src/core/diagram/qgspiediagram.cpp
  50. +0 −1 src/core/diagram/qgspiediagram.h
  51. +0 −4 src/core/diagram/qgstextdiagram.cpp
  52. +0 −1 src/core/diagram/qgstextdiagram.h
  53. +0 −4 src/core/dxf/qgsdxfexport.cpp
  54. +0 −1 src/core/dxf/qgsdxfexport.h
  55. +0 −4 src/core/dxf/qgsdxfpaintengine.cpp
  56. +1 −1 src/core/dxf/qgsdxfpaintengine.h
  57. +0 −5 src/core/effects/qgsblureffect.cpp
  58. +0 −1 src/core/effects/qgsblureffect.h
  59. +0 −5 src/core/effects/qgscoloreffect.cpp
  60. +0 −1 src/core/effects/qgscoloreffect.h
  61. +0 −10 src/core/effects/qgsgloweffect.cpp
  62. +0 −2 src/core/effects/qgsgloweffect.h
  63. +0 −5 src/core/effects/qgspainteffect.cpp
  64. +0 −1 src/core/effects/qgspainteffect.h
  65. +0 −15 src/core/effects/qgsshadoweffect.cpp
  66. +0 −3 src/core/effects/qgsshadoweffect.h
  67. +0 −5 src/core/effects/qgstransformeffect.cpp
  68. +0 −1 src/core/effects/qgstransformeffect.h
  69. +0 −8 src/core/layertree/qgslayertreemodellegendnode.cpp
  70. +0 −2 src/core/layertree/qgslayertreemodellegendnode.h
  71. +0 −4 src/core/qgsbrowsermodel.cpp
  72. +0 −1 src/core/qgsbrowsermodel.h
  73. +0 −4 src/core/qgscacheindex.cpp
  74. +1 −1 src/core/qgscacheindex.h
  75. +0 −5 src/core/qgscolorramp.cpp
  76. +0 −1 src/core/qgscolorramp.h
  77. +0 −30 src/core/qgscolorscheme.cpp
  78. +1 −11 src/core/qgscolorscheme.h
  79. +0 −4 src/core/qgsconditionalstyle.cpp
  80. +0 −1 src/core/qgsconditionalstyle.h
  81. +0 −4 src/core/qgscredentials.cpp
  82. +1 −1 src/core/qgscredentials.h
  83. +3 −5 src/core/qgsdatadefined.cpp
  84. +0 −20 src/core/qgsdataitem.cpp
  85. +0 −6 src/core/qgsdataitem.h
  86. +0 −5 src/core/qgsdbfilterproxymodel.cpp
  87. +0 −1 src/core/qgsdbfilterproxymodel.h
  88. +0 −8 src/core/qgsdiagramrenderer.cpp
  89. +0 −2 src/core/qgsdiagramrenderer.h
  90. +0 −4 src/core/qgsdistancearea.cpp
  91. +0 −3 src/core/qgsdistancearea.h
  92. +3 −5 src/core/qgseditformconfig.cpp
  93. +1 −2 src/core/qgseditformconfig.h
  94. +0 −4 src/core/qgsfeatureiterator.cpp
  95. +1 −1 src/core/qgsfeatureiterator.h
  96. +0 −4 src/core/qgsfieldformatter.cpp
  97. +1 −1 src/core/qgsfieldformatter.h
  98. +0 −13 src/core/qgsgeometrysimplifier.cpp
  99. +1 −2 src/core/qgsgeometrysimplifier.h
  100. +0 −4 src/core/qgsgml.cpp
  101. +0 −2 src/core/qgsgml.h
  102. +0 −5 src/core/qgsgmlschema.cpp
  103. +0 −2 src/core/qgsgmlschema.h
  104. +0 −5 src/core/qgshistogram.cpp
  105. +1 −1 src/core/qgshistogram.h
  106. +0 −4 src/core/qgsmaptopixelgeometrysimplifier.cpp
  107. +0 −1 src/core/qgsmaptopixelgeometrysimplifier.h
  108. +0 −5 src/core/qgsmessageoutput.cpp
  109. +1 −1 src/core/qgsmessageoutput.h
  110. +0 −4 src/core/qgsmultirenderchecker.cpp
  111. +2 −1 src/core/qgsmultirenderchecker.h
  112. +0 −4 src/core/qgsnetworkaccessmanager.cpp
  113. +0 −3 src/core/qgsnetworkaccessmanager.h
  114. +0 −4 src/core/qgsnetworkdiskcache.cpp
  115. +0 −1 src/core/qgsnetworkdiskcache.h
  116. +0 −4 src/core/qgsofflineediting.cpp
  117. +0 −1 src/core/qgsofflineediting.h
  118. +0 −5 src/core/qgsowsconnection.cpp
  119. +0 −3 src/core/qgsowsconnection.h
  120. +0 −4 src/core/qgspluginlayerregistry.cpp
  121. +1 −1 src/core/qgspluginlayerregistry.h
  122. +0 −4 src/core/qgsprojectbadlayerhandler.cpp
  123. +1 −1 src/core/qgsprojectbadlayerhandler.h
  124. +0 −8 src/core/qgsprojectproperty.cpp
  125. +1 −3 src/core/qgsprojectproperty.h
  126. +0 −4 src/core/qgspythonrunner.cpp
  127. +1 −1 src/core/qgspythonrunner.h
  128. +0 −4 src/core/qgssnappingconfig.cpp
  129. +0 −2 src/core/qgssnappingconfig.h
  130. +0 −5 src/core/qgssqlexpressioncompiler.cpp
  131. +1 −1 src/core/qgssqlexpressioncompiler.h
  132. +0 −5 src/core/qgsstatisticalsummary.cpp
  133. +1 −1 src/core/qgsstatisticalsummary.h
  134. +0 −4 src/core/qgstransactiongroup.cpp
  135. +1 −3 src/core/qgstransactiongroup.h
  136. +0 −5 src/core/qgsvectordataprovider.cpp
  137. +0 −2 src/core/qgsvectordataprovider.h
  138. +0 −8 src/core/qgsvectorfilewriter.cpp
  139. +2 −4 src/core/qgsvectorfilewriter.h
  140. +0 −5 src/core/qgsvectorlayereditbuffer.cpp
  141. +0 −1 src/core/qgsvectorlayereditbuffer.h
  142. +0 −4 src/core/qgsvectorlayerjoinbuffer.cpp
  143. +0 −1 src/core/qgsvectorlayerjoinbuffer.h
  144. +0 −4 src/core/qgsvectorlayerlabeling.cpp
  145. +1 −1 src/core/qgsvectorlayerlabeling.h
  146. +0 −4 src/core/qgsvectorlayerundocommand.cpp
  147. +0 −1 src/core/qgsvectorlayerundocommand.h
  148. +0 −4 src/core/raster/qgsbilinearrasterresampler.cpp
  149. +0 −1 src/core/raster/qgsbilinearrasterresampler.h
  150. +0 −4 src/core/raster/qgsbrightnesscontrastfilter.cpp
  151. +0 −1 src/core/raster/qgsbrightnesscontrastfilter.h
  152. +0 −4 src/core/raster/qgscolorrampshader.cpp
  153. +0 −2 src/core/raster/qgscolorrampshader.h
  154. +0 −4 src/core/raster/qgscubicrasterresampler.cpp
  155. +0 −1 src/core/raster/qgscubicrasterresampler.h
  156. +0 −4 src/core/raster/qgshuesaturationfilter.cpp
  157. +0 −1 src/core/raster/qgshuesaturationfilter.h
  158. +0 −3 src/core/raster/qgsrasteridentifyresult.cpp
  159. +1 −1 src/core/raster/qgsrasteridentifyresult.h
  160. +0 −4 src/core/raster/qgsrasterinterface.cpp
  161. +1 −1 src/core/raster/qgsrasterinterface.h
  162. +0 −4 src/core/raster/qgsrasternuller.cpp
  163. +0 −1 src/core/raster/qgsrasternuller.h
  164. +0 −4 src/core/raster/qgsrasterprojector.cpp
  165. +0 −2 src/core/raster/qgsrasterprojector.h
  166. +0 −4 src/core/raster/qgssinglebandcolordatarenderer.cpp
  167. +1 −1 src/core/raster/qgssinglebandcolordatarenderer.h
  168. +0 −4 src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp
  169. +0 −2 src/core/symbology-ng/qgscategorizedsymbolrenderer.h
  170. +1 −22 src/core/symbology-ng/qgscptcityarchive.cpp
  171. +0 −4 src/core/symbology-ng/qgscptcityarchive.h
  172. +0 −4 src/core/symbology-ng/qgsellipsesymbollayer.cpp
  173. +0 −1 src/core/symbology-ng/qgsellipsesymbollayer.h
  174. +0 −9 src/core/symbology-ng/qgsfillsymbollayer.cpp
  175. +0 −2 src/core/symbology-ng/qgsfillsymbollayer.h
  176. +0 −4 src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
  177. +0 −2 src/core/symbology-ng/qgsinvertedpolygonrenderer.h
  178. +0 −4 src/core/symbology-ng/qgsnullsymbolrenderer.cpp
  179. +0 −2 src/core/symbology-ng/qgsnullsymbolrenderer.h
  180. +0 −4 src/core/symbology-ng/qgssinglesymbolrenderer.cpp
  181. +0 −2 src/core/symbology-ng/qgssinglesymbolrenderer.h
@@ -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 )
@@ -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
@@ -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
@@ -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;
@@ -95,10 +95,6 @@ QgsComposerAttributeTableV2::QgsComposerAttributeTableV2( QgsComposition* compos
refreshAttributes();
}

QgsComposerAttributeTableV2::~QgsComposerAttributeTableV2()
{
}

QString QgsComposerAttributeTableV2::displayName() const
{
return tr( "<attribute table>" );
@@ -67,7 +67,6 @@ class CORE_EXPORT QgsComposerAttributeTableV2: public QgsComposerTableV2
};

QgsComposerAttributeTableV2( QgsComposition* composition, bool createUndoCommands );
~QgsComposerAttributeTableV2();

virtual QString displayName() const override;

@@ -24,10 +24,6 @@ QgsComposerEffect::QgsComposerEffect()
{
}

QgsComposerEffect::~QgsComposerEffect()
{
}

void QgsComposerEffect::draw( QPainter *painter )
{
QPoint offset;
@@ -30,7 +30,6 @@ class CORE_EXPORT QgsComposerEffect : public QGraphicsEffect

public:
QgsComposerEffect();
~QgsComposerEffect();

void setCompositionMode( QPainter::CompositionMode compositionMode );

@@ -46,10 +46,6 @@ QgsComposerFrame::QgsComposerFrame()
setBackgroundEnabled( false );
}

QgsComposerFrame::~QgsComposerFrame()
{
}

bool QgsComposerFrame::writeXml( QDomElement& elem, QDomDocument & doc ) const
{
QDomElement frameElem = doc.createElement( QStringLiteral( "ComposerFrame" ) );
@@ -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
@@ -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();
@@ -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 ); }
@@ -42,10 +42,6 @@ QgsComposerMapGridStack::QgsComposerMapGridStack( QgsComposerMap* map )

}

QgsComposerMapGridStack::~QgsComposerMapGridStack()
{
}

void QgsComposerMapGridStack::addGrid( QgsComposerMapGrid* grid )
{
QgsComposerMapItemStack::addItem( grid );
@@ -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.
@@ -29,11 +29,6 @@ QgsComposerMapItem::QgsComposerMapItem( const QString &name, QgsComposerMap *map

}

QgsComposerMapItem::~QgsComposerMapItem()
{

}

bool QgsComposerMapItem::writeXml( QDomElement &elem, QDomDocument &doc ) const
{
Q_UNUSED( doc );
@@ -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
*/
@@ -314,11 +314,6 @@ QgsComposerMapOverviewStack::QgsComposerMapOverviewStack( QgsComposerMap *map )

}

QgsComposerMapOverviewStack::~QgsComposerMapOverviewStack()
{

}

void QgsComposerMapOverviewStack::addOverview( QgsComposerMapOverview *overview )
{
QgsComposerMapItemStack::addItem( overview );
@@ -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.
@@ -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
@@ -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;
@@ -52,11 +52,6 @@ QgsComposerMouseHandles::QgsComposerMouseHandles( QgsComposition *composition )
setAcceptHoverEvents( true );
}

QgsComposerMouseHandles::~QgsComposerMouseHandles()
{

}

QGraphicsView* QgsComposerMouseHandles::graphicsView()
{
//have we already found the current view?
@@ -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; }
@@ -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 );
@@ -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 ); }
@@ -47,10 +47,6 @@ QgsComposerNodesItem::QgsComposerNodesItem( const QString& tagName,
mPolygon = polygon.translated( -topLeft );
}

QgsComposerNodesItem::~QgsComposerNodesItem()
{
}

double QgsComposerNodesItem::computeDistance( QPointF pt1,
QPointF pt2 ) const
{
@@ -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.
@@ -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 );
@@ -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; }
@@ -36,10 +36,6 @@ QgsComposerPolygon::QgsComposerPolygon( const QPolygonF& polygon, QgsComposition
createDefaultPolygonStyleSymbol();
}

QgsComposerPolygon::~QgsComposerPolygon()
{
}

bool QgsComposerPolygon::_addNode( const int indexPoint,
QPointF newPoint,
const double radius )
@@ -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;

@@ -36,10 +36,6 @@ QgsComposerPolyline::QgsComposerPolyline( const QPolygonF& polyline, QgsComposit
createDefaultPolylineStyleSymbol();
}

QgsComposerPolyline::~QgsComposerPolyline()
{
}

bool QgsComposerPolyline::_addNode( const int indexPoint,
QPointF newPoint,
const double radius )
@@ -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;

0 comments on commit 2a34af8

Please sign in to comment.
You can’t perform that action at this time.