Commit 0e9da9fb authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Bug 722759 - Documentation for derived classes no longer has an "Additional... 

Bug 722759 - Documentation for derived classes no longer has an "Additional Inherited Members" section after upgrading Doxygen from 1.8.3.1 to 1.8.6
parent bc7e6301

src/classdef.cpp

+11 −0
Original line number Diff line number Diff line
@@ -3953,6 +3953,17 @@ int ClassDef::countMemberDeclarations(MemberListType lt,ClassDef *inheritedFrom, 
      count+=ml2->numDecMembers();

      //printf("-> ml2=%d\n",ml2->numDecMembers());

    }

    // also include grouped members that have their own section in the class (see bug 722759)

    if (inheritedFrom && m_impl->memberGroupSDict)

    {

      MemberGroupSDict::Iterator mgli(*m_impl->memberGroupSDict);

      MemberGroup *mg;

      for (;(mg=mgli.current());++mgli)

      {

        count+=mg->countGroupedInheritedMembers(lt);

        if (lt2!=1) count+=mg->countGroupedInheritedMembers((MemberListType)lt2);

      }

    }

    static bool inlineInheritedMembers = Config_getBool("INLINE_INHERITED_MEMB");

    if (!inlineInheritedMembers) // show inherited members as separate lists

    {

src/context.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6168,7 +6168,7 @@ void InheritedMemberInfoListContext::addMemberList( 
    ClassDef *cd,MemberListType lt,const QCString &title,bool additionalList)

{

  QPtrDict<void> visited(17);

  bool memberInSection = cd->countMembersIncludingGrouped(lt,cd,FALSE);

  bool memberInSection = cd->countMembersIncludingGrouped(lt,cd,FALSE)>0;

  bool show = (additionalList && !memberInSection) || // inherited member to show in the additional inherited members list

              (!additionalList && memberInSection);   // inherited member to show in a member list of the class

  //printf("%s:%s show=%d\n",cd->name().data(),MemberList::listTypeAsString(lt).data(),show);