Commit 1f22d19e authored by Dimitri van Heesch's avatar Dimitri van Heesch

Bug 704412 - doxygen don't hide private Inherited Members

parent 1f5147ee
This diff is collapsed.
...@@ -383,9 +383,9 @@ class ClassDef : public Definition ...@@ -383,9 +383,9 @@ class ClassDef : public Definition
QCString getMemberListFileName() const; QCString getMemberListFileName() const;
void addMemberToList(MemberListType lt,MemberDef *md,bool isBrief); void addMemberToList(MemberListType lt,MemberDef *md,bool isBrief);
MemberList *createMemberList(MemberListType lt); MemberList *createMemberList(MemberListType lt);
void writeInheritedMemberDeclarations(OutputList &ol,MemberListType lt,const QCString &title,ClassDef *inheritedFrom,bool invert,QPtrDict<void> *visitedClasses); void writeInheritedMemberDeclarations(OutputList &ol,MemberListType lt,int lt2,const QCString &title,ClassDef *inheritedFrom,bool invert,bool showAlways,QPtrDict<void> *visitedClasses);
void writeMemberDeclarations(OutputList &ol,MemberListType lt,const QCString &title, void writeMemberDeclarations(OutputList &ol,MemberListType lt,const QCString &title,
const char *subTitle=0,bool showInline=FALSE,ClassDef *inheritedFrom=0,int lt2=-1,bool invert=FALSE,QPtrDict<void> *visitedClasses=0); const char *subTitle=0,bool showInline=FALSE,ClassDef *inheritedFrom=0,int lt2=-1,bool invert=FALSE,bool showAlways=FALSE,QPtrDict<void> *visitedClasses=0);
void writeMemberDocumentation(OutputList &ol,MemberListType lt,const QCString &title,bool showInline=FALSE); void writeMemberDocumentation(OutputList &ol,MemberListType lt,const QCString &title,bool showInline=FALSE);
void writeSimpleMemberDocumentation(OutputList &ol,MemberListType lt); void writeSimpleMemberDocumentation(OutputList &ol,MemberListType lt);
void writePlainMemberDeclaration(OutputList &ol,MemberListType lt,bool inGroup,ClassDef *inheritedFrom,const char *inheritId); void writePlainMemberDeclaration(OutputList &ol,MemberListType lt,bool inGroup,ClassDef *inheritedFrom,const char *inheritId);
...@@ -407,11 +407,16 @@ class ClassDef : public Definition ...@@ -407,11 +407,16 @@ class ClassDef : public Definition
void writeMoreLink(OutputList &ol,const QCString &anchor); void writeMoreLink(OutputList &ol,const QCString &anchor);
void writeDetailedDocumentationBody(OutputList &ol); void writeDetailedDocumentationBody(OutputList &ol);
int countInheritedDecMembersRec(MemberListType lt,ClassDef *inheritedFrom);
int countInheritedDecMembers(MemberListType lt);
int countAdditionalInheritedMembers(); int countAdditionalInheritedMembers();
void writeAdditionalInheritedMembers(OutputList &ol); void writeAdditionalInheritedMembers(OutputList &ol);
void addClassAttributes(OutputList &ol); void addClassAttributes(OutputList &ol);
int countMemberDeclarations(MemberListType lt,ClassDef *inheritedFrom,
int lt2,bool invert,bool showAlways,QPtrDict<void> *visitedClasses);
int countInheritedDecMembers(MemberListType lt,
ClassDef *inheritedFrom,bool invert,bool showAlways,
QPtrDict<void> *visitedClasses);
void getTitleForMemberListType(MemberListType type,
QCString &title,QCString &subtitle);
ClassDefImpl *m_impl; ClassDefImpl *m_impl;
......
...@@ -514,7 +514,7 @@ void FileDef::writeSummaryLinks(OutputList &ol) ...@@ -514,7 +514,7 @@ void FileDef::writeSummaryLinks(OutputList &ol)
MemberList * ml = getMemberList(lmd->type); MemberList * ml = getMemberList(lmd->type);
if (ml && ml->declVisible()) if (ml && ml->declVisible())
{ {
ol.writeSummaryLink(0,ml->listTypeAsString(),lmd->title(lang),first); ol.writeSummaryLink(0,ml->listTypeAsString(ml->listType()),lmd->title(lang),first);
first=FALSE; first=FALSE;
} }
} }
......
...@@ -913,7 +913,7 @@ void GroupDef::writeSummaryLinks(OutputList &ol) ...@@ -913,7 +913,7 @@ void GroupDef::writeSummaryLinks(OutputList &ol)
MemberList * ml = getMemberList(lmd->type); MemberList * ml = getMemberList(lmd->type);
if (ml && ml->declVisible()) if (ml && ml->declVisible())
{ {
ol.writeSummaryLink(0,ml->listTypeAsString(),lmd->title(lang),first); ol.writeSummaryLink(0,ml->listTypeAsString(ml->listType()),lmd->title(lang),first);
first=FALSE; first=FALSE;
} }
} }
......
...@@ -315,7 +315,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, ...@@ -315,7 +315,7 @@ void MemberList::writePlainDeclarations(OutputList &ol,
return; // no members in this list return; // no members in this list
} }
//printf(" --> writePlainDeclaration() numDecMembers()=%d\n", //printf(" --> writePlainDeclaration() numDecMembers()=%d\n",
// numDecMembers()); // numDecMembers());
ol.pushGeneratorState(); ol.pushGeneratorState();
...@@ -329,6 +329,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, ...@@ -329,6 +329,7 @@ void MemberList::writePlainDeclarations(OutputList &ol,
if ((inheritedFrom==0 || !md->isReimplementedBy(inheritedFrom)) && if ((inheritedFrom==0 || !md->isReimplementedBy(inheritedFrom)) &&
md->isBriefSectionVisible()) md->isBriefSectionVisible())
{ {
//printf(">>> rendering\n");
switch(md->memberType()) switch(md->memberType())
{ {
case MemberType_Define: // fall through case MemberType_Define: // fall through
...@@ -493,7 +494,7 @@ void MemberList::writeDeclarations(OutputList &ol, ...@@ -493,7 +494,7 @@ void MemberList::writeDeclarations(OutputList &ol,
ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd, ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd,
const char *title,const char *subtitle, const char *title,const char *subtitle,
const DefinitionIntf::DefType compoundType,bool showEnumValues, const DefinitionIntf::DefType compoundType,bool showEnumValues,
bool showInline,ClassDef *inheritedFrom) bool showInline,ClassDef *inheritedFrom,MemberListType lt)
{ {
(void)showEnumValues; // unused (void)showEnumValues; // unused
...@@ -507,8 +508,8 @@ void MemberList::writeDeclarations(OutputList &ol, ...@@ -507,8 +508,8 @@ void MemberList::writeDeclarations(OutputList &ol,
if (ctx==0 && gd) ctx = gd; if (ctx==0 && gd) ctx = gd;
if (ctx==0 && fd) ctx = fd; if (ctx==0 && fd) ctx = fd;
//printf("%p: MemberList::writeDeclaration(title=`%s',subtitle=`%s')=%d\n", //printf("%p: MemberList::writeDeclaration(title=`%s',subtitle=`%s')=%d inheritedFrom=%p\n",
// this,title,subtitle,numDecMembers()); // this,title,subtitle,numDecMembers(),inheritedFrom);
int num = numDecMembers(); int num = numDecMembers();
if (inheritedFrom) if (inheritedFrom)
...@@ -519,7 +520,7 @@ void MemberList::writeDeclarations(OutputList &ol, ...@@ -519,7 +520,7 @@ void MemberList::writeDeclarations(OutputList &ol,
{ {
ol.pushGeneratorState(); ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Html); ol.disableAllBut(OutputGenerator::Html);
inheritId = substitute(listTypeAsString(),"-","_")+"_"+ inheritId = substitute(listTypeAsString(lt),"-","_")+"_"+
stripPath(cd->getOutputFileBase()); stripPath(cd->getOutputFileBase());
if (title) if (title)
{ {
...@@ -540,7 +541,7 @@ void MemberList::writeDeclarations(OutputList &ol, ...@@ -540,7 +541,7 @@ void MemberList::writeDeclarations(OutputList &ol,
} }
else else
{ {
ol.startMemberHeader(listTypeAsString()); ol.startMemberHeader(listTypeAsString(m_listType));
} }
ol.parseText(title); ol.parseText(title);
if (showInline) if (showInline)
...@@ -872,9 +873,14 @@ void MemberList::unmarshal(StorageIntf *s) ...@@ -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_pubMethods: return "pub-methods";
case MemberListType_proMethods: return "pro-methods"; case MemberListType_proMethods: return "pro-methods";
...@@ -928,10 +934,6 @@ QCString MemberList::listTypeAsString() const ...@@ -928,10 +934,6 @@ QCString MemberList::listTypeAsString() const
return ""; return "";
} }
void MemberList::setNeedsSorting(bool b)
{
m_needsSorting = b;
}
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
......
...@@ -36,7 +36,7 @@ class MemberList : public QList<MemberDef> ...@@ -36,7 +36,7 @@ class MemberList : public QList<MemberDef>
MemberList(MemberListType lt); MemberList(MemberListType lt);
~MemberList(); ~MemberList();
MemberListType listType() const { return m_listType; } MemberListType listType() const { return m_listType; }
QCString listTypeAsString() const; QCString listTypeAsString(MemberListType type) const;
bool insert(uint index,const MemberDef *md); bool insert(uint index,const MemberDef *md);
void inSort(const MemberDef *md); void inSort(const MemberDef *md);
void append(const MemberDef *md); void append(const MemberDef *md);
...@@ -63,7 +63,7 @@ class MemberList : public QList<MemberDef> ...@@ -63,7 +63,7 @@ class MemberList : public QList<MemberDef>
ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd, ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd,
const char *title,const char *subtitle,const DefinitionIntf::DefType compoundType, const char *title,const char *subtitle,const DefinitionIntf::DefType compoundType,
bool showEnumValues=FALSE,bool showInline=FALSE, bool showEnumValues=FALSE,bool showInline=FALSE,
ClassDef *inheritedFrom=0); ClassDef *inheritedFrom=0,MemberListType lt=MemberListType_pubMethods);
void writeDocumentation(OutputList &ol,const char *scopeName, void writeDocumentation(OutputList &ol,const char *scopeName,
Definition *container,const char *title,bool showEnumValues=FALSE,bool showInline=FALSE); Definition *container,const char *title,bool showEnumValues=FALSE,bool showInline=FALSE);
void writeSimpleDocumentation(OutputList &ol,Definition *container); void writeSimpleDocumentation(OutputList &ol,Definition *container);
......
...@@ -429,7 +429,7 @@ void NamespaceDef::writeSummaryLinks(OutputList &ol) ...@@ -429,7 +429,7 @@ void NamespaceDef::writeSummaryLinks(OutputList &ol)
MemberList * ml = getMemberList(lmd->type); MemberList * ml = getMemberList(lmd->type);
if (ml && ml->declVisible()) if (ml && ml->declVisible())
{ {
ol.writeSummaryLink(0,ml->listTypeAsString(),lmd->title(lang),first); ol.writeSummaryLink(0,ml->listTypeAsString(ml->listType()),lmd->title(lang),first);
first=FALSE; first=FALSE;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment