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/frontend/qinputaspect.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/frontend/qinputaspect.cpp')
| -rw-r--r-- | src/input/frontend/qinputaspect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 |