Transfer ownership of widgets to C++ when pushed to the QgsMessageBar

m-kuhn · m-kuhn · commit 2b2da5d7f12d · 2012-12-10T23:24:20.000+01:00
diff --git a/python/gui/qgsmessagebar.sip b/python/gui/qgsmessagebar.sip
@@ -13,7 +13,7 @@ class QgsMessageBar: QFrame
      * @param widget widget to add
      * @param level is 0 for information, 1 for warning, 2 for critical
      */
-    void pushWidget( QWidget *widget, int level = 0 );
+    void pushWidget( QWidget *widget /Transfer/, int level = 0 );
 
     /*! remove the passed widget from the bar (if previously added),
      *  then display the next one in the stack if any or hide the bar
diff --git a/src/gui/qgsmessagebar.cpp b/src/gui/qgsmessagebar.cpp
@@ -90,6 +90,11 @@ void QgsMessageBar::popItem( QgsMessageBarItem *item )
     {
       mLayout->removeWidget( mCurrentItem->widget() );
       mCurrentItem->widget()->hide();
+      if ( mCurrentItem->widget()->parent() == this )
+      {
+        delete mCurrentItem->widget();
+      }
+      delete mCurrentItem;
       mCurrentItem = 0;
     }
 
@@ -126,6 +131,10 @@ bool QgsMessageBar::popWidget( QWidget *widget )
     if ( item->widget() == widget )
     {
       mList.removeOne( item );
+      if ( item->widget()->parent() == this )
+      {
+        delete item->widget();
+      }
       delete item;
       return true;
     }
@@ -141,7 +150,6 @@ bool QgsMessageBar::popWidget()
 
   QgsMessageBarItem *item = mCurrentItem;
   popItem( item );
-  delete item;
 
   return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,11 @@ void QgsMessageBar::popItem( QgsMessageBarItem *item )`
`90`	`90`	`{`
`91`	`91`	`mLayout->removeWidget( mCurrentItem->widget() );`
`92`	`92`	`mCurrentItem->widget()->hide();`
	`93`	`+ if ( mCurrentItem->widget()->parent() == this )`
	`94`	`+ {`
	`95`	`+ delete mCurrentItem->widget();`
	`96`	`+ }`
	`97`	`+ delete mCurrentItem;`
`93`	`98`	`mCurrentItem = 0;`
`94`	`99`	`}`
`95`	`100`
`@@ -126,6 +131,10 @@ bool QgsMessageBar::popWidget( QWidget *widget )`
`126`	`131`	`if ( item->widget() == widget )`
`127`	`132`	`{`
`128`	`133`	`mList.removeOne( item );`
	`134`	`+ if ( item->widget()->parent() == this )`
	`135`	`+ {`
	`136`	`+ delete item->widget();`
	`137`	`+ }`
`129`	`138`	`delete item;`
`130`	`139`	`return true;`
`131`	`140`	`}`
`@@ -141,7 +150,6 @@ bool QgsMessageBar::popWidget()`
`141`	`150`
`142`	`151`	`QgsMessageBarItem *item = mCurrentItem;`
`143`	`152`	`popItem( item );`
`144`		`- delete item;`
`145`	`153`
`146`	`154`	`return true;`
`147`	`155`	`}`