diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-18 08:42:17 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-18 07:57:26 +0000 |
| commit | 224b22e8c923e14420fd176bdc09e2d17d65f7c7 (patch) | |
| tree | 8ca9a98c2f4db8de21ce103a043094ab3f72bfde | |
| parent | 5e53b39e6a2dda3387dda9a810c4bfed8752ad6d (diff) | |
| download | qtxmlpatterns-224b22e8c923e14420fd176bdc09e2d17d65f7c7.tar.gz | |
Remove macro DEBUG_CODE from Test SDK.
It was used to disable code/variables referenced in Q_ASSERT_X.
Since the macro is now expanded in release mode as well, this
causes compilation errors.
Change-Id: I5b90515c042f9d3e76be84cd5385eae081a037c8
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
| -rw-r--r-- | tests/auto/xmlpatternssdk/XMLWriter.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/tests/auto/xmlpatternssdk/XMLWriter.cpp b/tests/auto/xmlpatternssdk/XMLWriter.cpp index 635f693..71ef022 100644 --- a/tests/auto/xmlpatternssdk/XMLWriter.cpp +++ b/tests/auto/xmlpatternssdk/XMLWriter.cpp @@ -76,12 +76,6 @@ using namespace QPatternistSDK; typedef QPair<QString, QString> NSBinding; typedef QList<NSBinding> NSBindingList; -#ifdef QT_NO_DEBUG -# define DEBUG_CODE(code) -#else -# define DEBUG_CODE(code) code -#endif - class XMLWriter::Private { public: @@ -290,8 +284,8 @@ public: QIODevice *dev; QStack<bool> hasContentStack; QString errorString; - DEBUG_CODE(QStack<QString> tags;) - DEBUG_CODE(QStack<NSBindingList> namespaceTracker;) + QStack<QString> tags; + QStack<NSBindingList> namespaceTracker; }; /** @@ -364,8 +358,8 @@ bool XMLWriter::startElement(const QString &qName, serialize('<'); serialize(qName); - DEBUG_CODE(d->tags.push(qName)); - DEBUG_CODE(d->namespaceTracker.push(d->namespaces)); + d->tags.push(qName); + d->namespaceTracker.push(d->namespaces); /* Add namespace declarations. */ const NSBindingList::const_iterator end(d->namespaces.constEnd()); @@ -421,7 +415,7 @@ bool XMLWriter::endElement(const QString &qName) Q_ASSERT_X(d->tags.pop() == qName, Q_FUNC_INFO, "The element tags are not balanced, the produced XML is invalid."); - DEBUG_CODE(d->namespaceTracker.pop()); + d->namespaceTracker.pop(); /* "this" element is content for our parent, so ensure hasElementContent is true. */ |