Skip to content

Commit 07cad67

Browse files
doxygendoxygen
committed
issue doxygen#11301 Doxygen 1.13.0 ignores visibility="no" for various layout elements
1 parent ee1bb44 commit 07cad67

File tree

9 files changed

+118
-133
lines changed

9 files changed

+118
-133
lines changed

‎src/classdef.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2262,7 +2262,7 @@ void ClassDefImpl::writeSummaryLinks(OutputList &ol) const
22622262
else if (lde->kind()==LayoutDocEntry::MemberDecl)
22632263
{
22642264
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
2265-
if (lmd && lmd->visible())
2265+
if (lmd)
22662266
{
22672267
MemberList * ml = getMemberList(lmd->type);
22682268
if (ml && ml->declVisible())
@@ -2367,7 +2367,7 @@ void ClassDefImpl::writeTagFile(TextStream &tagFile) const
23672367
case LayoutDocEntry::MemberDecl:
23682368
{
23692369
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
2370-
if (lmd && lmd->visible())
2370+
if (lmd)
23712371
{
23722372
MemberList * ml = getMemberList(lmd->type);
23732373
if (ml)
@@ -2466,7 +2466,7 @@ void ClassDefImpl::writeInlineDocumentation(OutputList &ol) const
24662466
case LayoutDocEntry::MemberDecl:
24672467
{
24682468
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
2469-
if (lmd && lmd->visible())
2469+
if (lmd)
24702470
{
24712471
ClassDefSet visitedClasses;
24722472
if (!isSimple) writeMemberDeclarations(ol,visitedClasses,lmd->type,lmd->title(lang),lmd->subtitle(lang),TRUE);
@@ -2485,7 +2485,7 @@ void ClassDefImpl::writeInlineDocumentation(OutputList &ol) const
24852485
case LayoutDocEntry::MemberDef:
24862486
{
24872487
const LayoutDocEntryMemberDef *lmd = dynamic_cast<const LayoutDocEntryMemberDef*>(lde.get());
2488-
if (lmd && lmd->visible())
2488+
if (lmd)
24892489
{
24902490
if (isSimple)
24912491
{
@@ -2765,7 +2765,7 @@ void ClassDefImpl::writeDocumentationContents(OutputList &ol,const QCString & /*
27652765
{
27662766
ClassDefSet visitedClasses;
27672767
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
2768-
if (lmd && lmd->visible())
2768+
if (lmd)
27692769
{
27702770
writeMemberDeclarations(ol,visitedClasses,lmd->type,lmd->title(lang),lmd->subtitle(lang));
27712771
}
@@ -2801,7 +2801,7 @@ void ClassDefImpl::writeDocumentationContents(OutputList &ol,const QCString & /*
28012801
case LayoutDocEntry::MemberDef:
28022802
{
28032803
const LayoutDocEntryMemberDef *lmd = dynamic_cast<const LayoutDocEntryMemberDef*>(lde.get());
2804-
if (lmd && lmd->visible())
2804+
if (lmd)
28052805
{
28062806
writeMemberDocumentation(ol,lmd->type,lmd->title(lang));
28072807
}
@@ -3520,7 +3520,7 @@ void ClassDefImpl::writeDeclaration(OutputList &ol,const MemberDef *md,bool inGr
35203520
if (lde->kind()==LayoutDocEntry::MemberDecl)
35213521
{
35223522
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
3523-
if (lmd && lmd->visible())
3523+
if (lmd)
35243524
{
35253525
writePlainMemberDeclaration(ol,lmd->type,inGroup,indentLevel,inheritedFrom,inheritId);
35263526
}
@@ -4609,7 +4609,7 @@ void ClassDefImpl::setAnonymousEnumType()
46094609
if (lde->kind()==LayoutDocEntry::MemberDecl)
46104610
{
46114611
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
4612-
if (lmd && lmd->visible())
4612+
if (lmd)
46134613
{
46144614
MemberList * ml = getMemberList(lmd->type);
46154615
if (ml)
@@ -4687,7 +4687,7 @@ void ClassDefImpl::getTitleForMemberListType(MemberListType type,
46874687
if (lde->kind()==LayoutDocEntry::MemberDecl)
46884688
{
46894689
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
4690-
if (lmd && lmd->type==type && lmd->visible())
4690+
if (lmd && lmd->type==type)
46914691
{
46924692
title = lmd->title(lang);
46934693
subtitle = lmd->subtitle(lang);
@@ -4707,7 +4707,7 @@ int ClassDefImpl::countAdditionalInheritedMembers() const
47074707
if (lde->kind()==LayoutDocEntry::MemberDecl)
47084708
{
47094709
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
4710-
if (lmd && lmd->visible() && lmd->type!=MemberListType::Friends()) // friendship is not inherited
4710+
if (lmd && lmd->type!=MemberListType::Friends()) // friendship is not inherited
47114711
{
47124712
ClassDefSet visited;
47134713
totalCount+=countInheritedDecMembers(lmd->type,this,TRUE,FALSE,visited);
@@ -4726,7 +4726,7 @@ void ClassDefImpl::writeAdditionalInheritedMembers(OutputList &ol) const
47264726
if (lde->kind()==LayoutDocEntry::MemberDecl)
47274727
{
47284728
const LayoutDocEntryMemberDecl *lmd = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get());
4729-
if (lmd && lmd->visible() && lmd->type!=MemberListType::Friends())
4729+
if (lmd && lmd->type!=MemberListType::Friends())
47304730
{
47314731
ClassDefSet visited;
47324732
writeInheritedMemberDeclarations(ol,visited,lmd->type,MemberListType::Invalid(),lmd->title(getLanguage()),this,TRUE,FALSE);

‎src/doxygen.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9922,19 +9922,19 @@ void printLayout()
99229922
if (const LayoutDocEntrySimple *ldes = dynamic_cast<const LayoutDocEntrySimple*>(lde.get()))
99239923
{
99249924
if (lde->kind() == LayoutDocEntry::MemberDeclEnd || lde->kind() == LayoutDocEntry::MemberDefEnd) extraIndent = false;
9925-
Debug::print(Debug::Layout,0," %skind: %s, visible=%d\n",
9926-
extraIndent? " " : "",qPrint(lde->entryToString()), ldes->visible());
9925+
Debug::print(Debug::Layout,0," %skind: %s\n",
9926+
extraIndent? " " : "",qPrint(lde->entryToString()));
99279927
if (lde->kind() == LayoutDocEntry::MemberDeclStart || lde->kind() == LayoutDocEntry::MemberDefStart) extraIndent = true;
99289928
}
99299929
else if (const LayoutDocEntryMemberDecl *lmdecl = dynamic_cast<const LayoutDocEntryMemberDecl*>(lde.get()))
99309930
{
9931-
Debug::print(Debug::Layout,0," %scomplex kind: %s, visible=%d, type: %s\n",
9932-
extraIndent? " " : "",qPrint(lde->entryToString()),lmdecl->visible(),qPrint(lmdecl->type.to_string()));
9931+
Debug::print(Debug::Layout,0," %scomplex kind: %s, type: %s\n",
9932+
extraIndent? " " : "",qPrint(lde->entryToString()),qPrint(lmdecl->type.to_string()));
99339933
}
99349934
else if (const LayoutDocEntryMemberDef *lmdef = dynamic_cast<const LayoutDocEntryMemberDef*>(lde.get()))
99359935
{
9936-
Debug::print(Debug::Layout,0," %scomplex kind: %s, visible=%d, type: %s\n",
9937-
extraIndent? " " : "",qPrint(lde->entryToString()),lmdef->visible(),qPrint(lmdef->type.to_string()));
9936+
Debug::print(Debug::Layout,0," %scomplex kind: %s, type: %s\n",
9937+
extraIndent? " " : "",qPrint(lde->entryToString()),qPrint(lmdef->type.to_string()));
99389938
}
99399939
else
99409940
{

‎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 && lmd->visible())
444+
if (lmd)
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 && lmd->visible())
830+
if (lmd)
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 && lmd->visible()) writeMemberDeclarations(ol,lmd->type,lmd->title(lang));
970+
if (lmd) 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 && lmd->visible()) writeMemberDocumentation(ol,lmd->type,lmd->title(lang));
988+
if (lmd) 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 && lmd->visible())
755+
if (lmd)
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 && lmd->visible())
1146+
if (lmd)
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 && lmd->visible())
1240+
if (lmd)
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 && lmd->visible())
1258+
if (lmd)
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 && lmd->visible())
553+
if (lmd)
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 && lmd->visible())
1760+
if (lmd)
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 && lmd->visible())
1786+
if (lmd)
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 && lmd->visible())
4069+
if (lmd)
40704070
{
40714071
MemberList *ml = gd->getMemberList(lmd->type);
40724072
if (ml)

0 commit comments

Comments
 (0)