[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Use AssociationWidget::syncToModel().


  M +2 -14     umlview.cpp   1.196


--- kdesdk/umbrello/umbrello/umlview.cpp  #1.195:1.196
@@ -2324,12 +2324,5 @@ void UMLView::createAutoAssociations( UM
                 // assocwidget line positions.
                 assocwidget->calculateEndingPoints();
-                assocwidget->setVisibility(assoc->getVisibility(A), A);
-                assocwidget->setVisibility(assoc->getVisibility(B), B);
-                assocwidget->setChangeability(assoc->getChangeability(A), A);
-                assocwidget->setChangeability(assoc->getChangeability(B), B);
-                assocwidget->setMulti(assoc->getMulti(A), A);
-                assocwidget->setMulti(assoc->getMulti(B), B);
-                assocwidget->setRoleName(assoc->getRoleName(A), A);
-                assocwidget->setRoleName(assoc->getRoleName(B), B);
+                assocwidget->syncToModel();
                 assocwidget->setActivated(true);
                 if (! addAssociation(assocwidget))
@@ -3558,10 +3551,5 @@ bool UMLView::loadUisDiagramPresentation
                                                 AssociationWidget *aw =
                                                     new AssociationWidget(this, wA, at, wB, umla);
-                                                QString multiA = umla->getMulti(Uml::A);
-                                                if (!multiA.isEmpty())
-                                                        aw->setMulti(multiA, Uml::A);
-                                                QString multiB = umla->getMulti(Uml::B);
-                                                if (!multiB.isEmpty())
-                                                        aw->setMulti(multiB, Uml::B);
+                                                aw->syncToModel();
                                                 m_AssociationList.append(aw);
                                         } else {