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

4 files changed, 13 insertions, 2 deletions

diff --git a/src/classdef.cpp b/src/classdef.cpp
index 2443d42..a5b065f 100644
--- a/src/classdef.cpp
+++ b/src/classdef.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,
diff --git a/src/classlist.cpp b/src/classlist.cpp
index f728530..5751356 100644
--- a/src/classlist.cpp
+++ b/src/classlist.cpp
@@ -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());
diff --git a/src/index.cpp b/src/index.cpp
index a283b0c..a645051 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -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); 
 
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
index 253b712..21f925e 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -998,6 +998,14 @@ void NamespaceDef::sortMemberLists()
   {
     if (ml->needsSorting()) { ml->sort(); ml->setNeedsSorting(FALSE); }
   }
+  if (classSDict)
+  {
+    classSDict->sort();
+  }
+  if (namespaceSDict)
+  {
+    namespaceSDict->sort();
+  }
 }