diff options
| author | Vladimír Vondruš <mosra@centrum.cz> | 2017-11-29 17:51:39 (GMT) |
|---|---|---|
| committer | Vladimír Vondruš <mosra@centrum.cz> | 2017-11-29 17:51:39 (GMT) |
| commit | 169cad806ea795e5c425fd397aa0de54cbc0a81e (patch) | |
| tree | e6bf67c83dbd12ce308215dd8f0534b8c12b3c8d | |
| parent | 17bceb8f4580535de52d19e8cadf0d088f972bef (diff) | |
| download | Doxygen-169cad806ea795e5c425fd397aa0de54cbc0a81e.zip Doxygen-169cad806ea795e5c425fd397aa0de54cbc0a81e.tar.gz Doxygen-169cad806ea795e5c425fd397aa0de54cbc0a81e.tar.bz2 | |
Provide information about enum type "strongness" in the XML output.
There's a new boolean `strong` attribute on the `<memberdef>` element
that defines whether the enum is a classic or a strong one.
Tests were updated to verify both cases.
| -rw-r--r-- | src/xmlgen.cpp | 7 | ||||
| -rw-r--r-- | templates/xml/compound.xsd | 1 | ||||
| -rw-r--r-- | testing/018/018__def_8c.xml | 2 | ||||
| -rw-r--r-- | testing/068/068__typed__enum_8cpp.xml | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp index 3b81408..5196eef 100644 --- a/src/xmlgen.cpp +++ b/src/xmlgen.cpp @@ -668,6 +668,13 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De t << "\""; } + if (md->memberType() == MemberType_Enumeration) + { + t << " strong=\""; + if (md->isStrong()) t << "yes"; else t << "no"; + t << "\""; + } + if (md->memberType() == MemberType_Variable) { //ArgumentList *al = md->argumentList(); diff --git a/templates/xml/compound.xsd b/templates/xml/compound.xsd index 8affc20..0720823 100644 --- a/templates/xml/compound.xsd +++ b/templates/xml/compound.xsd @@ -146,6 +146,7 @@ <xsd:attribute name="id" type="xsd:string" /> <xsd:attribute name="prot" type="DoxProtectionKind" /> <xsd:attribute name="static" type="DoxBool" /> + <xsd:attribute name="strong" type="DoxBool" use="optional"/> <xsd:attribute name="const" type="DoxBool" use="optional"/> <xsd:attribute name="explicit" type="DoxBool" use="optional"/> <xsd:attribute name="inline" type="DoxBool" use="optional"/> diff --git a/testing/018/018__def_8c.xml b/testing/018/018__def_8c.xml index 8bc5c09..5f42767 100644 --- a/testing/018/018__def_8c.xml +++ b/testing/018/018__def_8c.xml @@ -17,7 +17,7 @@ </memberdef> </sectiondef> <sectiondef kind="enum"> - <memberdef kind="enum" id="018__def_8c_1aa57b8491d1d8fc1014dd54bcf83b130a" prot="public" static="no"> + <memberdef kind="enum" id="018__def_8c_1aa57b8491d1d8fc1014dd54bcf83b130a" prot="public" static="no" strong="no"> <type/> <name>E</name> <enumvalue id="018__def_8c_1aa57b8491d1d8fc1014dd54bcf83b130aab1710e6a49014ba389d57c8753c530f4" prot="public"> diff --git a/testing/068/068__typed__enum_8cpp.xml b/testing/068/068__typed__enum_8cpp.xml index d6f1058..880bf14 100644 --- a/testing/068/068__typed__enum_8cpp.xml +++ b/testing/068/068__typed__enum_8cpp.xml @@ -3,7 +3,7 @@ <compounddef id="068__typed__enum_8cpp" kind="file" language="C++"> <compoundname>068_typed_enum.cpp</compoundname> <sectiondef kind="enum"> - <memberdef kind="enum" id="068__typed__enum_8cpp_1aa72902e6181db009a6a84502f81612c2" prot="public" static="no"> + <memberdef kind="enum" id="068__typed__enum_8cpp_1aa72902e6181db009a6a84502f81612c2" prot="public" static="no" strong="yes"> <type>unsigned short</type> <name>E</name> <briefdescription> |