summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2019-12-05 14:46:56 +0100
committerAlex Blasche <alexander.blasche@qt.io>2020-01-14 08:10:20 +0000
commita9b5b10ce113db1c1bb3d42d058caa7b8e1a964a (patch)
treea0c6c04ab8e1d9d0f6a307f0763acb3c5b7ef7b4
parent738036cb79cf49a0054b94d1dee20675f095ade2 (diff)
Fix up broken PropertiesChanged connectionsv5.14.15.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>
-rw-r--r--src/bluetooth/bluez/bluez5_helper.cpp9
-rw-r--r--src/bluetooth/bluez/bluez5_helper_p.h3
-rw-r--r--src/bluetooth/qbluetoothlocaldevice_bluez.cpp3
-rw-r--r--src/bluetooth/qbluetoothlocaldevice_p.h3
-rw-r--r--src/bluetooth/qbluetoothtransferreply_bluez.cpp6
-rw-r--r--src/bluetooth/qbluetoothtransferreply_bluez_p.h3
6 files changed, 16 insertions, 11 deletions
diff --git a/src/bluetooth/bluez/bluez5_helper.cpp b/src/bluetooth/bluez/bluez5_helper.cpp
index 7ce67690..58da1ed3 100644
--- a/src/bluetooth/bluez/bluez5_helper.cpp
+++ b/src/bluetooth/bluez/bluez5_helper.cpp
@@ -380,8 +380,8 @@ bool QtBluezDiscoveryManager::registerDiscoveryInterest(const QString &adapterPa
OrgFreedesktopDBusPropertiesInterface *propIface = new OrgFreedesktopDBusPropertiesInterface(
QStringLiteral("org.bluez"), adapterPath, QDBusConnection::systemBus());
- connect(propIface, SIGNAL(PropertiesChanged(QString,QVariantMap,QStringList)),
- SLOT(PropertiesChanged(QString,QVariantMap,QStringList)));
+ connect(propIface, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged,
+ this, &QtBluezDiscoveryManager::PropertiesChanged);
data->propteryListener = propIface;
OrgBluezAdapter1Interface iface(QStringLiteral("org.bluez"), adapterPath,
@@ -444,9 +444,10 @@ void QtBluezDiscoveryManager::InterfacesRemoved(const QDBusObjectPath &object_pa
void QtBluezDiscoveryManager::PropertiesChanged(const QString &interface,
const QVariantMap &changed_properties,
- const QStringList &invalidated_properties)
+ const QStringList &invalidated_properties,
+ const QDBusMessage &)
{
- Q_UNUSED(invalidated_properties);
+ Q_UNUSED(invalidated_properties)
OrgFreedesktopDBusPropertiesInterface *propIface =
qobject_cast<OrgFreedesktopDBusPropertiesInterface *>(sender());
diff --git a/src/bluetooth/bluez/bluez5_helper_p.h b/src/bluetooth/bluez/bluez5_helper_p.h
index 0db6f29f..c7879bdd 100644
--- a/src/bluetooth/bluez/bluez5_helper_p.h
+++ b/src/bluetooth/bluez/bluez5_helper_p.h
@@ -97,7 +97,8 @@ private slots:
const QStringList &interfaces);
void PropertiesChanged(const QString &interface,
const QVariantMap &changed_properties,
- const QStringList &invalidated_properties);
+ const QStringList &invalidated_properties,
+ const QDBusMessage &msg);
private:
void removeAdapterFromMonitoring(const QString &dbusPath);
diff --git a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
index f48717a6..05a540da 100644
--- a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
+++ b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
@@ -843,7 +843,8 @@ void QBluetoothLocalDevicePrivate::initializeAdapterBluez5()
// Bluez 5
void QBluetoothLocalDevicePrivate::PropertiesChanged(const QString &interface,
const QVariantMap &changed_properties,
- const QStringList &/*invalidated_properties*/)
+ const QStringList &/*invalidated_properties*/,
+ const QDBusMessage &)
{
//qDebug() << "Change" << interface << changed_properties;
if (interface == QStringLiteral("org.bluez.Adapter1")) {
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h
index d86ab22f..0c88f691 100644
--- a/src/bluetooth/qbluetoothlocaldevice_p.h
+++ b/src/bluetooth/qbluetoothlocaldevice_p.h
@@ -201,7 +201,8 @@ public slots:
private Q_SLOTS:
void PropertiesChanged(const QString &interface,
const QVariantMap &changed_properties,
- const QStringList &invalidated_properties);
+ const QStringList &invalidated_properties,
+ const QDBusMessage &signal);
void InterfacesAdded(const QDBusObjectPath &object_path,
InterfaceList interfaces_and_properties);
void InterfacesRemoved(const QDBusObjectPath &object_path,
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(
diff --git a/src/bluetooth/qbluetoothtransferreply_bluez_p.h b/src/bluetooth/qbluetoothtransferreply_bluez_p.h
index 48a8d4f0..c604ba17 100644
--- a/src/bluetooth/qbluetoothtransferreply_bluez_p.h
+++ b/src/bluetooth/qbluetoothtransferreply_bluez_p.h
@@ -118,7 +118,8 @@ private slots:
void sessionStarted(QDBusPendingCallWatcher *watcher);
void sessionChanged(const QString &interface,
const QVariantMap &changed_properties,
- const QStringList &invalidated_properties);
+ const QStringList &invalidated_properties,
+ const QDBusMessage &);
public slots:
void abort();