qiurui
/
qtconnectivity
mirror of https://github.com/qt/qtconnectivity.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix QObject::connect warnings due to removed Q_PRIVATE_SLOT instances 

This fixes a regression introduced by 819bb06c2c
on macOS.

Fixes: QTBUG-71032
Change-Id: I34a0325f89049bce86b5137ee722f6f063a4b882
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Alex Blasche 2018-10-09 14:37:06 +02:00
parent 35a97ca4b4
commit b65d9a863d
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
View File

@ -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