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

[Oliver Kellogg]

SVN commit 456387 by okellogg:

slotattributeRemoved(): The signature of UMLClassifier::attributeRemoved()
 was changed in commit 449247.


 M  +7 -4      associationwidget.cpp  
 M  +2 -1      associationwidget.h  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/associationwidget.cpp #456386:456387
@@ -3051,13 +3051,16 @@
     WidgetBase::setUMLObject(obj);
     if (obj && obj->getBaseType() == Uml::ot_Attribute) {
         UMLClassifier *klass = static_cast<UMLClassifier*>(obj->parent());
-        connect(klass, SIGNAL(attributeRemoved(UMLObject*)),
-                this, SLOT(slotAttributeRemoved(UMLObject*)));
+        connect(klass, SIGNAL(attributeRemoved(UMLClassifierListItem*)),
+                this, SLOT(slotAttributeRemoved(UMLClassifierListItem*)));
     }
 }
 
-void AssociationWidget::slotAttributeRemoved(UMLObject* obj) {
-    kdDebug() << "AssociationWidget::slotAttributeRemoved(" << obj->getName() << ")" << endl;
+void AssociationWidget::slotAttributeRemoved(UMLClassifierListItem* obj) {
+    if (obj != m_pObject)
+        kdDebug() << "AssociationWidget::slotAttributeRemoved:(obj=" << obj
+                  << "): m_pObject=" << m_pObject << endl;
+    m_pObject = NULL;
     m_pView->removeAssoc(this);
 }
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/associationwidget.h #456386:456387
@@ -32,6 +32,7 @@
 class UMLDoc;
 class UMLView;
 class UMLAssociation;
+class UMLClassifierListItem;
 class UMLAttribute;
 class UMLOperation;
 
@@ -943,7 +944,7 @@
      *
      * @param obj		The UMLAttribute removed.
      */
-    void slotAttributeRemoved(UMLObject* obj);
+    void slotAttributeRemoved(UMLClassifierListItem* obj);
 
     /**
      * Synchronize this widget from the UMLAssociation.