From 03e694e2702d598d3cfced3a63571d9f0fd66f16 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 2 Mar 2016 16:40:42 +0100 Subject: 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 --- src/bluetooth/qlowenergycontroller.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/bluetooth/qlowenergycontroller.h') 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 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; -- cgit v1.2.3