summaryrefslogtreecommitdiffstats
path: root/examples/bluetooth/lowenergyscanner/device.cpp
diff options
context:
space:
mode:
authorNedim Hadzic <nhadzic@blackberry.com>2014-02-19 15:59:53 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-21 22:57:03 +0100
commitcdc3ee8b00380ad208561e6c9bf575762fa398fb (patch)
tree768f63e371bdfd914943307d9b330d612d7a3329 /examples/bluetooth/lowenergyscanner/device.cpp
parentf9a28bc6009d3f0eecc65df9da75faa8c4133fcf (diff)
Renaming QLowEnergyServiceInfo methods
Ensures that QLowEnergyServiceInfo and QBluetoothServiceInfo are more alike. Tests and examples updated as well. Change-Id: I0f6a97900891a9673f99578bdc8d156a8c403513 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'examples/bluetooth/lowenergyscanner/device.cpp')
-rw-r--r--examples/bluetooth/lowenergyscanner/device.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp
index 50d51631..00a0ae39 100644
--- a/examples/bluetooth/lowenergyscanner/device.cpp
+++ b/examples/bluetooth/lowenergyscanner/device.cpp
@@ -176,7 +176,7 @@ void Device::connectToService(const QString &uuid)
for (int i = 0; i < m_services.size(); i++) {
ServiceInfo *service = (ServiceInfo*)m_services.at(i);
a = QLowEnergyServiceInfo(service->getLeService());
- if (a.uuid() == u)
+ if (a.serviceUuid() == u)
info->connectToService(a);
}
}
@@ -195,8 +195,8 @@ void Device::serviceConnected(const QLowEnergyServiceInfo &service)
void Device::errorReceived(const QLowEnergyServiceInfo &service)
{
- qDebug() << "Error: " << service.errorString();
- setUpdate(service.errorString());
+ qDebug() << "Error: " << info->errorString() << service.serviceUuid();
+ setUpdate(info->errorString());
}
void Device::setUpdate(QString message)