summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2018-11-21 13:46:35 +0100
committerAlex Blasche <alexander.blasche@qt.io>2018-11-22 09:37:16 +0100
commitc3820b3d04aca98ee4e0d5eb85b23819c039532f (patch)
tree3d5b149c4c32fb7934d33e114e47f05500bc2fa0 /src/bluetooth/qbluetoothdevicediscoveryagent_p.h
parent6cdb8dc9cd8a518d050d08be79938feee7a9bde2 (diff)
parent0446463da215fb14a6d5e70f3f9e5d8c2137d296 (diff)
Merge remote-tracking branch 'gerrit/dev' into win32
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.h')
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent_p.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
index cb12352f..97beced3 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -164,11 +164,11 @@ private:
QBluetoothAddress m_adapterAddress;
bool pendingCancel;
bool pendingStart;
- OrgBluezManagerInterface *manager;
- OrgBluezAdapterInterface *adapter;
- OrgFreedesktopDBusObjectManagerInterface *managerBluez5;
- OrgBluezAdapter1Interface *adapterBluez5;
- QTimer *discoveryTimer;
+ OrgBluezManagerInterface *manager = nullptr;
+ OrgBluezAdapterInterface *adapter = nullptr;
+ OrgFreedesktopDBusObjectManagerInterface *managerBluez5 = nullptr;
+ OrgBluezAdapter1Interface *adapterBluez5 = nullptr;
+ QTimer *discoveryTimer = nullptr;
QList<OrgFreedesktopDBusPropertiesInterface *> propertyMonitors;
void deviceFoundBluez5(const QString& devicePath);