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 | |
parent | c25d62cc83b9e8daa8c9b7fd6c03782b500093db (diff) | |
download | qtconnectivity-03e694e2702d598d3cfced3a63571d9f0fd66f16.tar.gz |
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>
-rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent.h | 4 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothdeviceinfo.h | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothlocaldevice.h | 4 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothserver.h | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.h | 4 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothsocket.h | 4 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothtransfermanager.h | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothtransferreply.h | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothuuid.h | 4 | ||||
-rw-r--r-- | src/bluetooth/qlowenergycontroller.h | 9 | ||||
-rw-r--r-- | src/bluetooth/qlowenergyservice.h | 2 | ||||
-rw-r--r-- | src/nfc/qnearfieldmanager.h | 4 | ||||
-rw-r--r-- | src/nfc/qnearfieldsharemanager.h | 2 | ||||
-rw-r--r-- | src/nfc/qnearfieldsharetarget.h | 2 | ||||
-rw-r--r-- | src/nfc/qnearfieldtarget.h | 2 | ||||
-rw-r--r-- | src/nfc/qqmlndefrecord.h | 4 |
16 files changed, 26 insertions, 27 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.h b/src/bluetooth/qbluetoothdevicediscoveryagent.h index 1641f16f..81febdc4 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent.h @@ -69,9 +69,9 @@ public: }; Q_ENUM(InquiryType) - QBluetoothDeviceDiscoveryAgent(QObject *parent = 0); + explicit QBluetoothDeviceDiscoveryAgent(QObject *parent = Q_NULLPTR); explicit QBluetoothDeviceDiscoveryAgent(const QBluetoothAddress &deviceAdapter, - QObject *parent = 0); + QObject *parent = Q_NULLPTR); ~QBluetoothDeviceDiscoveryAgent(); // TODO Remove inquiry type in Qt 6 -> not really used anywhere diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h index e543286d..a39b593f 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.h +++ b/src/bluetooth/qbluetoothdeviceinfo.h @@ -225,7 +225,7 @@ public: void setRssi(qint16 signal); void setServiceUuids(const QList<QBluetoothUuid> &uuids, DataCompleteness completeness); - QList<QBluetoothUuid> serviceUuids(DataCompleteness *completeness = 0) const; + QList<QBluetoothUuid> serviceUuids(DataCompleteness *completeness = Q_NULLPTR) const; DataCompleteness serviceUuidsCompleteness() const; void setCoreConfigurations(QBluetoothDeviceInfo::CoreConfigurations coreConfigs); diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h index 40e143ab..8d1d7b78 100644 --- a/src/bluetooth/qbluetoothlocaldevice.h +++ b/src/bluetooth/qbluetoothlocaldevice.h @@ -73,8 +73,8 @@ public: }; Q_ENUM(Error) - QBluetoothLocalDevice(QObject *parent = 0); - explicit QBluetoothLocalDevice(const QBluetoothAddress &address, QObject *parent = 0); + explicit QBluetoothLocalDevice(QObject *parent = Q_NULLPTR); + explicit QBluetoothLocalDevice(const QBluetoothAddress &address, QObject *parent = Q_NULLPTR); virtual ~QBluetoothLocalDevice(); bool isValid() const; diff --git a/src/bluetooth/qbluetoothserver.h b/src/bluetooth/qbluetoothserver.h index 752780a5..47b0b88b 100644 --- a/src/bluetooth/qbluetoothserver.h +++ b/src/bluetooth/qbluetoothserver.h @@ -64,7 +64,7 @@ public: }; Q_ENUM(Error) - QBluetoothServer(QBluetoothServiceInfo::Protocol serverType, QObject *parent = 0); + explicit QBluetoothServer(QBluetoothServiceInfo::Protocol serverType, QObject *parent = Q_NULLPTR); ~QBluetoothServer(); void close(); diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h index 984a4084..629259e4 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent.h @@ -74,8 +74,8 @@ public: }; Q_ENUM(DiscoveryMode) - QBluetoothServiceDiscoveryAgent(QObject *parent = 0); - explicit QBluetoothServiceDiscoveryAgent(const QBluetoothAddress &deviceAdapter, QObject *parent = 0); + explicit QBluetoothServiceDiscoveryAgent(QObject *parent = Q_NULLPTR); + explicit QBluetoothServiceDiscoveryAgent(const QBluetoothAddress &deviceAdapter, QObject *parent = Q_NULLPTR); ~QBluetoothServiceDiscoveryAgent(); bool isActive() const; diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h index 5d686d7f..d5da783f 100644 --- a/src/bluetooth/qbluetoothsocket.h +++ b/src/bluetooth/qbluetoothsocket.h @@ -82,8 +82,8 @@ public: }; Q_ENUM(SocketError) - explicit QBluetoothSocket(QBluetoothServiceInfo::Protocol socketType, QObject *parent = 0); // create socket of type socketType - QBluetoothSocket(QObject *parent = 0); // create a blank socket + explicit QBluetoothSocket(QBluetoothServiceInfo::Protocol socketType, QObject *parent = Q_NULLPTR); // create socket of type socketType + explicit QBluetoothSocket(QObject *parent = Q_NULLPTR); // create a blank socket virtual ~QBluetoothSocket(); void abort(); diff --git a/src/bluetooth/qbluetoothtransfermanager.h b/src/bluetooth/qbluetoothtransfermanager.h index 6d6b0318..d4257fab 100644 --- a/src/bluetooth/qbluetoothtransfermanager.h +++ b/src/bluetooth/qbluetoothtransfermanager.h @@ -52,7 +52,7 @@ class Q_BLUETOOTH_EXPORT QBluetoothTransferManager : public QObject Q_OBJECT public: - explicit QBluetoothTransferManager(QObject *parent = 0); + explicit QBluetoothTransferManager(QObject *parent = Q_NULLPTR); ~QBluetoothTransferManager(); QBluetoothTransferReply *put(const QBluetoothTransferRequest &request, QIODevice *data); diff --git a/src/bluetooth/qbluetoothtransferreply.h b/src/bluetooth/qbluetoothtransferreply.h index 755b9caa..3a5118b9 100644 --- a/src/bluetooth/qbluetoothtransferreply.h +++ b/src/bluetooth/qbluetoothtransferreply.h @@ -82,7 +82,7 @@ Q_SIGNALS: void error(QBluetoothTransferReply::TransferError lastError); protected: - explicit QBluetoothTransferReply(QObject *parent = 0); + explicit QBluetoothTransferReply(QObject *parent = Q_NULLPTR); void setManager(QBluetoothTransferManager *manager); void setRequest(const QBluetoothTransferRequest &request); 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); 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; diff --git a/src/bluetooth/qlowenergyservice.h b/src/bluetooth/qlowenergyservice.h index 524650c9..767bf6d6 100644 --- a/src/bluetooth/qlowenergyservice.h +++ b/src/bluetooth/qlowenergyservice.h @@ -127,7 +127,7 @@ private: // QLowEnergyController is the factory for this class friend class QLowEnergyController; QLowEnergyService(QSharedPointer<QLowEnergyServicePrivate> p, - QObject *parent = 0); + QObject *parent = Q_NULLPTR); }; Q_DECLARE_OPERATORS_FOR_FLAGS(QLowEnergyService::ServiceTypes) diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h index 416c5e91..8c91a801 100644 --- a/src/nfc/qnearfieldmanager.h +++ b/src/nfc/qnearfieldmanager.h @@ -59,8 +59,8 @@ public: Q_ENUM(TargetAccessMode) Q_DECLARE_FLAGS(TargetAccessModes, TargetAccessMode) - explicit QNearFieldManager(QObject *parent = 0); - explicit QNearFieldManager(QNearFieldManagerPrivate *backend, QObject *parent = 0); + explicit QNearFieldManager(QObject *parent = Q_NULLPTR); + explicit QNearFieldManager(QNearFieldManagerPrivate *backend, QObject *parent = Q_NULLPTR); ~QNearFieldManager(); bool isAvailable() const; diff --git a/src/nfc/qnearfieldsharemanager.h b/src/nfc/qnearfieldsharemanager.h index 264e82b6..03dc4db9 100644 --- a/src/nfc/qnearfieldsharemanager.h +++ b/src/nfc/qnearfieldsharemanager.h @@ -47,7 +47,7 @@ class Q_NFC_EXPORT QNearFieldShareManager : public QObject Q_OBJECT public: - explicit QNearFieldShareManager(QObject *parent = 0); + explicit QNearFieldShareManager(QObject *parent = Q_NULLPTR); ~QNearFieldShareManager(); enum ShareError { diff --git a/src/nfc/qnearfieldsharetarget.h b/src/nfc/qnearfieldsharetarget.h index cc85086f..36f4a5cc 100644 --- a/src/nfc/qnearfieldsharetarget.h +++ b/src/nfc/qnearfieldsharetarget.h @@ -63,7 +63,7 @@ Q_SIGNALS: void shareFinished(); private: - explicit QNearFieldShareTarget(QNearFieldShareManager::ShareModes modes, QObject *parent = 0); + explicit QNearFieldShareTarget(QNearFieldShareManager::ShareModes modes, QObject *parent = Q_NULLPTR); QNearFieldShareTargetPrivate *d_ptr; Q_DECLARE_PRIVATE(QNearFieldShareTarget) diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h index a7abbe25..d9f6786e 100644 --- a/src/nfc/qnearfieldtarget.h +++ b/src/nfc/qnearfieldtarget.h @@ -110,7 +110,7 @@ public: QSharedDataPointer<RequestIdPrivate> d; }; - explicit QNearFieldTarget(QObject *parent = 0); + explicit QNearFieldTarget(QObject *parent = Q_NULLPTR); virtual ~QNearFieldTarget(); virtual QByteArray uid() const = 0; diff --git a/src/nfc/qqmlndefrecord.h b/src/nfc/qqmlndefrecord.h index 93a3106e..35b2ab5f 100644 --- a/src/nfc/qqmlndefrecord.h +++ b/src/nfc/qqmlndefrecord.h @@ -63,8 +63,8 @@ public: }; Q_ENUM(TypeNameFormat) - explicit QQmlNdefRecord(QObject *parent = 0); - explicit QQmlNdefRecord(const QNdefRecord &record, QObject *parent = 0); + explicit QQmlNdefRecord(QObject *parent = Q_NULLPTR); + explicit QQmlNdefRecord(const QNdefRecord &record, QObject *parent = Q_NULLPTR); ~QQmlNdefRecord(); QString type() const; |