From 98d618b4445eaef498ae232bbd51a90f0e95e686 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 10 Jun 2020 15:52:56 +1000 Subject: [PATCH] Tighten includes --- .../symbology/qgscategorizedsymbolrenderer.sip.in | 1 + .../symbology/qgsgraduatedsymbolrenderer.sip.in | 1 - .../symbology/qgssinglesymbolrenderer.sip.in | 2 ++ src/core/qgsdiagramrenderer.h | 2 +- src/core/symbology/qgscategorizedsymbolrenderer.cpp | 2 ++ src/core/symbology/qgscategorizedsymbolrenderer.h | 9 +++++---- src/core/symbology/qgsgraduatedsymbolrenderer.h | 7 +++---- src/core/symbology/qgssinglesymbolrenderer.cpp | 2 ++ src/core/symbology/qgssinglesymbolrenderer.h | 7 ++++--- 9 files changed, 20 insertions(+), 13 deletions(-) diff --git a/python/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in b/python/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in index 336f29a3ded..4343774f6a2 100644 --- a/python/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in +++ b/python/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in @@ -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 can be added later by calling addCategory(). %End + ~QgsCategorizedSymbolRenderer(); virtual QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const; diff --git a/python/core/auto_generated/symbology/qgsgraduatedsymbolrenderer.sip.in b/python/core/auto_generated/symbology/qgsgraduatedsymbolrenderer.sip.in index 21278e262c2..4dcd621eea4 100644 --- a/python/core/auto_generated/symbology/qgsgraduatedsymbolrenderer.sip.in +++ b/python/core/auto_generated/symbology/qgsgraduatedsymbolrenderer.sip.in @@ -8,7 +8,6 @@ - class QgsGraduatedSymbolRenderer : QgsFeatureRenderer { diff --git a/python/core/auto_generated/symbology/qgssinglesymbolrenderer.sip.in b/python/core/auto_generated/symbology/qgssinglesymbolrenderer.sip.in index 45d33212fc9..819cec682d0 100644 --- a/python/core/auto_generated/symbology/qgssinglesymbolrenderer.sip.in +++ b/python/core/auto_generated/symbology/qgssinglesymbolrenderer.sip.in @@ -7,6 +7,7 @@ ************************************************************************/ + class QgsSingleSymbolRenderer : QgsFeatureRenderer { @@ -22,6 +23,7 @@ Constructor for QgsSingleSymbolRenderer. The same ``symbol`` will be used to render every feature. Ownership of ``symbol`` is transferred to the renderer. %End + ~QgsSingleSymbolRenderer(); virtual QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const; diff --git a/src/core/qgsdiagramrenderer.h b/src/core/qgsdiagramrenderer.h index 158e4c858ca..75ea6107c3d 100644 --- a/src/core/qgsdiagramrenderer.h +++ b/src/core/qgsdiagramrenderer.h @@ -30,7 +30,6 @@ #include "qgssymbol.h" #include "qgsproperty.h" #include "qgspropertycollection.h" -#include "qgsdatadefinedsizelegend.h" #include "diagram/qgsdiagram.h" #include "qgsreadwritecontext.h" @@ -45,6 +44,7 @@ class QgsVectorLayer; class QgsLayerTreeModelLegendNode; class QgsLayerTreeLayer; class QgsPaintEffect; +class QgsDataDefinedSizeLegend; namespace pal { class Layer; } SIP_SKIP diff --git a/src/core/symbology/qgscategorizedsymbolrenderer.cpp b/src/core/symbology/qgscategorizedsymbolrenderer.cpp index cb448856cb3..1fd94bc9813 100644 --- a/src/core/symbology/qgscategorizedsymbolrenderer.cpp +++ b/src/core/symbology/qgscategorizedsymbolrenderer.cpp @@ -179,6 +179,8 @@ QgsCategorizedSymbolRenderer::QgsCategorizedSymbolRenderer( const QString &attrN } } +QgsCategorizedSymbolRenderer::~QgsCategorizedSymbolRenderer() = default; + void QgsCategorizedSymbolRenderer::rebuildHash() { mSymbolHash.clear(); diff --git a/src/core/symbology/qgscategorizedsymbolrenderer.h b/src/core/symbology/qgscategorizedsymbolrenderer.h index ce6e287fb36..f4c6ab0d6fd 100644 --- a/src/core/symbology/qgscategorizedsymbolrenderer.h +++ b/src/core/symbology/qgscategorizedsymbolrenderer.h @@ -17,16 +17,16 @@ #include "qgis_core.h" #include "qgis.h" -#include "qgssymbol.h" #include "qgsrenderer.h" -#include "qgsexpression.h" -#include "qgscolorramp.h" -#include "qgsdatadefinedsizelegend.h" #include class QgsVectorLayer; class QgsStyle; +class QgsDataDefinedSizeLegend; +class QgsSymbol; +class QgsExpression; +class QgsColorRamp; /** * \ingroup core @@ -161,6 +161,7 @@ class CORE_EXPORT QgsCategorizedSymbolRenderer : public QgsFeatureRenderer * can be added later by calling addCategory(). */ QgsCategorizedSymbolRenderer( const QString &attrName = QString(), const QgsCategoryList &categories = QgsCategoryList() ); + ~QgsCategorizedSymbolRenderer() override; QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override; QgsSymbol *originalSymbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override; diff --git a/src/core/symbology/qgsgraduatedsymbolrenderer.h b/src/core/symbology/qgsgraduatedsymbolrenderer.h index 4284142304f..34c403ddfe2 100644 --- a/src/core/symbology/qgsgraduatedsymbolrenderer.h +++ b/src/core/symbology/qgsgraduatedsymbolrenderer.h @@ -18,16 +18,15 @@ #include "qgis_core.h" #include "qgis_sip.h" #include "qgis.h" -#include "qgssymbol.h" #include "qgsrenderer.h" #include "qgsrendererrange.h" -#include "qgsexpression.h" -#include "qgsdatadefinedsizelegend.h" #include "qgsclassificationmethod.h" - class QgsVectorLayer; class QgsColorRamp; +class QgsDataDefinedSizeLegend; +class QgsSymbol; +class QgsExpression; /** * \ingroup core diff --git a/src/core/symbology/qgssinglesymbolrenderer.cpp b/src/core/symbology/qgssinglesymbolrenderer.cpp index bee259f8222..124b3db6720 100644 --- a/src/core/symbology/qgssinglesymbolrenderer.cpp +++ b/src/core/symbology/qgssinglesymbolrenderer.cpp @@ -41,6 +41,8 @@ QgsSingleSymbolRenderer::QgsSingleSymbolRenderer( QgsSymbol *symbol ) Q_ASSERT( symbol ); } +QgsSingleSymbolRenderer::~QgsSingleSymbolRenderer() = default; + QgsSymbol *QgsSingleSymbolRenderer::symbolForFeature( const QgsFeature &, QgsRenderContext & ) const { return mSymbol.get(); diff --git a/src/core/symbology/qgssinglesymbolrenderer.h b/src/core/symbology/qgssinglesymbolrenderer.h index e77feb38113..c5d217dfb76 100644 --- a/src/core/symbology/qgssinglesymbolrenderer.h +++ b/src/core/symbology/qgssinglesymbolrenderer.h @@ -18,9 +18,9 @@ #include "qgis_core.h" #include "qgis.h" #include "qgsrenderer.h" -#include "qgssymbol.h" -#include "qgsexpression.h" -#include "qgsdatadefinedsizelegend.h" + +class QgsDataDefinedSizeLegend; +class QgsSymbol; /** * \ingroup core @@ -37,6 +37,7 @@ class CORE_EXPORT QgsSingleSymbolRenderer : public QgsFeatureRenderer * of \a symbol is transferred to the renderer. */ QgsSingleSymbolRenderer( QgsSymbol *symbol SIP_TRANSFER ); + ~QgsSingleSymbolRenderer() override; QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override; QgsSymbol *originalSymbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override;