diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xml/dom/qdom.h | 16 | ||||
| -rw-r--r-- | src/xml/sax/qxml.h | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h index 5a83659e5c..f2bcf83e2b 100644 --- a/src/xml/dom/qdom.h +++ b/src/xml/dom/qdom.h @@ -329,14 +329,14 @@ public: inline QDomNode::NodeType nodeType() const { return DocumentNode; } // Qt extensions - bool setContent(const QByteArray& text, bool namespaceProcessing, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 ); - bool setContent(const QString& text, bool namespaceProcessing, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 ); - bool setContent(QIODevice* dev, bool namespaceProcessing, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 ); - bool setContent(QXmlInputSource *source, bool namespaceProcessing, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 ); - bool setContent(const QByteArray& text, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 ); - bool setContent(const QString& text, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 ); - bool setContent(QIODevice* dev, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 ); - bool setContent(QXmlInputSource *source, QXmlReader *reader, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 ); + bool setContent(const QByteArray& text, bool namespaceProcessing, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR ); + bool setContent(const QString& text, bool namespaceProcessing, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR ); + bool setContent(QIODevice* dev, bool namespaceProcessing, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR ); + bool setContent(QXmlInputSource *source, bool namespaceProcessing, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR ); + bool setContent(const QByteArray& text, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR ); + bool setContent(const QString& text, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR ); + bool setContent(QIODevice* dev, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR ); + bool setContent(QXmlInputSource *source, QXmlReader *reader, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR ); // Qt extensions QString toString(int = 1) const; 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; |