diff options
Diffstat (limited to 'src/filedef.cpp')
| -rw-r--r-- | src/filedef.cpp | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/filedef.cpp b/src/filedef.cpp index 7e4a2c1..177cfa6 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -126,7 +126,9 @@ void FileDef::writeDocumentation(OutputList &ol) Doxygen::tagFile << " <compound kind=\"file\">" << endl; Doxygen::tagFile << " <name>" << convertToXML(name()) << "</name>" << endl; Doxygen::tagFile << " <path>" << convertToXML(getPath()) << "</path>" << endl; - Doxygen::tagFile << " <filename>" << convertToXML(getOutputFileBase()) << htmlFileExtension << "</filename>" << endl; + Doxygen::tagFile << " <filename>" + << convertToXML(getOutputFileBase()) + << "</filename>" << endl; } ol.startTextBlock(); @@ -186,9 +188,21 @@ void FileDef::writeDocumentation(OutputList &ol) // Here we use the include file name as it appears in the file. // we could also we the name as it is used within doxygen, // then we should have used fd->docName() instead of ii->includeName - if (fd && fd->isLinkable() && fd->generateSourceFile()) + if (fd && fd->isLinkable()) { - ol.writeObjectLink(fd->getReference(),fd->includeName(),0,ii->includeName); + ol.writeObjectLink(fd->getReference(), + fd->generateSourceFile() ? fd->includeName() : fd->getOutputFileBase(), + 0,ii->includeName); + if (!Config_getString("GENERATE_TAGFILE").isEmpty() && !fd->isReference()) + { + const char *locStr = (ii->local || isIDLorJava) ? "yes" : "no"; + Doxygen::tagFile << " <includes id=\"" + << convertToXML(fd->getOutputFileBase()) + << "\" local=\"" << locStr << "\">" + << convertToXML(ii->includeName) + << "</includes>" + << endl; + } } else { @@ -623,6 +637,12 @@ void FileDef::addIncludedByDependency(FileDef *fd,const char *incName,bool local } } +bool FileDef::isIncluded(const QCString &name) const +{ + if (name.isEmpty()) return FALSE; + return includeDict->find(name)!=0; +} + bool FileDef::generateSourceFile() const { QCString extension = name().right(4); |