From c3addaca1743325f1bd75a24a84e56fcb6d80694 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 30 Jun 2015 22:11:15 +0200 Subject: QtXml: Use Q_NULLPTR instead of 0 in all public headers This is in preparation of adding -Wzero-as-null-pointer-constant (or similar) to the headers check. Task-number: QTBUG-45291 Change-Id: Id65c5a13d66e08937e6115e8c5b37923c8489f1a Reviewed-by: Thiago Macieira --- src/xml/sax/qxml.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/xml/sax/qxml.h') diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index d7285fc289..6bb9bfbe9c 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -201,10 +201,10 @@ class Q_XML_EXPORT QXmlReader { public: virtual ~QXmlReader() {} - virtual bool feature(const QString& name, bool *ok = 0) const = 0; + virtual bool feature(const QString& name, bool *ok = Q_NULLPTR) const = 0; virtual void setFeature(const QString& name, bool value) = 0; virtual bool hasFeature(const QString& name) const = 0; - virtual void* property(const QString& name, bool *ok = 0) const = 0; + virtual void* property(const QString& name, bool *ok = Q_NULLPTR) const = 0; virtual void setProperty(const QString& name, void* value) = 0; virtual bool hasProperty(const QString& name) const = 0; virtual void setEntityResolver(QXmlEntityResolver* handler) = 0; @@ -229,11 +229,11 @@ public: QXmlSimpleReader(); virtual ~QXmlSimpleReader(); - bool feature(const QString& name, bool *ok = 0) const Q_DECL_OVERRIDE; + bool feature(const QString& name, bool *ok = Q_NULLPTR) const Q_DECL_OVERRIDE; void setFeature(const QString& name, bool value) Q_DECL_OVERRIDE; bool hasFeature(const QString& name) const Q_DECL_OVERRIDE; - void* property(const QString& name, bool *ok = 0) const Q_DECL_OVERRIDE; + void* property(const QString& name, bool *ok = Q_NULLPTR) const Q_DECL_OVERRIDE; void setProperty(const QString& name, void* value) Q_DECL_OVERRIDE; bool hasProperty(const QString& name) const Q_DECL_OVERRIDE; -- cgit v1.2.3