summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothlocaldevice_p.h
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2018-08-22 14:08:18 +0200
committerAlex Blasche <alexander.blasche@qt.io>2018-08-24 05:44:21 +0000
commitfcf1f30d5fc541a15f0dd4df40a1869630aa3478 (patch)
tree3310037c3740b939e72fb51efdb066f2c64536b5 /src/bluetooth/qbluetoothlocaldevice_p.h
parent89e92af7948cde05bbb07a082835344f3f3adb4e (diff)
Code cleanup: Use nullptr wherever possible
Change-Id: I7dd2d055c8d667f049d7cb2c371619137bf76030 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice_p.h')
-rw-r--r--src/bluetooth/qbluetoothlocaldevice_p.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h
index a52b683c..038effcd 100644
--- a/src/bluetooth/qbluetoothlocaldevice_p.h
+++ b/src/bluetooth/qbluetoothlocaldevice_p.h
@@ -140,13 +140,13 @@ public:
QSet<OrgBluezDeviceInterface *> devices;
QSet<QBluetoothAddress> connectedDevicesSet;
- OrgBluezAdapterInterface *adapter; //Bluez 4
- OrgBluezAdapter1Interface *adapterBluez5; //Bluez 5
- OrgFreedesktopDBusPropertiesInterface *adapterProperties; //Bluez 5
- OrgFreedesktopDBusObjectManagerInterface *managerBluez5; //Bluez 5
+ OrgBluezAdapterInterface *adapter = nullptr; //Bluez 4
+ OrgBluezAdapter1Interface *adapterBluez5 = nullptr; //Bluez 5
+ OrgFreedesktopDBusPropertiesInterface *adapterProperties = nullptr; //Bluez 5
+ OrgFreedesktopDBusObjectManagerInterface *managerBluez5 = nullptr; //Bluez 5
QMap<QString, OrgFreedesktopDBusPropertiesInterface *> deviceChangeMonitors; //Bluez 5
- OrgBluezAgentAdaptor *agent;
- OrgBluezManagerInterface *manager;
+ OrgBluezAgentAdaptor *agent = nullptr;
+ OrgBluezManagerInterface *manager = nullptr;
QList<QBluetoothAddress> connectedDevices() const;
@@ -154,8 +154,8 @@ public:
QBluetoothAddress localAddress;
QBluetoothAddress address;
QBluetoothLocalDevice::Pairing pairing;
- OrgBluezDevice1Interface *pairingTarget;
- QTimer *pairingDiscoveryTimer;
+ OrgBluezDevice1Interface *pairingTarget = nullptr;
+ QTimer *pairingDiscoveryTimer = nullptr;
QBluetoothLocalDevice::HostMode currentMode;
int pendingHostModeChange;
@@ -199,7 +199,7 @@ private:
void connectDeviceChanges();
QDBusMessage msgConfirmation;
- QDBusConnection *msgConnection;
+ QDBusConnection *msgConnection = nullptr;
QString deviceAdapterPath;
QBluetoothLocalDevice *q_ptr;