diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 14:15:08 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 13:37:14 +0000 |
| commit | 1c9abcce13038a3c0b1234cd1c25be09fc3a69f0 (patch) | |
| tree | 85fe1772cf27bf5be114808b92cd6a3fe8f9baf1 | |
| parent | 79f6da1b90c2a1a0a39084b7ab79f1dedc5caa25 (diff) | |
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
QtBase 5.6 headers already compile that way, so let the other
modules follow suit.
Change-Id: I64bf4f61bfdaab96ba65647809a42133c0a87137
Task-number: QTBUG-45291
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| -rw-r--r-- | src/gamepad/qgamepad.h | 2 | ||||
| -rw-r--r-- | src/gamepad/qgamepadkeynavigation.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gamepad/qgamepad.h b/src/gamepad/qgamepad.h index 3ad3503..2c99e85 100644 --- a/src/gamepad/qgamepad.h +++ b/src/gamepad/qgamepad.h @@ -72,7 +72,7 @@ class Q_GAMEPAD_EXPORT QGamepad : public QObject Q_PROPERTY(bool buttonCenter READ buttonCenter NOTIFY buttonCenterChanged) Q_PROPERTY(bool buttonGuide READ buttonGuide NOTIFY buttonGuideChanged) public: - explicit QGamepad(int deviceId = 0, QObject *parent = 0); + explicit QGamepad(int deviceId = 0, QObject *parent = nullptr); ~QGamepad(); int deviceId() const; diff --git a/src/gamepad/qgamepadkeynavigation.h b/src/gamepad/qgamepadkeynavigation.h index e9e7959..9bd599c 100644 --- a/src/gamepad/qgamepadkeynavigation.h +++ b/src/gamepad/qgamepadkeynavigation.h @@ -70,7 +70,7 @@ class Q_GAMEPAD_EXPORT QGamepadKeyNavigation : public QObject Q_PROPERTY(Qt::Key buttonL3Key READ buttonL3Key WRITE setButtonL3Key NOTIFY buttonL3KeyChanged) Q_PROPERTY(Qt::Key buttonR3Key READ buttonR3Key WRITE setButtonR3Key NOTIFY buttonR3KeyChanged) public: - explicit QGamepadKeyNavigation(QObject *parent = 0); + explicit QGamepadKeyNavigation(QObject *parent = nullptr); bool active() const; QGamepad *gamepad() const; |