summaryrefslogtreecommitdiffstats
path: root/src/xml/sax/qxml.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2015-06-30 22:11:15 +0200
committerMarc Mutz <marc.mutz@kdab.com>2015-07-04 06:03:44 +0000
commitc3addaca1743325f1bd75a24a84e56fcb6d80694 (patch)
tree3eb21d7265b89746091ad17c91c35f4ec29b56ec /src/xml/sax/qxml.h
parent160f4191d4de89c37d2f69b8023b3bfa457766cb (diff)
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/xml/sax/qxml.h')
-rw-r--r--src/xml/sax/qxml.h8
1 files changed, 4 insertions, 4 deletions
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;