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

[Ralf Habacker]

SVN commit 1288033 by habacker:

Reduced differences to soc-umbrello branch.

 M  +14 -8     umlscene.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1288032:1288033
@@ -1176,13 +1176,16 @@
                 testType != Uml::AssociationType::UniAssociation &&
                 testType != Uml::AssociationType::Composition &&
                 testType != Uml::AssociationType::Aggregation &&
-                testType != Uml::AssociationType::Relationship)
+                testType != Uml::AssociationType::Relationship) {
             continue;
-        if (pWidgetA->id() == assoc->widgetIDForRole(A) &&
-                pWidgetB->id() == assoc->widgetIDForRole(B) &&
-                assoc->roleName(Uml::B) == roleNameB)
+        }
+
+        if (pWidgetA->id() == assoc->widgetIDForRole(Uml::A) &&
+                pWidgetB->id() == assoc->widgetIDForRole(Uml::B) &&
+                assoc->roleName(Uml::B) == roleNameB) {
             return assoc;
     }
+    }
     return 0;
 }
 
@@ -1200,12 +1203,15 @@
 {
     foreach(AssociationWidget* assoc, m_AssociationList) {
         Uml::AssociationType testType = assoc->associationType();
-        if (testType != at)
+        if (testType != at) {
             continue;
-        if (pWidgetA->id() == assoc->widgetIDForRole(A) &&
-                pWidgetB->id() == assoc->widgetIDForRole(B))
+        }
+
+        if (pWidgetA->id() == assoc->widgetIDForRole(Uml::A) &&
+                pWidgetB->id() == assoc->widgetIDForRole(Uml::B)) {
             return assoc;
     }
+    }
     return 0;
 }
 
@@ -1240,7 +1246,7 @@
     } else
         m_WidgetList.removeAll(o);
     o->deleteLater();
-    m_doc->setModified();
+    m_doc->setModified(true);
 }
 
 /**