diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-08-21 12:15:20 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-09-03 08:38:55 +0200 |
| commit | 5a694018992051a3c99339d5860eda4bbb703275 (patch) | |
| tree | 6e9cf5f194873509fac7abc3c730184b929cb0ef /examples | |
| parent | da7ccfcd08c587283f4656b30ca15011ebdbeb5c (diff) | |
Remove QLowEnergyServiceInfo
There is no need for this class anymore as QBluetoothServiceInfo
covers the same information.
Change-Id: I411a8abb68b34a3a4893a67ee9fac096f44bbd62
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/bluetooth/btscanner/service.cpp | 11 | ||||
| -rw-r--r-- | examples/bluetooth/btscanner/service.h | 3 | ||||
| -rw-r--r-- | examples/bluetooth/lowenergyscanner/device.h | 1 |
3 files changed, 0 insertions, 15 deletions
diff --git a/examples/bluetooth/btscanner/service.cpp b/examples/bluetooth/btscanner/service.cpp index d24837eb..c886c901 100644 --- a/examples/bluetooth/btscanner/service.cpp +++ b/examples/bluetooth/btscanner/service.cpp @@ -45,7 +45,6 @@ #include <qbluetoothservicediscoveryagent.h> #include <qbluetoothserviceinfo.h> #include <qbluetoothlocaldevice.h> -#include <qlowenergyserviceinfo.h> #include <qbluetoothuuid.h> @@ -77,8 +76,6 @@ ServiceDiscoveryDialog::ServiceDiscoveryDialog(const QString &name, connect(discoveryAgent, SIGNAL(serviceDiscovered(QBluetoothServiceInfo)), this, SLOT(addService(QBluetoothServiceInfo))); connect(discoveryAgent, SIGNAL(finished()), ui->status, SLOT(hide())); - connect(discoveryAgent, SIGNAL(serviceDiscovered(const QLowEnergyServiceInfo&)), - this, SLOT(addLowEnergyService(const QLowEnergyServiceInfo&))); discoveryAgent->start(); } @@ -102,11 +99,3 @@ void ServiceDiscoveryDialog::addService(const QBluetoothServiceInfo &info) ui->list->addItem(line); } - -void ServiceDiscoveryDialog::addLowEnergyService(const QLowEnergyServiceInfo &gatt) -{ - QString line = gatt.serviceName(); - - ui->list->addItem(line); -} - diff --git a/examples/bluetooth/btscanner/service.h b/examples/bluetooth/btscanner/service.h index 2089eb87..293bc7a9 100644 --- a/examples/bluetooth/btscanner/service.h +++ b/examples/bluetooth/btscanner/service.h @@ -49,8 +49,6 @@ QT_FORWARD_DECLARE_CLASS(QBluetoothAddress) QT_FORWARD_DECLARE_CLASS(QBluetoothServiceInfo) QT_FORWARD_DECLARE_CLASS(QBluetoothServiceDiscoveryAgent) -QT_FORWARD_DECLARE_CLASS (QLowEnergyServiceInfo) -QT_FORWARD_DECLARE_CLASS (QLowEnergyCharacteristicInfo) QT_USE_NAMESPACE @@ -64,7 +62,6 @@ public: public slots: void addService(const QBluetoothServiceInfo&); - void addLowEnergyService(const QLowEnergyServiceInfo&); private: QBluetoothServiceDiscoveryAgent *discoveryAgent; diff --git a/examples/bluetooth/lowenergyscanner/device.h b/examples/bluetooth/lowenergyscanner/device.h index 97a52b26..09b32599 100644 --- a/examples/bluetooth/lowenergyscanner/device.h +++ b/examples/bluetooth/lowenergyscanner/device.h @@ -55,7 +55,6 @@ #include "characteristicinfo.h" QT_FORWARD_DECLARE_CLASS (QBluetoothDeviceInfo) -QT_FORWARD_DECLARE_CLASS (QLowEnergyServiceInfo) QT_FORWARD_DECLARE_CLASS (QBluetoothServiceInfo) class Device: public QObject |