Fix an Q_ASSERT failure in the Print Composer when "Adding new vect l…

…egend" and then clicking it into place on the composer canvas. This appears to be because of the use of QWidget::removeChild in QgsComposer::removeWidgetChildren, which is a Qt3 idiom (it doesn't appear in the Qt4.1 API). A QWidget::setParent(0) idiom is now used instead. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5611 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 19, 2006 · ce15e7e · ce15e7e
1 parent 8fd8143
commit ce15e7e
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/composer/qgscomposer.cpp b/src/composer/qgscomposer.cpp
@@ -140,8 +140,17 @@ void QgsComposer::removeWidgetChildren ( QWidget *w )
       if( ob->isWidgetType() ) 
       {
         QWidget *ow = (QWidget *) ob;
-        w->removeChild ( ob );
-        ow->hide ();
+
+        // The following line is legacy Qt3, is not supported in Qt4
+        // and can cause a SIGABRT
+        //w->removeChild ( ob );
+        // instead:
+        ow->setParent(0);
+        // TODO: Eventually mItemOptionsFrame should be made
+        // a Qt4 QStackedWidget and all this removeWidgetChildren
+        // shenanigans can alledgedly go away
+
+        ow->hide();
       }
     }
   }