Commit 0160b7d8 authored by Oliver Kellogg's avatar Oliver Kellogg
Browse files

umbrello/codeimport/kdevcppparser/cpptree2uml.cpp

- In function parseBaseClause() first call Import_Utils::createUMLObject()
  for creating the parent object coresponding to baseName, and then call
    Import_Utils::createGeneralization(UMLClassifier*, UMLClassifier*)
  with the parent object obtained.

umbrello/codeimport/import_utils.cpp
- At function
    createGeneralization(UMLClassifier *child, const QString &parentName)
  mention its shortcoming and mention the preferred solution as applied
  above.

BUG:336810
parent 97b727cb
......@@ -563,6 +563,10 @@ void createGeneralization(UMLClassifier *child, UMLClassifier *parent)
/**
* Create a generalization from the existing child UMLObject to the given
* parent class name.
* This method does not handle scopes well and is only a last resort.
* The method
* createGeneralization(UMLClassifier *child, UMLClassifier *parent)
* should be used instead.
*/
void createGeneralization(UMLClassifier *child, const QString &parentName)
{
......
......@@ -579,7 +579,11 @@ void CppTree2Uml::parseBaseClause(BaseClauseAST * baseClause, UMLClassifier* kla
}
QString baseName = baseSpecifier->name()->text();
Import_Utils::createGeneralization(klass, baseName);
// uDebug() << "CppTree2Uml::parseBaseClause : baseSpecifier is " << baseName;
UMLObject *c = Import_Utils::createUMLObject(UMLObject::ot_Class, baseName,
m_currentNamespace[m_nsCnt],
baseSpecifier->comment());
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