Changeset 73614 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 10, 2018 12:15:14 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9152: Export Appliance wizard: Adjust JSON parser to handle item arrays with complex (object) types.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp

@@ -211 +211 @@
     AssertMsgReturn(field.isArray(), ("Field '%s' has wrong structure!", strFieldName.toUtf8().constData()), QStringList());
     const QJsonArray fieldValueArray = field.toArray();
-    QStringList fieldValueStirngList;
+    QStringList fieldValueStringList;
+    /* Parse array: */
     for (int i = 0; i < fieldValueArray.count(); ++i)
-            fieldValueStirngList << fieldValueArray[i].toString();
-    //printf("  Field value: \"%s\"\n", fieldValueStirngList.join(", ").toUtf8().constData());
-
-    return fieldValueStirngList;
+    {
+        /* Parse current array value: */
+        const QJsonValue value = fieldValueArray[i];
+        /* If value is of string type, we just take it: */
+        if (value.isString())
+            fieldValueStringList << fieldValueArray[i].toString();
+        /* If value is of object type, we just take object values only: */
+        else if (value.isObject())
+        {
+            const QJsonObject valueObject = value.toObject();
+            foreach (const QString &strKey, valueObject.keys())
+                fieldValueStringList << valueObject.value(strKey).toString();
+        }
+    }
+    //printf("  Field value: \"%s\"\n", fieldValueStringList.join(", ").toUtf8().constData());
+
+    return fieldValueStringList;
 }