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

[Oliver Kellogg]

SVN commit 1280142 by okellogg:

PascalWriter::isOOClass(): Handle ot == UMLObject::ot_Datatype.
PascalWriter::qualifiedName(): Check c for NULL before calling isOOClass(c).


 M  +2 -2      pascalwriter.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/pascal/pascalwriter.cpp #1280141:1280142
@@ -53,7 +53,7 @@
     UMLObject::ObjectType ot = c->baseType();
     if (ot == UMLObject::ot_Interface)
         return true;
-    if (ot == UMLObject::ot_Enum)
+    if (ot == UMLObject::ot_Enum || ot == UMLObject::ot_Datatype)
         return false;
     if (ot != UMLObject::ot_Class) {
         uDebug() << "unknown object type " << UMLObject::toString(ot);
@@ -84,7 +84,7 @@
             retval.append(defaultPackageSuffix);
     } else {
         retval = umlPkg->fullyQualifiedName(".");
-        if (isOOClass(c)) {
+        if (c && isOOClass(c)) {
             retval.append(".");
             retval.append(className);
         }