diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2014-08-08 12:32:33 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-08-08 12:32:33 (GMT) |
commit | 97d12d058a7831adcc8c6f2cfe8c20ddd2ae5bc2 (patch) | |
tree | cbe9d47addde8fc8e3c8a3a017165bb0cce1ba3b | |
parent | ed8ce3cf405204916f9832e26797cb15d1490fd1 (diff) | |
download | Doxygen-97d12d058a7831adcc8c6f2cfe8c20ddd2ae5bc2.zip Doxygen-97d12d058a7831adcc8c6f2cfe8c20ddd2ae5bc2.tar.gz Doxygen-97d12d058a7831adcc8c6f2cfe8c20ddd2ae5bc2.tar.bz2 |
Bug 733451 - volatile declaration on member functions is not handled as xml attribute
-rw-r--r-- | src/compound.xsd | 12 | ||||
-rw-r--r-- | src/xmlgen.cpp | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/compound.xsd b/src/compound.xsd index 2521a2e..dec596b 100644 --- a/src/compound.xsd +++ b/src/compound.xsd @@ -145,12 +145,12 @@ <xsd:attribute name="id" type="xsd:string" /> <xsd:attribute name="prot" type="DoxProtectionKind" /> <xsd:attribute name="static" type="DoxBool" /> - <xsd:attribute name="const" type="DoxBool" /> - <xsd:attribute name="explicit" type="DoxBool" /> - <xsd:attribute name="inline" type="DoxBool" /> - <xsd:attribute name="virt" type="DoxVirtualKind" /> - <xsd:attribute name="volatile" type="DoxBool" /> - <xsd:attribute name="mutable" type="DoxBool" /> + <xsd:attribute name="const" type="DoxBool" use="optional"/> + <xsd:attribute name="explicit" type="DoxBool" use="optional"/> + <xsd:attribute name="inline" type="DoxBool" use="optional"/> + <xsd:attribute name="virt" type="DoxVirtualKind" use="optional"/> + <xsd:attribute name="volatile" type="DoxBool" use="optional"/> + <xsd:attribute name="mutable" type="DoxBool" use="optional"/> <!-- Qt property --> <xsd:attribute name="readable" type="DoxBool" use="optional"/> <xsd:attribute name="writable" type="DoxBool" use="optional"/> diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp index 2bb5734..c9fe950 100644 --- a/src/xmlgen.cpp +++ b/src/xmlgen.cpp @@ -646,6 +646,11 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De t << " required=\"yes\""; } + if (al && al->volatileSpecifier) + { + t << " volatile=\"yes\""; + } + t << " virt=\""; switch (md->virtualness()) { @@ -671,7 +676,6 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De { t << " initonly=\"yes\""; } - if (md->isAttribute()) { t << " attribute=\"yes\""; |