diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2000-06-11 19:22:39 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2000-06-11 19:22:39 (GMT) |
commit | 93737357fcce05f46d2db771293d746ea4b79acc (patch) | |
tree | a213e1477917c43abbeeac764fe4d2846e726728 /src/index.cpp | |
parent | 4bdaaa8da9bee65b5cda2e60a55f95d948feba88 (diff) | |
download | Doxygen-93737357fcce05f46d2db771293d746ea4b79acc.zip Doxygen-93737357fcce05f46d2db771293d746ea4b79acc.tar.gz Doxygen-93737357fcce05f46d2db771293d746ea4b79acc.tar.bz2 |
Release-1.1.4-20000611
Diffstat (limited to 'src/index.cpp')
-rw-r--r-- | src/index.cpp | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/src/index.cpp b/src/index.cpp index 75edfdd..06ab9ac 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -115,7 +115,7 @@ void writeClassTree(OutputList &ol,BaseClassList *bcl,bool hideSuper) //printf("Passed...\n"); if (cd->isLinkable()) { - ol.writeIndexItem(cd->getReference(),cd->getOutputFileBase(),cd->name()); + ol.writeIndexItem(cd->getReference(),cd->getOutputFileBase(),cd->displayName()); if (cd->isReference()) { ol.startTypewriter(); @@ -125,13 +125,16 @@ void writeClassTree(OutputList &ol,BaseClassList *bcl,bool hideSuper) if (hasHtmlHelp) { htmlHelp->addContentsItem(cd->name(),cd->getOutputFileBase()); - //cd->writeMembersToContents(); } } else { ol.writeIndexItem(0,0,cd->name()); //if (hasHtmlHelp) htmlHelp->addContentsItem(cd->name(),"nodoc"); + if (hasHtmlHelp) + { + htmlHelp->addContentsItem(cd->name(),0); + } } if (!cd->visited && !hideSuper && cd->superClasses()->count()>0) { @@ -184,7 +187,7 @@ void writeClassHierarchy(OutputList &ol) } if (cd->isLinkable()) { - ol.writeIndexItem(cd->getReference(),cd->getOutputFileBase(),cd->name()); + ol.writeIndexItem(cd->getReference(),cd->getOutputFileBase(),cd->displayName()); if (cd->isReference()) { ol.startTypewriter(); @@ -199,8 +202,12 @@ void writeClassHierarchy(OutputList &ol) } else { - ol.writeIndexItem(0,0,cd->name()); + ol.writeIndexItem(0,0,cd->displayName()); //if (hasHtmlHelp) htmlHelp->addContentsItem(cd->name(),"nodoc"); + if (hasHtmlHelp) + { + htmlHelp->addContentsItem(cd->name(),0); + } } if (!cd->visited && cd->superClasses()->count()>0) { @@ -654,7 +661,7 @@ void writeAnnotatedClassList(OutputList &ol) case ClassDef::Union: type="union"; break; default: type="interface"; break; } - ol.writeStartAnnoItem(type,cd->getOutputFileBase(),0,cd->name()); + ol.writeStartAnnoItem(type,cd->getOutputFileBase(),0,cd->displayName()); ol.docify(" ("); if (!cd->briefDescription().isEmpty()) { @@ -792,7 +799,14 @@ void writeAlphabeticalClassList(OutputList &ol) { QCString cname; QCString namesp; - extractNamespaceName(cd->name(),cname,namesp); + if (Config::hideScopeNames) + { + cname=cd->displayName(); + } + else + { + extractNamespaceName(cd->name(),cname,namesp); + } ol.writeObjectLink(cd->getReference(), cd->getOutputFileBase(),0,cname); @@ -927,7 +941,7 @@ void writeMemberList(OutputList &ol) if (//cd && (md->isFriend() || md->protection()!=Private || Config::extractPrivateFlag) && //!md->isReference() && md->hasDocumentation() && md->isLinkableInProject() && - prevName!=cd->name() && + prevName!=cd->displayName() && cd->isLinkableInProject() ) { @@ -936,9 +950,9 @@ void writeMemberList(OutputList &ol) else ol.docify(", "); ol.writeObjectLink(cd->getReference(),cd->getOutputFileBase(),md->anchor(), - cd->name()); + cd->displayName()); count++; - prevName=cd->name(); + prevName=cd->displayName(); } md=mn->prev(); } @@ -1384,7 +1398,7 @@ void writePageIndex(OutputList &ol) startTitle(ol,0); QCString title = theTranslator->trRelatedPages(); if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" "); - ol.docify(title); + parseText(ol,title); endTitle(ol,0,0); ol.startTextBlock(); HtmlHelp *htmlHelp = 0; @@ -1568,7 +1582,7 @@ void writeIndex(OutputList &ol) parseDoc(ol,defFileName,defLine,0,0,Config::projectNumber); ol.endProjectNumber(); } - if (Config::noIndexFlag) writeQuickLinks(ol,FALSE); + if (Config::noIndexFlag && mainPage==0) writeQuickLinks(ol,FALSE); if (mainPage) { |