Skip to content
Permalink
Browse files

Merge pull request #1668 from m-kuhn/action-menu-crash

Alternative approach to f9fcee9
  • Loading branch information
jef-n committed Oct 29, 2014
2 parents 4cf08c5 + a7f889d commit cc5d3bcb78c5cf68cc0ce47810c8a2ab4e89ba8d
Showing with 7 additions and 7 deletions.
  1. +7 −6 src/gui/qgsattributedialog.cpp
  2. +0 −1 src/gui/qgsattributedialog.h
@@ -28,7 +28,6 @@
QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer* vl, QgsFeature* thepFeature, bool featureOwner, QgsDistanceArea myDa, QWidget* parent, bool showDialogButtons )
: QDialog( parent )
, mHighlight( 0 )
, mOwnedFeature( featureOwner ? thepFeature : 0 )
{
QgsAttributeEditorContext context;
context.setDistanceArea( myDa );
@@ -37,17 +36,22 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer* vl, QgsFeature* thepFeat

if ( !showDialogButtons )
mAttributeForm->hideButtonBox();

if ( featureOwner )
delete thepFeature;
}

QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer* vl, QgsFeature* thepFeature, bool featureOwner, QWidget* parent, bool showDialogButtons, QgsAttributeEditorContext context )
: QDialog( parent )
, mHighlight( 0 )
, mOwnedFeature( featureOwner ? thepFeature : 0 )
{
init( vl, thepFeature, context, parent );

if ( !showDialogButtons )
mAttributeForm->hideButtonBox();

if ( featureOwner )
delete thepFeature;
}

QgsAttributeDialog::~QgsAttributeDialog()
@@ -58,9 +62,6 @@ QgsAttributeDialog::~QgsAttributeDialog()
delete mHighlight;
}

if( mOwnedFeature )
delete mOwnedFeature;

saveGeometry();
}

@@ -110,7 +111,7 @@ void QgsAttributeDialog::init( QgsVectorLayer* layer, QgsFeature* feature, QgsAt
connect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );

mMenuBar = new QMenuBar( this );
QgsActionMenu* menu = new QgsActionMenu( layer, feature, this );
QgsActionMenu* menu = new QgsActionMenu( layer, &mAttributeForm->feature(), this );
mMenuBar->addMenu( menu );
layout()->setMenuBar( mMenuBar );

@@ -136,7 +136,6 @@ class GUI_EXPORT QgsAttributeDialog : public QDialog
QString mReturnvarname;
QgsAttributeForm* mAttributeForm;
QMenuBar* mMenuBar;
QgsFeature *mOwnedFeature;

// true if this dialog is editable
bool mEditable;

0 comments on commit cc5d3bc

Please sign in to comment.
You can’t perform that action at this time.