diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-29 19:35:20 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-01 15:43:11 +0000 |
commit | a01b14670e5b35a951ec57297613418dc829d65c (patch) | |
tree | d9bdcc4ca7b325ff5a1c2e68b801efe9e4d667b8 /src/input/backend/updateaxisactionjob.cpp | |
parent | f9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff) |
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736
Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input/backend/updateaxisactionjob.cpp')
-rw-r--r-- | src/input/backend/updateaxisactionjob.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/input/backend/updateaxisactionjob.cpp b/src/input/backend/updateaxisactionjob.cpp index 741685dc8..97ad15842 100644 --- a/src/input/backend/updateaxisactionjob.cpp +++ b/src/input/backend/updateaxisactionjob.cpp @@ -102,15 +102,15 @@ bool UpdateAxisActionJob::processActionInput(const Qt3DCore::QNodeId actionInput if (m_handler->actionInputManager()->lookupResource(actionInputId)) { ActionInput *actionInput = m_handler->actionInputManager()->lookupResource(actionInputId); - QAbstractPhysicalDeviceBackendNode *physicalDeviceBackend = Q_NULLPTR; + QAbstractPhysicalDeviceBackendNode *physicalDeviceBackend = nullptr; const auto integrations = m_handler->inputDeviceIntegrations(); for (QInputDeviceIntegration *integration : integrations) { - if ((physicalDeviceBackend = integration->physicalDevice(actionInput->sourceDevice())) != Q_NULLPTR) + if ((physicalDeviceBackend = integration->physicalDevice(actionInput->sourceDevice())) != nullptr) break; } - if (physicalDeviceBackend != Q_NULLPTR) { + if (physicalDeviceBackend != nullptr) { // Update the value return anyOfRequiredButtonsPressed(actionInput->buttons(), physicalDeviceBackend); } @@ -170,15 +170,15 @@ void UpdateAxisActionJob::updateAxis(LogicalDevice *device) const auto axisInputIds = axis->inputs(); for (const Qt3DCore::QNodeId axisInputId : axisInputIds) { AxisInput *axisInput = m_handler->axisInputManager()->lookupResource(axisInputId); - QAbstractPhysicalDeviceBackendNode *physicalDeviceBackend = Q_NULLPTR; + QAbstractPhysicalDeviceBackendNode *physicalDeviceBackend = nullptr; const auto integrations = m_handler->inputDeviceIntegrations(); for (QInputDeviceIntegration *integration : integrations) { - if ((physicalDeviceBackend = integration->physicalDevice(axisInput->sourceDevice())) != Q_NULLPTR) + if ((physicalDeviceBackend = integration->physicalDevice(axisInput->sourceDevice())) != nullptr) break; } - if (physicalDeviceBackend != Q_NULLPTR) { + if (physicalDeviceBackend != nullptr) { // Update the value const QVector<int> buttons = axisInput->buttons(); // Axis was specified -> we take this as the base value |