diff options
| author | Nedim Hadzic <nhadzic@blackberry.com> | 2014-03-20 12:08:08 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-25 11:46:14 +0100 |
| commit | ec4aa0bcb592e9668b0767906157a1a51915d76c (patch) | |
| tree | a3670134427ed8191a247d44031dcdb7135ba212 /examples/bluetooth/lowenergyscanner | |
| parent | 5c9d111edbdf73a4875bcf9ea02a3057659f7730 (diff) | |
Added and improved error handling in controller class
Error enums added and implemented together with examples.
Change-Id: I912c396080ee9a6b87f41104eb7e41f8c62abf8b
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'examples/bluetooth/lowenergyscanner')
| -rw-r--r-- | examples/bluetooth/lowenergyscanner/device.cpp | 7 | ||||
| -rw-r--r-- | examples/bluetooth/lowenergyscanner/device.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp index 44cd3512..d137fd40 100644 --- a/examples/bluetooth/lowenergyscanner/device.cpp +++ b/examples/bluetooth/lowenergyscanner/device.cpp @@ -152,7 +152,8 @@ void Device::scanServices(QString address) // Connecting signals and slots for connecting to LE services. info = new QLowEnergyController(); connect(info, SIGNAL(connected(QLowEnergyServiceInfo)), this, SLOT(serviceConnected(QLowEnergyServiceInfo))); - connect(info, SIGNAL(error(QLowEnergyServiceInfo)), this, SLOT(errorReceived(QLowEnergyServiceInfo))); + connect(info, SIGNAL(error(QLowEnergyServiceInfo, QLowEnergyCOntroller::Error)), + this, SLOT(errorReceived(QLowEnergyServiceInfo,QLowEnergyCOntroller::Error))); connect(info, SIGNAL(disconnected(QLowEnergyServiceInfo)), this, SLOT(serviceDisconnected(QLowEnergyServiceInfo))); } } @@ -195,9 +196,9 @@ void Device::serviceConnected(const QLowEnergyServiceInfo &service) emit characteristicsDone(); } -void Device::errorReceived(const QLowEnergyServiceInfo &service) +void Device::errorReceived(const QLowEnergyServiceInfo &service, QLowEnergyController::Error error) { - qWarning() << "Error: " << info->errorString() << service.serviceUuid(); + qWarning() << "Error: " << info->errorString() << service.serviceUuid() << error; setUpdate(info->errorString()); } diff --git a/examples/bluetooth/lowenergyscanner/device.h b/examples/bluetooth/lowenergyscanner/device.h index 307b0fb9..3ac28c8f 100644 --- a/examples/bluetooth/lowenergyscanner/device.h +++ b/examples/bluetooth/lowenergyscanner/device.h @@ -49,6 +49,7 @@ #include <QBluetoothServiceDiscoveryAgent> #include <QBluetoothDeviceDiscoveryAgent> #include "deviceinfo.h" +#include "qlowenergycontroller.h" #include "qlowenergyserviceinfo.h" #include "serviceinfo.h" #include "characteristicinfo.h" @@ -56,7 +57,6 @@ QT_FORWARD_DECLARE_CLASS (QBluetoothDeviceInfo) QT_FORWARD_DECLARE_CLASS (QLowEnergyServiceInfo) QT_FORWARD_DECLARE_CLASS (QLowEnergyCharacteristicInfo) -QT_FORWARD_DECLARE_CLASS (QLowEnergyController) QT_FORWARD_DECLARE_CLASS (QBluetoothServiceInfo) class Device: public QObject @@ -86,7 +86,7 @@ public slots: void serviceScanDone(); void serviceConnected(const QLowEnergyServiceInfo &service); void connectToService(const QString &uuid); - void errorReceived(const QLowEnergyServiceInfo &service); + void errorReceived(const QLowEnergyServiceInfo &service, QLowEnergyController::Error); void disconnectFromService(); void serviceDisconnected(const QLowEnergyServiceInfo &service); void serviceScanError(QBluetoothServiceDiscoveryAgent::Error); |