From b211fa43a050d63259e5f73ffd68aaa82a1c634b Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Tue, 4 Jul 2017 08:15:09 +0200
Subject: [PATCH] lowenergyscanner: Use new connect syntax
Change-Id: I87047bbc8b777f597ac4843c0c5466489d764f46
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
---
.../bluetooth/lowenergyscanner/device.cpp | 36 +++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp
index 28a051f5..0275c435 100644
--- a/examples/bluetooth/lowenergyscanner/device.cpp
+++ b/examples/bluetooth/lowenergyscanner/device.cpp
@@ -55,11 +55,11 @@ Device::Device():
//! [les-devicediscovery-1]
discoveryAgent = new QBluetoothDeviceDiscoveryAgent();
discoveryAgent->setLowEnergyDiscoveryTimeout(5000);
- connect(discoveryAgent, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo&)),
- this, SLOT(addDevice(const QBluetoothDeviceInfo&)));
- connect(discoveryAgent, SIGNAL(error(QBluetoothDeviceDiscoveryAgent::Error)),
- this, SLOT(deviceScanError(QBluetoothDeviceDiscoveryAgent::Error)));
- connect(discoveryAgent, SIGNAL(finished()), this, SLOT(deviceScanFinished()));
+ connect(discoveryAgent, &QBluetoothDeviceDiscoveryAgent::deviceDiscovered,
+ this, &Device::addDevice);
+ connect(discoveryAgent, QOverload<QBluetoothDeviceDiscoveryAgent::Error>::of(&QBluetoothDeviceDiscoveryAgent::error),
+ this, &Device::deviceScanError);
+ connect(discoveryAgent, &QBluetoothDeviceDiscoveryAgent::finished, this, &Device::deviceScanFinished);
//! [les-devicediscovery-1]
setUpdate("Search");
@@ -169,16 +169,16 @@ void Device::scanServices(const QString &address)
if (!controller) {
// Connecting signals and slots for connecting to LE services.
controller = new QLowEnergyController(currentDevice.getDevice());
- connect(controller, SIGNAL(connected()),
- this, SLOT(deviceConnected()));
- connect(controller, SIGNAL(error(QLowEnergyController::Error)),
- this, SLOT(errorReceived(QLowEnergyController::Error)));
- connect(controller, SIGNAL(disconnected()),
- this, SLOT(deviceDisconnected()));
- connect(controller, SIGNAL(serviceDiscovered(QBluetoothUuid)),
- this, SLOT(addLowEnergyService(QBluetoothUuid)));
- connect(controller, SIGNAL(discoveryFinished()),
- this, SLOT(serviceScanDone()));
+ connect(controller, &QLowEnergyController::connected,
+ this, &Device::deviceConnected);
+ connect(controller, QOverload<QLowEnergyController::Error>::of(&QLowEnergyController::error),
+ this, &Device::errorReceived);
+ connect(controller, &QLowEnergyController::disconnected,
+ this, &Device::deviceDisconnected);
+ connect(controller, &QLowEnergyController::serviceDiscovered,
+ this, &Device::addLowEnergyService);
+ connect(controller, &QLowEnergyController::discoveryFinished,
+ this, &Device::serviceScanDone);
}
if (isRandomAddress())
@@ -235,8 +235,8 @@ void Device::connectToService(const QString &uuid)
if (service->state() == QLowEnergyService::DiscoveryRequired) {
//! [les-service-3]
- connect(service, SIGNAL(stateChanged(QLowEnergyService::ServiceState)),
- this, SLOT(serviceDetailsDiscovered(QLowEnergyService::ServiceState)));
+ connect(service, &QLowEnergyService::stateChanged,
+ this, &Device::serviceDetailsDiscovered);
service->discoverDetails();
setUpdate("Back\n(Discovering details...)");
//! [les-service-3]
@@ -250,7 +250,7 @@ void Device::connectToService(const QString &uuid)
m_characteristics.append(cInfo);
}
- QTimer::singleShot(0, this, SIGNAL(characteristicsUpdated()));
+ QTimer::singleShot(0, this, &Device::characteristicsUpdated);
}
void Device::deviceConnected()
--
GitLab