composer item group: fix destruction

jef-n · jef-n · commit bcd9f0426f31 · 2013-07-20T19:23:35.000+02:00
diff --git a/src/core/composer/qgscomposeritemgroup.cpp b/src/core/composer/qgscomposeritemgroup.cpp
@@ -21,7 +21,8 @@
 #include <QPen>
 #include <QPainter>
 
-QgsComposerItemGroup::QgsComposerItemGroup( QgsComposition* c ): QgsComposerItem( c )
+QgsComposerItemGroup::QgsComposerItemGroup( QgsComposition* c )
+  : QgsComposerItem( c )
 {
   setZValue( 90 );
   show();
@@ -51,6 +52,9 @@ void QgsComposerItemGroup::addItem( QgsComposerItem* item )
   {
     return;
   }
+
+  connect( item, SIGNAL( destroyed() ), this, SLOT( itemDestroyed() ) );
+
   mItems.insert( item );
   item->setSelected( false );
   item->setFlag( QGraphicsItem::ItemIsSelectable, false ); //item in groups cannot be selected
@@ -68,7 +72,6 @@ void QgsComposerItemGroup::addItem( QgsComposerItem* item )
     mSceneBoundingRectangle.setRight( maxXItem );
     mSceneBoundingRectangle.setBottom( maxYItem );
   }
-
   else
   {
     if ( minXItem < mSceneBoundingRectangle.left() )
@@ -103,6 +106,11 @@ void QgsComposerItemGroup::removeItems()
   mItems.clear();
 }
 
+void QgsComposerItemGroup::itemDestroyed()
+{
+  mItems.remove( static_cast<QgsComposerItem*>( sender() ) );
+}
+
 void QgsComposerItemGroup::paint( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget )
 {
   Q_UNUSED( option );
diff --git a/src/core/composer/qgscomposeritemgroup.h b/src/core/composer/qgscomposeritemgroup.h
@@ -59,6 +59,9 @@ class CORE_EXPORT QgsComposerItemGroup: public QgsComposerItem
   signals:
     void childItemDeleted( QgsComposerItem* item );
 
+  public slots:
+    void itemDestroyed();
+
   protected:
     void drawFrame( QPainter* p );
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@`
`21`	`21`	`#include <QPen>`
`22`	`22`	`#include <QPainter>`
`23`	`23`
`24`		`-QgsComposerItemGroup::QgsComposerItemGroup( QgsComposition* c ): QgsComposerItem( c )`
	`24`	`+QgsComposerItemGroup::QgsComposerItemGroup( QgsComposition* c )`
	`25`	`+ : QgsComposerItem( c )`
`25`	`26`	`{`
`26`	`27`	`setZValue( 90 );`
`27`	`28`	`show();`
`@@ -51,6 +52,9 @@ void QgsComposerItemGroup::addItem( QgsComposerItem* item )`
`51`	`52`	`{`
`52`	`53`	`return;`
`53`	`54`	`}`
	`55`	`+`
	`56`	`+ connect( item, SIGNAL( destroyed() ), this, SLOT( itemDestroyed() ) );`
	`57`	`+`
`54`	`58`	`mItems.insert( item );`
`55`	`59`	`item->setSelected( false );`
`56`	`60`	`item->setFlag( QGraphicsItem::ItemIsSelectable, false ); //item in groups cannot be selected`
`@@ -68,7 +72,6 @@ void QgsComposerItemGroup::addItem( QgsComposerItem* item )`
`68`	`72`	`mSceneBoundingRectangle.setRight( maxXItem );`
`69`	`73`	`mSceneBoundingRectangle.setBottom( maxYItem );`
`70`	`74`	`}`
`71`		`-`
`72`	`75`	`else`
`73`	`76`	`{`
`74`	`77`	`if ( minXItem < mSceneBoundingRectangle.left() )`
`@@ -103,6 +106,11 @@ void QgsComposerItemGroup::removeItems()`
`103`	`106`	`mItems.clear();`
`104`	`107`	`}`
`105`	`108`
	`109`	`+void QgsComposerItemGroup::itemDestroyed()`
	`110`	`+{`
	`111`	`+ mItems.remove( static_cast<QgsComposerItem*>( sender() ) );`
	`112`	`+}`
	`113`	`+`
`106`	`114`	`void QgsComposerItemGroup::paint( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget )`
`107`	`115`	`{`
`108`	`116`	`Q_UNUSED( option );`