Commit f9b80aff authored by Dimitri van Heesch's avatar Dimitri van Heesch

Bug 722619 - doxygen 1.8.6 sorts the contents of a namespace by group within the Class List

parent 9b76c1a9
......@@ -3930,6 +3930,10 @@ void ClassDef::sortMemberLists()
{
if (ml->needsSorting()) { ml->sort(); ml->setNeedsSorting(FALSE); }
}
if (m_impl->innerClasses)
{
m_impl->innerClasses->sort();
}
}
int ClassDef::countMemberDeclarations(MemberListType lt,ClassDef *inheritedFrom,
......
......@@ -36,7 +36,6 @@ ClassList::~ClassList()
static int compItems(const ClassDef *c1,const ClassDef *c2)
{
static bool b = Config_getBool("SORT_BY_SCOPE_NAME");
//printf("compItems: %d %s<->%s\n",b,c1->name().data(),c2->name().data());
if (b)
{
return qstricmp(c1->name(), c2->name());
......
......@@ -1413,7 +1413,7 @@ static void writeNamespaceTree(NamespaceSDict *nsDict,FTVHelp *ftv,
}
}
if (isLinkable || hasChildren)
if ((isLinkable && !showClasses) || hasChildren)
{
ftv->addContentsItem(hasChildren,nd->localName(),ref,file,0,FALSE,TRUE,nd);
......
......@@ -998,6 +998,14 @@ void NamespaceDef::sortMemberLists()
{
if (ml->needsSorting()) { ml->sort(); ml->setNeedsSorting(FALSE); }
}
if (classSDict)
{
classSDict->sort();
}
if (namespaceSDict)
{
namespaceSDict->sort();
}
}
......
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