Skip to content

Commit 0019111

Browse files
doxygendoxygen
committed
issue #11012 Doxygen 1.10 and 1.11 not documenting C# enum and its members
1 parent 2a62c19 commit 0019111

File tree

10 files changed

+448
-245
lines changed

10 files changed

+448
-245
lines changed

‎src/classdef.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2281,7 +2281,7 @@ void ClassDefImpl::writeSummaryLinks(OutputList &ol) const
22812281
else if (lde->kind()==LayoutDocEntry::MemberDecl)
22822282
{
22832283
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
2284-
if (lmd)
2284+
if (lmd && lmd->visible())
22852285
{
22862286
MemberList * ml = getMemberList(lmd->type);
22872287
if (ml && ml->declVisible())
@@ -2386,7 +2386,7 @@ void ClassDefImpl::writeTagFile(TextStream &tagFile) const
23862386
case LayoutDocEntry::MemberDecl:
23872387
{
23882388
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
2389-
if (lmd)
2389+
if (lmd && lmd->visible())
23902390
{
23912391
MemberList * ml = getMemberList(lmd->type);
23922392
if (ml)
@@ -2485,7 +2485,7 @@ void ClassDefImpl::writeInlineDocumentation(OutputList &ol) const
24852485
case LayoutDocEntry::MemberDecl:
24862486
{
24872487
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
2488-
if (lmd)
2488+
if (lmd && lmd->visible())
24892489
{
24902490
ClassDefSet visitedClasses;
24912491
if (!isSimple) writeMemberDeclarations(ol,visitedClasses,lmd->type,lmd->title(lang),lmd->subtitle(lang),TRUE);
@@ -2504,7 +2504,7 @@ void ClassDefImpl::writeInlineDocumentation(OutputList &ol) const
25042504
case LayoutDocEntry::MemberDef:
25052505
{
25062506
const LayoutDocEntryMemberDef *lmd = dynamic_cast<const LayoutDocEntryMemberDef*>(lde.get());
2507-
if (lmd)
2507+
if (lmd && lmd->visible())
25082508
{
25092509
if (isSimple)
25102510
{
@@ -2784,7 +2784,7 @@ void ClassDefImpl::writeDocumentationContents(OutputList &ol,const QCString & /*
27842784
{
27852785
ClassDefSet visitedClasses;
27862786
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
2787-
if (lmd)
2787+
if (lmd && lmd->visible())
27882788
{
27892789
writeMemberDeclarations(ol,visitedClasses,lmd->type,lmd->title(lang),lmd->subtitle(lang));
27902790
}
@@ -2820,7 +2820,7 @@ void ClassDefImpl::writeDocumentationContents(OutputList &ol,const QCString & /*
28202820
case LayoutDocEntry::MemberDef:
28212821
{
28222822
const LayoutDocEntryMemberDef *lmd = dynamic_cast<const LayoutDocEntryMemberDef*>(lde.get());
2823-
if (lmd)
2823+
if (lmd && lmd->visible())
28242824
{
28252825
writeMemberDocumentation(ol,lmd->type,lmd->title(lang));
28262826
}
@@ -3539,7 +3539,7 @@ void ClassDefImpl::writeDeclaration(OutputList &ol,const MemberDef *md,bool inGr
35393539
if (lde->kind()==LayoutDocEntry::MemberDecl)
35403540
{
35413541
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
3542-
if (lmd)
3542+
if (lmd && lmd->visible())
35433543
{
35443544
writePlainMemberDeclaration(ol,lmd->type,inGroup,indentLevel,inheritedFrom,inheritId);
35453545
}
@@ -4620,7 +4620,7 @@ void ClassDefImpl::setAnonymousEnumType()
46204620
if (lde->kind()==LayoutDocEntry::MemberDecl)
46214621
{
46224622
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
4623-
if (lmd)
4623+
if (lmd && lmd->visible())
46244624
{
46254625
MemberList * ml = getMemberList(lmd->type);
46264626
if (ml)
@@ -4698,7 +4698,7 @@ void ClassDefImpl::getTitleForMemberListType(MemberListType type,
46984698
if (lde->kind()==LayoutDocEntry::MemberDecl)
46994699
{
47004700
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
4701-
if (lmd && lmd->type==type)
4701+
if (lmd && lmd->type==type && lmd->visible())
47024702
{
47034703
title = lmd->title(lang);
47044704
subtitle = lmd->subtitle(lang);
@@ -4718,7 +4718,7 @@ int ClassDefImpl::countAdditionalInheritedMembers() const
47184718
if (lde->kind()==LayoutDocEntry::MemberDecl)
47194719
{
47204720
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
4721-
if (lmd && lmd->type!=MemberListType::Friends()) // friendship is not inherited
4721+
if (lmd && lmd->visible() && lmd->type!=MemberListType::Friends()) // friendship is not inherited
47224722
{
47234723
ClassDefSet visited;
47244724
totalCount+=countInheritedDecMembers(lmd->type,this,TRUE,FALSE,visited);
@@ -4737,7 +4737,7 @@ void ClassDefImpl::writeAdditionalInheritedMembers(OutputList &ol) const
47374737
if (lde->kind()==LayoutDocEntry::MemberDecl)
47384738
{
47394739
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
4740-
if (lmd && lmd->type!=MemberListType::Friends())
4740+
if (lmd && lmd->visible() && lmd->type!=MemberListType::Friends())
47414741
{
47424742
ClassDefSet visited;
47434743
writeInheritedMemberDeclarations(ol,visited,lmd->type,MemberListType::Invalid(),lmd->title(getLanguage()),this,TRUE,FALSE);

‎src/doxygen.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9917,13 +9917,13 @@ void printLayout()
99179917
}
99189918
else if (const LayoutDocEntryMemberDecl *lmdecl = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get()))
99199919
{
9920-
Debug::print(Debug::Layout,0," %scomplex kind: %s, type: %s\n",
9921-
extraIndent? " " : "",qPrint(lde->entryToString()),qPrint(lmdecl->type.to_string()));
9920+
Debug::print(Debug::Layout,0," %scomplex kind: %s, visible=%d, type: %s\n",
9921+
extraIndent? " " : "",qPrint(lde->entryToString()),lmdecl->visible(),qPrint(lmdecl->type.to_string()));
99229922
}
99239923
else if (const LayoutDocEntryMemberDef *lmdef = dynamic_cast<const LayoutDocEntryMemberDef*>(lde.get()))
99249924
{
9925-
Debug::print(Debug::Layout,0," %scomplex kind: %s, type: %s\n",
9926-
extraIndent? " " : "",qPrint(lde->entryToString()),qPrint(lmdef->type.to_string()));
9925+
Debug::print(Debug::Layout,0," %scomplex kind: %s, visible=%d, type: %s\n",
9926+
extraIndent? " " : "",qPrint(lde->entryToString()),lmdef->visible(),qPrint(lmdef->type.to_string()));
99279927
}
99289928
else
99299929
{

‎src/filedef.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ void FileDefImpl::writeTagFile(TextStream &tagFile)
441441
case LayoutDocEntry::MemberDecl:
442442
{
443443
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
444-
if (lmd)
444+
if (lmd && lmd->visible())
445445
{
446446
MemberList * ml = getMemberList(lmd->type);
447447
if (ml)
@@ -827,7 +827,7 @@ void FileDefImpl::writeSummaryLinks(OutputList &ol) const
827827
else if (lde->kind()==LayoutDocEntry::MemberDecl)
828828
{
829829
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
830-
if (lmd)
830+
if (lmd && lmd->visible())
831831
{
832832
MemberList * ml = getMemberList(lmd->type);
833833
if (ml && ml->declVisible())
@@ -967,7 +967,7 @@ void FileDefImpl::writeDocumentation(OutputList &ol)
967967
case LayoutDocEntry::MemberDecl:
968968
{
969969
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
970-
if (lmd) writeMemberDeclarations(ol,lmd->type,lmd->title(lang));
970+
if (lmd && lmd->visible()) writeMemberDeclarations(ol,lmd->type,lmd->title(lang));
971971
}
972972
break;
973973
case LayoutDocEntry::MemberDeclEnd:
@@ -985,7 +985,7 @@ void FileDefImpl::writeDocumentation(OutputList &ol)
985985
case LayoutDocEntry::MemberDef:
986986
{
987987
const LayoutDocEntryMemberDef *lmd = dynamic_cast<const LayoutDocEntryMemberDef*>(lde.get());
988-
if (lmd) writeMemberDocumentation(ol,lmd->type,lmd->title(lang));
988+
if (lmd && lmd->visible()) writeMemberDocumentation(ol,lmd->type,lmd->title(lang));
989989
}
990990
break;
991991
case LayoutDocEntry::MemberDefEnd:

‎src/groupdef.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ void GroupDefImpl::writeTagFile(TextStream &tagFile)
752752
case LayoutDocEntry::MemberDecl:
753753
{
754754
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
755-
if (lmd)
755+
if (lmd && lmd->visible())
756756
{
757757
MemberList * ml = getMemberList(lmd->type);
758758
if (ml)
@@ -1143,7 +1143,7 @@ void GroupDefImpl::writeSummaryLinks(OutputList &ol) const
11431143
else if (lde->kind()==LayoutDocEntry::MemberDecl)
11441144
{
11451145
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
1146-
if (lmd)
1146+
if (lmd && lmd->visible())
11471147
{
11481148
MemberList * ml = getMemberList(lmd->type);
11491149
if (ml && ml->declVisible())
@@ -1237,7 +1237,7 @@ void GroupDefImpl::writeDocumentation(OutputList &ol)
12371237
case LayoutDocEntry::MemberDecl:
12381238
{
12391239
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
1240-
if (lmd)
1240+
if (lmd && lmd->visible())
12411241
{
12421242
writeMemberDeclarations(ol,lmd->type,lmd->title(lang));
12431243
}
@@ -1255,7 +1255,7 @@ void GroupDefImpl::writeDocumentation(OutputList &ol)
12551255
case LayoutDocEntry::MemberDef:
12561256
{
12571257
const LayoutDocEntryMemberDef *lmd = dynamic_cast<const LayoutDocEntryMemberDef*>(lde.get());
1258-
if (lmd)
1258+
if (lmd && lmd->visible())
12591259
{
12601260
writeMemberDocumentation(ol,lmd->type,lmd->title(lang));
12611261
}

‎src/index.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ void addMembersToIndex(T *def,LayoutDocManager::LayoutPart part,
550550
if (kind==LayoutDocEntry::MemberDef)
551551
{
552552
const LayoutDocEntryMemberDef *lmd = dynamic_cast<const LayoutDocEntryMemberDef*>(lde.get());
553-
if (lmd)
553+
if (lmd && lmd->visible())
554554
{
555555
MemberList *ml = def->getMemberList(lmd->type);
556556
if (ml)
@@ -1757,7 +1757,7 @@ static void writeNamespaceMembers(const NamespaceDef *nd,bool addToIndex)
17571757
if (lde->kind()==LayoutDocEntry::MemberDef)
17581758
{
17591759
const LayoutDocEntryMemberDef *lmd = dynamic_cast<const LayoutDocEntryMemberDef*>(lde.get());
1760-
if (lmd)
1760+
if (lmd && lmd->visible())
17611761
{
17621762
MemberList *ml = nd->getMemberList(lmd->type);
17631763
if (ml)
@@ -1783,7 +1783,7 @@ static void writeModuleMembers(const ModuleDef *mod,bool addToIndex)
17831783
if (lde->kind()==LayoutDocEntry::MemberDecl)
17841784
{
17851785
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
1786-
if (lmd)
1786+
if (lmd && lmd->visible())
17871787
{
17881788
MemberList *ml = mod->getMemberList(lmd->type);
17891789
if (ml)
@@ -4066,7 +4066,7 @@ static void writeGroupTreeNode(OutputList &ol, const GroupDef *gd, int level, FT
40664066
if (lde->kind()==LayoutDocEntry::MemberDef && addToIndex)
40674067
{
40684068
const LayoutDocEntryMemberDef *lmd = dynamic_cast<const LayoutDocEntryMemberDef*>(lde.get());
4069-
if (lmd)
4069+
if (lmd && lmd->visible())
40704070
{
40714071
MemberList *ml = gd->getMemberList(lmd->type);
40724072
if (ml)

0 commit comments

Comments
 (0)