Skip to content

Commit 89f6ca9

Browse files
committed
Fix memory leak
1 parent 4e16665 commit 89f6ca9

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

python/gui/symbology/qgsrulebasedrendererwidget.sip

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ Tree model for the rules:
2626
#include "qgsrulebasedrendererwidget.h"
2727
%End
2828
public:
29-
QgsRuleBasedRendererModel( QgsRuleBasedRenderer *r );
29+
30+
QgsRuleBasedRendererModel( QgsRuleBasedRenderer *renderer, QObject *parent );
31+
%Docstring
32+
Constructor for QgsRuleBasedRendererModel, for the specified ``renderer``.
33+
%End
3034

3135
virtual Qt::ItemFlags flags( const QModelIndex &index ) const;
3236
virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const;

src/gui/symbology/qgsrulebasedrendererwidget.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ QgsRuleBasedRendererWidget::QgsRuleBasedRendererWidget( QgsVectorLayer *layer, Q
7171
setupUi( this );
7272
this->layout()->setContentsMargins( 0, 0, 0, 0 );
7373

74-
mModel = new QgsRuleBasedRendererModel( mRenderer );
74+
mModel = new QgsRuleBasedRendererModel( mRenderer, viewRules );
7575
#ifdef ENABLE_MODELTEST
7676
new ModelTest( mModel, this ); // for model validity checking
7777
#endif
@@ -799,8 +799,9 @@ void QgsRendererRulePropsWidget::setDockMode( bool dockMode )
799799

800800
/////
801801

802-
QgsRuleBasedRendererModel::QgsRuleBasedRendererModel( QgsRuleBasedRenderer *r )
803-
: mR( r )
802+
QgsRuleBasedRendererModel::QgsRuleBasedRendererModel( QgsRuleBasedRenderer *renderer, QObject *parent )
803+
: QAbstractItemModel( parent )
804+
, mR( renderer )
804805
{
805806
}
806807

src/gui/symbology/qgsrulebasedrendererwidget.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ class GUI_EXPORT QgsRuleBasedRendererModel : public QAbstractItemModel
4949
Q_OBJECT
5050

5151
public:
52-
QgsRuleBasedRendererModel( QgsRuleBasedRenderer *r );
52+
53+
/**
54+
* Constructor for QgsRuleBasedRendererModel, for the specified \a renderer.
55+
*/
56+
QgsRuleBasedRendererModel( QgsRuleBasedRenderer *renderer, QObject *parent );
5357

5458
virtual Qt::ItemFlags flags( const QModelIndex &index ) const override;
5559
virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override;

0 commit comments

Comments
 (0)