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

Fix memory leak and pass ownership of py editor widgets to C++

Browse Source
This commit is contained in:
Matthias Kuhn 2014-08-03 18:49:02 +02:00
parent 44bed005f1
commit f63a01cc7c
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/gui/editorwidgets/core/qgseditorwidgetfactory.sip
View File

@ -44,7 +44,7 @@ class QgsEditorWidgetFactory
* *
* @return A new widget wrapper * @return A new widget wrapper
*/ */
virtual QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const = 0; virtual QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const = 0 /Factory/;
/** /**
* Return The human readable identifier name of this widget type * Return The human readable identifier name of this widget type
@ -63,7 +63,7 @@ class QgsEditorWidgetFactory
* *
* @return A configuration widget * @return A configuration widget
*/ */
virtual QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const = 0; virtual QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const = 0 /Factory/;
/** /**
* Read the config from an XML file and map it to a proper {@link QgsEditorWidgetConfig}. * Read the config from an XML file and map it to a proper {@link QgsEditorWidgetConfig}.

2
python/gui/editorwidgets/core/qgseditorwidgetwrapper.sip
View File

@ -72,7 +72,7 @@ class QgsEditorWidgetWrapper : QObject
static QgsEditorWidgetWrapper* fromWidget( QWidget* widget ); static QgsEditorWidgetWrapper* fromWidget( QWidget* widget );
protected: protected:
virtual QWidget* createWidget( QWidget* parent ) = 0 /Factory/; virtual QWidget* createWidget( QWidget* parent ) = 0;
virtual void initWidget( QWidget* editor ); virtual void initWidget( QWidget* editor );

2
src/app/qgsattributetypedialog.cpp
View File

@ -77,6 +77,8 @@ QgsAttributeTypeDialog::~QgsAttributeTypeDialog()
{ {
QSettings settings; QSettings settings;
settings.setValue( "/Windows/QgsAttributeTypeDialog/geometry", saveGeometry() ); settings.setValue( "/Windows/QgsAttributeTypeDialog/geometry", saveGeometry() );
qDeleteAll( mEditorConfigWidgets.values() );
} }
const QString QgsAttributeTypeDialog::editorWidgetV2Type() const QString QgsAttributeTypeDialog::editorWidgetV2Type()