[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators

[Oliver Kellogg]

SVN commit 603941 by okellogg:

qualifiedName(): Avoid root folder of Logical View.


 M  +5 -1      adawriter.cpp  
 M  +5 -2      pascalwriter.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/adawriter.cpp #603940:603941
@@ -23,12 +23,13 @@
 #include <qtextstream.h>
 
 #include "../umldoc.h"
+#include "../uml.h"
 #include "../classifier.h"
 #include "../enum.h"
 #include "../classifierlistitem.h"
 #include "../umlclassifierlistitemlist.h"
 #include "../umltemplatelist.h"
-#include "../package.h"
+#include "../folder.h"
 #include "../association.h"
 #include "../attribute.h"
 #include "../operation.h"
@@ -74,6 +75,9 @@
     QString className = cleanName(p->getName());
     QString retval;
 
+    if (umlPkg == UMLApp::app()->getDocument()->getRootFolder(Uml::mt_Logical))
+        umlPkg = NULL;
+
     UMLClassifier *c = dynamic_cast<UMLClassifier*>(p);
     if (umlPkg == NULL) {
         retval = className;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/pascalwriter.cpp #603940:603941
@@ -25,7 +25,7 @@
 #include "../classifierlistitem.h"
 #include "../umlclassifierlistitemlist.h"
 #include "../umltemplatelist.h"
-#include "../package.h"
+#include "../folder.h"
 #include "../association.h"
 #include "../attribute.h"
 #include "../operation.h"
@@ -72,6 +72,9 @@
     QString className = cleanName(p->getName());
     QString retval;
 
+    if (umlPkg == UMLApp::app()->getDocument()->getRootFolder(Uml::mt_Logical))
+        umlPkg = NULL;
+
     UMLClassifier *c = dynamic_cast<UMLClassifier*>(p);
     if (umlPkg == NULL) {
         retval = className;
@@ -354,8 +357,8 @@
                 pas << ";" << m_endl;
         }
         m_indentLevel--;
+        pas << ")";
     }
-    pas << ")";
     if (! use_procedure)
         pas << " : " << rettype;
     pas << "; virtual; abstract;" << m_endl << m_endl;