fixed newly introduced segfault on removing layers from legend (#2073)

wonder · wonder · commit a7e5b9206778 · 2009-11-09T16:20:02.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12059 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -583,15 +583,15 @@ void QgsLegend::legendGroupRemove()
     while ( child )
     {
       setCurrentItem( child );
-      legendLayerRemove();
+      removeCurrentLayer();
       child = lg->child( 0 );
     }
     delete lg;
     adjustIconSize();
   }
 }
 
-void QgsLegend::legendLayerRemove()
+void QgsLegend::removeCurrentLayer()
 {
   if ( !mMapCanvas || mMapCanvas->isDrawing() )
   {
@@ -605,12 +605,7 @@ void QgsLegend::legendLayerRemove()
 
   removeLayer( ll->layer(), true );
 
-  mStateOfCheckBoxes.erase( ll );
-  removeItem( ll );
-  delete ll;
-
   adjustIconSize();
-
 }
 
 bool QgsLegend::removeLayer( QgsMapLayer* ml, bool askCancelOnEditable )
diff --git a/src/app/legend/qgslegend.h b/src/app/legend/qgslegend.h
@@ -210,7 +210,7 @@ class QgsLegend : public QTreeWidget
     void writeProject( QDomDocument & );
 
     /**Removes the current LegendLayer*/
-    void legendLayerRemove();
+    void removeCurrentLayer();
 
     /**Removes a layer. If the layer is editable, a dialog is shown where user can select 'save', 'discard' and optionally 'cancel'. Cancel
       is useful if a single layer is removed whereas on closing of the whole project or application, the cancel option may not be possible
diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
@@ -376,7 +376,7 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu, QAction* toggleEditingActio
 
   // remove from canvas
   theMenu.addAction( QgisApp::getThemeIcon( "/mActionRemove.png" ),
-                     tr( "&Remove" ), legend(), SLOT( legendLayerRemove() ) );
+                     tr( "&Remove" ), legend(), SLOT( removeCurrentLayer() ) );
 
   theMenu.addSeparator();
 
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4769,7 +4769,7 @@ void QgisApp::isInOverview()
 
 void QgisApp::removeLayer()
 {
-  mMapLegend->legendLayerRemove();
+  mMapLegend->removeCurrentLayer();
   // notify the project we've made a change
   QgsProject::instance()->dirty( true );
 }

Original file line number	Diff line number	Diff line change
`@@ -583,15 +583,15 @@ void QgsLegend::legendGroupRemove()`
`583`	`583`	`while ( child )`
`584`	`584`	`{`
`585`	`585`	`setCurrentItem( child );`
`586`		`- legendLayerRemove();`
	`586`	`+ removeCurrentLayer();`
`587`	`587`	`child = lg->child( 0 );`
`588`	`588`	`}`
`589`	`589`	`delete lg;`
`590`	`590`	`adjustIconSize();`
`591`	`591`	`}`
`592`	`592`	`}`
`593`	`593`
`594`		`-void QgsLegend::legendLayerRemove()`
	`594`	`+void QgsLegend::removeCurrentLayer()`
`595`	`595`	`{`
`596`	`596`	`if ( !mMapCanvas \|\| mMapCanvas->isDrawing() )`
`597`	`597`	`{`
`@@ -605,12 +605,7 @@ void QgsLegend::legendLayerRemove()`
`605`	`605`
`606`	`606`	`removeLayer( ll->layer(), true );`
`607`	`607`
`608`		`- mStateOfCheckBoxes.erase( ll );`
`609`		`- removeItem( ll );`
`610`		`- delete ll;`
`611`		`-`
`612`	`608`	`adjustIconSize();`
`613`		`-`
`614`	`609`	`}`
`615`	`610`
`616`	`611`	`bool QgsLegend::removeLayer( QgsMapLayer* ml, bool askCancelOnEditable )`
Original file line number	Diff line number	Diff line change
`@@ -4769,7 +4769,7 @@ void QgisApp::isInOverview()`
`4769`	`4769`
`4770`	`4770`	`void QgisApp::removeLayer()`
`4771`	`4771`	`{`
`4772`		`- mMapLegend->legendLayerRemove();`
	`4772`	`+ mMapLegend->removeCurrentLayer();`
`4773`	`4773`	`// notify the project we've made a change`
`4774`	`4774`	`QgsProject::instance()->dirty( true );`
`4775`	`4775`	`}`