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

[Oliver Kellogg]

CVS commit by okellogg: 

qualifiedName(): Superfluous, use UMLObject::getFullyQualifiedName instead.


  M +3 -16     idlwriter.cpp   1.37
  M +0 -2      idlwriter.h   1.13


--- kdesdk/umbrello/umbrello/codegenerators/idlwriter.cpp  #1.36:1.37
@@ -58,17 +58,4 @@ bool IDLWriter::assocTypeIsMappableToAtt
 }
 
-QString IDLWriter::qualifiedName(UMLClassifier *c) {
-        UMLPackage *umlPkg = c->getUMLPackage();
-        QString className = cleanName(c->getName());
-        QString retval;
-
-        if (umlPkg) {
-                retval = umlPkg->getFullyQualifiedName();
-                retval.append("::");
-        }
-        retval.append(className);
-        return retval;
-}
-
 /**
  * returns "IDL"
@@ -310,5 +297,5 @@ void IDLWriter::writeClass(UMLClassifier
                 int n_parents = superclasses.count();
                 while (n_parents--) {
-                        idl << qualifiedName(parent);
+                        idl << parent->getFullyQualifiedName("::");
                         if (n_parents)
                                 idl << ", ";
@@ -335,6 +322,6 @@ void IDLWriter::writeClass(UMLClassifier
                 UMLClassifier* other = (UMLClassifier*)m_doc->findObjectById(a->getRoleId(Uml::A));
                 QString bareName = cleanName(other->getName());
-                idl << getIndent() << "typedef sequence<" << qualifiedName(other) << "> "
-                    << bareName << "Vector;" << m_endl << m_endl;
+                idl << getIndent() << "typedef sequence<" << other->getFullyQualifiedName("::")
+                    << "> " << bareName << "Vector;" << m_endl << m_endl;
         }
 

--- kdesdk/umbrello/umbrello/codegenerators/idlwriter.h  #1.12:1.13
@@ -78,6 +78,4 @@ private:
         static bool assocTypeIsMappableToAttribute(Uml::Association_Type at);
 
-        QString qualifiedName(UMLClassifier* c);
-
 };