summaryrefslogtreecommitdiffstats
path: root/src/logic
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-04-29 19:35:20 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-01 15:43:11 +0000
commita01b14670e5b35a951ec57297613418dc829d65c (patch)
treed9bdcc4ca7b325ff5a1c2e68b801efe9e4d667b8 /src/logic
parentf9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff)
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/logic')
-rw-r--r--src/logic/callbackjob.cpp2
-rw-r--r--src/logic/executor.cpp2
-rw-r--r--src/logic/handler.cpp2
-rw-r--r--src/logic/qlogicaspect.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/logic/callbackjob.cpp b/src/logic/callbackjob.cpp
index dd2adaee0..9eec09bf5 100644
--- a/src/logic/callbackjob.cpp
+++ b/src/logic/callbackjob.cpp
@@ -47,7 +47,7 @@ namespace Logic {
CallbackJob::CallbackJob()
: QAspectJob()
- , m_logicManager(Q_NULLPTR)
+ , m_logicManager(nullptr)
{
}
diff --git a/src/logic/executor.cpp b/src/logic/executor.cpp
index c8eb6881f..74267379e 100644
--- a/src/logic/executor.cpp
+++ b/src/logic/executor.cpp
@@ -52,7 +52,7 @@ namespace Logic {
Executor::Executor(QObject *parent)
: QObject(parent)
- , m_scene(Q_NULLPTR)
+ , m_scene(nullptr)
{
}
diff --git a/src/logic/handler.cpp b/src/logic/handler.cpp
index 6872aadb2..a4f727efc 100644
--- a/src/logic/handler.cpp
+++ b/src/logic/handler.cpp
@@ -48,7 +48,7 @@ namespace Qt3DLogic {
namespace Logic {
Handler::Handler()
- : m_logicManager(Q_NULLPTR)
+ : m_logicManager(nullptr)
{
}
diff --git a/src/logic/qlogicaspect.h b/src/logic/qlogicaspect.h
index 60e2e5753..4eb90bbca 100644
--- a/src/logic/qlogicaspect.h
+++ b/src/logic/qlogicaspect.h
@@ -53,7 +53,7 @@ class QT3DLOGICSHARED_EXPORT QLogicAspect : public Qt3DCore::QAbstractAspect
{
Q_OBJECT
public:
- explicit QLogicAspect(QObject *parent = Q_NULLPTR);
+ explicit QLogicAspect(QObject *parent = nullptr);
QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;