diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2018-08-22 15:21:15 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2018-08-29 06:01:51 +0000 |
commit | 819bb06c2cb3372cb1bb9ddd7f3a504f78d3452d (patch) | |
tree | fa9f44ef090b5674b51f5e59a437f05da347dfa0 /src/bluetooth/qbluetoothservicediscoveryagent.h | |
parent | 77c3c1427d240c9d17534583218b850f73352b12 (diff) |
Normalize QObject::connect() statements
Some cases use the Q_PRIVATE_SLOT logic which does not require QObject
inheritance. Those cases were converted to lambda logic to avoid need for
QObject inheritance.
The Q_PRIVATE_SLOT macro was removed from qbluetoothdevicediscoveryagent.h.
This is not a BC problem because the macro expands to nothing. Only
moc recognizes the pattern.
Change-Id: Ic7cb4cde397f9b230b6fd0b4046e59e504583e58
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent.h')
-rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h index 4a553c7d..1db05f55 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent.h @@ -110,25 +110,6 @@ Q_SIGNALS: private: QBluetoothServiceDiscoveryAgentPrivate *d_ptr; - - - Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscovered(const QBluetoothDeviceInfo &info)) - Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscoveryFinished()) - Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscoveryError(QBluetoothDeviceDiscoveryAgent::Error)) - Q_PRIVATE_SLOT(d_func(), void _q_serviceDiscoveryFinished()) - -#if QT_CONFIG(bluez) - Q_PRIVATE_SLOT(d_func(), void _q_discoveredServices(QDBusPendingCallWatcher*)) - Q_PRIVATE_SLOT(d_func(), void _q_createdDevice(QDBusPendingCallWatcher*)) - Q_PRIVATE_SLOT(d_func(), void _q_foundDevice(QDBusPendingCallWatcher*)) - Q_PRIVATE_SLOT(d_func(), void _q_sdpScannerDone(int,QProcess::ExitStatus)) -#endif -#ifdef QT_ANDROID_BLUETOOTH - Q_PRIVATE_SLOT(d_func(), void _q_processFetchedUuids(const QBluetoothAddress &address, - const QList<QBluetoothUuid>&)) - Q_PRIVATE_SLOT(d_func(), void _q_fetchUuidsTimeout()) - Q_PRIVATE_SLOT(d_func(), void _q_hostModeStateChanged(QBluetoothLocalDevice::HostMode state)) -#endif }; QT_END_NAMESPACE |