From d99aeec3ac0b0b1ebf36895c25e092b08e95e06a Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sat, 24 Apr 2021 16:44:13 +0200 Subject: classes incorrectly appeared in the navgiation index When GENERATE_TREEVIEW was enabled and the classlist was disabled in the DoxygenLayout.xml --- src/index.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/index.cpp b/src/index.cpp index 1497aad..99942f1 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -1576,7 +1576,8 @@ static void writeClassTree(const ListType &cl,FTVHelp *ftv,bool addToIndex,bool { ftv->addContentsItem(count>0,cd->displayName(FALSE),cd->getReference(), cd->getOutputFileBase(),cd->anchor(),FALSE,TRUE,cd); - if ((cd->getOuterScope()==0 || + if (addToIndex && + (cd->getOuterScope()==0 || cd->getOuterScope()->definitionType()!=Definition::TypeClass ) ) @@ -1584,7 +1585,7 @@ static void writeClassTree(const ListType &cl,FTVHelp *ftv,bool addToIndex,bool addMembersToIndex(cd,LayoutDocManager::Class, cd->displayName(FALSE), cd->anchor(), - addToIndex && cd->partOfGroups().empty() && !cd->isSimple()); + cd->partOfGroups().empty() && !cd->isSimple()); } if (count>0) { @@ -1694,8 +1695,8 @@ static void writeNamespaceTreeElement(const NamespaceDef *nd,FTVHelp *ftv, { ftv->incContentsDepth(); writeNamespaceTree(nd->getNamespaces(),ftv,FALSE,addToIndex); - writeClassTree(nd->getClasses(),ftv,FALSE,FALSE,ClassDef::Class); - writeConceptList(nd->getConcepts(),ftv,FALSE); + writeClassTree(nd->getClasses(),ftv,addToIndex,FALSE,ClassDef::Class); + writeConceptList(nd->getConcepts(),ftv,addToIndex); writeNamespaceMembers(nd,addToIndex); ftv->decContentsDepth(); } -- cgit v0.12