diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2013-07-29 20:10:05 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-08-01 19:25:14 (GMT) |
commit | 1f22d19e7953fb9cdf0b6289a461d7d8f320e917 (patch) | |
tree | 39b389e94c68797a29fb51d79f2d77ccfac738e7 /src/memberlist.cpp | |
parent | 1f5147ee4343415bcda7ba9995d78f5923e49313 (diff) | |
download | Doxygen-1f22d19e7953fb9cdf0b6289a461d7d8f320e917.zip Doxygen-1f22d19e7953fb9cdf0b6289a461d7d8f320e917.tar.gz Doxygen-1f22d19e7953fb9cdf0b6289a461d7d8f320e917.tar.bz2 |
Bug 704412 - doxygen don't hide private Inherited Members
Diffstat (limited to 'src/memberlist.cpp')
-rw-r--r-- | src/memberlist.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/memberlist.cpp b/src/memberlist.cpp index 76ffff1..68edabc 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -315,7 +315,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, return; // no members in this list } //printf(" --> writePlainDeclaration() numDecMembers()=%d\n", - // numDecMembers()); + // numDecMembers()); ol.pushGeneratorState(); @@ -329,6 +329,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, if ((inheritedFrom==0 || !md->isReimplementedBy(inheritedFrom)) && md->isBriefSectionVisible()) { + //printf(">>> rendering\n"); switch(md->memberType()) { case MemberType_Define: // fall through @@ -493,7 +494,7 @@ void MemberList::writeDeclarations(OutputList &ol, ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd, const char *title,const char *subtitle, const DefinitionIntf::DefType compoundType,bool showEnumValues, - bool showInline,ClassDef *inheritedFrom) + bool showInline,ClassDef *inheritedFrom,MemberListType lt) { (void)showEnumValues; // unused @@ -507,8 +508,8 @@ void MemberList::writeDeclarations(OutputList &ol, if (ctx==0 && gd) ctx = gd; if (ctx==0 && fd) ctx = fd; - //printf("%p: MemberList::writeDeclaration(title=`%s',subtitle=`%s')=%d\n", - // this,title,subtitle,numDecMembers()); + //printf("%p: MemberList::writeDeclaration(title=`%s',subtitle=`%s')=%d inheritedFrom=%p\n", + // this,title,subtitle,numDecMembers(),inheritedFrom); int num = numDecMembers(); if (inheritedFrom) @@ -519,7 +520,7 @@ void MemberList::writeDeclarations(OutputList &ol, { ol.pushGeneratorState(); ol.disableAllBut(OutputGenerator::Html); - inheritId = substitute(listTypeAsString(),"-","_")+"_"+ + inheritId = substitute(listTypeAsString(lt),"-","_")+"_"+ stripPath(cd->getOutputFileBase()); if (title) { @@ -540,7 +541,7 @@ void MemberList::writeDeclarations(OutputList &ol, } else { - ol.startMemberHeader(listTypeAsString()); + ol.startMemberHeader(listTypeAsString(m_listType)); } ol.parseText(title); if (showInline) @@ -872,9 +873,14 @@ void MemberList::unmarshal(StorageIntf *s) } } -QCString MemberList::listTypeAsString() const +void MemberList::setNeedsSorting(bool b) +{ + m_needsSorting = b; +} + +QCString MemberList::listTypeAsString(MemberListType type) const { - switch(m_listType) + switch(type) { case MemberListType_pubMethods: return "pub-methods"; case MemberListType_proMethods: return "pro-methods"; @@ -928,10 +934,6 @@ QCString MemberList::listTypeAsString() const return ""; } -void MemberList::setNeedsSorting(bool b) -{ - m_needsSorting = b; -} //-------------------------------------------------------------------------- |