diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2019-12-05 14:46:56 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2020-01-14 08:10:20 +0000 |
| commit | a9b5b10ce113db1c1bb3d42d058caa7b8e1a964a (patch) | |
| tree | a0c6c04ab8e1d9d0f6a307f0763acb3c5b7ef7b4 /src/bluetooth/qbluetoothtransferreply_bluez.cpp | |
| parent | 738036cb79cf49a0054b94d1dee20675f095ade2 (diff) | |
Fix up broken PropertiesChanged connectionsv5.14.1
Change b7b979d1735764930cc6f736cfa8e22b71547ea8 introduced a slightly
modified version of the OrgFreedesktopDBusPropertiesInterface::PropertiesChanged
signal. This signal was taken into use in one case but all other
instances of this signal were not modified and broken.
This patch modifies the remaining cases and converts the connect statements
to function pointer syntax. This forces the compiler to check that signal
and slot parameters match.
Change-Id: I41b45f7e2f7b66ff29f321acc38ff2ce1c81864e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Thiemo van Engelen <tvanengelen@victronenergy.com>
Diffstat (limited to 'src/bluetooth/qbluetoothtransferreply_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothtransferreply_bluez.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothtransferreply_bluez.cpp b/src/bluetooth/qbluetoothtransferreply_bluez.cpp index 486e6288..c5e6a4cb 100644 --- a/src/bluetooth/qbluetoothtransferreply_bluez.cpp +++ b/src/bluetooth/qbluetoothtransferreply_bluez.cpp @@ -265,15 +265,15 @@ void QBluetoothTransferReplyBluez::sessionStarted(QDBusPendingCallWatcher *watch OrgFreedesktopDBusPropertiesInterface *properties = new OrgFreedesktopDBusPropertiesInterface( QStringLiteral("org.bluez.obex"), path.path(), QDBusConnection::sessionBus(), this); - connect(properties, SIGNAL(PropertiesChanged(QString,QVariantMap,QStringList)), - SLOT(sessionChanged(QString,QVariantMap,QStringList))); + connect(properties, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged, + this, &QBluetoothTransferReplyBluez::sessionChanged); watcher->deleteLater(); } void QBluetoothTransferReplyBluez::sessionChanged(const QString &interface, const QVariantMap &changed_properties, - const QStringList &) + const QStringList &, const QDBusMessage &) { if (changed_properties.contains(QStringLiteral("Transferred"))) { emit transferProgress( |