diff options
| -rw-r--r-- | src/doxygen.cpp | 1 | ||||
| -rw-r--r-- | src/filedef.cpp | 2 | ||||
| -rw-r--r-- | src/ftvhelp.cpp | 2 | ||||
| -rw-r--r-- | src/memberdef.cpp | 2 | ||||
| -rw-r--r-- | src/pagedef.cpp | 2 | ||||
| -rw-r--r-- | src/vhdldocgen.cpp | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 19c7f2c..a5314ae 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -10535,6 +10535,7 @@ static void writeTagFile() << "</title>" << endl << " <filename>" << convertToXML(Doxygen::mainPage->getOutputFileBase()) + << Doxygen::htmlFileExtension << "</filename>" << endl; mainPage->writeDocAnchorsToTagFile(); diff --git a/src/filedef.cpp b/src/filedef.cpp index a60f4d8..45849dd 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -349,7 +349,7 @@ void FileDefImpl::writeTagFile(FTextStream &tagFile) tagFile << " <compound kind=\"file\">" << endl; tagFile << " <name>" << convertToXML(name()) << "</name>" << endl; tagFile << " <path>" << convertToXML(getPath()) << "</path>" << endl; - tagFile << " <filename>" << convertToXML(addHtmlExtensionIfMissing(getOutputFileBase())) << "</filename>" << endl; + tagFile << " <filename>" << convertToXML(getOutputFileBase()) << Doxygen::htmlFileExtension << "</filename>" << endl; if (m_includeList && m_includeList->count()>0) { QListIterator<IncludeInfo> ili(*m_includeList); diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp index c3aac54..cb50af1 100644 --- a/src/ftvhelp.cpp +++ b/src/ftvhelp.cpp @@ -259,7 +259,7 @@ static QCString node2URL(const FTVNode *n,bool overruleFile=FALSE,bool srcLink=F url = fd->getOutputFileBase(); } } - url+=Doxygen::htmlFileExtension; + url = addHtmlExtensionIfMissing(url); if (!n->anchor.isEmpty()) url+="#"+n->anchor; } return url; diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 6d98311..39b8f70 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -4544,7 +4544,7 @@ void MemberDefImpl::writeTagFile(FTextStream &tagFile) const tagFile << " <type>" << convertToXML(typeString()) << "</type>" << endl; } tagFile << " <name>" << convertToXML(name()) << "</name>" << endl; - tagFile << " <anchorfile>" << convertToXML(getOutputFileBase()+Doxygen::htmlFileExtension) << "</anchorfile>" << endl; + tagFile << " <anchorfile>" << convertToXML(getOutputFileBase()) << Doxygen::htmlFileExtension << "</anchorfile>" << endl; tagFile << " <anchor>" << convertToXML(anchor()) << "</anchor>" << endl; QCString idStr = id(); if (!idStr.isEmpty()) diff --git a/src/pagedef.cpp b/src/pagedef.cpp index 15d6ca8..011b647 100644 --- a/src/pagedef.cpp +++ b/src/pagedef.cpp @@ -162,7 +162,7 @@ void PageDefImpl::writeTagFile(FTextStream &tagFile) tagFile << " <compound kind=\"page\">" << endl; tagFile << " <name>" << name() << "</name>" << endl; tagFile << " <title>" << convertToXML(title()) << "</title>" << endl; - tagFile << " <filename>" << convertToXML(getOutputFileBase()) << "</filename>" << endl; + tagFile << " <filename>" << convertToXML(getOutputFileBase())<< Doxygen::htmlFileExtension << "</filename>" << endl; writeDocAnchorsToTagFile(tagFile); tagFile << " </compound>" << endl; } diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index 3528627..8b2ac41 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -1877,7 +1877,7 @@ void VhdlDocGen::writeTagFile(MemberDef *mdef,FTextStream &tagFile) tagFile << "\">" << endl; tagFile << " <type>" << convertToXML(mdef->typeString()) << "</type>" << endl; tagFile << " <name>" << convertToXML(mdef->name()) << "</name>" << endl; - tagFile << " <anchorfile>" << convertToXML(mdef->getOutputFileBase()+Doxygen::htmlFileExtension) << "</anchorfile>" << endl; + tagFile << " <anchorfile>" << convertToXML(mdef->getOutputFileBase()) << Doxygen::htmlFileExtension << "</anchorfile>" << endl; tagFile << " <anchor>" << convertToXML(mdef->anchor()) << "</anchor>" << endl; if (VhdlDocGen::isVhdlFunction(mdef)) |