diff options
8 files changed, 24 insertions, 23 deletions
diff --git a/examples/bluetooth/heartlistener/heartrate.cpp b/examples/bluetooth/heartlistener/heartrate.cpp index 7d135e5b..27461978 100644 --- a/examples/bluetooth/heartlistener/heartrate.cpp +++ b/examples/bluetooth/heartlistener/heartrate.cpp @@ -87,7 +87,7 @@ void HeartRate::deviceSearch() void HeartRate::addDevice(const QBluetoothDeviceInfo &device) { - if (device.coreConfiguration() & QBluetoothDeviceInfo::LowEnergyCoreConfiguration) { + if (device.coreConfigurations() & QBluetoothDeviceInfo::LowEnergyCoreConfiguration) { QBluetoothLocalDevice localDevice; QBluetoothLocalDevice::Pairing pairingStatus = localDevice.pairingStatus(device.address()); if (pairingStatus == QBluetoothLocalDevice::Paired || pairingStatus == QBluetoothLocalDevice::AuthorizedPaired ) diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp index d137fd40..8f899354 100644 --- a/examples/bluetooth/lowenergyscanner/device.cpp +++ b/examples/bluetooth/lowenergyscanner/device.cpp @@ -95,7 +95,7 @@ void Device::startDeviceDiscovery() void Device::addDevice(const QBluetoothDeviceInfo &info) { - if (info.coreConfiguration() & QBluetoothDeviceInfo::LowEnergyCoreConfiguration) { + if (info.coreConfigurations() & QBluetoothDeviceInfo::LowEnergyCoreConfiguration) { DeviceInfo *d = new DeviceInfo(info); devices.append(d); setUpdate("Last device added: " + d->getName()); diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp index fd2c5703..f70c3e64 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp @@ -314,9 +314,9 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_deviceFound(const QString &addres * Low Energy devices do not have property Class. */ if (btClass == 0) - device.setCoreConfiguration(QBluetoothDeviceInfo::LowEnergyCoreConfiguration); + device.setCoreConfigurations(QBluetoothDeviceInfo::LowEnergyCoreConfiguration); else - device.setCoreConfiguration(QBluetoothDeviceInfo::BaseRateCoreConfiguration); + device.setCoreConfigurations(QBluetoothDeviceInfo::BaseRateCoreConfiguration); for (int i = 0; i < discoveredDevices.size(); i++) { if (discoveredDevices[i].address() == device.address()) { if (discoveredDevices[i] == device) { diff --git a/src/bluetooth/qbluetoothdeviceinfo.cpp b/src/bluetooth/qbluetoothdeviceinfo.cpp index 9e6ebaec..d43cbab6 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.cpp +++ b/src/bluetooth/qbluetoothdeviceinfo.cpp @@ -515,25 +515,25 @@ QBluetoothDeviceInfo::DataCompleteness QBluetoothDeviceInfo::serviceUuidsComplet } /*! - Sets the CoreConfiguration of the device to a \a coreConfig. This will help to make a difference + Sets the CoreConfigurations of the device to \a coreConfigs. This will help to make a difference between regular and Low Energy devices. - \sa coreConfiguration() + \sa coreConfigurations() */ -void QBluetoothDeviceInfo::setCoreConfiguration(const CoreConfiguration &coreConfig) +void QBluetoothDeviceInfo::setCoreConfigurations(QBluetoothDeviceInfo::CoreConfigurations coreConfigs) { Q_D(QBluetoothDeviceInfo); - d->deviceCoreConfiguration = coreConfig; + d->deviceCoreConfiguration = coreConfigs; } /*! Returns the configuration of the device. If device configuration is not set, basic rate device configuration will be returned. - \sa setCoreConfiguration() + \sa setCoreConfigurations() */ -QBluetoothDeviceInfo::CoreConfiguration QBluetoothDeviceInfo::coreConfiguration() const +QBluetoothDeviceInfo::CoreConfigurations QBluetoothDeviceInfo::coreConfigurations() const { Q_D(const QBluetoothDeviceInfo); diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h index 2bfc8b55..f2cc1529 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.h +++ b/src/bluetooth/qbluetoothdeviceinfo.h @@ -231,8 +231,9 @@ public: void setServiceUuids(const QList<QBluetoothUuid> &uuids, DataCompleteness completeness); QList<QBluetoothUuid> serviceUuids(DataCompleteness *completeness = 0) const; DataCompleteness serviceUuidsCompleteness() const; - void setCoreConfiguration(const CoreConfiguration &coreConfig); - CoreConfiguration coreConfiguration() const; + + void setCoreConfigurations(QBluetoothDeviceInfo::CoreConfigurations coreConfigs); + QBluetoothDeviceInfo::CoreConfigurations coreConfigurations() const; protected: QBluetoothDeviceInfoPrivate *d_ptr; diff --git a/src/bluetooth/qbluetoothdeviceinfo_p.h b/src/bluetooth/qbluetoothdeviceinfo_p.h index d6c63a24..f5e575aa 100644 --- a/src/bluetooth/qbluetoothdeviceinfo_p.h +++ b/src/bluetooth/qbluetoothdeviceinfo_p.h @@ -69,7 +69,7 @@ public: QBluetoothDeviceInfo::DataCompleteness serviceUuidsCompleteness; QList<QBluetoothUuid> serviceUuids; - QBluetoothDeviceInfo::CoreConfiguration deviceCoreConfiguration; + QBluetoothDeviceInfo::CoreConfigurations deviceCoreConfiguration; }; QT_END_NAMESPACE diff --git a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp index 6b99639e..023c1390 100644 --- a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp +++ b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp @@ -278,10 +278,10 @@ void tst_QBluetoothDeviceInfo::tst_construction() QCOMPARE(deviceInfo.serviceClasses(), serviceClasses); QCOMPARE(deviceInfo.majorDeviceClass(), majorDeviceClass); QCOMPARE(deviceInfo.minorDeviceClass(), minorDeviceClass); - QCOMPARE(deviceInfo.coreConfiguration(), QBluetoothDeviceInfo::BaseRateCoreConfiguration); + QCOMPARE(deviceInfo.coreConfigurations(), QBluetoothDeviceInfo::BaseRateCoreConfiguration); - deviceInfo.setCoreConfiguration(coreConfiguration); - QCOMPARE(deviceInfo.coreConfiguration(), coreConfiguration); + deviceInfo.setCoreConfigurations(coreConfiguration); + QCOMPARE(deviceInfo.coreConfigurations(), coreConfiguration); QBluetoothDeviceInfo copyInfo(deviceInfo); QVERIFY(copyInfo.isValid()); @@ -291,7 +291,7 @@ void tst_QBluetoothDeviceInfo::tst_construction() QCOMPARE(copyInfo.serviceClasses(), serviceClasses); QCOMPARE(copyInfo.majorDeviceClass(), majorDeviceClass); QCOMPARE(copyInfo.minorDeviceClass(), minorDeviceClass); - QCOMPARE(copyInfo.coreConfiguration(), coreConfiguration); + QCOMPARE(copyInfo.coreConfigurations(), coreConfiguration); } } @@ -311,7 +311,7 @@ void tst_QBluetoothDeviceInfo::tst_assignment() QFETCH(QBluetoothDeviceInfo::CoreConfiguration, coreConfiguration); QBluetoothDeviceInfo deviceInfo(address, name, classOfDevice); - deviceInfo.setCoreConfiguration(coreConfiguration); + deviceInfo.setCoreConfigurations(coreConfiguration); QVERIFY(deviceInfo.isValid()); @@ -325,7 +325,7 @@ void tst_QBluetoothDeviceInfo::tst_assignment() QCOMPARE(copyInfo.serviceClasses(), serviceClasses); QCOMPARE(copyInfo.majorDeviceClass(), majorDeviceClass); QCOMPARE(copyInfo.minorDeviceClass(), minorDeviceClass); - QCOMPARE(copyInfo.coreConfiguration(), coreConfiguration); + QCOMPARE(copyInfo.coreConfigurations(), coreConfiguration); } { @@ -342,7 +342,7 @@ void tst_QBluetoothDeviceInfo::tst_assignment() QCOMPARE(copyInfo.serviceClasses(), serviceClasses); QCOMPARE(copyInfo.majorDeviceClass(), majorDeviceClass); QCOMPARE(copyInfo.minorDeviceClass(), minorDeviceClass); - QCOMPARE(copyInfo.coreConfiguration(), coreConfiguration); + QCOMPARE(copyInfo.coreConfigurations(), coreConfiguration); } { @@ -368,8 +368,8 @@ void tst_QBluetoothDeviceInfo::tst_assignment() QCOMPARE(copyInfo2.majorDeviceClass(), majorDeviceClass); QCOMPARE(copyInfo1.minorDeviceClass(), minorDeviceClass); QCOMPARE(copyInfo2.minorDeviceClass(), minorDeviceClass); - QCOMPARE(copyInfo1.coreConfiguration(), coreConfiguration); - QCOMPARE(copyInfo2.coreConfiguration(), coreConfiguration); + QCOMPARE(copyInfo1.coreConfigurations(), coreConfiguration); + QCOMPARE(copyInfo2.coreConfigurations(), coreConfiguration); } { diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index ee9d39a8..75c1c821 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp @@ -478,7 +478,7 @@ void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscovery() *reinterpret_cast<const QLowEnergyServiceInfo*>(v.constData()); QVERIFY(info.isValid()); - if (info.device().coreConfiguration() == QBluetoothDeviceInfo::LowEnergyCoreConfiguration || info.device().coreConfiguration() == QBluetoothDeviceInfo::BaseRateAndLowEnergyCoreConfiguration) { + if (info.device().coreConfigurations() & QBluetoothDeviceInfo::LowEnergyCoreConfiguration) { leDevice = true; leController.connectToService(info); leCounter ++; |