diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-02 16:40:42 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-15 17:50:55 +0000 |
| commit | 03e694e2702d598d3cfced3a63571d9f0fd66f16 (patch) | |
| tree | 91a8c7956cf177fb7c86a99c184d407e8e84c968 /src/bluetooth/qbluetoothuuid.h | |
| parent | c25d62cc83b9e8daa8c9b7fd6c03782b500093db (diff) | |
Add explicit and 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.
Added explicit where it was missing. This is not a source-
incompatible change, because code that breaks by this is
a bug. Let's not have this sitting around in an LTS.
Task-number: QTBUG-45291
Change-Id: I375361699615d0fc874e0b96a84543e233eff5f0
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'src/bluetooth/qbluetoothuuid.h')
| -rw-r--r-- | src/bluetooth/qbluetoothuuid.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h index 4646531c..901d458f 100644 --- a/src/bluetooth/qbluetoothuuid.h +++ b/src/bluetooth/qbluetoothuuid.h @@ -376,8 +376,8 @@ public: int minimumSize() const; - quint16 toUInt16(bool *ok = 0) const; - quint32 toUInt32(bool *ok = 0) const; + quint16 toUInt16(bool *ok = Q_NULLPTR) const; + quint32 toUInt32(bool *ok = Q_NULLPTR) const; quint128 toUInt128() const; static QString serviceClassToString(ServiceClassUuid uuid); |