sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak

Browse Source
This commit is contained in:
Nyall Dawson 2017-11-20 19:59:15 +10:00
parent 4e16665b0e
commit 89f6ca9f18
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/gui/symbology/qgsrulebasedrendererwidget.sip
View File

@ -26,7 +26,11 @@ Tree model for the rules:
#include "qgsrulebasedrendererwidget.h"
%End
public:
QgsRuleBasedRendererModel( QgsRuleBasedRenderer *r );
QgsRuleBasedRendererModel( QgsRuleBasedRenderer *renderer, QObject *parent );
%Docstring
Constructor for QgsRuleBasedRendererModel, for the specified ``renderer``.
%End
virtual Qt::ItemFlags flags( const QModelIndex &index ) const;
virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const;

7
src/gui/symbology/qgsrulebasedrendererwidget.cpp
View File

@ -71,7 +71,7 @@ QgsRuleBasedRendererWidget::QgsRuleBasedRendererWidget( QgsVectorLayer *layer, Q
setupUi( this );
this->layout()->setContentsMargins( 0, 0, 0, 0 );
mModel = new QgsRuleBasedRendererModel( mRenderer );
mModel = new QgsRuleBasedRendererModel( mRenderer, viewRules );
#ifdef ENABLE_MODELTEST
new ModelTest( mModel, this ); // for model validity checking
#endif
@ -799,8 +799,9 @@ void QgsRendererRulePropsWidget::setDockMode( bool dockMode )
/////
QgsRuleBasedRendererModel::QgsRuleBasedRendererModel( QgsRuleBasedRenderer *r )
: mR( r )
QgsRuleBasedRendererModel::QgsRuleBasedRendererModel( QgsRuleBasedRenderer *renderer, QObject *parent )
: QAbstractItemModel( parent )
, mR( renderer )
{
}

6
src/gui/symbology/qgsrulebasedrendererwidget.h
View File

@ -49,7 +49,11 @@ class GUI_EXPORT QgsRuleBasedRendererModel : public QAbstractItemModel
Q_OBJECT
public:
QgsRuleBasedRendererModel( QgsRuleBasedRenderer *r );
/**
* Constructor for QgsRuleBasedRendererModel, for the specified \a renderer.
*/
QgsRuleBasedRendererModel( QgsRuleBasedRenderer *renderer, QObject *parent );
virtual Qt::ItemFlags flags( const QModelIndex &index ) const override;
virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override;