summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2015-06-26 19:09:12 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2015-06-26 19:09:12 (GMT)
commite4a9d06d7871f24dd6e37ecac6addae729e6d721 (patch)
treefd9d3bb476ada78c46081661b4980168fd122e22 /src
parentae8f618d140b4368045d286a682df3f6de7b2960 (diff)
downloadDoxygen-e4a9d06d7871f24dd6e37ecac6addae729e6d721.zip
Doxygen-e4a9d06d7871f24dd6e37ecac6addae729e6d721.tar.gz
Doxygen-e4a9d06d7871f24dd6e37ecac6addae729e6d721.tar.bz2
Bug 751455 - class scoped enum documentation appearing at group level instead of class level
Diffstat (limited to 'src')
-rw-r--r--src/config.xml9
-rw-r--r--src/scanner.l3
2 files changed, 11 insertions, 1 deletions
diff --git a/src/config.xml b/src/config.xml
index d7cd1f2..3408c67 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -679,6 +679,15 @@ Go to the <a href="commands.html">next</a> section or return to the
]]>
</docs>
</option>
+ <option type='bool' id='GROUP_NESTED_COMPOUNDS' defval='0'>
+ <docs>
+<![CDATA[
+ If one adds a struct or class to a group and this option is enabled, then also
+ any nested class or struct is added to the same group. By default this option
+ is disabled and one has to add nested compounds explicitly via @ingroup.
+]]>
+ </docs>
+ </option>
<option type='bool' id='SUBGROUPING' defval='1'>
<docs>
<![CDATA[
diff --git a/src/scanner.l b/src/scanner.l
index 6fb4631..328dc3f 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -6748,7 +6748,8 @@ static void parseCompounds(Entry *rt)
initEntry();
// deep copy group list from parent (see bug 727732)
- if (rt->groups)
+ static bool autoGroupNested = Config_getBool("GROUP_NESTED_COMPOUNDS");
+ if (rt->groups && ce->section!=Entry::ENUM_SEC && !(ce->spec&Entry::Enum))
{
QListIterator<Grouping> gli(*rt->groups);
Grouping *g;