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

[Oliver Kellogg]

SVN commit 467302 by okellogg:

apply commit 467300 from branches/KDE/3.5

 M  +5 -5      associationwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/associationwidget.cpp #467301:467302
@@ -398,8 +398,8 @@
         m_role[role].m_pRole = new FloatingText(m_pView, tr, strRole);
         m_role[role].m_pRole->setLink(this);
         m_pView->addWidget(m_role[role].m_pRole);
-        Uml::Visibility scope = getVisibility(role);
-        m_role[role].m_pRole->setPreText(scope.toString());
+        Uml::Visibility vis = getVisibility(role);
+        m_role[role].m_pRole->setPreText(vis.toString(true));
     } else {
         if (m_role[role].m_pRole->getText().isEmpty()) {
             newLabel = true;
@@ -462,7 +462,7 @@
     m_role[role].m_Visibility = value;
     // update role pre-text attribute as appropriate
     if (m_role[role].m_pRole) {
-        QString scopeString = value.toString();
+        QString scopeString = value.toString(true);
         m_role[role].m_pRole->setPreText(scopeString);
     }
 }
@@ -584,8 +584,8 @@
             robj.m_pRole->setLink(this);
             Text_Role tr = (r == A ? tr_RoleAName : tr_RoleBName);
             robj.m_pRole->setRole(tr);
-            Uml::Visibility scope = getVisibility((Role_Type)r);
-            robj.m_pRole->setPreText(scope.toString());
+            Uml::Visibility vis = getVisibility((Role_Type)r);
+            robj.m_pRole->setPreText(vis.toString(true));
 
             if (FloatingText::isTextValid(robj.m_pRole->getText()))
                 robj.m_pRole -> show();