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

[Oliver Kellogg]

CVS commit by okellogg: 

constructWidget: Simplify, improve robustness.


  M +4 -10     assocrolepage.cpp   1.12


--- kdesdk/umbrello/umbrello/dialogs/assocrolepage.cpp  #1.11:1.12
@@ -15,6 +15,4 @@
 
 #include "assocrolepage.h"
-#include "../association.h"
-#include "../umlrole.h"
 
 AssocRolePage::AssocRolePage (UMLDoc *d, QWidget *parent, AssociationWidget *assoc)
@@ -40,10 +38,6 @@ void AssocRolePage::constructWidget() {
 
         // underlying roles and objects
-        UMLRole * roleA = m_pAssociationWidget->getAssociation()->getUMLRoleA();
-        UMLRole * roleB = m_pAssociationWidget->getAssociation()->getUMLRoleB();
-        UMLObject * objA = roleA->getObject();
-        UMLObject * objB = roleB->getObject();
-        QString nameA = objA->getName();
-        QString nameB = objB->getName();
+        QString nameA = m_pAssociationWidget->getRoleNameA();
+        QString nameB = m_pAssociationWidget->getRoleNameB();
         QString titleA = i18n("Role A Properties");
         QString titleB = i18n("Role B Properties"); 
@@ -96,5 +90,5 @@ void AssocRolePage::constructWidget() {
         m_pRoleALE = new QLineEdit(propsAGB);
         propsALayout -> addWidget(m_pRoleALE, 0, 1);
-        m_pRoleALE -> setText(m_pAssociationWidget->getRoleNameA());
+        m_pRoleALE -> setText(nameA);
 
         // Multi A
@@ -150,5 +144,5 @@ void AssocRolePage::constructWidget() {
         m_pRoleBLE = new QLineEdit(propsBGB);
         propsBLayout -> addWidget(m_pRoleBLE, 0, 1);
-        m_pRoleBLE -> setText( m_pAssociationWidget->getRoleNameB() );
+        m_pRoleBLE -> setText(nameB);
 
         // Multi B