summaryrefslogtreecommitdiffstats
path: root/src/htmlgen.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2018-11-17 15:02:52 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2018-11-17 15:02:52 (GMT)
commit8ff99363c2f6b3226fe5b57f38ae1d4805dca22c (patch)
tree61f48ffd1ddae2b718ecbb5cd393bf2c985ccd83 /src/htmlgen.cpp
parent6d0cd13b0afabaea9dfbe0a9e354b9e278bc15de (diff)
parent9d35bd4f5865a63f3daacc8d4ab613fb4743bb72 (diff)
downloadDoxygen-8ff99363c2f6b3226fe5b57f38ae1d4805dca22c.zip
Doxygen-8ff99363c2f6b3226fe5b57f38ae1d4805dca22c.tar.gz
Doxygen-8ff99363c2f6b3226fe5b57f38ae1d4805dca22c.tar.bz2
Merge branch 'master' of https://github.com/zeroc-ice/doxygen into zeroc-ice-master
Diffstat (limited to 'src/htmlgen.cpp')
-rw-r--r--src/htmlgen.cpp18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index f0f627c..8de836d 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -2185,9 +2185,17 @@ static void writeDefaultQuickLinks(FTextStream &t,bool compact,
case HLI_Modules: kind = LayoutNavEntry::Modules; break;
//case HLI_Directories: kind = LayoutNavEntry::Dirs; break;
case HLI_Namespaces: kind = LayoutNavEntry::NamespaceList; altKind = LayoutNavEntry::Namespaces; break;
- case HLI_Hierarchy: kind = LayoutNavEntry::ClassHierarchy; break;
+ case HLI_ClassHierarchy: kind = LayoutNavEntry::ClassHierarchy; break;
+ case HLI_InterfaceHierarchy: kind = LayoutNavEntry::InterfaceHierarchy; break;
+ case HLI_ExceptionHierarchy: kind = LayoutNavEntry::ExceptionHierarchy; break;
case HLI_Classes: kind = LayoutNavEntry::ClassIndex; altKind = LayoutNavEntry::Classes; break;
- case HLI_Annotated: kind = LayoutNavEntry::ClassList; altKind = LayoutNavEntry::Classes; break;
+ case HLI_Interfaces: kind = LayoutNavEntry::InterfaceIndex; altKind = LayoutNavEntry::Interfaces; break;
+ case HLI_Structs: kind = LayoutNavEntry::StructIndex; altKind = LayoutNavEntry::Structs; break;
+ case HLI_Exceptions: kind = LayoutNavEntry::ExceptionIndex; altKind = LayoutNavEntry::Exceptions; break;
+ case HLI_AnnotatedClasses: kind = LayoutNavEntry::ClassList; altKind = LayoutNavEntry::Classes; break;
+ case HLI_AnnotatedInterfaces: kind = LayoutNavEntry::InterfaceList; altKind = LayoutNavEntry::Interfaces; break;
+ case HLI_AnnotatedStructs: kind = LayoutNavEntry::StructList; altKind = LayoutNavEntry::Structs; break;
+ case HLI_AnnotatedExceptions: kind = LayoutNavEntry::ExceptionList; altKind = LayoutNavEntry::Exceptions; break;
case HLI_Files: kind = LayoutNavEntry::FileList; altKind = LayoutNavEntry::Files; break;
case HLI_NamespaceMembers: kind = LayoutNavEntry::NamespaceMembers; break;
case HLI_Functions: kind = LayoutNavEntry::ClassMembers; break;
@@ -2197,6 +2205,12 @@ static void writeDefaultQuickLinks(FTextStream &t,bool compact,
case HLI_UserGroup: kind = LayoutNavEntry::UserGroup; break;
case HLI_ClassVisible: kind = LayoutNavEntry::ClassList; altKind = LayoutNavEntry::Classes;
highlightParent = TRUE; break;
+ case HLI_InterfaceVisible: kind = LayoutNavEntry::InterfaceList; altKind = LayoutNavEntry::Interfaces;
+ highlightParent = TRUE; break;
+ case HLI_StructVisible: kind = LayoutNavEntry::StructList; altKind = LayoutNavEntry::Structs;
+ highlightParent = TRUE; break;
+ case HLI_ExceptionVisible: kind = LayoutNavEntry::ExceptionList; altKind = LayoutNavEntry::Exceptions;
+ highlightParent = TRUE; break;
case HLI_NamespaceVisible: kind = LayoutNavEntry::NamespaceList; altKind = LayoutNavEntry::Namespaces;
highlightParent = TRUE; break;
case HLI_FileVisible: kind = LayoutNavEntry::FileList; altKind = LayoutNavEntry::Files;