Commit 2716fc48 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Merge pull request #261 from lhelsloot/feature/bug_722940

Bug 722940 - classes with same name in different namespace adding to same group
parents 02265be7 73a5a4c4
...@@ -151,13 +151,13 @@ bool GroupDef::addClass(const ClassDef *cd) ...@@ -151,13 +151,13 @@ bool GroupDef::addClass(const ClassDef *cd)
static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS"); static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS");
if (cd->isHidden()) return FALSE; if (cd->isHidden()) return FALSE;
updateLanguage(cd); updateLanguage(cd);
if (classSDict->find(cd->qualifiedName())==0) QCString qn = cd->name();
if (classSDict->find(qn)==0)
{ {
QCString qn = cd->qualifiedName();
//printf("--- addClass %s sort=%d\n",qn.data(),sortBriefDocs); //printf("--- addClass %s sort=%d\n",qn.data(),sortBriefDocs);
if (sortBriefDocs) if (sortBriefDocs)
{ {
classSDict->inSort(cd->qualifiedName(),cd); classSDict->inSort(qn,cd);
} }
else else
{ {
...@@ -180,13 +180,13 @@ bool GroupDef::addClass(const ClassDef *cd) ...@@ -180,13 +180,13 @@ bool GroupDef::addClass(const ClassDef *cd)
j++; j++;
} }
//printf("Found scope at index %d\n",j); //printf("Found scope at index %d\n",j);
classSDict->insertAt(j,cd->qualifiedName(),cd); classSDict->insertAt(j,qn,cd);
found=TRUE; found=TRUE;
} }
} }
if (!found) // no insertion point found -> just append if (!found) // no insertion point found -> just append
{ {
classSDict->append(cd->qualifiedName(),cd); classSDict->append(qn,cd);
} }
} }
return TRUE; return TRUE;
......
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