summaryrefslogtreecommitdiffstats
path: root/src/index.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2003-10-05 12:34:05 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2003-10-05 12:34:05 (GMT)
commitaaf87cb6d6601d665a06dc4556da4ce10c98e127 (patch)
tree97864d162da48ec2548b1b05987ddbb5301769b1 /src/index.cpp
parent7cdb9679aa5e9baf87772f2c7799ff7b5fe01207 (diff)
downloadDoxygen-aaf87cb6d6601d665a06dc4556da4ce10c98e127.zip
Doxygen-aaf87cb6d6601d665a06dc4556da4ce10c98e127.tar.gz
Doxygen-aaf87cb6d6601d665a06dc4556da4ce10c98e127.tar.bz2
Release-1.3.4-20031005
Diffstat (limited to 'src/index.cpp')
-rw-r--r--src/index.cpp23
1 files changed, 10 insertions, 13 deletions
diff --git a/src/index.cpp b/src/index.cpp
index e4fe138..e908836 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -1678,15 +1678,15 @@ void writeMemberList(OutputList &ol,bool useSections,ClassMemberHighlight filter
ClassDef *cd=md->getClassDef();
if (
md->isLinkableInProject() &&
- prevName!=cd->displayName() &&
- cd->isLinkableInProject() && cd->templateMaster()==0
+ prevName!=cd->displayName() &&
+ cd->templateMaster()==0
)
{
if (count==0)
ol.docify(": ");
else
ol.docify(", ");
- ol.writeObjectLink(cd->getReference(),cd->getOutputFileBase(),md->anchor(),
+ ol.writeObjectLink(md->getReference(),md->getOutputFileBase(),md->anchor(),
cd->displayName());
count++;
prevName=cd->displayName();
@@ -1965,9 +1965,7 @@ static void writeFileMemberList(OutputList &ol,
while (md)
{
FileDef *fd=md->getFileDef();
- bool hasDocs = md->getFileDef() &&
- md->getFileDef()->isLinkableInProject();
- if (fd && hasDocs &&
+ if (fd && fd->isLinkableInProject() &&
md->isLinkableInProject() &&
prevName!=fd->name())
{
@@ -1975,9 +1973,9 @@ static void writeFileMemberList(OutputList &ol,
ol.docify(": ");
else
ol.docify(", ");
- QCString baseName=fd->name().copy();
- ol.writeObjectLink(fd->getReference(),
- fd->getOutputFileBase(),md->anchor(), baseName);
+ QCString baseName=fd->name();
+ ol.writeObjectLink(md->getReference(),
+ md->getOutputFileBase(),md->anchor(), baseName);
count++;
prevName=fd->name();
}
@@ -2064,7 +2062,7 @@ void writeNamespaceMemberList(OutputList &ol,bool useSections,
ol.docify(": ");
else
ol.docify(", ");
- ol.writeObjectLink(nd->getReference(),nd->getOutputFileBase(),
+ ol.writeObjectLink(md->getReference(),md->getOutputFileBase(),
md->anchor(),nd->name());
count++;
prevName=nd->name();
@@ -2734,14 +2732,13 @@ void writeGroupTreeNode(OutputList &ol, GroupDef *gd,int level)
ftvHelp->incContentsDepth();
}
}
- GroupDef *gd=md->getGroupDef();
if(htmlHelp)
{
- htmlHelp->addContentsItem(FALSE,md->name(),gd->getOutputFileBase(),md->anchor());
+ htmlHelp->addContentsItem(FALSE,md->name(),md->getOutputFileBase(),md->anchor());
}
if(ftvHelp)
{
- ftvHelp->addContentsItem(FALSE,gd->getReference(),gd->getOutputFileBase(),md->anchor(),md->name());
+ ftvHelp->addContentsItem(FALSE,md->getReference(),md->getOutputFileBase(),md->anchor(),md->name());
}
}
md=members->next();