diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2018-08-22 14:08:18 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2018-08-24 05:44:21 +0000 |
commit | fcf1f30d5fc541a15f0dd4df40a1869630aa3478 (patch) | |
tree | 3310037c3740b939e72fb51efdb066f2c64536b5 /src/bluetooth/android | |
parent | 89e92af7948cde05bbb07a082835344f3f3adb4e (diff) |
Code cleanup: Use nullptr wherever possible
Change-Id: I7dd2d055c8d667f049d7cb2c371619137bf76030
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/bluetooth/android')
6 files changed, 6 insertions, 6 deletions
diff --git a/src/bluetooth/android/androidbroadcastreceiver_p.h b/src/bluetooth/android/androidbroadcastreceiver_p.h index ed30acad..49aa63c0 100644 --- a/src/bluetooth/android/androidbroadcastreceiver_p.h +++ b/src/bluetooth/android/androidbroadcastreceiver_p.h @@ -65,7 +65,7 @@ class AndroidBroadcastReceiver: public QObject { Q_OBJECT public: - AndroidBroadcastReceiver(QObject* parent = 0); + AndroidBroadcastReceiver(QObject* parent = nullptr); virtual ~AndroidBroadcastReceiver(); void addAction(const QAndroidJniObject &filter); diff --git a/src/bluetooth/android/devicediscoverybroadcastreceiver_p.h b/src/bluetooth/android/devicediscoverybroadcastreceiver_p.h index 526c57e2..0302971d 100644 --- a/src/bluetooth/android/devicediscoverybroadcastreceiver_p.h +++ b/src/bluetooth/android/devicediscoverybroadcastreceiver_p.h @@ -63,7 +63,7 @@ class DeviceDiscoveryBroadcastReceiver : public AndroidBroadcastReceiver { Q_OBJECT public: - DeviceDiscoveryBroadcastReceiver(QObject* parent = 0); + DeviceDiscoveryBroadcastReceiver(QObject* parent = nullptr); virtual void onReceive(JNIEnv *env, jobject context, jobject intent); virtual void onReceiveLeScan(JNIEnv *env, jobject jBluetoothDevice, jint rssi, jbyteArray scanRecord); diff --git a/src/bluetooth/android/localdevicebroadcastreceiver_p.h b/src/bluetooth/android/localdevicebroadcastreceiver_p.h index 261bf29d..c6ae424d 100644 --- a/src/bluetooth/android/localdevicebroadcastreceiver_p.h +++ b/src/bluetooth/android/localdevicebroadcastreceiver_p.h @@ -61,7 +61,7 @@ class LocalDeviceBroadcastReceiver : public AndroidBroadcastReceiver { Q_OBJECT public: - explicit LocalDeviceBroadcastReceiver(QObject *parent = 0); + explicit LocalDeviceBroadcastReceiver(QObject *parent = nullptr); virtual ~LocalDeviceBroadcastReceiver() {} virtual void onReceive(JNIEnv *env, jobject context, jobject intent); virtual void onReceiveLeScan(JNIEnv *, jobject, jint, jbyteArray) {} diff --git a/src/bluetooth/android/lowenergynotificationhub_p.h b/src/bluetooth/android/lowenergynotificationhub_p.h index da651e68..27016bc5 100644 --- a/src/bluetooth/android/lowenergynotificationhub_p.h +++ b/src/bluetooth/android/lowenergynotificationhub_p.h @@ -69,7 +69,7 @@ class LowEnergyNotificationHub : public QObject Q_OBJECT public: explicit LowEnergyNotificationHub(const QBluetoothAddress &remote, bool isPeripheral, - QObject *parent = 0); + QObject *parent = nullptr); ~LowEnergyNotificationHub(); static void lowEnergy_connectionChange(JNIEnv*, jobject, jlong qtObject, diff --git a/src/bluetooth/android/serveracceptancethread_p.h b/src/bluetooth/android/serveracceptancethread_p.h index 45a5c667..c7c68314 100644 --- a/src/bluetooth/android/serveracceptancethread_p.h +++ b/src/bluetooth/android/serveracceptancethread_p.h @@ -62,7 +62,7 @@ class ServerAcceptanceThread : public QObject { Q_OBJECT public: - explicit ServerAcceptanceThread(QObject *parent = 0); + explicit ServerAcceptanceThread(QObject *parent = nullptr); ~ServerAcceptanceThread(); void setServiceDetails(const QBluetoothUuid &uuid, const QString &serviceName, QBluetooth::SecurityFlags securityFlags); diff --git a/src/bluetooth/android/servicediscoverybroadcastreceiver_p.h b/src/bluetooth/android/servicediscoverybroadcastreceiver_p.h index a93cbd3f..4984e358 100644 --- a/src/bluetooth/android/servicediscoverybroadcastreceiver_p.h +++ b/src/bluetooth/android/servicediscoverybroadcastreceiver_p.h @@ -64,7 +64,7 @@ class ServiceDiscoveryBroadcastReceiver : public AndroidBroadcastReceiver { Q_OBJECT public: - ServiceDiscoveryBroadcastReceiver(QObject* parent = 0); + ServiceDiscoveryBroadcastReceiver(QObject* parent = nullptr); virtual void onReceive(JNIEnv *env, jobject context, jobject intent); virtual void onReceiveLeScan(JNIEnv *, jobject, jint, jbyteArray) {} |