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

[Oliver Kellogg]

CVS commit by okellogg: 

qualifiedName(): Use new method UMLObject::getFullyQualifiedName().


  M +7 -3      adawriter.cpp   1.14


--- kdesdk/umbrello/umbrello/codegenerators/adawriter.cpp  #1.13:1.14
@@ -28,4 +28,6 @@
 #include "../umldoc.h"
 #include "../class.h"
+#include "../enum.h"
+#include "../package.h"
 #include "../association.h"
 #include "../attribute.h"
@@ -94,4 +96,6 @@ bool AdaWriter::isOOClass(UMLClassifier 
                 stype == "CORBATypedef")
                 return false;
+        if (dynamic_cast<UMLEnum*>(c))
+                return false;
         if (! dynamic_cast<UMLClass*>(c))
                 return true;
@@ -106,14 +110,14 @@ bool AdaWriter::isOOClass(UMLClassifier 
 
 QString AdaWriter::qualifiedName(UMLClassifier *c, bool withType, bool byValue) {
-        QString umlPkg = c->getPackage();
+        UMLPackage *umlPkg = c->getUMLPackage();
         QString className = cleanName(c->getName());
         QString retval;
 
-        if (umlPkg.isEmpty()) {
+        if (umlPkg == NULL) {
                 retval = className;
                 if (! isOOClass(c))
                         retval.append(defaultPackageSuffix);
         } else {
-                retval = umlPkg;
+                retval = umlPkg->getFullyQualifiedName(".");
                 if (isOOClass(c)) {
                         retval.append(".");