diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2018-10-09 14:37:06 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2018-10-09 13:02:29 +0000 |
| commit | b65d9a863dd9831e9f3a55e60c9ec899392dd489 (patch) | |
| tree | fc9ca116b991960813d272022568466a8130c792 | |
| parent | 35a97ca4b43b4dc481b907d37204613460b07bbd (diff) | |
Fix QObject::connect warnings due to removed Q_PRIVATE_SLOT instances
This fixes a regression introduced by 819bb06c2cb3372cb1bb9ddd7f3a504f78d3452d
on macOS.
Fixes: QTBUG-71032
Change-Id: I34a0325f89049bce86b5137ee722f6f063a4b882
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_osx.mm | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm index 61d3bcc2..6a0247a6 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm +++ b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm @@ -83,8 +83,6 @@ public: void _q_deviceDiscovered(const QBluetoothDeviceInfo &info); void _q_deviceDiscoveryError(QBluetoothDeviceDiscoveryAgent::Error); void _q_deviceDiscoveryFinished(); - void _q_serviceDiscoveryFinished(); - private: // SDPInquiryDelegate: @@ -293,11 +291,6 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_deviceDiscoveryFinished() } } -void QBluetoothServiceDiscoveryAgentPrivate::_q_serviceDiscoveryFinished() -{ - // See SDPInquiryFinished. -} - void QBluetoothServiceDiscoveryAgentPrivate::SDPInquiryFinished(IOBluetoothDevice *device) { Q_ASSERT_X(device, Q_FUNC_INFO, "invalid IOBluetoothDevice (nil)"); @@ -397,12 +390,14 @@ void QBluetoothServiceDiscoveryAgentPrivate::setupDeviceDiscoveryAgent() deviceDiscoveryAgent.reset(new QBluetoothDeviceDiscoveryAgent(localAdapterAddress, q_ptr)); - QObject::connect(deviceDiscoveryAgent.data(), SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo &)), - q_ptr, SLOT(_q_deviceDiscovered(const QBluetoothDeviceInfo &))); - QObject::connect(deviceDiscoveryAgent.data(), SIGNAL(finished()), - q_ptr, SLOT(_q_deviceDiscoveryFinished())); - QObject::connect(deviceDiscoveryAgent.data(), SIGNAL(error(QBluetoothDeviceDiscoveryAgent::Error)), - q_ptr, SLOT(_q_deviceDiscoveryError(QBluetoothDeviceDiscoveryAgent::Error))); + QObject::connect(deviceDiscoveryAgent.data(), &QBluetoothDeviceDiscoveryAgent::deviceDiscovered, + this, &QBluetoothServiceDiscoveryAgentPrivate::_q_deviceDiscovered); + QObject::connect(deviceDiscoveryAgent.data(), &QBluetoothDeviceDiscoveryAgent::finished, + this, &QBluetoothServiceDiscoveryAgentPrivate::_q_deviceDiscoveryFinished); + QObject::connect(deviceDiscoveryAgent.data(), + QOverload<QBluetoothDeviceDiscoveryAgent::Error>::of(&QBluetoothDeviceDiscoveryAgent::error), + this, + &QBluetoothServiceDiscoveryAgentPrivate::_q_deviceDiscoveryError); } bool QBluetoothServiceDiscoveryAgentPrivate::isDuplicatedService(const QBluetoothServiceInfo &serviceInfo) const |