summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3dinput
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/quick3d/quick3dinput
parentf9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff)
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/quick3dinput')
-rw-r--r--src/quick3d/quick3dinput/items/quick3daction_p.h2
-rw-r--r--src/quick3d/quick3dinput/items/quick3daxis_p.h2
-rw-r--r--src/quick3d/quick3dinput/items/quick3dinputchord_p.h2
-rw-r--r--src/quick3d/quick3dinput/items/quick3dinputsequence_p.h2
-rw-r--r--src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h2
-rw-r--r--src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp4
-rw-r--r--src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h4
7 files changed, 9 insertions, 9 deletions
diff --git a/src/quick3d/quick3dinput/items/quick3daction_p.h b/src/quick3d/quick3dinput/items/quick3daction_p.h
index b16fe32a6..8394f9c48 100644
--- a/src/quick3d/quick3dinput/items/quick3daction_p.h
+++ b/src/quick3d/quick3dinput/items/quick3daction_p.h
@@ -68,7 +68,7 @@ class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DAction : public QObject
Q_PROPERTY(QQmlListProperty<Qt3DInput::QAbstractActionInput> inputs READ qmlActionInputs CONSTANT)
Q_CLASSINFO("DefaultProperty", "inputs")
public:
- explicit Quick3DAction(QObject *parent = Q_NULLPTR);
+ explicit Quick3DAction(QObject *parent = nullptr);
inline QAction *parentAction() const { return qobject_cast<QAction *>(parent()); }
QQmlListProperty<QAbstractActionInput> qmlActionInputs();
diff --git a/src/quick3d/quick3dinput/items/quick3daxis_p.h b/src/quick3d/quick3dinput/items/quick3daxis_p.h
index 819b949d0..7eee3421a 100644
--- a/src/quick3d/quick3dinput/items/quick3daxis_p.h
+++ b/src/quick3d/quick3dinput/items/quick3daxis_p.h
@@ -68,7 +68,7 @@ class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DAxis : public QObject
Q_PROPERTY(QQmlListProperty<Qt3DInput::QAxisInput> inputs READ qmlAxisInputs CONSTANT)
Q_CLASSINFO("DefaultProperty", "inputs")
public:
- explicit Quick3DAxis(QObject *parent = Q_NULLPTR);
+ explicit Quick3DAxis(QObject *parent = nullptr);
inline QAxis *parentAxis() const { return qobject_cast<QAxis *>(parent()); }
QQmlListProperty<QAxisInput> qmlAxisInputs();
diff --git a/src/quick3d/quick3dinput/items/quick3dinputchord_p.h b/src/quick3d/quick3dinput/items/quick3dinputchord_p.h
index b65ec5f75..d9759b856 100644
--- a/src/quick3d/quick3dinput/items/quick3dinputchord_p.h
+++ b/src/quick3d/quick3dinput/items/quick3dinputchord_p.h
@@ -66,7 +66,7 @@ class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DInputChord : public QObject
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DInput::QAbstractActionInput> chords READ qmlActionInputs CONSTANT)
public:
- explicit Quick3DInputChord(QObject *parent = Q_NULLPTR);
+ explicit Quick3DInputChord(QObject *parent = nullptr);
inline QInputChord *parentChord() const { return qobject_cast<QInputChord *>(parent()); }
QQmlListProperty<QAbstractActionInput> qmlActionInputs();
diff --git a/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h b/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h
index ba0c8f56d..ccf872675 100644
--- a/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h
+++ b/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h
@@ -66,7 +66,7 @@ class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DInputSequence : public QObject
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DInput::QAbstractActionInput> sequences READ qmlActionInputs CONSTANT)
public:
- explicit Quick3DInputSequence(QObject *parent = Q_NULLPTR);
+ explicit Quick3DInputSequence(QObject *parent = nullptr);
inline QInputSequence *parentSequence() const { return qobject_cast<QInputSequence *>(parent()); }
QQmlListProperty<QAbstractActionInput> qmlActionInputs();
diff --git a/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h b/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h
index f0bde3ba3..5b3b36039 100644
--- a/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h
+++ b/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h
@@ -69,7 +69,7 @@ class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DLogicalDevice : public QObject
Q_PROPERTY(QQmlListProperty<Qt3DInput::QAxis> axes READ qmlAxes CONSTANT)
Q_PROPERTY(QQmlListProperty<Qt3DInput::QAction> actions READ qmlActions CONSTANT)
public:
- explicit Quick3DLogicalDevice(QObject *parent = Q_NULLPTR);
+ explicit Quick3DLogicalDevice(QObject *parent = nullptr);
inline QLogicalDevice *parentLogicalDevice() const { return qobject_cast<QLogicalDevice *>(parent()); }
QQmlListProperty<QAxis> qmlAxes();
diff --git a/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp b/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp
index 99fdcccb5..8f9fe81ec 100644
--- a/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp
+++ b/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp
@@ -59,7 +59,7 @@ void QuickInputNodeFactory::registerType(const char *className, const char *quic
Qt3DCore::QNode *QuickInputNodeFactory::createNode(const char *type)
{
if (!m_types.contains(type))
- return Q_NULLPTR;
+ return nullptr;
Type &typeInfo(m_types[type]);
@@ -68,7 +68,7 @@ Qt3DCore::QNode *QuickInputNodeFactory::createNode(const char *type)
typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second);
}
- return typeInfo.t ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t->create()) : Q_NULLPTR;
+ return typeInfo.t ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t->create()) : nullptr;
}
} // namespace Qt3DInput
diff --git a/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h b/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
index f53fca3ff..103152b9d 100644
--- a/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
+++ b/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
@@ -71,9 +71,9 @@ public:
private:
struct Type {
- Type() : t(Q_NULLPTR), resolved(false) { }
+ Type() : t(nullptr), resolved(false) { }
Type(const char *quickName, int major, int minor)
- : quickName(quickName), version(major, minor), t(Q_NULLPTR), resolved(false) { }
+ : quickName(quickName), version(major, minor), t(nullptr), resolved(false) { }
QByteArray quickName;
QPair<int, int> version;
QQmlType *t;