diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2018-06-24 08:57:30 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-24 08:57:30 (GMT) |
commit | 56c60e84e6dd6d7e4e7774be24d1402782fd3230 (patch) | |
tree | 4341e26d4bf860fec4c5784b042a5c9130ae2da4 /src/index.cpp | |
parent | ba30b13cfd4910a5913f080a039fc429ec8a7e3f (diff) | |
parent | 154e877cc2e8b10091d7e0068b6f6d5793cd29f3 (diff) | |
download | Doxygen-56c60e84e6dd6d7e4e7774be24d1402782fd3230.zip Doxygen-56c60e84e6dd6d7e4e7774be24d1402782fd3230.tar.gz Doxygen-56c60e84e6dd6d7e4e7774be24d1402782fd3230.tar.bz2 |
Merge branch 'master' into feature/bug_tableofcontents_latex
Diffstat (limited to 'src/index.cpp')
-rw-r--r-- | src/index.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/index.cpp b/src/index.cpp index e9f5437..c605005 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -2508,8 +2508,8 @@ static const CmhlInfo *getCmhlInfo(int hl) { CmhlInfo("functions", theTranslator->trAll()), CmhlInfo("functions_func", - fortranOpt ? theTranslator->trSubprograms() : - vhdlOpt ? VhdlDocGen::trFunctionAndProc() : + fortranOpt ? theTranslator->trSubprograms() : + vhdlOpt ? theTranslator->trFunctionAndProc() : theTranslator->trFunctions()), CmhlInfo("functions_vars",theTranslator->trVariables()), CmhlInfo("functions_type",theTranslator->trTypedefs()), @@ -2687,8 +2687,8 @@ static const FmhlInfo *getFmhlInfo(int hl) { FmhlInfo("globals", theTranslator->trAll()), FmhlInfo("globals_func", - fortranOpt ? theTranslator->trSubprograms() : - vhdlOpt ? VhdlDocGen::trFunctionAndProc() : + fortranOpt ? theTranslator->trSubprograms() : + vhdlOpt ? theTranslator->trFunctionAndProc() : theTranslator->trFunctions()), FmhlInfo("globals_vars",theTranslator->trVariables()), FmhlInfo("globals_type",theTranslator->trTypedefs()), @@ -2855,8 +2855,8 @@ static const NmhlInfo *getNmhlInfo(int hl) { NmhlInfo("namespacemembers", theTranslator->trAll()), NmhlInfo("namespacemembers_func", - fortranOpt ? theTranslator->trSubprograms() : - vhdlOpt ? VhdlDocGen::trFunctionAndProc() : + fortranOpt ? theTranslator->trSubprograms() : + vhdlOpt ? theTranslator->trFunctionAndProc() : theTranslator->trFunctions()), NmhlInfo("namespacemembers_vars",theTranslator->trVariables()), NmhlInfo("namespacemembers_type",theTranslator->trTypedefs()), @@ -4022,7 +4022,7 @@ static void writeIndex(OutputList &ol) ol.startIndexSection(isClassHierarchyIndex); ol.parseText(/*projPrefix+*/ (fortranOpt ? theTranslator->trCompoundIndexFortran() : - vhdlOpt ? VhdlDocGen::trDesignUnitIndex() : + vhdlOpt ? theTranslator->trHierarchicalIndex() : theTranslator->trHierarchicalIndex() )); ol.endIndexSection(isClassHierarchyIndex); @@ -4032,7 +4032,7 @@ static void writeIndex(OutputList &ol) ol.startIndexSection(isCompoundIndex); ol.parseText(/*projPrefix+*/ (fortranOpt ? theTranslator->trCompoundIndexFortran() : - vhdlOpt ? VhdlDocGen::trDesignUnitIndex() : + vhdlOpt ? theTranslator->trDesignUnitIndex() : theTranslator->trCompoundIndex() )); ol.endIndexSection(isCompoundIndex); |