Fix one memory leak + add note to show() calls as they will delete the dialog

wonder-sk · wonder-sk · commit aa46df2fadfb · 2014-10-21T18:11:51.000+07:00
diff --git a/src/app/qgsfeatureaction.cpp b/src/app/qgsfeatureaction.cpp
@@ -97,7 +97,7 @@ bool QgsFeatureAction::viewFeatureForm( QgsHighlight *h )
 
   QgsAttributeDialog *dialog = newDialog( true );
   dialog->setHighlight( h );
-  dialog->show();
+  dialog->show(); // will also delete the dialog on close (show() is overridden)
 
   return true;
 }
@@ -122,7 +122,7 @@ bool QgsFeatureAction::editFeature( bool showModal )
   }
   else
   {
-    dialog->show();
+    dialog->show(); // will also delete the dialog on close (show() is overridden)
   }
 
   return true;
@@ -196,11 +196,12 @@ bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes, boo
 
     if ( showModal )
     {
+      dialog->setAttribute( Qt::WA_DeleteOnClose );
       dialog->exec();
     }
     else
     {
-      dialog->show();
+      dialog->show(); // will also delete the dialog on close (show() is overridden)
       return true;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ bool QgsFeatureAction::viewFeatureForm( QgsHighlight *h )`
`97`	`97`
`98`	`98`	`QgsAttributeDialog *dialog = newDialog( true );`
`99`	`99`	`dialog->setHighlight( h );`
`100`		`- dialog->show();`
	`100`	`+ dialog->show(); // will also delete the dialog on close (show() is overridden)`
`101`	`101`
`102`	`102`	`return true;`
`103`	`103`	`}`
`@@ -122,7 +122,7 @@ bool QgsFeatureAction::editFeature( bool showModal )`
`122`	`122`	`}`
`123`	`123`	`else`
`124`	`124`	`{`
`125`		`- dialog->show();`
	`125`	`+ dialog->show(); // will also delete the dialog on close (show() is overridden)`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`return true;`
`@@ -196,11 +196,12 @@ bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes, boo`
`196`	`196`
`197`	`197`	`if ( showModal )`
`198`	`198`	`{`
	`199`	`+ dialog->setAttribute( Qt::WA_DeleteOnClose );`
`199`	`200`	`dialog->exec();`
`200`	`201`	`}`
`201`	`202`	`else`
`202`	`203`	`{`
`203`		`- dialog->show();`
	`204`	`+ dialog->show(); // will also delete the dialog on close (show() is overridden)`
`204`	`205`	`return true;`
`205`	`206`	`}`
`206`	`207`	`}`