diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2021-03-16 20:09:11 +0100 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2021-03-22 13:51:28 +0100 |
| commit | 75c3a3ee9fd13fe3717b93d575cd7a72415d0bdd (patch) | |
| tree | f6131b91438e958dc0b1e6788b32f8ea72dadac2 /examples/bluetooth/lowenergyscanner | |
| parent | 50311fdd2da129645a8452b7bf644c332ff3808a (diff) | |
rename error signals to errorOccurred
Currently, there is a name clash between the error getter and
the error signal. This leads to extensive use of qOverload or
similar. This patch renames all error signals to errorOccurred
to resolve this.
Task-number: QTBUG-62877
Change-Id: I615e2405f855433b6e142d820072c4d3f35ae28f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples/bluetooth/lowenergyscanner')
| -rw-r--r-- | examples/bluetooth/lowenergyscanner/device.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp index 3c695970..be3f3103 100644 --- a/examples/bluetooth/lowenergyscanner/device.cpp +++ b/examples/bluetooth/lowenergyscanner/device.cpp @@ -68,8 +68,8 @@ Device::Device() discoveryAgent->setLowEnergyDiscoveryTimeout(5000); connect(discoveryAgent, &QBluetoothDeviceDiscoveryAgent::deviceDiscovered, this, &Device::addDevice); - connect(discoveryAgent, QOverload<QBluetoothDeviceDiscoveryAgent::Error>::of(&QBluetoothDeviceDiscoveryAgent::error), - this, &Device::deviceScanError); + connect(discoveryAgent, &QBluetoothDeviceDiscoveryAgent::errorOccurred, this, + &Device::deviceScanError); connect(discoveryAgent, &QBluetoothDeviceDiscoveryAgent::finished, this, &Device::deviceScanFinished); //! [les-devicediscovery-1] @@ -188,8 +188,7 @@ void Device::scanServices(const QString &address) controller = QLowEnergyController::createCentral(currentDevice.getDevice()); connect(controller, &QLowEnergyController::connected, this, &Device::deviceConnected); - connect(controller, QOverload<QLowEnergyController::Error>::of(&QLowEnergyController::error), - this, &Device::errorReceived); + connect(controller, &QLowEnergyController::errorOccurred, this, &Device::errorReceived); connect(controller, &QLowEnergyController::disconnected, this, &Device::deviceDisconnected); connect(controller, &QLowEnergyController::serviceDiscovered, |