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/qlowenergycontroller.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/qlowenergycontroller.h')
-rw-r--r-- | src/bluetooth/qlowenergycontroller.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/bluetooth/qlowenergycontroller.h b/src/bluetooth/qlowenergycontroller.h index be729dda..27e88ded 100644 --- a/src/bluetooth/qlowenergycontroller.h +++ b/src/bluetooth/qlowenergycontroller.h @@ -74,12 +74,12 @@ public: Q_ENUM(RemoteAddressType) explicit QLowEnergyController(const QBluetoothAddress &remoteDevice, - QObject *parent = 0); // TODO Qt 6 remove ctor + QObject *parent = Q_NULLPTR); // TODO Qt 6 remove ctor explicit QLowEnergyController(const QBluetoothDeviceInfo &remoteDevice, - QObject *parent = 0); + QObject *parent = Q_NULLPTR); explicit QLowEnergyController(const QBluetoothAddress &remoteDevice, const QBluetoothAddress &localDevice, - QObject *parent = 0); // TODO Qt 6 remove ctor + QObject *parent = Q_NULLPTR); // TODO Qt 6 remove ctor ~QLowEnergyController(); QBluetoothAddress localAddress() const; @@ -97,8 +97,7 @@ public: void discoverServices(); QList<QBluetoothUuid> services() const; - QLowEnergyService *createServiceObject( - const QBluetoothUuid &service, QObject *parent = 0); + QLowEnergyService *createServiceObject(const QBluetoothUuid &service, QObject *parent = Q_NULLPTR); Error error() const; QString errorString() const; |