diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 10:36:17 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-04-12 09:04:51 +0000 |
| commit | c2f6e18278e197232aa66ed899a1f1c1b5b726c2 (patch) | |
| tree | 10fec606ac6037ba81cbce9ebc1e98a63e3da27e | |
| parent | eb525425bad4524eb8abb288db7d29c62d621470 (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.
Task-number: QTBUG-45291
Change-Id: I3913c0f2413da79a74026318344b8bf2b94b52f2
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| -rw-r--r-- | src/feedback/qfeedbackactuator.h | 2 | ||||
| -rw-r--r-- | src/feedback/qfeedbackeffect.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/feedback/qfeedbackactuator.h b/src/feedback/qfeedbackactuator.h index bcfa8fa..bd48241 100644 --- a/src/feedback/qfeedbackactuator.h +++ b/src/feedback/qfeedbackactuator.h @@ -70,7 +70,7 @@ public: Unknown }; - QFeedbackActuator(QObject *parent = 0); + QFeedbackActuator(QObject *parent = Q_NULLPTR); int id() const; bool isValid() const; diff --git a/src/feedback/qfeedbackeffect.h b/src/feedback/qfeedbackeffect.h index 824da42..f6e2651 100644 --- a/src/feedback/qfeedbackeffect.h +++ b/src/feedback/qfeedbackeffect.h @@ -86,7 +86,7 @@ public: DeviceBusy }; - explicit QFeedbackEffect(QObject *parent = 0); + explicit QFeedbackEffect(QObject *parent = Q_NULLPTR); virtual State state() const = 0; virtual int duration() const = 0; @@ -125,7 +125,7 @@ class Q_FEEDBACK_EXPORT QFeedbackHapticsEffect : public QFeedbackEffect Q_PROPERTY(QFeedbackActuator* actuator READ actuator WRITE setActuator) public: - explicit QFeedbackHapticsEffect(QObject *parent = 0); + explicit QFeedbackHapticsEffect(QObject *parent = Q_NULLPTR); ~QFeedbackHapticsEffect(); void setDuration(int msecs); @@ -173,7 +173,7 @@ class Q_FEEDBACK_EXPORT QFeedbackFileEffect : public QFeedbackEffect Q_PROPERTY(QUrl source READ source WRITE setSource) public: - explicit QFeedbackFileEffect(QObject *parent = 0); + explicit QFeedbackFileEffect(QObject *parent = Q_NULLPTR); ~QFeedbackFileEffect(); int duration() const; |