From b51b53190b64ebaa9588fd6f16d0fb9baadf011c Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 31 Aug 2016 23:39:04 +0200 Subject: [PATCH] Improve macros for XML parsing --- misc/xmlparsermacros.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/misc/xmlparsermacros.h b/misc/xmlparsermacros.h index 561de16..3055d8b 100644 --- a/misc/xmlparsermacros.h +++ b/misc/xmlparsermacros.h @@ -11,5 +11,6 @@ #define eliftag(tagName) else if(xmlReader.name() == QLatin1String(tagName)) #define else_skip else { xmlReader.skipCurrentElement(); } #define children while(xmlReader.readNextStartElement()) -#define text xmlReader.readElementText(QXmlStreamReader::ErrorOnUnexpectedElement) -#define attribute(attributeName) xmlReader.attributes().value(QLatin1String(attributeName)) +#define text (xmlReader.readElementText(QXmlStreamReader::ErrorOnUnexpectedElement)) +#define attribute(attributeName) (xmlReader.attributes().value(QLatin1String(attributeName))) +#define attributeFlag(attributeName) (xmlReader.attributes().hasAttribute(QLatin1String(attributeName)) && xmlReader.attributes().value(QLatin1String(attributeName)) != QLatin1String("false"))