Skip to content

Commit

Permalink
Merge pull request #261 from lhelsloot/feature/bug_722940
Browse files Browse the repository at this point in the history
Bug 722940 - classes with same name in different namespace adding to same group
  • Loading branch information
Dimitri van Heesch committed Dec 14, 2014
2 parents 02265be + 73a5a4c commit 2716fc4
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/groupdef.cpp
Expand Up @@ -151,13 +151,13 @@ bool GroupDef::addClass(const ClassDef *cd)
static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS");
if (cd->isHidden()) return FALSE;
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);
if (sortBriefDocs)
{
classSDict->inSort(cd->qualifiedName(),cd);
classSDict->inSort(qn,cd);
}
else
{
Expand All @@ -180,13 +180,13 @@ bool GroupDef::addClass(const ClassDef *cd)
j++;
}
//printf("Found scope at index %d\n",j);
classSDict->insertAt(j,cd->qualifiedName(),cd);
classSDict->insertAt(j,qn,cd);
found=TRUE;
}
}
if (!found) // no insertion point found -> just append
{
classSDict->append(cd->qualifiedName(),cd);
classSDict->append(qn,cd);
}
}
return TRUE;
Expand Down

0 comments on commit 2716fc4

Please sign in to comment.