Fix memory leaks in renderer widgets

(cherry picked from commit 9a9b7ee)
qgis · May 31, 2021 · a624eff · a624eff
1 parent 1d1a688
commit a624eff
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 43 deletions.
diff --git a/python/gui/auto_generated/symbology/qgs25drendererwidget.sip.in b/python/gui/auto_generated/symbology/qgs25drendererwidget.sip.in
@@ -33,6 +33,7 @@ Constructor
 :param style:
 :param renderer: the mask renderer (will not take ownership)
 %End
+    ~Qgs25DRendererWidget();
 
     virtual QgsFeatureRenderer *renderer();
 

diff --git a/python/gui/auto_generated/symbology/qgsheatmaprendererwidget.sip.in b/python/gui/auto_generated/symbology/qgsheatmaprendererwidget.sip.in
@@ -33,6 +33,7 @@ Constructor
 :param style:
 :param renderer: the mask renderer (will not take ownership)
 %End
+    ~QgsHeatmapRendererWidget();
 
     virtual QgsFeatureRenderer *renderer();
 

diff --git a/python/gui/auto_generated/symbology/qgsinvertedpolygonrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgsinvertedpolygonrendererwidget.sip.in
@@ -38,6 +38,7 @@ Constructor
 :param style:
 :param renderer: the mask renderer (will not take ownership)
 %End
+    ~QgsInvertedPolygonRendererWidget();
 
     virtual QgsFeatureRenderer *renderer();
 

diff --git a/src/gui/symbology/qgs25drendererwidget.cpp b/src/gui/symbology/qgs25drendererwidget.cpp
@@ -18,6 +18,7 @@
 #include "qgsvectorlayer.h"
 #include "qgsmaplayerstylemanager.h"
 #include "qgsexpressioncontextutils.h"
+#include "qgssymbol.h"
 
 Qgs25DRendererWidget::Qgs25DRendererWidget( QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer )
   : QgsRendererWidget( layer, style )
@@ -54,7 +55,7 @@ Qgs25DRendererWidget::Qgs25DRendererWidget( QgsVectorLayer *layer, QgsStyle *sty
 
   if ( renderer )
   {
-    mRenderer = Qgs25DRenderer::convertFromRenderer( renderer );
+    mRenderer.reset( Qgs25DRenderer::convertFromRenderer( renderer ) );
   }
 
   mHeightWidget->setLayer( layer );
@@ -85,9 +86,11 @@ Qgs25DRendererWidget::Qgs25DRendererWidget( QgsVectorLayer *layer, QgsStyle *sty
   connect( mWallExpositionShading, &QAbstractButton::toggled, this, &Qgs25DRendererWidget::updateRenderer );
 }
 
+Qgs25DRendererWidget::~Qgs25DRendererWidget() = default;
+
 QgsFeatureRenderer *Qgs25DRendererWidget::renderer()
 {
-  return mRenderer;
+  return mRenderer.get();
 }
 
 void Qgs25DRendererWidget::updateRenderer()

diff --git a/src/gui/symbology/qgs25drendererwidget.h b/src/gui/symbology/qgs25drendererwidget.h
@@ -48,6 +48,7 @@ class GUI_EXPORT Qgs25DRendererWidget : public QgsRendererWidget, protected Ui::
      * \param renderer the mask renderer (will not take ownership)
      */
     Qgs25DRendererWidget( QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer SIP_TRANSFER );
+    ~Qgs25DRendererWidget() override;
 
     QgsFeatureRenderer *renderer() override;
 
@@ -57,7 +58,7 @@ class GUI_EXPORT Qgs25DRendererWidget : public QgsRendererWidget, protected Ui::
   private:
     void apply() override SIP_FORCE;
 
-    Qgs25DRenderer *mRenderer = nullptr;
+    std::unique_ptr< Qgs25DRenderer > mRenderer;
 
     friend class QgsAppScreenShots;
 };

diff --git a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp
@@ -463,7 +463,7 @@ QgsGraduatedSymbolRendererWidget::QgsGraduatedSymbolRendererWidget( QgsVectorLay
   // setup user interface
   setupUi( this );
 
-  mSymmetryPointValidator = new QDoubleValidator();
+  mSymmetryPointValidator = new QDoubleValidator( this );
   cboSymmetryPoint->setEditable( true );
   cboSymmetryPoint->setValidator( mSymmetryPointValidator );
 

diff --git a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.h b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.h
@@ -196,7 +196,7 @@ class GUI_EXPORT QgsGraduatedSymbolRendererWidget : public QgsRendererWidget, pr
 
     QgsRangeList mCopyBuffer;
 
-    QDoubleValidator *mSymmetryPointValidator;
+    QDoubleValidator *mSymmetryPointValidator = nullptr;
 
     std::vector< std::unique_ptr< QgsAbstractProcessingParameterWidgetWrapper >> mParameterWidgetWrappers;
 };

diff --git a/src/gui/symbology/qgsheatmaprendererwidget.cpp b/src/gui/symbology/qgsheatmaprendererwidget.cpp
@@ -105,11 +105,11 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer *layer, QgsSt
 
   if ( renderer )
   {
-    mRenderer = QgsHeatmapRenderer::convertFromRenderer( renderer );
+    mRenderer.reset( QgsHeatmapRenderer::convertFromRenderer( renderer ) );
   }
   if ( !mRenderer )
   {
-    mRenderer = new QgsHeatmapRenderer();
+    mRenderer = std::make_unique< QgsHeatmapRenderer >();
   }
 
   btnColorRamp->setShowGradientOnly( true );
@@ -141,9 +141,11 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer *layer, QgsSt
   connect( mWeightExpressionWidget, static_cast < void ( QgsFieldExpressionWidget::* )( const QString & ) >( &QgsFieldExpressionWidget::fieldChanged ), this, &QgsHeatmapRendererWidget::weightExpressionChanged );
 }
 
+QgsHeatmapRendererWidget::~QgsHeatmapRendererWidget() = default;
+
 QgsFeatureRenderer *QgsHeatmapRendererWidget::renderer()
 {
-  return mRenderer;
+  return mRenderer.get();
 }
 
 void QgsHeatmapRendererWidget::setContext( const QgsSymbolWidgetContext &context )

diff --git a/src/gui/symbology/qgsheatmaprendererwidget.h b/src/gui/symbology/qgsheatmaprendererwidget.h
@@ -48,12 +48,13 @@ class GUI_EXPORT QgsHeatmapRendererWidget : public QgsRendererWidget, private Ui
      * \param renderer the mask renderer (will not take ownership)
      */
     QgsHeatmapRendererWidget( QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer );
+    ~QgsHeatmapRendererWidget() override;
 
     QgsFeatureRenderer *renderer() override;
     void setContext( const QgsSymbolWidgetContext &context ) override;
 
   private:
-    QgsHeatmapRenderer *mRenderer = nullptr;
+    std::unique_ptr< QgsHeatmapRenderer > mRenderer;
 
     QgsExpressionContext createExpressionContext() const override;
 

diff --git a/src/gui/symbology/qgsinvertedpolygonrendererwidget.cpp b/src/gui/symbology/qgsinvertedpolygonrendererwidget.cpp
@@ -100,6 +100,8 @@ QgsInvertedPolygonRendererWidget::QgsInvertedPolygonRendererWidget( QgsVectorLay
   }
 }
 
+QgsInvertedPolygonRendererWidget::~QgsInvertedPolygonRendererWidget() = default;
+
 QgsFeatureRenderer *QgsInvertedPolygonRendererWidget::renderer()
 {
   if ( mRenderer && mEmbeddedRendererWidget )

diff --git a/src/gui/symbology/qgsinvertedpolygonrendererwidget.h b/src/gui/symbology/qgsinvertedpolygonrendererwidget.h
@@ -17,11 +17,11 @@
 
 #include "ui_qgsinvertedpolygonrendererwidgetbase.h"
 #include "qgis_sip.h"
-#include "qgsinvertedpolygonrenderer.h"
 #include "qgsrendererwidget.h"
 #include "qgis_gui.h"
 
 class QMenu;
+class QgsInvertedPolygonRenderer;
 
 /**
  * \ingroup gui
@@ -50,6 +50,7 @@ class GUI_EXPORT QgsInvertedPolygonRendererWidget : public QgsRendererWidget, pr
      * \param renderer the mask renderer (will not take ownership)
      */
     QgsInvertedPolygonRendererWidget( QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer );
+    ~QgsInvertedPolygonRendererWidget() override;
 
     QgsFeatureRenderer *renderer() override;
 

diff --git a/src/gui/symbology/qgsnullsymbolrendererwidget.cpp b/src/gui/symbology/qgsnullsymbolrendererwidget.cpp
@@ -26,28 +26,24 @@ QgsRendererWidget *QgsNullSymbolRendererWidget::create( QgsVectorLayer *layer, Q
 
 QgsNullSymbolRendererWidget::QgsNullSymbolRendererWidget( QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer )
   : QgsRendererWidget( layer, style )
-
 {
   if ( renderer )
   {
-    mRenderer = QgsNullSymbolRenderer::convertFromRenderer( renderer );
+    mRenderer.reset( QgsNullSymbolRenderer::convertFromRenderer( renderer ) );
   }
   if ( !mRenderer )
   {
-    mRenderer = new QgsNullSymbolRenderer();
+    mRenderer = std::make_unique< QgsNullSymbolRenderer >();
   }
 
   QGridLayout *layout = new QGridLayout( this );
   QLabel *label = new QLabel( tr( "No symbols will be rendered for features in this layer." ) );
   layout->addWidget( label );
 }
 
-QgsNullSymbolRendererWidget::~QgsNullSymbolRendererWidget()
-{
-  delete mRenderer;
-}
+QgsNullSymbolRendererWidget::~QgsNullSymbolRendererWidget() = default;
 
 QgsFeatureRenderer *QgsNullSymbolRendererWidget::renderer()
 {
-  return mRenderer;
+  return mRenderer.get();
 }
diff --git a/src/gui/symbology/qgsnullsymbolrendererwidget.h b/src/gui/symbology/qgsnullsymbolrendererwidget.h
@@ -49,7 +49,7 @@ class GUI_EXPORT QgsNullSymbolRendererWidget : public QgsRendererWidget
   protected:
 
     //! Renderer being configured by the widget
-    QgsNullSymbolRenderer *mRenderer = nullptr;
+    std::unique_ptr< QgsNullSymbolRenderer > mRenderer;
 
 };
 

diff --git a/src/gui/symbology/qgspointclusterrendererwidget.cpp b/src/gui/symbology/qgspointclusterrendererwidget.cpp
@@ -62,11 +62,11 @@ QgsPointClusterRendererWidget::QgsPointClusterRendererWidget( QgsVectorLayer *la
 
   if ( renderer )
   {
-    mRenderer = QgsPointClusterRenderer::convertFromRenderer( renderer );
+    mRenderer.reset( QgsPointClusterRenderer::convertFromRenderer( renderer ) );
   }
   if ( !mRenderer )
   {
-    mRenderer = new QgsPointClusterRenderer();
+    mRenderer = std::make_unique< QgsPointClusterRenderer >();
   }
 
   blockAllSignals( true );
@@ -108,14 +108,11 @@ QgsPointClusterRendererWidget::QgsPointClusterRendererWidget( QgsVectorLayer *la
   mCenterSymbolToolButton->registerExpressionContextGenerator( this );
 }
 
-QgsPointClusterRendererWidget::~QgsPointClusterRendererWidget()
-{
-  delete mRenderer;
-}
+QgsPointClusterRendererWidget::~QgsPointClusterRendererWidget() = default;
 
 QgsFeatureRenderer *QgsPointClusterRendererWidget::renderer()
 {
-  return mRenderer;
+  return mRenderer.get();
 }
 
 void QgsPointClusterRendererWidget::setContext( const QgsSymbolWidgetContext &context )

diff --git a/src/gui/symbology/qgspointclusterrendererwidget.h b/src/gui/symbology/qgspointclusterrendererwidget.h
@@ -64,7 +64,7 @@ class GUI_EXPORT QgsPointClusterRendererWidget: public QgsRendererWidget, public
     QgsExpressionContext createExpressionContext() const override;
 
   private:
-    QgsPointClusterRenderer *mRenderer = nullptr;
+    std::unique_ptr< QgsPointClusterRenderer > mRenderer;
 
     void blockAllSignals( bool block );
     void setupBlankUi( const QString &layerName );

diff --git a/src/gui/symbology/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology/qgspointdisplacementrendererwidget.cpp
@@ -70,11 +70,11 @@ QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVecto
 
   if ( renderer )
   {
-    mRenderer = QgsPointDisplacementRenderer::convertFromRenderer( renderer );
+    mRenderer.reset( QgsPointDisplacementRenderer::convertFromRenderer( renderer ) );
   }
   if ( !mRenderer )
   {
-    mRenderer = new QgsPointDisplacementRenderer();
+    mRenderer = std::make_unique< QgsPointDisplacementRenderer >();
   }
 
   blockAllSignals( true );
@@ -175,14 +175,11 @@ QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVecto
   mCenterSymbolToolButton->registerExpressionContextGenerator( this );
 }
 
-QgsPointDisplacementRendererWidget::~QgsPointDisplacementRendererWidget()
-{
-  delete mRenderer;
-}
+QgsPointDisplacementRendererWidget::~QgsPointDisplacementRendererWidget() = default;
 
 QgsFeatureRenderer *QgsPointDisplacementRendererWidget::renderer()
 {
-  return mRenderer;
+  return mRenderer.get();
 }
 
 void QgsPointDisplacementRendererWidget::setContext( const QgsSymbolWidgetContext &context )

diff --git a/src/gui/symbology/qgspointdisplacementrendererwidget.h b/src/gui/symbology/qgspointdisplacementrendererwidget.h
@@ -44,7 +44,7 @@ class GUI_EXPORT QgsPointDisplacementRendererWidget: public QgsRendererWidget, p
     QgsExpressionContext createExpressionContext() const override;
 
   private:
-    QgsPointDisplacementRenderer *mRenderer = nullptr;
+    std::unique_ptr< QgsPointDisplacementRenderer > mRenderer;
 
     void blockAllSignals( bool block );
     void setupBlankUi( const QString &layerName );

diff --git a/src/gui/symbology/qgsrulebasedrendererwidget.cpp b/src/gui/symbology/qgsrulebasedrendererwidget.cpp
@@ -61,20 +61,20 @@ QgsRuleBasedRendererWidget::QgsRuleBasedRendererWidget( QgsVectorLayer *layer, Q
 
   if ( renderer )
   {
-    mRenderer = QgsRuleBasedRenderer::convertFromRenderer( renderer );
+    mRenderer.reset( QgsRuleBasedRenderer::convertFromRenderer( renderer ) );
   }
   if ( !mRenderer )
   {
     // some default options
     QgsSymbol *symbol = QgsSymbol::defaultSymbol( mLayer->geometryType() );
 
-    mRenderer = new QgsRuleBasedRenderer( symbol );
+    mRenderer = qgis::make_unique< QgsRuleBasedRenderer >( symbol );
   }
 
   setupUi( this );
   this->layout()->setContentsMargins( 0, 0, 0, 0 );
 
-  mModel = new QgsRuleBasedRendererModel( mRenderer, viewRules );
+  mModel = new QgsRuleBasedRendererModel( mRenderer.get(), viewRules );
 #ifdef ENABLE_MODELTEST
   new ModelTest( mModel, this ); // for model validity checking
 #endif
@@ -135,12 +135,11 @@ QgsRuleBasedRendererWidget::QgsRuleBasedRendererWidget( QgsVectorLayer *layer, Q
 QgsRuleBasedRendererWidget::~QgsRuleBasedRendererWidget()
 {
   qDeleteAll( mCopyBuffer );
-  delete mRenderer;
 }
 
 QgsFeatureRenderer *QgsRuleBasedRendererWidget::renderer()
 {
-  return mRenderer;
+  return mRenderer.get();
 }
 
 void QgsRuleBasedRendererWidget::setDockMode( bool dockMode )
@@ -452,7 +451,7 @@ void QgsRuleBasedRendererWidget::setRenderingOrder()
   QgsPanelWidget *panel = QgsPanelWidget::findParentPanel( this );
   if ( panel && panel->dockMode() )
   {
-    QgsSymbolLevelsWidget *widget = new QgsSymbolLevelsWidget( mRenderer, true, panel );
+    QgsSymbolLevelsWidget *widget = new QgsSymbolLevelsWidget( mRenderer.get(), true, panel );
     widget->setForceOrderingEnabled( true );
     widget->setPanelTitle( tr( "Symbol Levels" ) );
     connect( widget, &QgsPanelWidget::widgetChanged, this, [ = ]()
@@ -463,7 +462,7 @@ void QgsRuleBasedRendererWidget::setRenderingOrder()
   }
   else
   {
-    QgsSymbolLevelsDialog dlg( mRenderer, true, panel );
+    QgsSymbolLevelsDialog dlg( mRenderer.get(), true, panel );
     dlg.setForceOrderingEnabled( true );
     if ( dlg.exec() )
     {

diff --git a/src/gui/symbology/qgsrulebasedrendererwidget.h b/src/gui/symbology/qgsrulebasedrendererwidget.h
@@ -166,7 +166,7 @@ class GUI_EXPORT QgsRuleBasedRendererWidget : public QgsRendererWidget, private
     void refreshSymbolView() override;
     void keyPressEvent( QKeyEvent *event ) override;
 
-    QgsRuleBasedRenderer *mRenderer = nullptr;
+    std::unique_ptr< QgsRuleBasedRenderer > mRenderer;
     QgsRuleBasedRendererModel *mModel = nullptr;
 
     QMenu *mRefineMenu = nullptr;