Tighten includes

This commit is contained in:
Nyall Dawson 2020-06-10 15:52:56 +10:00
parent 15e6c3ef93
commit 98d618b444
9 changed files with 20 additions and 13 deletions

View File

@ -146,6 +146,7 @@ The ``attrName`` argument specifies the layer's field name, or expression, which
A list of renderer ``categories`` can optionally be specified. If no categories are specified in the constructor, they A list of renderer ``categories`` can optionally be specified. If no categories are specified in the constructor, they
can be added later by calling addCategory(). can be added later by calling addCategory().
%End %End
~QgsCategorizedSymbolRenderer();
virtual QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const; virtual QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const;

View File

@ -8,7 +8,6 @@
class QgsGraduatedSymbolRenderer : QgsFeatureRenderer class QgsGraduatedSymbolRenderer : QgsFeatureRenderer
{ {

View File

@ -7,6 +7,7 @@
************************************************************************/ ************************************************************************/
class QgsSingleSymbolRenderer : QgsFeatureRenderer class QgsSingleSymbolRenderer : QgsFeatureRenderer
{ {
@ -22,6 +23,7 @@ Constructor for QgsSingleSymbolRenderer.
The same ``symbol`` will be used to render every feature. Ownership The same ``symbol`` will be used to render every feature. Ownership
of ``symbol`` is transferred to the renderer. of ``symbol`` is transferred to the renderer.
%End %End
~QgsSingleSymbolRenderer();
virtual QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const; virtual QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const;

View File

@ -30,7 +30,6 @@
#include "qgssymbol.h" #include "qgssymbol.h"
#include "qgsproperty.h" #include "qgsproperty.h"
#include "qgspropertycollection.h" #include "qgspropertycollection.h"
#include "qgsdatadefinedsizelegend.h"
#include "diagram/qgsdiagram.h" #include "diagram/qgsdiagram.h"
#include "qgsreadwritecontext.h" #include "qgsreadwritecontext.h"
@ -45,6 +44,7 @@ class QgsVectorLayer;
class QgsLayerTreeModelLegendNode; class QgsLayerTreeModelLegendNode;
class QgsLayerTreeLayer; class QgsLayerTreeLayer;
class QgsPaintEffect; class QgsPaintEffect;
class QgsDataDefinedSizeLegend;
namespace pal { class Layer; } SIP_SKIP namespace pal { class Layer; } SIP_SKIP

View File

@ -179,6 +179,8 @@ QgsCategorizedSymbolRenderer::QgsCategorizedSymbolRenderer( const QString &attrN
} }
} }
QgsCategorizedSymbolRenderer::~QgsCategorizedSymbolRenderer() = default;
void QgsCategorizedSymbolRenderer::rebuildHash() void QgsCategorizedSymbolRenderer::rebuildHash()
{ {
mSymbolHash.clear(); mSymbolHash.clear();

View File

@ -17,16 +17,16 @@
#include "qgis_core.h" #include "qgis_core.h"
#include "qgis.h" #include "qgis.h"
#include "qgssymbol.h"
#include "qgsrenderer.h" #include "qgsrenderer.h"
#include "qgsexpression.h"
#include "qgscolorramp.h"
#include "qgsdatadefinedsizelegend.h"
#include <QHash> #include <QHash>
class QgsVectorLayer; class QgsVectorLayer;
class QgsStyle; class QgsStyle;
class QgsDataDefinedSizeLegend;
class QgsSymbol;
class QgsExpression;
class QgsColorRamp;
/** /**
* \ingroup core * \ingroup core
@ -161,6 +161,7 @@ class CORE_EXPORT QgsCategorizedSymbolRenderer : public QgsFeatureRenderer
* can be added later by calling addCategory(). * can be added later by calling addCategory().
*/ */
QgsCategorizedSymbolRenderer( const QString &attrName = QString(), const QgsCategoryList &categories = QgsCategoryList() ); QgsCategorizedSymbolRenderer( const QString &attrName = QString(), const QgsCategoryList &categories = QgsCategoryList() );
~QgsCategorizedSymbolRenderer() override;
QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override; QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override;
QgsSymbol *originalSymbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override; QgsSymbol *originalSymbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override;

View File

@ -18,16 +18,15 @@
#include "qgis_core.h" #include "qgis_core.h"
#include "qgis_sip.h" #include "qgis_sip.h"
#include "qgis.h" #include "qgis.h"
#include "qgssymbol.h"
#include "qgsrenderer.h" #include "qgsrenderer.h"
#include "qgsrendererrange.h" #include "qgsrendererrange.h"
#include "qgsexpression.h"
#include "qgsdatadefinedsizelegend.h"
#include "qgsclassificationmethod.h" #include "qgsclassificationmethod.h"
class QgsVectorLayer; class QgsVectorLayer;
class QgsColorRamp; class QgsColorRamp;
class QgsDataDefinedSizeLegend;
class QgsSymbol;
class QgsExpression;
/** /**
* \ingroup core * \ingroup core

View File

@ -41,6 +41,8 @@ QgsSingleSymbolRenderer::QgsSingleSymbolRenderer( QgsSymbol *symbol )
Q_ASSERT( symbol ); Q_ASSERT( symbol );
} }
QgsSingleSymbolRenderer::~QgsSingleSymbolRenderer() = default;
QgsSymbol *QgsSingleSymbolRenderer::symbolForFeature( const QgsFeature &, QgsRenderContext & ) const QgsSymbol *QgsSingleSymbolRenderer::symbolForFeature( const QgsFeature &, QgsRenderContext & ) const
{ {
return mSymbol.get(); return mSymbol.get();

View File

@ -18,9 +18,9 @@
#include "qgis_core.h" #include "qgis_core.h"
#include "qgis.h" #include "qgis.h"
#include "qgsrenderer.h" #include "qgsrenderer.h"
#include "qgssymbol.h"
#include "qgsexpression.h" class QgsDataDefinedSizeLegend;
#include "qgsdatadefinedsizelegend.h" class QgsSymbol;
/** /**
* \ingroup core * \ingroup core
@ -37,6 +37,7 @@ class CORE_EXPORT QgsSingleSymbolRenderer : public QgsFeatureRenderer
* of \a symbol is transferred to the renderer. * of \a symbol is transferred to the renderer.
*/ */
QgsSingleSymbolRenderer( QgsSymbol *symbol SIP_TRANSFER ); QgsSingleSymbolRenderer( QgsSymbol *symbol SIP_TRANSFER );
~QgsSingleSymbolRenderer() override;
QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override; QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override;
QgsSymbol *originalSymbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override; QgsSymbol *originalSymbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override;