[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

parseOperation(): Allow spaces and path in return type.


  M +2 -9      model_utils.cpp   1.21


--- kdesdk/umbrello/umbrello/model_utils.cpp  #1.20:1.21
@@ -122,13 +122,6 @@ UMLObject* findUMLObject(UMLObjectList i
                 UMLPackage *pkg = NULL;
                 if (dynamic_cast<UMLClassifierListItem*>(currentObj)) {
-                        // FIXME: This is ugly. It is non-obvious what the
-                        // currentObj->parent() is. In particular, UMLObject
-                        // has a constructor that makes UMLDoc the parent()
-                        // - pray we're not dealing with an object that was
-                        // constructed like that :(
                         pkg = dynamic_cast<UMLPackage*>(currentObj->parent());
                 } else {
-                        //pkg = dynamic_cast<UMLPackage*>(currentObj);
-                        //if (pkg == NULL)
                                 pkg = currentObj->getUMLPackage();
                 }
@@ -309,5 +302,5 @@ Parse_Status parseOperation(QString m, O
         desc.m_name = pat.cap(1);
         desc.m_pReturnType = NULL;
-        pat = QRegExp( ":\\s*(\\w+)$" );
+        pat = QRegExp( ":\\s*(\\w[\\w\\. ]*)$" );
         pos = pat.search(m);
         if (pos != -1) {  // return type is optional