Merge branch 'master' into feature/bug_tableofcontents_latex

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);