summaryrefslogtreecommitdiffstats
path: root/src/input/frontend
diff options
context:
space:
mode:
Diffstat (limited to 'src/input/frontend')
-rw-r--r--src/input/frontend/qabstractphysicaldevice.h4
-rw-r--r--src/input/frontend/qaction.cpp4
-rw-r--r--src/input/frontend/qaction.h2
-rw-r--r--src/input/frontend/qactioninput.h2
-rw-r--r--src/input/frontend/qactioninput_p.h2
-rw-r--r--src/input/frontend/qaxis.cpp4
-rw-r--r--src/input/frontend/qaxis.h2
-rw-r--r--src/input/frontend/qaxisinput.h2
-rw-r--r--src/input/frontend/qaxisinput_p.h2
-rw-r--r--src/input/frontend/qaxissetting.h2
-rw-r--r--src/input/frontend/qgamepadinput_p.h2
-rw-r--r--src/input/frontend/qgenericinputdevice_p.h2
-rw-r--r--src/input/frontend/qinputaspect.cpp8
-rw-r--r--src/input/frontend/qinputchord.cpp4
-rw-r--r--src/input/frontend/qinputchord.h2
-rw-r--r--src/input/frontend/qinputdeviceintegration.cpp2
-rw-r--r--src/input/frontend/qinputdeviceintegration.h4
-rw-r--r--src/input/frontend/qinputdeviceintegrationfactory.cpp2
-rw-r--r--src/input/frontend/qinputdeviceplugin.cpp2
-rw-r--r--src/input/frontend/qinputdeviceplugin.h2
-rw-r--r--src/input/frontend/qinputsequence.cpp4
-rw-r--r--src/input/frontend/qinputsequence.h2
-rw-r--r--src/input/frontend/qinputsettings.cpp2
-rw-r--r--src/input/frontend/qinputsettings.h2
-rw-r--r--src/input/frontend/qkeyboardhandler.cpp2
-rw-r--r--src/input/frontend/qlogicaldevice.cpp8
-rw-r--r--src/input/frontend/qlogicaldevice.h2
-rw-r--r--src/input/frontend/qmousehandler.cpp2
28 files changed, 40 insertions, 40 deletions
diff --git a/src/input/frontend/qabstractphysicaldevice.h b/src/input/frontend/qabstractphysicaldevice.h
index 94b23bd14..3725ae1c4 100644
--- a/src/input/frontend/qabstractphysicaldevice.h
+++ b/src/input/frontend/qabstractphysicaldevice.h
@@ -57,7 +57,7 @@ class QT3DINPUTSHARED_EXPORT QAbstractPhysicalDevice : public Qt3DCore::QNode
{
Q_OBJECT
public:
- explicit QAbstractPhysicalDevice(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QAbstractPhysicalDevice(Qt3DCore::QNode *parent = nullptr);
virtual int axisCount() const;
virtual int buttonCount() const;
@@ -72,7 +72,7 @@ public:
QVector<QAxisSetting *> axisSettings() const;
protected:
- QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
+ QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent = nullptr);
Q_DECLARE_PRIVATE(QAbstractPhysicalDevice)
Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
};
diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp
index 3eadd9d71..31bac3fa1 100644
--- a/src/input/frontend/qaction.cpp
+++ b/src/input/frontend/qaction.cpp
@@ -120,7 +120,7 @@ void QAction::addInput(QAbstractActionInput *input)
if (!input->parent())
input->setParent(this);
- if (d->m_changeArbiter != Q_NULLPTR) {
+ if (d->m_changeArbiter != nullptr) {
const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), input);
change->setPropertyName("input");
d->notifyObservers(change);
@@ -136,7 +136,7 @@ void QAction::removeInput(QAbstractActionInput *input)
Q_D(QAction);
if (d->m_inputs.contains(input)) {
- if (d->m_changeArbiter != Q_NULLPTR) {
+ if (d->m_changeArbiter != nullptr) {
const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), input);
change->setPropertyName("input");
d->notifyObservers(change);
diff --git a/src/input/frontend/qaction.h b/src/input/frontend/qaction.h
index 442d58e7c..9dc3ab3f4 100644
--- a/src/input/frontend/qaction.h
+++ b/src/input/frontend/qaction.h
@@ -55,7 +55,7 @@ class QT3DINPUTSHARED_EXPORT QAction : public Qt3DCore::QNode
Q_OBJECT
Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
public:
- explicit QAction(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QAction(Qt3DCore::QNode *parent = nullptr);
bool isActive() const;
diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h
index 89c912ef4..0103e0062 100644
--- a/src/input/frontend/qactioninput.h
+++ b/src/input/frontend/qactioninput.h
@@ -58,7 +58,7 @@ class QT3DINPUTSHARED_EXPORT QActionInput : public Qt3DInput::QAbstractActionInp
Q_PROPERTY(QVariantList buttons READ buttons WRITE setButtons NOTIFY buttonsChanged)
public:
- explicit QActionInput(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QActionInput(Qt3DCore::QNode *parent = nullptr);
QAbstractPhysicalDevice *sourceDevice() const;
QVariantList buttons() const;
diff --git a/src/input/frontend/qactioninput_p.h b/src/input/frontend/qactioninput_p.h
index 0927b9805..84a56689d 100644
--- a/src/input/frontend/qactioninput_p.h
+++ b/src/input/frontend/qactioninput_p.h
@@ -69,7 +69,7 @@ class QActionInputPrivate : public Qt3DCore::QNodePrivate
public:
QActionInputPrivate()
: Qt3DCore::QNodePrivate()
- , m_sourceDevice(Q_NULLPTR)
+ , m_sourceDevice(nullptr)
{}
QVariantList m_buttons;
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index 9c5b80a1d..3f7fe632e 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -78,7 +78,7 @@ void QAxis::addInput(QAxisInput *input)
if (!input->parent())
input->setParent(this);
- if (d->m_changeArbiter != Q_NULLPTR) {
+ if (d->m_changeArbiter != nullptr) {
const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), input);
change->setPropertyName("input");
d->notifyObservers(change);
@@ -91,7 +91,7 @@ void QAxis::removeInput(QAxisInput *input)
Q_D(QAxis);
if (d->m_inputs.contains(input)) {
- if (d->m_changeArbiter != Q_NULLPTR) {
+ if (d->m_changeArbiter != nullptr) {
const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), input);
change->setPropertyName("input");
d->notifyObservers(change);
diff --git a/src/input/frontend/qaxis.h b/src/input/frontend/qaxis.h
index d7532d04e..d72ef2c1b 100644
--- a/src/input/frontend/qaxis.h
+++ b/src/input/frontend/qaxis.h
@@ -54,7 +54,7 @@ class QT3DINPUTSHARED_EXPORT QAxis : public Qt3DCore::QNode
Q_OBJECT
Q_PROPERTY(float value READ value NOTIFY valueChanged)
public:
- explicit QAxis(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QAxis(Qt3DCore::QNode *parent = nullptr);
void addInput(QAxisInput *input);
void removeInput(QAxisInput *input);
diff --git a/src/input/frontend/qaxisinput.h b/src/input/frontend/qaxisinput.h
index 97e3f1eeb..1156011e3 100644
--- a/src/input/frontend/qaxisinput.h
+++ b/src/input/frontend/qaxisinput.h
@@ -60,7 +60,7 @@ class QT3DINPUTSHARED_EXPORT QAxisInput : public Qt3DCore::QNode
Q_PROPERTY(QVariantList buttons READ buttons WRITE setButtons NOTIFY buttonsChanged)
public:
- explicit QAxisInput(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QAxisInput(Qt3DCore::QNode *parent = nullptr);
QAbstractPhysicalDevice *sourceDevice() const;
float scale() const;
diff --git a/src/input/frontend/qaxisinput_p.h b/src/input/frontend/qaxisinput_p.h
index b23f27e27..36087564d 100644
--- a/src/input/frontend/qaxisinput_p.h
+++ b/src/input/frontend/qaxisinput_p.h
@@ -66,7 +66,7 @@ class QAxisInputPrivate : public Qt3DCore::QNodePrivate
public:
QAxisInputPrivate()
: Qt3DCore::QNodePrivate()
- , m_sourceDevice(Q_NULLPTR)
+ , m_sourceDevice(nullptr)
, m_scale(0.0f)
, m_axis(-1)
{}
diff --git a/src/input/frontend/qaxissetting.h b/src/input/frontend/qaxissetting.h
index 033b6fa7b..aace04a1b 100644
--- a/src/input/frontend/qaxissetting.h
+++ b/src/input/frontend/qaxissetting.h
@@ -59,7 +59,7 @@ class QT3DINPUTSHARED_EXPORT QAxisSetting : public Qt3DCore::QNode
Q_PROPERTY(bool smooth READ isSmoothEnabled WRITE setSmoothEnabled NOTIFY smoothChanged)
public:
- explicit QAxisSetting(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QAxisSetting(Qt3DCore::QNode *parent = nullptr);
float deadZoneRadius() const;
QVariantList axes() const;
diff --git a/src/input/frontend/qgamepadinput_p.h b/src/input/frontend/qgamepadinput_p.h
index 25c844f47..b30758f82 100644
--- a/src/input/frontend/qgamepadinput_p.h
+++ b/src/input/frontend/qgamepadinput_p.h
@@ -61,7 +61,7 @@ class QT3DINPUTSHARED_PRIVATE_EXPORT QGamepadInput : public QAbstractPhysicalDev
Q_OBJECT
Q_PROPERTY(int deviceId READ deviceId WRITE setDeviceId NOTIFY deviceIdChanged)
public:
- explicit QGamepadInput(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QGamepadInput(Qt3DCore::QNode *parent = nullptr);
explicit QGamepadInput(const QGamepadInput &other);
int deviceId() const;
diff --git a/src/input/frontend/qgenericinputdevice_p.h b/src/input/frontend/qgenericinputdevice_p.h
index 011f3864f..f4af03975 100644
--- a/src/input/frontend/qgenericinputdevice_p.h
+++ b/src/input/frontend/qgenericinputdevice_p.h
@@ -64,7 +64,7 @@ class QT3DINPUTSHARED_PRIVATE_EXPORT QGenericInputDevice : public QAbstractPhysi
Q_PROPERTY(QVariantMap axesMap READ axesMap WRITE setAxesMap NOTIFY axesMapChanged)
Q_PROPERTY(QVariantMap buttonsMap READ buttonsMap WRITE setButtonsMap NOTIFY buttonsMapChanged)
public:
- QGenericInputDevice(Qt3DCore::QNode *parent = Q_NULLPTR);
+ QGenericInputDevice(Qt3DCore::QNode *parent = nullptr);
QVariantMap axesMap() const;
void setAxesMap(const QVariantMap &axesMap);
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp
index a9fd5ccc8..e78b65057 100644
--- a/src/input/frontend/qinputaspect.cpp
+++ b/src/input/frontend/qinputaspect.cpp
@@ -143,7 +143,7 @@ void QInputAspectPrivate::loadInputDevicePlugins()
QStringList keys = QInputDeviceIntegrationFactory::keys();
Q_FOREACH (const QString &key, keys) {
Qt3DInput::QInputDeviceIntegration *integration = QInputDeviceIntegrationFactory::create(key, QStringList());
- if (integration != Q_NULLPTR) {
+ if (integration != nullptr) {
m_inputHandler->addInputDeviceIntegration(integration);
// Initialize will allow the InputDeviceIntegration to
// register their frontend / backend types,
@@ -158,9 +158,9 @@ void QInputAspectPrivate::loadInputDevicePlugins()
QAbstractPhysicalDevice *QInputAspect::createPhysicalDevice(const QString &name)
{
Q_D(QInputAspect);
- QAbstractPhysicalDevice *device = Q_NULLPTR;
+ QAbstractPhysicalDevice *device = nullptr;
Q_FOREACH (Qt3DInput::QInputDeviceIntegration *integration, d->m_inputHandler->inputDeviceIntegrations()) {
- if ((device = integration->createPhysicalDevice(name)) != Q_NULLPTR)
+ if ((device = integration->createPhysicalDevice(name)) != nullptr)
break;
}
return device;
@@ -220,7 +220,7 @@ void QInputAspect::onUnregistered()
Q_D(QInputAspect);
// At this point it is too late to call removeEventFilter as the eventSource (Window)
// may already be destroyed
- d->m_inputHandler.reset(Q_NULLPTR);
+ d->m_inputHandler.reset(nullptr);
}
} // namespace Qt3DInput
diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp
index 8f72049f8..b33e202c4 100644
--- a/src/input/frontend/qinputchord.cpp
+++ b/src/input/frontend/qinputchord.cpp
@@ -150,7 +150,7 @@ void QInputChord::addChord(QAbstractActionInput *input)
if (!input->parent())
input->setParent(this);
- if (d->m_changeArbiter != Q_NULLPTR) {
+ if (d->m_changeArbiter != nullptr) {
const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), input);
change->setPropertyName("chord");
d->notifyObservers(change);
@@ -168,7 +168,7 @@ void QInputChord::removeChord(QAbstractActionInput *input)
Q_D(QInputChord);
if (d->m_chords.contains(input)) {
- if (d->m_changeArbiter != Q_NULLPTR) {
+ if (d->m_changeArbiter != nullptr) {
const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), input);
change->setPropertyName("chord");
d->notifyObservers(change);
diff --git a/src/input/frontend/qinputchord.h b/src/input/frontend/qinputchord.h
index 404fc8624..5177b84c2 100644
--- a/src/input/frontend/qinputchord.h
+++ b/src/input/frontend/qinputchord.h
@@ -57,7 +57,7 @@ class QT3DINPUTSHARED_EXPORT QInputChord : public Qt3DInput::QAbstractActionInpu
Q_PROPERTY(int timeout READ timeout WRITE setTimeout NOTIFY timeoutChanged)
public:
- explicit QInputChord(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QInputChord(Qt3DCore::QNode *parent = nullptr);
int timeout() const;
diff --git a/src/input/frontend/qinputdeviceintegration.cpp b/src/input/frontend/qinputdeviceintegration.cpp
index b9a4cbd9c..de9e763b7 100644
--- a/src/input/frontend/qinputdeviceintegration.cpp
+++ b/src/input/frontend/qinputdeviceintegration.cpp
@@ -48,7 +48,7 @@ namespace Qt3DInput {
QInputDeviceIntegrationPrivate::QInputDeviceIntegrationPrivate()
: QObjectPrivate()
- , m_aspect(Q_NULLPTR)
+ , m_aspect(nullptr)
{
}
diff --git a/src/input/frontend/qinputdeviceintegration.h b/src/input/frontend/qinputdeviceintegration.h
index e6aa7540f..c6a78c500 100644
--- a/src/input/frontend/qinputdeviceintegration.h
+++ b/src/input/frontend/qinputdeviceintegration.h
@@ -65,8 +65,8 @@ class QT3DINPUTSHARED_EXPORT QInputDeviceIntegration : public QObject
{
Q_OBJECT
protected:
- explicit QInputDeviceIntegration(QObject *parent = Q_NULLPTR);
- explicit QInputDeviceIntegration(QInputDeviceIntegrationPrivate &dd, QObject *parent = Q_NULLPTR);
+ explicit QInputDeviceIntegration(QObject *parent = nullptr);
+ explicit QInputDeviceIntegration(QInputDeviceIntegrationPrivate &dd, QObject *parent = nullptr);
template<class Frontend>
void registerBackendType(const Qt3DCore::QBackendNodeMapperPtr &functor)
diff --git a/src/input/frontend/qinputdeviceintegrationfactory.cpp b/src/input/frontend/qinputdeviceintegrationfactory.cpp
index 93e2e1626..12520c2fe 100644
--- a/src/input/frontend/qinputdeviceintegrationfactory.cpp
+++ b/src/input/frontend/qinputdeviceintegrationfactory.cpp
@@ -87,7 +87,7 @@ QInputDeviceIntegration *QInputDeviceIntegrationFactory::create(const QString &n
if (QInputDeviceIntegration *ret = qLoadPlugin<QInputDeviceIntegration, QInputDevicePlugin>(loader(), name, args))
return ret;
#endif
- return Q_NULLPTR;
+ return nullptr;
}
} // Qt3DInput
diff --git a/src/input/frontend/qinputdeviceplugin.cpp b/src/input/frontend/qinputdeviceplugin.cpp
index ed2d42d3f..695e85f50 100644
--- a/src/input/frontend/qinputdeviceplugin.cpp
+++ b/src/input/frontend/qinputdeviceplugin.cpp
@@ -56,7 +56,7 @@ QInputDeviceIntegration *QInputDevicePlugin::create(const QString &key, const QS
{
Q_UNUSED(key)
Q_UNUSED(paramList)
- return Q_NULLPTR;
+ return nullptr;
}
} // Qt3DInput
diff --git a/src/input/frontend/qinputdeviceplugin.h b/src/input/frontend/qinputdeviceplugin.h
index 52e0e3c8c..b31f57f51 100644
--- a/src/input/frontend/qinputdeviceplugin.h
+++ b/src/input/frontend/qinputdeviceplugin.h
@@ -56,7 +56,7 @@ class QT3DINPUTSHARED_EXPORT QInputDevicePlugin : public QObject
{
Q_OBJECT
public:
- explicit QInputDevicePlugin(QObject *parent = Q_NULLPTR);
+ explicit QInputDevicePlugin(QObject *parent = nullptr);
~QInputDevicePlugin();
virtual QInputDeviceIntegration *create(const QString &key, const QStringList &paramList);
diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp
index ffbb4dfd2..812226753 100644
--- a/src/input/frontend/qinputsequence.cpp
+++ b/src/input/frontend/qinputsequence.cpp
@@ -196,7 +196,7 @@ void QInputSequence::addSequence(QAbstractActionInput *input)
if (!input->parent())
input->setParent(this);
- if (d->m_changeArbiter != Q_NULLPTR) {
+ if (d->m_changeArbiter != nullptr) {
const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), input);
change->setPropertyName("sequence");
d->notifyObservers(change);
@@ -213,7 +213,7 @@ void QInputSequence::removeSequence(QAbstractActionInput *input)
{
Q_D(QInputSequence);
if (d->m_sequences.contains(input)) {
- if (d->m_changeArbiter != Q_NULLPTR) {
+ if (d->m_changeArbiter != nullptr) {
const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), input);
change->setPropertyName("sequence");
d->notifyObservers(change);
diff --git a/src/input/frontend/qinputsequence.h b/src/input/frontend/qinputsequence.h
index e6b067774..b5a85c8a9 100644
--- a/src/input/frontend/qinputsequence.h
+++ b/src/input/frontend/qinputsequence.h
@@ -58,7 +58,7 @@ class QT3DINPUTSHARED_EXPORT QInputSequence : public Qt3DInput::QAbstractActionI
Q_PROPERTY(int buttonInterval READ buttonInterval WRITE setButtonInterval NOTIFY buttonIntervalChanged)
public:
- explicit QInputSequence(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QInputSequence(Qt3DCore::QNode *parent = nullptr);
int timeout() const;
int buttonInterval() const;
diff --git a/src/input/frontend/qinputsettings.cpp b/src/input/frontend/qinputsettings.cpp
index d696ad894..73f5ec896 100644
--- a/src/input/frontend/qinputsettings.cpp
+++ b/src/input/frontend/qinputsettings.cpp
@@ -47,7 +47,7 @@ namespace Qt3DInput {
QInputSettingsPrivate::QInputSettingsPrivate()
: Qt3DCore::QComponentPrivate()
- , m_eventSource(Q_NULLPTR)
+ , m_eventSource(nullptr)
{
}
diff --git a/src/input/frontend/qinputsettings.h b/src/input/frontend/qinputsettings.h
index c306ddd96..b4ff0cf0f 100644
--- a/src/input/frontend/qinputsettings.h
+++ b/src/input/frontend/qinputsettings.h
@@ -54,7 +54,7 @@ class QT3DINPUTSHARED_EXPORT QInputSettings : public Qt3DCore::QComponent
Q_OBJECT
Q_PROPERTY(QObject *eventSource READ eventSource WRITE setEventSource NOTIFY eventSourceChanged)
public:
- explicit QInputSettings(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QInputSettings(Qt3DCore::QNode *parent = nullptr);
QObject *eventSource() const;
diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp
index 0e9b969d9..29b68ad60 100644
--- a/src/input/frontend/qkeyboardhandler.cpp
+++ b/src/input/frontend/qkeyboardhandler.cpp
@@ -108,7 +108,7 @@ const QByteArray keyToSignal(int key)
QKeyboardHandlerPrivate::QKeyboardHandlerPrivate()
: QComponentPrivate()
- , m_keyboardDevice(Q_NULLPTR)
+ , m_keyboardDevice(nullptr)
, m_focus(false)
{
m_shareable = false;
diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp
index eda2cb8ac..dae33d902 100644
--- a/src/input/frontend/qlogicaldevice.cpp
+++ b/src/input/frontend/qlogicaldevice.cpp
@@ -158,7 +158,7 @@ void QLogicalDevice::addAction(QAction *action)
if (!action->parent())
action->setParent(this);
- if (d->m_changeArbiter != Q_NULLPTR) {
+ if (d->m_changeArbiter != nullptr) {
const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), action);
change->setPropertyName("action");
d->notifyObservers(change);
@@ -174,7 +174,7 @@ void QLogicalDevice::removeAction(QAction *action)
Q_D(QLogicalDevice);
if (d->m_actions.contains(action)) {
- if (d->m_changeArbiter != Q_NULLPTR) {
+ if (d->m_changeArbiter != nullptr) {
const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), action);
change->setPropertyName("action");
d->notifyObservers(change);
@@ -212,7 +212,7 @@ void QLogicalDevice::addAxis(QAxis *axis)
if (!axis->parent())
axis->setParent(this);
- if (d->m_changeArbiter != Q_NULLPTR) {
+ if (d->m_changeArbiter != nullptr) {
const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), axis);
change->setPropertyName("axis");
d->notifyObservers(change);
@@ -227,7 +227,7 @@ void QLogicalDevice::removeAxis(QAxis *axis)
{
Q_D(QLogicalDevice);
if (d->m_axes.contains(axis)) {
- if (d->m_changeArbiter != Q_NULLPTR) {
+ if (d->m_changeArbiter != nullptr) {
const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), axis);
change->setPropertyName("axis");
d->notifyObservers(change);
diff --git a/src/input/frontend/qlogicaldevice.h b/src/input/frontend/qlogicaldevice.h
index f42deaa73..018d2cb5c 100644
--- a/src/input/frontend/qlogicaldevice.h
+++ b/src/input/frontend/qlogicaldevice.h
@@ -55,7 +55,7 @@ class QT3DINPUTSHARED_EXPORT QLogicalDevice : public Qt3DCore::QComponent
{
Q_OBJECT
public:
- explicit QLogicalDevice(Qt3DCore::QNode *parent = Q_NULLPTR);
+ explicit QLogicalDevice(Qt3DCore::QNode *parent = nullptr);
void addAction(QAction *action);
void removeAction(QAction *action);
diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp
index 8ff0b0e17..052565cce 100644
--- a/src/input/frontend/qmousehandler.cpp
+++ b/src/input/frontend/qmousehandler.cpp
@@ -51,7 +51,7 @@ namespace Qt3DInput {
/*! \internal */
QMouseHandlerPrivate::QMouseHandlerPrivate()
: QComponentPrivate()
- , m_mouseDevice(Q_NULLPTR)
+ , m_mouseDevice(nullptr)
, m_containsMouse(false)
{
m_shareable = false;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 02:45:26 +0000