[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

getTypeName(): Fully qualify name except for cases of obvious visibility.


  M +6 -3      classifierlistitem.cpp   1.19


--- kdesdk/umbrello/umbrello/classifierlistitem.cpp  #1.18:1.19
@@ -55,7 +55,10 @@ UMLClassifier * UMLClassifierListItem::g
 
 QString UMLClassifierListItem::getTypeName() {
-        if (m_pSecondary != NULL)
-                return m_pSecondary->getName();
+        if (m_pSecondary == NULL)
         return m_SecondaryId;
+        const UMLPackage *typePkg = m_pSecondary->getUMLPackage();
+        if (typePkg != NULL && typePkg != m_pUMLPackage)
+                return m_pSecondary->getFullyQualifiedName(".");
+        return m_pSecondary->getName();
 }