Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c

2 files changed, 9 insertions, 27 deletions

diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h
index c92de0a140..cffc080f87 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h
@@ -92,15 +92,11 @@ public:
 public Q_SLOTS: // METHODS
     QDBusPendingReply<QString, QDBusObjectPath> GetMenuForWindow(uint windowId)
     {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(windowId);
-        return asyncCallWithArgumentList(QStringLiteral("GetMenuForWindow"), argumentList);
+        return asyncCall(QStringLiteral("GetMenuForWindow"), windowId);
     }
     QDBusReply<QString> GetMenuForWindow(uint windowId, QDBusObjectPath &menuObjectPath)
     {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(windowId);
-        QDBusMessage reply = callWithArgumentList(QDBus::Block, QStringLiteral("GetMenuForWindow"), argumentList);
+        QDBusMessage reply = call(QDBus::Block, QStringLiteral("GetMenuForWindow"), windowId);
         QList<QVariant> arguments = reply.arguments();
         if (reply.type() == QDBusMessage::ReplyMessage && arguments.count() == 2)
             menuObjectPath = qdbus_cast<QDBusObjectPath>(arguments.at(1));
@@ -109,16 +105,12 @@ public Q_SLOTS: // METHODS
 
     QDBusPendingReply<> RegisterWindow(uint windowId, const QDBusObjectPath &menuObjectPath)
     {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(windowId) << QVariant::fromValue(menuObjectPath);
-        return asyncCallWithArgumentList(QStringLiteral("RegisterWindow"), argumentList);
+        return asyncCall(QStringLiteral("RegisterWindow"), windowId, menuObjectPath);
     }
 
     QDBusPendingReply<> UnregisterWindow(uint windowId)
     {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(windowId);
-        return asyncCallWithArgumentList(QStringLiteral("UnregisterWindow"), argumentList);
+        return asyncCall(QStringLiteral("UnregisterWindow"), windowId);
     }
 };
 
diff --git a/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h b/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h
index ab99ea65dd..2194a787eb 100644
--- a/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h
+++ b/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h
@@ -95,26 +95,21 @@ public:
 public Q_SLOTS: // METHODS
     inline QDBusPendingReply<> closeNotification(uint id)
     {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(id);
-        return asyncCallWithArgumentList(QStringLiteral("CloseNotification"), argumentList);
+        return asyncCall(QStringLiteral("CloseNotification"), id);
     }
 
     inline QDBusPendingReply<QStringList> getCapabilities()
     {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("GetCapabilities"), argumentList);
+        return asyncCall(QStringLiteral("GetCapabilities"));
     }
 
     inline QDBusPendingReply<QString, QString, QString, QString> getServerInformation()
     {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("GetServerInformation"), argumentList);
+        return asyncCall(QStringLiteral("GetServerInformation"));
     }
     inline QDBusReply<QString> getServerInformation(QString &vendor, QString &version, QString &specVersion)
     {
-        QList<QVariant> argumentList;
-        QDBusMessage reply = callWithArgumentList(QDBus::Block, QStringLiteral("GetServerInformation"), argumentList);
+        QDBusMessage reply = call(QDBus::Block, QStringLiteral("GetServerInformation"));
         if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 4) {
             vendor = qdbus_cast<QString>(reply.arguments().at(1));
             version = qdbus_cast<QString>(reply.arguments().at(2));
@@ -129,12 +124,7 @@ public Q_SLOTS: // METHODS
                                           const QVariantMap &hints, int timeout)
     {
         qCDebug(qLcTray) << appName << replacesId << appIcon << summary << body << actions << hints << timeout;
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(appName) << QVariant::fromValue(replacesId) <<
-                        QVariant::fromValue(appIcon) << QVariant::fromValue(summary) <<
-                        QVariant::fromValue(body) << QVariant::fromValue(actions) <<
-                        QVariant::fromValue(hints) << QVariant::fromValue(timeout);
-        return asyncCallWithArgumentList(QStringLiteral("Notify"), argumentList);
+        return asyncCall(QStringLiteral("Notify"), appName, replacesId, appIcon, summary, body, actions, hints, timeout);
     }
 
 Q_SIGNALS: