Permalink
Browse files

Bug 722619 - doxygen 1.8.6 sorts the contents of a namespace by group…

… within the Class List
  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Feb 22, 2014
1 parent 9b76c1a commit f9b80aff6d20524dd0838aff12033fe3df66ba98
Showing with 13 additions and 2 deletions.
  1. +4 −0 src/classdef.cpp
  2. +0 −1 src/classlist.cpp
  3. +1 −1 src/index.cpp
  4. +8 −0 src/namespacedef.cpp
@@ -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();
}
}

0 comments on commit f9b80af

Please sign in to comment.