Commit f90f771b authored by Oliver Kellogg's avatar Oliver Kellogg
Browse files

(In reply to comment #4)

> [...] Unfortunately the fix seems not to be complete because with
> the following testcase class GlobalA is shown in Logical View but
> assigned to namespace NameSpace which is wrong.

Here is the fix for this case.
The fixing of your other test cases is still wide open, help appreciated.

umbrello/codeimport/kdevcppparser/cpptree2uml.cpp
- In function parseBaseClause(), before calling
  Import_Utils::createUMLObject() for creating the parent object, call
  Import_Utils::putAtGlobalScope(true). After creation of parent object,
  call Import_Utils::putAtGlobalScope(false).

CCBUG:336810
parent 0160b7d8
......@@ -580,9 +580,11 @@ void CppTree2Uml::parseBaseClause(BaseClauseAST * baseClause, UMLClassifier* kla
QString baseName = baseSpecifier->name()->text();
// uDebug() << "CppTree2Uml::parseBaseClause : baseSpecifier is " << baseName;
Import_Utils::putAtGlobalScope(true);
UMLObject *c = Import_Utils::createUMLObject(UMLObject::ot_Class, baseName,
m_currentNamespace[m_nsCnt],
baseSpecifier->comment());
Import_Utils::putAtGlobalScope(false);
Import_Utils::createGeneralization(klass, static_cast<UMLClassifier*>(c));
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment