[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

1. slotMenuSelection(): Call UMLView::removeAssocInViewAndDoc()
   in the Delete operations.
2. loadFromXMI(): There's nothing mysterious about the "delete ft" crash -
   the ft is already deleted by the m_pView->removeWidget().


  M +1 -9      associationwidget.cpp   1.54


--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.53:1.54
@@ -2511,5 +2511,5 @@ void AssociationWidget::slotMenuSelectio
         case ListPopupMenu::mt_Delete_Association:
         case ListPopupMenu::mt_Delete_Message:
-                m_pView->removeAssoc(this);
+                m_pView->removeAssocInViewAndDoc(this);
                 done = true;
                 break;
@@ -3469,8 +3469,4 @@ bool AssociationWidget::loadFromXMI( QDo
                                                         m_pView->removeWidget(m_pRoleA);
                                                         m_pRoleA = 0; 
-                                                        /* delete ft;
-                                                           Strangely, we get a crash here.
-                                                           To be investigated further.
-                                                          */
                                                 }
                                         break;
@@ -3483,8 +3479,4 @@ bool AssociationWidget::loadFromXMI( QDo
                                                         m_pView->removeWidget(m_pRoleB);
                                                         m_pRoleB = 0; 
-                                                        /* delete ft;
-                                                           Strangely, we get a crash here.
-                                                           To be investigated further.
-                                                          */
                                                 }
                                         break;