Tighten includes

qgis · Jun 10, 2020 · 98d618b · 98d618b
1 parent 15e6c3e
commit 98d618b
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <QHash>
 
 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
@@ -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
@@ -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
@@ -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;