From 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 11:49:52 +0200 Subject: Replace Q_NULLPTR with nullptr where possible Remaining uses of Q_NULLPTR are in: src/corelib/global/qcompilerdetection.h (definition and documentation of Q_NULLPTR) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a Reviewed-by: Ville Voutilainen Reviewed-by: Lars Knoll Reviewed-by: Olivier Goffart (Woboq GmbH) --- 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 7e048debbc..7c5b5fe204 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -225,10 +225,10 @@ class Q_XML_EXPORT QXmlReader { public: virtual ~QXmlReader() {} - virtual bool feature(const QString& name, bool *ok = Q_NULLPTR) const = 0; + virtual bool feature(const QString& name, bool *ok = 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 = Q_NULLPTR) const = 0; + virtual void* property(const QString& name, bool *ok = 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; @@ -253,11 +253,11 @@ public: QXmlSimpleReader(); virtual ~QXmlSimpleReader(); - bool feature(const QString& name, bool *ok = Q_NULLPTR) const override; + bool feature(const QString& name, bool *ok = nullptr) const override; void setFeature(const QString& name, bool value) override; bool hasFeature(const QString& name) const override; - void* property(const QString& name, bool *ok = Q_NULLPTR) const override; + void* property(const QString& name, bool *ok = nullptr) const override; void setProperty(const QString& name, void* value) override; bool hasProperty(const QString& name) const override; -- cgit v1.2.3