diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-01 02:13:35 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-04-27 11:22:08 +0000 |
| commit | 8d6a2dcffdd90b031996225455c6580371226ead (patch) | |
| tree | 1e4a45ef889de9d9d90a1c502b192f21325a3743 /src/input/frontend/qkeyboarddevice.h | |
| parent | c620bbc80513fac7f7fcf354c49c1197bde5f1c2 (diff) | |
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
Also mark some ctors explicit.
Change-Id: I9fb029fb6cc5eccee30f8eff81e0a1b2616da465
Task-number: QTBUG-45291
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/input/frontend/qkeyboarddevice.h')
| -rw-r--r-- | src/input/frontend/qkeyboarddevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/frontend/qkeyboarddevice.h b/src/input/frontend/qkeyboarddevice.h index 6dbe62965..dbcf39e5b 100644 --- a/src/input/frontend/qkeyboarddevice.h +++ b/src/input/frontend/qkeyboarddevice.h @@ -57,7 +57,7 @@ class QT3DINPUTSHARED_EXPORT QKeyboardDevice : public Qt3DInput::QAbstractPhysic Q_PROPERTY(Qt3DInput::QKeyboardHandler *activeInput READ activeInput NOTIFY activeInputChanged) public: - explicit QKeyboardDevice(QNode *parent = 0); + explicit QKeyboardDevice(QNode *parent = nullptr); QKeyboardHandler *activeInput() const; @@ -69,7 +69,7 @@ public: int buttonIdentifier(const QString &name) const Q_DECL_FINAL; protected: - QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent = 0); + explicit QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent = nullptr); void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; Q_SIGNALS: |