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

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

parent 9b76c1a9

src/classdef.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -3930,6 +3930,10 @@ void ClassDef::sortMemberLists() 
  {

  {

    if (ml->needsSorting()) { ml->sort(); ml->setNeedsSorting(FALSE); }

    if (ml->needsSorting()) { ml->sort(); ml->setNeedsSorting(FALSE); }

  }

  }

  if (m_impl->innerClasses)

  {

    m_impl->innerClasses->sort();

  }

}

}





int ClassDef::countMemberDeclarations(MemberListType lt,ClassDef *inheritedFrom,

int ClassDef::countMemberDeclarations(MemberListType lt,ClassDef *inheritedFrom,

src/classlist.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ ClassList::~ClassList() 
static int compItems(const ClassDef *c1,const ClassDef *c2)

static int compItems(const ClassDef *c1,const ClassDef *c2)

{

{

  static bool b = Config_getBool("SORT_BY_SCOPE_NAME");

  static bool b = Config_getBool("SORT_BY_SCOPE_NAME");

  //printf("compItems: %d %s<->%s\n",b,c1->name().data(),c2->name().data());

  if (b)

  if (b)

  {

  {

     return qstricmp(c1->name(), c2->name());

     return qstricmp(c1->name(), c2->name());

src/index.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -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); 

          ftv->addContentsItem(hasChildren,nd->localName(),ref,file,0,FALSE,TRUE,nd);

src/namespacedef.cpp

+8 −0
Original line number Original line Diff line number Diff line
@@ -998,6 +998,14 @@ void NamespaceDef::sortMemberLists() 
  {

  {

    if (ml->needsSorting()) { ml->sort(); ml->setNeedsSorting(FALSE); }

    if (ml->needsSorting()) { ml->sort(); ml->setNeedsSorting(FALSE); }

  }

  }

  if (classSDict)

  {

    classSDict->sort();

  }

  if (namespaceSDict)

  {

    namespaceSDict->sort();

  }

}

}