From 17de2d6fc1814c0fc32cef5c29f9f791ec5a7ade Mon Sep 17 00:00:00 2001 From: Benedek Kupper Date: Tue, 15 Nov 2022 17:19:54 +0100 Subject: [PATCH] bluetooth: use qt5 connect syntax The origin of the mixed use is probably due to existing overloaded methods of error() The solution is here: https://stackoverflow.com/questions/16794695/connecting-overloaded-signals-and-slots-in-qt-5 --- libnymea-networkmanager/bluetooth/bluetoothserver.cpp | 3 ++- libnymea-networkmanager/bluetooth/networkservice.cpp | 11 ++++++----- libnymea-networkmanager/bluetooth/wirelessservice.cpp | 11 ++++++----- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/libnymea-networkmanager/bluetooth/bluetoothserver.cpp b/libnymea-networkmanager/bluetooth/bluetoothserver.cpp index 9d304ae..28f70b9 100644 --- a/libnymea-networkmanager/bluetooth/bluetoothserver.cpp +++ b/libnymea-networkmanager/bluetooth/bluetoothserver.cpp @@ -452,7 +452,8 @@ void BluetoothServer::start() connect(m_controller, &QLowEnergyController::stateChanged, this, &BluetoothServer::onControllerStateChanged); connect(m_controller, &QLowEnergyController::connected, this, &BluetoothServer::onConnected); connect(m_controller, &QLowEnergyController::disconnected, this, &BluetoothServer::onDisconnected); - connect(m_controller, SIGNAL(error(QLowEnergyController::Error)), this, SLOT(onError(QLowEnergyController::Error))); + connect(m_controller, static_cast + (&QLowEnergyController::error), this, &BluetoothServer::onError); // Note: https://www.bluetooth.com/specifications/gatt/services m_deviceInfoService = m_controller->addService(deviceInformationServiceData(), m_controller); diff --git a/libnymea-networkmanager/bluetooth/networkservice.cpp b/libnymea-networkmanager/bluetooth/networkservice.cpp index 545fc95..e708dc8 100644 --- a/libnymea-networkmanager/bluetooth/networkservice.cpp +++ b/libnymea-networkmanager/bluetooth/networkservice.cpp @@ -50,11 +50,12 @@ NetworkService::NetworkService(QLowEnergyService *service, NetworkManager *netwo qCDebug(dcNetworkManagerBluetoothServer()) << "Create NetworkService."; // Service - connect(m_service, SIGNAL(characteristicChanged(QLowEnergyCharacteristic, QByteArray)), this, SLOT(characteristicChanged(QLowEnergyCharacteristic, QByteArray))); - connect(m_service, SIGNAL(characteristicRead(QLowEnergyCharacteristic, QByteArray)), this, SLOT(characteristicChanged(QLowEnergyCharacteristic, QByteArray))); - connect(m_service, SIGNAL(characteristicWritten(QLowEnergyCharacteristic, QByteArray)), this, SLOT(characteristicWritten(QLowEnergyCharacteristic, QByteArray))); - connect(m_service, SIGNAL(descriptorWritten(QLowEnergyDescriptor, QByteArray)), this, SLOT(descriptorWritten(QLowEnergyDescriptor, QByteArray))); - connect(m_service, SIGNAL(error(QLowEnergyService::ServiceError)), this, SLOT(serviceError(QLowEnergyService::ServiceError))); + connect(m_service, &QLowEnergyService::characteristicChanged, this, &NetworkService::characteristicChanged); + connect(m_service, &QLowEnergyService::characteristicRead, this, &NetworkService::characteristicRead); + connect(m_service, &QLowEnergyService::characteristicWritten, this, &NetworkService::characteristicWritten); + connect(m_service, &QLowEnergyService::descriptorWritten, this, &NetworkService::descriptorWritten); + connect(m_service, static_cast + (&QLowEnergyService::error), this, &NetworkService::serviceError); // NetworkManager connect(m_networkManager, &NetworkManager::stateChanged, this, &NetworkService::onNetworkManagerStateChanged); diff --git a/libnymea-networkmanager/bluetooth/wirelessservice.cpp b/libnymea-networkmanager/bluetooth/wirelessservice.cpp index f9e701f..d5dcb7e 100644 --- a/libnymea-networkmanager/bluetooth/wirelessservice.cpp +++ b/libnymea-networkmanager/bluetooth/wirelessservice.cpp @@ -52,11 +52,12 @@ WirelessService::WirelessService(QLowEnergyService *service, NetworkManager *net qCDebug(dcNetworkManagerBluetoothServer()) << "Create WirelessService."; // Service - connect(m_service, SIGNAL(characteristicChanged(QLowEnergyCharacteristic, QByteArray)), this, SLOT(characteristicChanged(QLowEnergyCharacteristic, QByteArray))); - connect(m_service, SIGNAL(characteristicRead(QLowEnergyCharacteristic, QByteArray)), this, SLOT(characteristicChanged(QLowEnergyCharacteristic, QByteArray))); - connect(m_service, SIGNAL(characteristicWritten(QLowEnergyCharacteristic, QByteArray)), this, SLOT(characteristicWritten(QLowEnergyCharacteristic, QByteArray))); - connect(m_service, SIGNAL(descriptorWritten(QLowEnergyDescriptor, QByteArray)), this, SLOT(descriptorWritten(QLowEnergyDescriptor, QByteArray))); - connect(m_service, SIGNAL(error(QLowEnergyService::ServiceError)), this, SLOT(serviceError(QLowEnergyService::ServiceError))); + connect(m_service, &QLowEnergyService::characteristicChanged, this, &WirelessService::characteristicChanged); + connect(m_service, &QLowEnergyService::characteristicRead, this, &WirelessService::characteristicRead); + connect(m_service, &QLowEnergyService::characteristicWritten, this, &WirelessService::characteristicWritten); + connect(m_service, &QLowEnergyService::descriptorWritten, this, &WirelessService::descriptorWritten); + connect(m_service, static_cast + (&QLowEnergyService::error), this, &WirelessService::serviceError); // Get the wireless network device if there is any if (!m_networkManager->wirelessAvailable()) {