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/qbluetoothservicediscoveryagent_p.h | |
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/qbluetoothservicediscoveryagent_p.h')
-rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h index 2a57c531..dbf8b1d4 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h @@ -178,23 +178,23 @@ private: DiscoveryState state; QList<QBluetoothUuid> uuidFilter; - QBluetoothDeviceDiscoveryAgent *deviceDiscoveryAgent; + QBluetoothDeviceDiscoveryAgent *deviceDiscoveryAgent = nullptr; QBluetoothServiceDiscoveryAgent::DiscoveryMode mode; bool singleDevice; #if QT_CONFIG(bluez) QString foundHostAdapterPath; - OrgBluezManagerInterface *manager; - OrgFreedesktopDBusObjectManagerInterface *managerBluez5; - OrgBluezAdapterInterface *adapter; - OrgBluezDeviceInterface *device; - QProcess *sdpScannerProcess; + OrgBluezManagerInterface *manager = nullptr; + OrgFreedesktopDBusObjectManagerInterface *managerBluez5 = nullptr; + OrgBluezAdapterInterface *adapter = nullptr; + OrgBluezDeviceInterface *device = nullptr; + QProcess *sdpScannerProcess = nullptr; #endif #ifdef QT_ANDROID_BLUETOOTH - ServiceDiscoveryBroadcastReceiver *receiver; - LocalDeviceBroadcastReceiver *localDeviceReceiver; + ServiceDiscoveryBroadcastReceiver *receiver = nullptr; + LocalDeviceBroadcastReceiver *localDeviceReceiver = nullptr; QAndroidJniObject btAdapter; QMap<QBluetoothAddress,QPair<QBluetoothDeviceInfo,QList<QBluetoothUuid> > > sdpCache; |