Commit 90512d08 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Fixed regression that could cause double nested classes

parent 63dedfa8
...@@ -1295,21 +1295,15 @@ static void addClassToContext(EntryNav *rootNav) ...@@ -1295,21 +1295,15 @@ static void addClassToContext(EntryNav *rootNav)
tagName = rootNav->tagInfo()->tagName; tagName = rootNav->tagInfo()->tagName;
refFileName = rootNav->tagInfo()->fileName; refFileName = rootNav->tagInfo()->fileName;
} }
Definition *d = 0;
int i; int i;
if ((i=fullName.find("::"))!=-1) if ((i=fullName.find("::"))!=-1)
{ {
d = buildScopeFromQualifiedName(fullName,fullName.contains("::"),root->lang); buildScopeFromQualifiedName(fullName,fullName.contains("::"),root->lang);
} }
cd=new ClassDef(root->fileName,root->startLine,root->startColumn, cd=new ClassDef(root->fileName,root->startLine,root->startColumn,
fullName,sec,tagName,refFileName,TRUE,root->spec&Entry::Enum); fullName,sec,tagName,refFileName,TRUE,root->spec&Entry::Enum);
Debug::print(Debug::Classes,0," New class `%s' (sec=0x%08x)! #tArgLists=%d\n", Debug::print(Debug::Classes,0," New class `%s' (sec=0x%08x)! #tArgLists=%d\n",
fullName.data(),sec,root->tArgLists ? (int)root->tArgLists->count() : -1); fullName.data(),sec,root->tArgLists ? (int)root->tArgLists->count() : -1);
if (d)
{
cd->setOuterScope(d);
d->addInnerCompound(cd);
}
cd->setDocumentation(root->doc,root->docFile,root->docLine); // copy docs to definition cd->setDocumentation(root->doc,root->docFile,root->docLine); // copy docs to definition
cd->setBriefDescription(root->brief,root->briefFile,root->briefLine); cd->setBriefDescription(root->brief,root->briefFile,root->briefLine);
cd->setLanguage(root->lang); cd->setLanguage(root->lang);
......
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