Rename the oddly named QVariant converter function for DBus

We need to tweak arbitrary QVariants for transmission via DBus, as
some types are not serializable. The converter functions are only
suitable for this use case, so name them "fromDBus" / "toDBus".

(this needs cherry-picking because of the follow-up patch)

Change-Id: Ia809242e175c20f236e6ab2b4268826650821d50
Pick-to: 6.7 6.6 6.5
Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>

7 files changed, 19 insertions, 19 deletions

diff --git a/src/application-main-lib/intentclientdbusimplementation.cpp b/src/application-main-lib/intentclientdbusimplementation.cpp
index c245732d..3ce125bf 100644
--- a/src/application-main-lib/intentclientdbusimplementation.cpp
+++ b/src/application-main-lib/intentclientdbusimplementation.cpp
@@ -69,7 +69,7 @@ void IntentClientDBusImplementation::requestToSystem(const QPointer<IntentClient
 {
     QDBusPendingReply<QString> reply =
             m_dbusInterface->requestToSystem(icr->intentId(), icr->applicationId(),
-                                             convertFromJSVariant(icr->parameters()).toMap());
+                                             convertToDBusVariant(icr->parameters()).toMap());
 
     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, icr);
     connect(watcher, &QDBusPendingCallWatcher::finished, icr, [this, watcher, icr]() {
@@ -85,7 +85,7 @@ void IntentClientDBusImplementation::replyFromApplication(const QPointer<IntentC
 {
     if (icr) {
         m_dbusInterface->replyFromApplication(icr->requestId().toString(), !icr->succeeded(),
-                                              convertFromJSVariant(icr->result()).toMap());
+                                              convertToDBusVariant(icr->result()).toMap());
         // Checking for errors here is futile. Even if we would detect an error or timeout, we
         // couldn't do anything about it, as that would mean that the AM process is dead or frozen.
     }
diff --git a/src/common-lib/dbus-utilities.cpp b/src/common-lib/dbus-utilities.cpp
index fd944fe8..663be551 100644
--- a/src/common-lib/dbus-utilities.cpp
+++ b/src/common-lib/dbus-utilities.cpp
@@ -30,7 +30,7 @@ using namespace Qt::StringLiterals;
 
 QT_BEGIN_NAMESPACE_AM
 
-QVariant convertFromJSVariant(const QVariant &variant)
+QVariant convertToDBusVariant(const QVariant &variant)
 {
 #if !defined(QT_QML_LIB)
     return variant;
@@ -38,12 +38,12 @@ QVariant convertFromJSVariant(const QVariant &variant)
     int type = variant.userType();
 
     if (type == qMetaTypeId<QJSValue>()) {
-        return convertFromJSVariant(variant.value<QJSValue>().toVariant());
+        return convertToDBusVariant(variant.value<QJSValue>().toVariant());
     } else if (type == QMetaType::QUrl) {
         return QVariant(variant.toUrl().toString());
     } else if (type == QMetaType::QVariant) {
         // got a matryoshka variant
-        return convertFromJSVariant(variant.value<QVariant>());
+        return convertToDBusVariant(variant.value<QVariant>());
     } else if ((type == QMetaType::UnknownType) || (type == QMetaType::Nullptr)) {
         // we cannot send QVariant::Invalid and null values via DBus, so we abuse BYTE(0) for this purpose
         return QVariant::fromValue<uchar>(0);
@@ -51,13 +51,13 @@ QVariant convertFromJSVariant(const QVariant &variant)
         QVariantList outList;
         QVariantList inList = variant.toList();
         for (auto it = inList.cbegin(); it != inList.cend(); ++it)
-            outList.append(convertFromJSVariant(*it));
+            outList.append(convertToDBusVariant(*it));
         return outList;
     } else if (type == QMetaType::QVariantMap) {
         QVariantMap outMap;
         QVariantMap inMap = variant.toMap();
         for (auto it = inMap.cbegin(); it != inMap.cend(); ++it)
-            outMap.insert(it.key(), convertFromJSVariant(it.value()));
+            outMap.insert(it.key(), convertToDBusVariant(it.value()));
         return outMap;
     } else {
         return variant;
diff --git a/src/common-lib/dbus-utilities.h b/src/common-lib/dbus-utilities.h
index fc0bce8c..86080c8b 100644
--- a/src/common-lib/dbus-utilities.h
+++ b/src/common-lib/dbus-utilities.h
@@ -21,7 +21,7 @@ Q_DECLARE_METATYPE(QtAM::UnixFdMap)
 
 QT_BEGIN_NAMESPACE_AM
 
-QVariant convertFromJSVariant(const QVariant &variant);
+QVariant convertToDBusVariant(const QVariant &variant);
 
 QVariant convertFromDBusVariant(const QVariant &variant);
 
diff --git a/src/main-lib/applicationmanageradaptor_dbus.cpp b/src/main-lib/applicationmanageradaptor_dbus.cpp
index 3f361c7f..5802a89c 100644
--- a/src/main-lib/applicationmanageradaptor_dbus.cpp
+++ b/src/main-lib/applicationmanageradaptor_dbus.cpp
@@ -75,7 +75,7 @@ bool ApplicationManagerAdaptor::singleProcess() const
 
 QVariantMap ApplicationManagerAdaptor::systemProperties() const
 {
-    return convertFromJSVariant(ApplicationManager::instance()->systemProperties()).toMap();
+    return convertToDBusVariant(ApplicationManager::instance()->systemProperties()).toMap();
 }
 
 bool ApplicationManagerAdaptor::windowManagerCompositorReady() const
@@ -151,7 +151,7 @@ QVariantMap ApplicationManagerAdaptor::get(const QString &id)
     auto map = ApplicationManager::instance()->get(id);
     map.remove(u"application"_s);       // cannot marshall QObject *
     map.remove(u"applicationObject"_s); // cannot marshall QObject *
-    return convertFromJSVariant(map).toMap();
+    return convertToDBusVariant(map).toMap();
 }
 
 QString ApplicationManagerAdaptor::identifyApplication(qlonglong pid)
diff --git a/src/main-lib/packagemanageradaptor_dbus.cpp b/src/main-lib/packagemanageradaptor_dbus.cpp
index 93dfb219..35ec19e3 100644
--- a/src/main-lib/packagemanageradaptor_dbus.cpp
+++ b/src/main-lib/packagemanageradaptor_dbus.cpp
@@ -67,7 +67,7 @@ PackageManagerAdaptor::PackageManagerAdaptor(QObject *parent)
             appList.append(app);
         }
         map.insert(u"applications"_s, appList);
-        map = convertFromJSVariant(map).toMap();
+        map = convertToDBusVariant(map).toMap();
 
         emit taskRequestingInstallationAcknowledge(taskId, map, packageExtraMetaData,
                                                    packageExtraSignedMetaData);
@@ -153,7 +153,7 @@ QVariantMap PackageManagerAdaptor::get(const QString &id)
     auto map = PackageManager::instance()->get(id);
     map.remove(u"package"_s);       // cannot marshall QObject *
     map.remove(u"packageObject"_s); // cannot marshall QObject *
-    return convertFromJSVariant(map).toMap();
+    return convertToDBusVariant(map).toMap();
 }
 
 qlonglong PackageManagerAdaptor::installedPackageSize(const QString &packageId)
@@ -166,14 +166,14 @@ QVariantMap PackageManagerAdaptor::installedPackageExtraMetaData(const QString &
 {
     QT_AM_AUTHENTICATE_DBUS(QVariantMap)
     const auto map = PackageManager::instance()->installedPackageExtraMetaData(packageId);
-    return convertFromJSVariant(map).toMap();
+    return convertToDBusVariant(map).toMap();
 }
 
 QVariantMap PackageManagerAdaptor::installedPackageExtraSignedMetaData(const QString &packageId)
 {
     QT_AM_AUTHENTICATE_DBUS(QVariantMap)
     const auto map = PackageManager::instance()->installedPackageExtraSignedMetaData(packageId);
-    return convertFromJSVariant(map).toMap();
+    return convertToDBusVariant(map).toMap();
 }
 
 QString PackageManagerAdaptor::removePackage(const QString &packageId, bool keepDocuments)
diff --git a/src/manager-lib/intentaminterface.cpp b/src/manager-lib/intentaminterface.cpp
index f62aae6f..4cf7e011 100644
--- a/src/manager-lib/intentaminterface.cpp
+++ b/src/manager-lib/intentaminterface.cpp
@@ -470,7 +470,7 @@ void IntentServerDBusIpcConnection::requestToApplication(IntentServerRequest *is
 
     emit m_adaptor->requestToApplication(requestIdStr, isr->intentId(),
                                          isr->selectedIntent()->applicationId(),
-                                         convertFromJSVariant(isr->parameters()).toMap());
+                                         convertToDBusVariant(isr->parameters()).toMap());
 }
 
 void IntentServerDBusIpcConnection::replyFromSystem(IntentServerRequest *isr)
@@ -478,7 +478,7 @@ void IntentServerDBusIpcConnection::replyFromSystem(IntentServerRequest *isr)
     Q_ASSERT(isr);
 
     emit m_adaptor->replyFromSystem(isr->requestId().toString(), !isr->succeeded(),
-                                    convertFromJSVariant(isr->result()).toMap());
+                                    convertToDBusVariant(isr->result()).toMap());
 }
 
 QString IntentServerDBusIpcConnection::requestToSystem(const QString &intentId,
diff --git a/src/manager-lib/nativeruntime.cpp b/src/manager-lib/nativeruntime.cpp
index 5fb9921b..53fc5c92 100644
--- a/src/manager-lib/nativeruntime.cpp
+++ b/src/manager-lib/nativeruntime.cpp
@@ -305,7 +305,7 @@ bool NativeRuntime::start()
     if (!m_startedViaLauncher && !m_isQuickLauncher)
         config.insert(u"systemProperties"_s, systemProperties());
     if (m_app)
-        config.insert(u"application"_s, convertFromJSVariant(m_app->info()->toVariantMap()).toMap());
+        config.insert(u"application"_s, m_app->info()->toVariantMap());
     if (!uiConfig.isEmpty())
         config.insert(u"ui"_s, uiConfig);
 
@@ -489,8 +489,8 @@ bool NativeRuntime::startApplicationViaLauncher()
 
     emit m_dbusRuntimeInterface->generatedAdaptor<RuntimeInterfaceAdaptor>()
         ->startApplication(baseDir, pathInContainer, m_document, m_mimeType,
-                           convertFromJSVariant(m_app->info()->toVariantMap()).toMap(),
-                           convertFromJSVariant(systemProperties()).toMap());
+                           convertToDBusVariant(m_app->info()->toVariantMap()).toMap(),
+                           convertToDBusVariant(systemProperties()).toMap());
     return true;
 }