[Uml-devel] branches/KDE/3.5/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 667075 by okellogg:

Revert the part of r663014 that introduced m_{Widget,Message}List.setAutoDelete(true).
The Undo mechanism cannot deal with it.
BUG:145762


 M  +5 -0      ChangeLog  
 M  +1 -1      VERSION  
 M  +3 -2      umbrello/umlview.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #667074:667075
@@ -1,3 +1,8 @@
+Version 1.5.71
+
+* Bugs/wishes from http://bugs.kde.org:
+* Crash on deleting class in list view (145762)
+
 Version 1.5.7
 
 * Bugs/wishes from http://bugs.kde.org:
--- branches/KDE/3.5/kdesdk/umbrello/VERSION #667074:667075
@@ -1 +1 @@
-1.5.7
+1.5.71
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlview.cpp #667074:667075
@@ -131,8 +131,6 @@
 
     // Initialize other data
     m_AssociationList.setAutoDelete( true );
-    m_WidgetList.setAutoDelete( true );
-    m_MessageList.setAutoDelete( true );
 
     //Setup up booleans
     m_bChildDisplayedDoc = false;
@@ -697,6 +695,7 @@
         //make sure not in selected list
         m_SelectedList.remove(obj);
         m_MessageList.remove(obj);
+        delete obj;
     }
 }
 
@@ -826,6 +825,7 @@
     else
         m_WidgetList.remove(o);
     m_pDoc->setModified();
+    delete o;
 }
 
 bool UMLView::getUseFillColor() const {
@@ -1367,6 +1367,7 @@
             obj->setVisible(true);
         } else {
             m_WidgetList.remove(obj);
+            delete obj;
         }
     }//end while