summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-24 23:55:07 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-26 17:13:52 +0000
commit34cd2d63fc3ce594887f5245896c795ffb8596b5 (patch)
treee196d2aaae2b6cf41ae4360ed6ad3695673eec2f
parent524c0417cdd1127ca10700f727e6882458e0c581 (diff)
downloadqtxmlpatterns-34cd2d63fc3ce594887f5245896c795ffb8596b5.tar.gz
Replace Q_NULLPTR with nullptr
Change-Id: Iae074eb184283d09528ada65ec2d8d252639720d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/xmlpatterns/api/qabstractmessagehandler.h2
-rw-r--r--src/xmlpatterns/api/qabstracturiresolver.h2
-rw-r--r--src/xmlpatterns/api/qabstractxmlnodemodel.h2
-rw-r--r--src/xmlpatterns/expr/qexpressionsequence.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h b/src/xmlpatterns/api/qabstractmessagehandler.h
index c6f84a2..0e05550 100644
--- a/src/xmlpatterns/api/qabstractmessagehandler.h
+++ b/src/xmlpatterns/api/qabstractmessagehandler.h
@@ -51,7 +51,7 @@ class Q_XMLPATTERNS_EXPORT QAbstractMessageHandler : public QObject
{
Q_OBJECT
public:
- QAbstractMessageHandler(QObject *parent = Q_NULLPTR);
+ QAbstractMessageHandler(QObject *parent = nullptr);
virtual ~QAbstractMessageHandler();
void message(QtMsgType type,
diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h
index 7fc08c2..01d973c 100644
--- a/src/xmlpatterns/api/qabstracturiresolver.h
+++ b/src/xmlpatterns/api/qabstracturiresolver.h
@@ -53,7 +53,7 @@ class Q_XMLPATTERNS_EXPORT QAbstractUriResolver : public QObject
{
Q_OBJECT
public:
- QAbstractUriResolver(QObject *parent = Q_NULLPTR);
+ QAbstractUriResolver(QObject *parent = nullptr);
virtual ~QAbstractUriResolver();
virtual QUrl resolve(const QUrl &relative,
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h
index db3cd4d..d16a35e 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel.h
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h
@@ -104,7 +104,7 @@ namespace QPatternist
{
data = 0;
additionalData = 0;
- model = Q_NULLPTR;
+ model = nullptr;
}
};
}
diff --git a/src/xmlpatterns/expr/qexpressionsequence.cpp b/src/xmlpatterns/expr/qexpressionsequence.cpp
index 193e15f..883757c 100644
--- a/src/xmlpatterns/expr/qexpressionsequence.cpp
+++ b/src/xmlpatterns/expr/qexpressionsequence.cpp
@@ -117,7 +117,7 @@ Expression::Ptr ExpressionSequence::compress(const StaticContext::Ptr &context)
} else if (Id == IDLiteralSequence) {
/* Rewrite "(1, (2, 3), 4)" into "(1, 2, 3, 4)" */
// Note: LiteralSequence does not use the dynamic context, so we pass in a nullptr.
- Item::Iterator::Ptr seqIt = (*it)->evaluateSequence(DynamicContext::Ptr(Q_NULLPTR));
+ Item::Iterator::Ptr seqIt = (*it)->evaluateSequence(DynamicContext::Ptr(nullptr));
while (!seqIt->next().isNull())
result.append(Literal::Ptr(new Literal(seqIt->current())));