Remove additionalConfiguration

The additionalConfiguration key in config files, as well as the
property have already been marked deprecated. Support for this
will be finally removed now.

Change-Id: Ib139e3d0f6baf2944e2f56fdf4da810eac138894
Reviewed-by: Nedim Hadzic <nedim.hadzic@pelagicore.com>

11 files changed, 22 insertions, 59 deletions

diff --git a/src/application-lib/applicationinterface.h b/src/application-lib/applicationinterface.h
index 96989e6c..a2aa3c21 100644
--- a/src/application-lib/applicationinterface.h
+++ b/src/application-lib/applicationinterface.h
@@ -54,12 +54,10 @@ class ApplicationInterface : public QObject
     Q_CLASSINFO("D-Bus Interface", "io.qt.ApplicationManager.ApplicationInterface")
     Q_PROPERTY(QString applicationId READ applicationId CONSTANT SCRIPTABLE true)
     Q_PROPERTY(QVariantMap systemProperties READ systemProperties CONSTANT SCRIPTABLE true)
-    Q_PROPERTY(QVariantMap additionalConfiguration READ additionalConfiguration CONSTANT SCRIPTABLE true)  // deprecated
     Q_PROPERTY(QVariantMap applicationProperties READ applicationProperties CONSTANT SCRIPTABLE true)
 
 public:
     virtual QString applicationId() const = 0;
-    virtual QVariantMap additionalConfiguration() const = 0;
     virtual QVariantMap systemProperties() const = 0;
     virtual QVariantMap applicationProperties() const = 0;
 
diff --git a/src/launcher-lib/qmlapplicationinterface.cpp b/src/launcher-lib/qmlapplicationinterface.cpp
index d262e3ce..66fb5775 100644
--- a/src/launcher-lib/qmlapplicationinterface.cpp
+++ b/src/launcher-lib/qmlapplicationinterface.cpp
@@ -171,11 +171,6 @@ QVariantMap QmlApplicationInterface::systemProperties() const
     return m_systemProperties;
 }
 
-QVariantMap QmlApplicationInterface::additionalConfiguration() const
-{
-    return m_systemProperties;
-}
-
 QVariantMap QmlApplicationInterface::applicationProperties() const
 {
     return m_applicationProperties;
diff --git a/src/launcher-lib/qmlapplicationinterface.h b/src/launcher-lib/qmlapplicationinterface.h
index c130577a..088c097a 100644
--- a/src/launcher-lib/qmlapplicationinterface.h
+++ b/src/launcher-lib/qmlapplicationinterface.h
@@ -71,7 +71,6 @@ public:
 
     QString applicationId() const override;
     QVariantMap systemProperties() const override;
-    QVariantMap additionalConfiguration() const override;
     QVariantMap applicationProperties() const override;
     Q_INVOKABLE QT_PREPEND_NAMESPACE_AM(Notification *) createNotification();
     Q_INVOKABLE void acknowledgeQuit() const;
diff --git a/src/manager-lib/applicationmanager.cpp b/src/manager-lib/applicationmanager.cpp
index bf830801..93e09f0a 100644
--- a/src/manager-lib/applicationmanager.cpp
+++ b/src/manager-lib/applicationmanager.cpp
@@ -471,11 +471,6 @@ void ApplicationManager::setSecurityChecksEnabled(bool enabled)
     d->securityChecksEnabled = enabled;
 }
 
-QVariantMap ApplicationManager::additionalConfiguration() const
-{
-    return d->systemProperties;
-}
-
 QVariantMap ApplicationManager::systemProperties() const
 {
     return d->systemProperties;
diff --git a/src/manager-lib/applicationmanager.h b/src/manager-lib/applicationmanager.h
index f213e26b..5f0dd6c5 100644
--- a/src/manager-lib/applicationmanager.h
+++ b/src/manager-lib/applicationmanager.h
@@ -75,7 +75,6 @@ class ApplicationManager : public QAbstractListModel, protected QDBusContext
     Q_PROPERTY(bool securityChecksEnabled READ securityChecksEnabled)
     Q_PROPERTY(bool dummy READ isDummy CONSTANT)  // set to false here and true in the dummydata imports
     Q_PROPERTY(QVariantMap systemProperties READ systemProperties CONSTANT)
-    Q_PROPERTY(QVariantMap additionalConfiguration READ additionalConfiguration CONSTANT)  // deprecated
     Q_PROPERTY(QJSValue containerSelectionFunction READ containerSelectionFunction WRITE setContainerSelectionFunction NOTIFY containerSelectionFunctionChanged)
 
 public:
@@ -96,8 +95,6 @@ public:
     bool isDummy() const { return false; }
     QVariantMap systemProperties() const;
     void setSystemProperties(const QVariantMap &map);
-    QVariantMap additionalConfiguration() const;
-    void setAdditionalConfiguration(const QVariantMap &map);
 
     void setDebugWrapperConfiguration(const QVariantList &debugWrappers);
 
diff --git a/src/manager-lib/nativeruntime.cpp b/src/manager-lib/nativeruntime.cpp
index 147e7695..87782fd6 100644
--- a/src/manager-lib/nativeruntime.cpp
+++ b/src/manager-lib/nativeruntime.cpp
@@ -431,11 +431,6 @@ QString NativeRuntimeApplicationInterface::applicationId() const
     return QString();
 }
 
-QVariantMap NativeRuntimeApplicationInterface::additionalConfiguration() const
-{
-    return systemProperties();
-}
-
 QVariantMap NativeRuntimeApplicationInterface::systemProperties() const
 {
     if (m_runtime)
diff --git a/src/manager-lib/nativeruntime_p.h b/src/manager-lib/nativeruntime_p.h
index ea80a900..6ebb139c 100644
--- a/src/manager-lib/nativeruntime_p.h
+++ b/src/manager-lib/nativeruntime_p.h
@@ -57,7 +57,6 @@ public:
 
     QString applicationId() const override;
     QVariantMap systemProperties() const override;
-    QVariantMap additionalConfiguration() const override;
     QVariantMap applicationProperties() const override;
 
     virtual void finishedInitialization() override;
diff --git a/src/manager-lib/qmlinprocessapplicationinterface.cpp b/src/manager-lib/qmlinprocessapplicationinterface.cpp
index d3a006e9..b4b07daa 100644
--- a/src/manager-lib/qmlinprocessapplicationinterface.cpp
+++ b/src/manager-lib/qmlinprocessapplicationinterface.cpp
@@ -71,11 +71,6 @@ QString QmlInProcessApplicationInterface::applicationId() const
     return QString();
 }
 
-QVariantMap QmlInProcessApplicationInterface::additionalConfiguration() const
-{
-    return systemProperties();
-}
-
 QVariantMap QmlInProcessApplicationInterface::systemProperties() const
 {
     if (m_runtime)
diff --git a/src/manager-lib/qmlinprocessapplicationinterface.h b/src/manager-lib/qmlinprocessapplicationinterface.h
index 2fe0d4b3..65e51cd3 100644
--- a/src/manager-lib/qmlinprocessapplicationinterface.h
+++ b/src/manager-lib/qmlinprocessapplicationinterface.h
@@ -83,7 +83,6 @@ public:
 
     QString applicationId() const override;
     QVariantMap systemProperties() const override;
-    QVariantMap additionalConfiguration() const override;
     QVariantMap applicationProperties() const override;
 
     Q_INVOKABLE QT_PREPEND_NAMESPACE_AM(Notification *) createNotification();
diff --git a/src/manager/configuration.cpp b/src/manager/configuration.cpp
index 3f57d10d..e13eab1c 100644
--- a/src/manager/configuration.cpp
+++ b/src/manager/configuration.cpp
@@ -601,12 +601,7 @@ bool Configuration::dbusStartSessionBus() const
 
 QVariantMap Configuration::rawSystemProperties() const
 {
-    QVariantMap vm = d->findInConfigFile({ qSL("systemProperties") }).toMap();
-    if (vm.isEmpty()) {  // for temporary backwards compatibility:
-        QVariant ac = d->findInConfigFile({ qSL("ui"), qSL("additionalConfiguration") });
-        vm = { std::pair<QString, QVariant>(QStringLiteral("public"), ac) };
-    }
-    return vm;
+    return d->findInConfigFile({ qSL("systemProperties") }).toMap();
 }
 
 bool Configuration::applicationUserIdSeparation(uint *minUserId, uint *maxUserId, uint *commonGroupId) const
diff --git a/tests/qml/simple/tst_applicationmanager.qml b/tests/qml/simple/tst_applicationmanager.qml
index 27dc0daf..e1745653 100644
--- a/tests/qml/simple/tst_applicationmanager.qml
+++ b/tests/qml/simple/tst_applicationmanager.qml
@@ -104,31 +104,27 @@ TestCase {
     }
 
     function test_systemProperties() {
-        function sub(obj) {
-            compare(obj.ignored, undefined)
-            compare(obj.booleanTest, true)
-            compare(obj.stringTest, "pelagicore")
-            compare(obj.intTest, -1)
-            compare(obj.floatTest, .5)
-            compare(obj.arrayTest[0], "value1")
-            compare(obj.arrayTest[1], "value2")
-            compare(obj.mapTest["key1"], "1")
-            compare(obj.mapTest["key2"], "2")
-            compare(obj.nested.level21, 21)
-            compare(obj.nested.level2.level31, 31)
-            compare(obj.nested.level2.level32, undefined)
-            compare(obj.nested.level21, 21)
-            compare(obj.nested.level22, 22)
-            compare(obj.pub1, 'pub1')
-            compare(obj.pro1, 'pro1')
-            compare(obj.pubandpro, 'pro2')
-            compare(obj.pubandpri, 'pri3')
-            compare(obj.proandpri, 'pri4')
-            compare(obj.inall, 'private')
-            compare(obj.nullTest, null)
-        }
-        sub(ApplicationManager.systemProperties);
-        sub(ApplicationManager.additionalConfiguration);
+        compare(ApplicationManager.systemProperties.ignored, undefined)
+        compare(ApplicationManager.systemProperties.booleanTest, true)
+        compare(ApplicationManager.systemProperties.stringTest, "pelagicore")
+        compare(ApplicationManager.systemProperties.intTest, -1)
+        compare(ApplicationManager.systemProperties.floatTest, .5)
+        compare(ApplicationManager.systemProperties.arrayTest[0], "value1")
+        compare(ApplicationManager.systemProperties.arrayTest[1], "value2")
+        compare(ApplicationManager.systemProperties.mapTest["key1"], "1")
+        compare(ApplicationManager.systemProperties.mapTest["key2"], "2")
+        compare(ApplicationManager.systemProperties.nested.level21, 21)
+        compare(ApplicationManager.systemProperties.nested.level2.level31, 31)
+        compare(ApplicationManager.systemProperties.nested.level2.level32, undefined)
+        compare(ApplicationManager.systemProperties.nested.level21, 21)
+        compare(ApplicationManager.systemProperties.nested.level22, 22)
+        compare(ApplicationManager.systemProperties.pub1, 'pub1')
+        compare(ApplicationManager.systemProperties.pro1, 'pro1')
+        compare(ApplicationManager.systemProperties.pubandpro, 'pro2')
+        compare(ApplicationManager.systemProperties.pubandpri, 'pri3')
+        compare(ApplicationManager.systemProperties.proandpri, 'pri4')
+        compare(ApplicationManager.systemProperties.inall, 'private')
+        compare(ApplicationManager.systemProperties.nullTest, null)
     }
 
     function test_application() {