[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

resolveRef(): Avoid futile call to UMLDoc::findUMLObject().


  M +12 -6     umlobject.cpp   1.69


--- kdesdk/umbrello/umbrello/umlobject.cpp  #1.68:1.69
@@ -341,4 +341,8 @@ bool UMLObject::resolveRef() {
                 return true;
         }
+#ifdef VERBOSE_DEBUGGING
+        kdDebug() << "UMLObject::resolveRef(" << m_Name << "): m_SecondaryId is "
+                  << m_SecondaryId << endl;
+#endif
         UMLDoc *pDoc = UMLApp::app()->getDocument();
         // In the new, XMI standard compliant save format,
@@ -368,4 +372,5 @@ bool UMLObject::resolveRef() {
         // Work around UMLDoc::createUMLObject()'s incapability
         // of on-the-fly scope creation:
+        if (m_SecondaryId.contains("::")) {
         m_SecondaryId.replace("::", ".");
         m_pSecondary = pDoc->findUMLObject( m_SecondaryId, Uml::ot_UMLObject, this );
@@ -375,4 +380,5 @@ bool UMLObject::resolveRef() {
                 return true;
         }
+        }
         kdDebug() << "UMLObject::resolveRef: Creating new type for "
                   << m_SecondaryId << endl;