[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Activate removal of the UMLAssociation from the UMLDoc in AssociationWidget::cleanup() .
Notice that deletion of associations is currently a non-undoable operation.


  M +4 -2      associationwidget.cpp   1.36
  M +1 -1      umldoc.cpp   1.64


--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.35:1.36
@@ -916,7 +916,9 @@ void AssociationWidget::cleanup() {
         }
 
-        // We should to remove the UMLAssociation from the document
+        // For now, we simply remove the UMLAssociation from the document.
+        // (It would be better to decouple the existence of the UMLAssociation
+        // from the existence of the widgets. Someday...)
         if (m_pAssociation) {
-                //m_pView->getDocument()->removeAssociation(m_pAssociation);
+                m_pView->getDocument()->removeAssociation(m_pAssociation);
                 m_pAssociation = 0;
         }

--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.63:1.64
@@ -835,5 +835,5 @@ void UMLDoc::removeAssociation (UMLAssoc
         // emit sigObjectRemoved(object);
 
-        setModified(true);
+        setModified(true, false);
 }