From 9c124b1b0a3730978699b8a6420308b5e5ab4e4e Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 26 Nov 2018 10:37:10 +0100 Subject: Qt 6: Deprecate QHash::insertMulti [ChangeLog][QtCore][QHash] insertMulti(), unite() and values(const Key &key) are now deprecated. Please use QMultiHash instead. Change-Id: Ic14907fd5fd38d585708e2dcf2c0200d221ebb25 Reviewed-by: Timur Pocheptsov --- src/dbus/qdbusargument.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dbus') diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index b7cd4c8989..340f11bf5d 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -370,7 +370,7 @@ inline const QDBusArgument &operator>>(const QDBusArgument &arg, QHash & T value; arg.beginMapEntry(); arg >> key >> value; - map.insertMulti(key, value); + static_cast &>(map).insert(key, value); arg.endMapEntry(); } arg.endMap(); -- cgit v1.2.3 From 43837f38b23e46b2b26599b30724902ce6eddabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Wed, 27 Nov 2019 17:13:13 +0100 Subject: Change some uses of QMap::insertMulti to QMultiMap::insert By casting it, these are situations where we cannot change the type itself to QMultiMap. For QVariant it's a public define and for dbus it's the type of an argument to the function. Change-Id: I0f385dc857fce5de3e8254d18268fd84a6d7707c Reviewed-by: Lars Knoll --- src/dbus/qdbusargument.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dbus') diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 340f11bf5d..477bd1e8fd 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -321,7 +321,7 @@ inline const QDBusArgument &operator>>(const QDBusArgument &arg, QMap &m T value; arg.beginMapEntry(); arg >> key >> value; - map.insertMulti(key, value); + static_cast &>(map).insert(key, value); arg.endMapEntry(); } arg.endMap(); -- cgit v1.2.3 From 40f28b1a8afbe15da369db53cda3dadd8d11ee43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 29 Nov 2019 12:13:49 +0100 Subject: Don't use QMap::unite for merging maps Other code using these maps are not treating them like multi-maps Change-Id: I3381fde3b3612a29110cfe890f20f96f3c0bd3a2 Reviewed-by: Lars Knoll --- src/dbus/qdbusmetaobject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dbus') diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 74e17ced77..3c529ab755 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -631,10 +631,10 @@ QDBusMetaObject *QDBusMetaObject::createMetaObject(const QString &interface, con QDBusIntrospection::Interface merged = *it.value().constData(); for (++it; it != end; ++it) { - merged.annotations.unite(it.value()->annotations); + merged.annotations.insert(it.value()->annotations); merged.methods.unite(it.value()->methods); merged.signals_.unite(it.value()->signals_); - merged.properties.unite(it.value()->properties); + merged.properties.insert(it.value()->properties); } merged.name = QLatin1String("local.Merged"); -- cgit v1.2.3 From d6266c757d2f2ea4ff1e71dc8545f9bf97aa3bb1 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 6 Dec 2019 13:19:37 +0100 Subject: Replace usages of QVariant::value by qvariant_cast This is done automatically with a clazy check Change-Id: I3b59511d3d36d416c8eda74858ead611d327b116 Reviewed-by: Lars Knoll --- src/dbus/qdbusinterface.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/dbus') diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp index 72b9d42247..fb958a8954 100644 --- a/src/dbus/qdbusinterface.cpp +++ b/src/dbus/qdbusinterface.cpp @@ -60,15 +60,15 @@ static void copyArgument(void *to, int id, const QVariant &arg) return; case QMetaType::UChar: - *reinterpret_cast(to) = arg.value(); + *reinterpret_cast(to) = qvariant_cast(arg); return; case QMetaType::Short: - *reinterpret_cast(to) = arg.value(); + *reinterpret_cast(to) = qvariant_cast(arg); return; case QMetaType::UShort: - *reinterpret_cast(to) = arg.value(); + *reinterpret_cast(to) = qvariant_cast(arg); return; case QVariant::Int: @@ -105,13 +105,13 @@ static void copyArgument(void *to, int id, const QVariant &arg) } if (id == QDBusMetaTypeId::variant()) { - *reinterpret_cast(to) = arg.value(); + *reinterpret_cast(to) = qvariant_cast(arg); return; } else if (id == QDBusMetaTypeId::objectpath()) { - *reinterpret_cast(to) = arg.value(); + *reinterpret_cast(to) = qvariant_cast(arg); return; } else if (id == QDBusMetaTypeId::signature()) { - *reinterpret_cast(to) = arg.value(); + *reinterpret_cast(to) = qvariant_cast(arg); return; } @@ -136,7 +136,7 @@ static void copyArgument(void *to, int id, const QVariant &arg) } // is it the same signature? - QDBusArgument dbarg = arg.value(); + QDBusArgument dbarg = qvariant_cast(arg); if (dbarg.currentSignature() != QLatin1String(userSignature)) { // not the same signature, another mismatch //qWarning? -- cgit v1.2.3