diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2012-07-29 10:11:12 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2012-07-29 10:11:12 (GMT) |
commit | a934b38cd8b355648e0c07123a99e222ce7cd12b (patch) | |
tree | b0768f059d8b116092a15f295347b3797f43e6c0 /src/index.cpp | |
parent | ae962ae4a4dd46f4730982f97110cbf3d2aef397 (diff) | |
download | Doxygen-a934b38cd8b355648e0c07123a99e222ce7cd12b.zip Doxygen-a934b38cd8b355648e0c07123a99e222ce7cd12b.tar.gz Doxygen-a934b38cd8b355648e0c07123a99e222ce7cd12b.tar.bz2 |
Release-1.8.1.2-20120729
Diffstat (limited to 'src/index.cpp')
-rw-r--r-- | src/index.cpp | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/src/index.cpp b/src/index.cpp index 387aa54..257f5aa 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -384,11 +384,12 @@ void addMembersToIndex(T *def,LayoutDocManager::LayoutPart part, ClassSDict::Iterator it(*classes); for (;(cd=it.current());++it) { - if (cd->isLinkable()) + if (cd->isLinkable() && (cd->partOfGroups()==0 || def->definitionType()==Definition::TypeGroup)) { bool isNestedClass = def->definitionType()==Definition::TypeClass; addMembersToIndex(cd,LayoutDocManager::Class,cd->displayName(FALSE),cd->anchor(), - addToIndex && isNestedClass,preventSeparateIndex); + addToIndex && isNestedClass, + preventSeparateIndex || cd->isEmbeddedInOuterScope()); } } } @@ -1374,7 +1375,7 @@ void writeClassTree(ClassSDict *clDict,FTVHelp *ftv,bool addToIndex,bool globalO ftv->addContentsItem(count>0,cd->displayName(FALSE),cd->getReference(), cd->getOutputFileBase(),cd->anchor(),FALSE,TRUE,cd); if (addToIndex && - !cd->isEmbeddedInOuterScope() && + cd->partOfGroups()==0 && (cd->getOuterScope()==0 || cd->getOuterScope()->definitionType()!=Definition::TypeClass ) @@ -1402,7 +1403,7 @@ static bool containsVisibleChild(NamespaceDef *nd,bool includeClasses) NamespaceDef *cnd; for (cnli.toFirst();(cnd=cnli.current());++cnli) { - if (cnd->isLinkable() && cnd->localName().find('@')!=-1) + if (cnd->isLinkable() && cnd->localName().find('@')==-1) { return TRUE; } @@ -3158,6 +3159,7 @@ bool writeMemberNavIndex(FTextStream &t, //---------------------------------------------------------------------------- +#if 0 static bool writeFullNavIndex(FTextStream &t, LayoutNavEntry *root,int indent,bool &first) { static struct NavEntryCountMap @@ -3239,6 +3241,7 @@ static bool writeFullNavIndex(FTextStream &t, LayoutNavEntry *root,int indent,bo } return found; } +#endif //---------------------------------------------------------------------------- @@ -3563,21 +3566,24 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp* ClassDef *cd; for (;(cd=it.current());++it) { - bool nestedClassInSameGroup = - cd->getOuterScope() && cd->getOuterScope()->definitionType()==Definition::TypeClass && - cd->getOuterScope()->partOfGroups()!=0 && cd->getOuterScope()->partOfGroups()->contains(gd); - if (cd->isVisible() && !nestedClassInSameGroup) + //bool nestedClassInSameGroup = + // cd->getOuterScope() && cd->getOuterScope()->definitionType()==Definition::TypeClass && + // cd->getOuterScope()->partOfGroups()!=0 && cd->getOuterScope()->partOfGroups()->contains(gd); + //printf("===== GroupClasses: %s visible=%d nestedClassInSameGroup=%d\n",cd->name().data(),cd->isVisible(),nestedClassInSameGroup); + if (cd->isVisible() /*&& !nestedClassInSameGroup*/) { - if (cd->isLinkable() && cd->isEmbeddedInOuterScope()) - { + //if (cd->isEmbeddedInOuterScope()) + //{ + //printf("add class & members %d\n",addToIndex); addMembersToIndex(cd,LayoutDocManager::Class,cd->displayName(FALSE),cd->anchor(),addToIndex,TRUE); - } - else // only index the class, not its members - { - Doxygen::indexList.addContentsItem(FALSE, - cd->localName(),cd->getReference(), - cd->getOutputFileBase(),cd->anchor(),FALSE,FALSE); - } + //} + //else // only index the class, not its members + //{ + // printf("%s: add class only\n",cd->name().data()); + // Doxygen::indexList.addContentsItem(FALSE, + // cd->displayName(TRUE),cd->getReference(), + // cd->getOutputFileBase(),cd->anchor(),addToIndex,TRUE); + //} } } } |