From 127533229614c5202243be06a8317e1946652238 Mon Sep 17 00:00:00 2001 From: Paul Colby Date: Tue, 2 Jan 2024 20:34:49 +1100 Subject: [PATCH] Don't use contextless connects Not strictly necessary, but best practice, enforced in Qt 6.7 since we're defining QT_NO_CONTEXTLESS_CONNECT. See https://bugreports.qt.io/browse/QTBUG-116296 for background. --- src/cli/abstractcommand.cpp | 2 +- src/lib/abstractpokitservice.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cli/abstractcommand.cpp b/src/cli/abstractcommand.cpp index ab81cc6b9..fa40bfed9 100644 --- a/src/cli/abstractcommand.cpp +++ b/src/cli/abstractcommand.cpp @@ -33,7 +33,7 @@ AbstractCommand::AbstractCommand(QObject * const parent) : QObject(parent), #else &PokitDiscoveryAgent::errorOccurred, #endif - [](const PokitDiscoveryAgent::Error &error) { + this, [](const PokitDiscoveryAgent::Error &error) { qCWarning(lc).noquote() << tr("Bluetooth discovery error:") << error; QTimer::singleShot(0, QCoreApplication::instance(), [](){ QCoreApplication::exit(EXIT_FAILURE); diff --git a/src/lib/abstractpokitservice.cpp b/src/lib/abstractpokitservice.cpp index f83cd1a3c..fbc5f188d 100644 --- a/src/lib/abstractpokitservice.cpp +++ b/src/lib/abstractpokitservice.cpp @@ -221,14 +221,14 @@ bool AbstractPokitServicePrivate::createServiceObject() connect(service, &QLowEnergyService::characteristicChanged, this, &AbstractPokitServicePrivate::characteristicChanged); - connect(service, &QLowEnergyService::descriptorRead, + connect(service, &QLowEnergyService::descriptorRead, this, [](const QLowEnergyDescriptor &descriptor, const QByteArray &value){ qCDebug(lc).noquote() << tr(R"(Descriptor "%1" (%2) read.)") .arg(descriptor.name(), descriptor.uuid().toString()); Q_UNUSED(value) }); - connect(service, &QLowEnergyService::descriptorWritten, + connect(service, &QLowEnergyService::descriptorWritten, this, [](const QLowEnergyDescriptor &descriptor, const QByteArray &newValue){ qCDebug(lc).noquote() << tr(R"(Descriptor "%1" (%2) written.)") .arg(descriptor.name(), descriptor.uuid().toString());