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

[Oliver Kellogg]

SVN commit 581960 by okellogg:

findUMLObject(): Remove ancient special processing for data types.
BUG:133597


 M  +4 -20     model_utils.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/model_utils.cpp #581959:581960
@@ -115,28 +115,12 @@
             name.remove("&");
     }
 #endif
-    if (type != Uml::ot_Datatype) {
-        if (name.contains("::"))
-            components = QStringList::split("::", name);
-        else if (name.contains("."))
-            components = QStringList::split(".", name);
-    }
     QString nameWithoutFirstPrefix;
+    if (name.contains("::"))
+        components = QStringList::split("::", name);
+    else if (name.contains("."))
+        components = QStringList::split(".", name);
     if (components.size() > 1) {
-        if (name.contains(QRegExp("[^\\w:\\.]"))) {
-            // It's obviously a datatype.
-            // Scope qualified datatypes live in the global scope.
-            for (UMLObjectListIt oit(inList); oit.current(); ++oit) {
-                UMLObject *obj = oit.current();
-                if (caseSensitive) {
-                    if (obj->getName() == name)
-                        return obj;
-                } else if (obj->getName().lower() == name.lower()) {
-                    return obj;
-                }
-            }
-            return NULL;
-        }
         name = components.front();
         components.pop_front();
         nameWithoutFirstPrefix = components.join("::");