summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-02 14:20:37 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-02 22:48:22 +0000
commit7a8d395a3b1eb5f24aa96509666326bad4218c14 (patch)
treead1b50ddede64ddeca82cf5a9f38d98b9640fe98
parent4fbcab4d3d560ee694d266de86ad18776b723550 (diff)
downloadqtxmlpatterns-7a8d395a3b1eb5f24aa96509666326bad4218c14.tar.gz
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Task-number: QTBUG-45291 Change-Id: Ia5d1ab50f82abad6e51bcd5883e22595eaaedc33 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
-rw-r--r--src/xmlpatterns/api/qabstractmessagehandler.h2
-rw-r--r--src/xmlpatterns/api/qabstracturiresolver.h2
-rw-r--r--src/xmlpatterns/api/qabstractxmlnodemodel.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h b/src/xmlpatterns/api/qabstractmessagehandler.h
index 3106f0d..09c8f86 100644
--- a/src/xmlpatterns/api/qabstractmessagehandler.h
+++ b/src/xmlpatterns/api/qabstractmessagehandler.h
@@ -45,7 +45,7 @@ class Q_XMLPATTERNS_EXPORT QAbstractMessageHandler : public QObject
{
Q_OBJECT
public:
- QAbstractMessageHandler(QObject *parent = 0);
+ QAbstractMessageHandler(QObject *parent = Q_NULLPTR);
virtual ~QAbstractMessageHandler();
void message(QtMsgType type,
diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h
index 6a57b50..2131aa7 100644
--- a/src/xmlpatterns/api/qabstracturiresolver.h
+++ b/src/xmlpatterns/api/qabstracturiresolver.h
@@ -47,7 +47,7 @@ class Q_XMLPATTERNS_EXPORT QAbstractUriResolver : public QObject
{
Q_OBJECT
public:
- QAbstractUriResolver(QObject *parent = 0);
+ QAbstractUriResolver(QObject *parent = Q_NULLPTR);
virtual ~QAbstractUriResolver();
virtual QUrl resolve(const QUrl &relative,
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h
index 06df5be..c174be7 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel.h
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h
@@ -98,7 +98,7 @@ namespace QPatternist
{
data = 0;
additionalData = 0;
- model = 0;
+ model = Q_NULLPTR;
}
};
}