summaryrefslogtreecommitdiffstats
path: root/examples/bluetooth/lowenergyscanner
diff options
context:
space:
mode:
Diffstat (limited to 'examples/bluetooth/lowenergyscanner')
-rw-r--r--examples/bluetooth/lowenergyscanner/device.cpp8
-rw-r--r--examples/bluetooth/lowenergyscanner/device.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp
index e1bb63fe..3d82800f 100644
--- a/examples/bluetooth/lowenergyscanner/device.cpp
+++ b/examples/bluetooth/lowenergyscanner/device.cpp
@@ -156,11 +156,11 @@ void Device::scanServices(const QString &address)
if (!controller) {
// Connecting signals and slots for connecting to LE services.
- controller = new QLowEnergyControllerNew(currentDevice.getDevice().address());
+ controller = new QLowEnergyController(currentDevice.getDevice().address());
connect(controller, SIGNAL(connected()),
this, SLOT(deviceConnected()));
- connect(controller, SIGNAL(error(QLowEnergyControllerNew::Error)),
- this, SLOT(errorReceived(QLowEnergyControllerNew::Error)));
+ connect(controller, SIGNAL(error(QLowEnergyController::Error)),
+ this, SLOT(errorReceived(QLowEnergyController::Error)));
connect(controller, SIGNAL(disconnected()),
this, SLOT(deviceDisconnected()));
connect(controller, SIGNAL(serviceDiscovered(QBluetoothUuid)),
@@ -232,7 +232,7 @@ void Device::deviceConnected()
controller->discoverServices();
}
-void Device::errorReceived(QLowEnergyControllerNew::Error /*error*/)
+void Device::errorReceived(QLowEnergyController::Error /*error*/)
{
qWarning() << "Error: " << controller->errorString();
setUpdate(controller->errorString());
diff --git a/examples/bluetooth/lowenergyscanner/device.h b/examples/bluetooth/lowenergyscanner/device.h
index bb99ffe0..f15c4c95 100644
--- a/examples/bluetooth/lowenergyscanner/device.h
+++ b/examples/bluetooth/lowenergyscanner/device.h
@@ -48,7 +48,7 @@
#include <QList>
#include <QBluetoothServiceDiscoveryAgent>
#include <QBluetoothDeviceDiscoveryAgent>
-#include <QLowEnergyControllerNew>
+#include <QLowEnergyController>
#include <QBluetoothServiceInfo>
#include "deviceinfo.h"
#include "serviceinfo.h"
@@ -88,10 +88,10 @@ private slots:
void deviceScanFinished();
void deviceScanError(QBluetoothDeviceDiscoveryAgent::Error);
- // QLowEnergyControllerNew realted
+ // QLowEnergyController realted
void addLowEnergyService(const QBluetoothUuid &uuid);
void deviceConnected();
- void errorReceived(QLowEnergyControllerNew::Error);
+ void errorReceived(QLowEnergyController::Error);
void serviceScanDone();
void deviceDisconnected();
@@ -115,7 +115,7 @@ private:
QList<QObject*> m_characteristics;
QString m_message;
bool connected;
- QLowEnergyControllerNew *controller;
+ QLowEnergyController *controller;
bool m_deviceScanState;
};