diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2018-12-26 11:53:15 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2018-12-26 11:53:15 (GMT) |
| commit | d03868616adf46369b0e208a093493f71b3f98b0 (patch) | |
| tree | e471db0d12a248534a84609b96971cf23b71a806 /src | |
| parent | 1f4a3ab39a467b2e5e0159f95ed10cb9830d5011 (diff) | |
| parent | f5ed5051c0754f9c7e0e5556114e173016d7f984 (diff) | |
| download | Doxygen-d03868616adf46369b0e208a093493f71b3f98b0.zip Doxygen-d03868616adf46369b0e208a093493f71b3f98b0.tar.gz Doxygen-d03868616adf46369b0e208a093493f71b3f98b0.tar.bz2 | |
Merge branch 'xml-namespace-members-in-file-scope' of https://github.com/mosra/doxygen into mosra-xml-namespace-members-in-file-scope
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.xml | 9 | ||||
| -rw-r--r-- | src/xmlgen.cpp | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/config.xml b/src/config.xml index db0f557..13ae663 100644 --- a/src/config.xml +++ b/src/config.xml @@ -2945,6 +2945,15 @@ or ]]> </docs> </option> + <option type='bool' id='XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE' defval='0' depends='GENERATE_XML'> + <docs> +<![CDATA[ + If the \c XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE tag is set to \c YES, doxygen + will include namespace members in file scope as well, matching the HTML + output. +]]> + </docs> + </option> </group> <group name='Docbook' docs='Configuration options related to the DOCBOOK output'> <option type='bool' id='GENERATE_DOCBOOK' defval='0'> diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp index 4b12757..985a3e7 100644 --- a/src/xmlgen.cpp +++ b/src/xmlgen.cpp @@ -1027,7 +1027,7 @@ static void generateXMLSection(Definition *d,FTextStream &ti,FTextStream &t, { // namespace members are also inserted in the file scope, but // to prevent this duplication in the XML output, we filter those here. - if (d->definitionType()!=Definition::TypeFile || md->getNamespaceDef()==0) + if ((Config_getBool(XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE) || d->definitionType()!=Definition::TypeFile) || md->getNamespaceDef()==0) { count++; } @@ -1049,7 +1049,7 @@ static void generateXMLSection(Definition *d,FTextStream &ti,FTextStream &t, { // namespace members are also inserted in the file scope, but // to prevent this duplication in the XML output, we filter those here. - if (d->definitionType()!=Definition::TypeFile || md->getNamespaceDef()==0) + if ((Config_getBool(XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE) || d->definitionType()!=Definition::TypeFile) || md->getNamespaceDef()==0) { generateXMLForMember(md,ti,t,d); } |