Changeset View
Changeset View
Standalone View
Standalone View
src/bluetoothdevice.cpp
Show All 39 Lines | |||||
40 | { | 40 | { | ||
41 | Q_D(BluetoothDevice); | 41 | Q_D(BluetoothDevice); | ||
42 | 42 | | |||
43 | QVariantMap initialProperties = NetworkManagerPrivate::retrieveInitialProperties(d->btIface.staticInterfaceName(), path); | 43 | QVariantMap initialProperties = NetworkManagerPrivate::retrieveInitialProperties(d->btIface.staticInterfaceName(), path); | ||
44 | if (!initialProperties.isEmpty()) { | 44 | if (!initialProperties.isEmpty()) { | ||
45 | d->propertiesChanged(initialProperties); | 45 | d->propertiesChanged(initialProperties); | ||
46 | } | 46 | } | ||
47 | 47 | | |||
48 | #if NM_CHECK_VERSION(1, 4, 0) | | |||
49 | QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, | 48 | QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, | ||
50 | QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); | 49 | QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); | ||
51 | #else | | |||
52 | connect(&d->btIface, &OrgFreedesktopNetworkManagerDeviceBluetoothInterface::PropertiesChanged, d, &BluetoothDevicePrivate::propertiesChanged); | | |||
53 | #endif | | |||
54 | } | 50 | } | ||
55 | 51 | | |||
56 | NetworkManager::BluetoothDevice::~BluetoothDevice() | 52 | NetworkManager::BluetoothDevice::~BluetoothDevice() | ||
57 | { | 53 | { | ||
58 | } | 54 | } | ||
59 | 55 | | |||
60 | NetworkManager::Device::Type NetworkManager::BluetoothDevice::type() const | 56 | NetworkManager::Device::Type NetworkManager::BluetoothDevice::type() const | ||
61 | { | 57 | { | ||
Show All 36 Lines |