From 0678c09248b4e1a65e73d92e053272045788b70a Mon Sep 17 00:00:00 2001
From: Martin Kampas <martin.kampas@jolla.com>
Date: Fri, 15 Nov 2019 08:18:05 +0100
Subject: [PATCH] [systemsettings] Update plugins.qmltypes. Contributes to
 JB#48047

---
 src/plugin/plugins.qmltypes | 94 ++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 58 deletions(-)

diff --git a/src/plugin/plugins.qmltypes b/src/plugin/plugins.qmltypes
index d10dfbe..878ba2a 100644
--- a/src/plugin/plugins.qmltypes
+++ b/src/plugin/plugins.qmltypes
@@ -372,52 +372,12 @@ Module {
         Property { name: "mlsEnabled"; type: "bool" }
         Property { name: "mlsOnlineState"; type: "OnlineAGpsState" }
         Property { name: "mlsAvailable"; type: "bool"; isReadonly: true }
+        Property { name: "yandexLocatorEnabled"; type: "bool" }
+        Property { name: "yandexLocatorOnlineState"; type: "OnlineAGpsState" }
+        Property { name: "yandexLocatorAvailable"; type: "bool"; isReadonly: true }
         Property { name: "locationMode"; type: "LocationMode" }
         Property { name: "allowedDataSources"; type: "DataSources" }
     }
-    Component {
-        name: "ObjectListModel"
-        prototype: "QAbstractListModel"
-        Property { name: "automaticRoles"; type: "bool" }
-        Property { name: "populated"; type: "bool" }
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Signal {
-            name: "itemAdded"
-            Parameter { name: "item"; type: "QObject"; isPointer: true }
-        }
-        Signal {
-            name: "itemRemoved"
-            Parameter { name: "item"; type: "QObject"; isPointer: true }
-        }
-        Method {
-            name: "insertItem"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "item"; type: "QObject"; isPointer: true }
-        }
-        Method {
-            name: "appendItem"
-            Parameter { name: "item"; type: "QObject"; isPointer: true }
-        }
-        Method {
-            name: "removeItem"
-            Parameter { name: "item"; type: "QObject"; isPointer: true }
-        }
-        Method {
-            name: "removeItemAt"
-            Parameter { name: "index"; type: "int" }
-        }
-        Method { name: "clear" }
-        Method {
-            name: "get"
-            type: "QObject*"
-            Parameter { name: "index"; type: "int" }
-        }
-        Method {
-            name: "indexOf"
-            type: "int"
-            Parameter { name: "item"; type: "QObject"; isPointer: true }
-        }
-    }
     Component {
         name: "PartitionModel"
         prototype: "QAbstractListModel"
@@ -496,6 +456,7 @@ Module {
         Property { name: "count"; type: "int"; isReadonly: true }
         Property { name: "storageTypes"; type: "StorageTypes" }
         Property { name: "supportedFormatTypes"; type: "QStringList"; isReadonly: true }
+        Property { name: "externalStoragesPopulated"; type: "bool"; isReadonly: true }
         Signal {
             name: "errorMessage"
             Parameter { name: "objectPath"; type: "string" }
@@ -691,29 +652,24 @@ Module {
         }
     }
     Component {
-        name: "VpnModel"
-        prototype: "ObjectListModel"
-        exports: ["org.nemomobile.systemsettings/VpnModel 1.0"]
+        name: "SettingsVpnModel"
+        prototype: "VpnModel"
+        exports: ["org.nemomobile.systemsettings/SettingsVpnModel 1.0"]
         isCreatable: false
         isSingleton: true
         exportMetaObjectRevisions: [0]
-        Enum {
-            name: "ConnectionState"
-            values: {
-                "Idle": 0,
-                "Failure": 1,
-                "Configuration": 2,
-                "Ready": 3,
-                "Disconnect": 4
-            }
-        }
-        Property { name: "bestState"; type: "int"; isReadonly: true }
+        Property { name: "bestState"; type: "VpnConnection::ConnectionState"; isReadonly: true }
         Property { name: "autoConnect"; type: "bool"; isReadonly: true }
         Property { name: "orderByConnected"; type: "bool" }
         Signal {
             name: "connectionStateChanged"
             Parameter { name: "path"; type: "string" }
-            Parameter { name: "state"; type: "int" }
+            Parameter { name: "state"; type: "VpnConnection::ConnectionState" }
+        }
+        Method {
+            name: "isDefaultDomain"
+            type: "bool"
+            Parameter { name: "domain"; type: "string" }
         }
         Method {
             name: "createConnection"
@@ -766,5 +722,27 @@ Module {
             Parameter { name: "path"; type: "string" }
             Parameter { name: "type"; type: "string" }
         }
+        Method {
+            name: "get"
+            type: "VpnConnection*"
+            Parameter { name: "index"; type: "int" }
+        }
+    }
+    Component {
+        name: "VpnModel"
+        prototype: "QAbstractListModel"
+        Property { name: "connected"; type: "bool"; isReadonly: true }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "vpnManager"; type: "VpnManager"; isReadonly: true; isPointer: true }
+        Property { name: "populated"; type: "bool"; isReadonly: true }
+        Signal {
+            name: "connectedChanged"
+            Parameter { name: "connected"; type: "bool" }
+        }
+        Method {
+            name: "connectionSettings"
+            type: "QVariantMap"
+            Parameter { name: "path"; type: "string" }
+        }
     }
 }