From 0d779779364606de02c30d6c9b085a968a148a22 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 17 May 2017 12:11:15 -0700 Subject: [PATCH] Enable Map/List storage in the settings --- libraries/shared/src/SettingHelpers.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libraries/shared/src/SettingHelpers.cpp b/libraries/shared/src/SettingHelpers.cpp index cbda4e4096..20d6170fc4 100644 --- a/libraries/shared/src/SettingHelpers.cpp +++ b/libraries/shared/src/SettingHelpers.cpp @@ -126,17 +126,6 @@ QJsonDocument variantMapToJsonDocument(const QSettings::SettingsMap& map) { } switch (variantType) { - case QVariant::Map: { - auto varmap = variant.toMap(); - for (auto mapit = varmap.cbegin(); mapit != varmap.cend(); ++mapit) { - auto& mapkey = mapit.key(); - auto& mapvariant = mapit.value(); - object.insert(key + "/" + mapkey, QJsonValue::fromVariant(mapvariant)); - } - break; - } - - case QVariant::List: case QVariant::Hash: { qCritical() << "Unsupported variant type" << variant.typeName(); Q_ASSERT(false); @@ -152,6 +141,8 @@ QJsonDocument variantMapToJsonDocument(const QSettings::SettingsMap& map) { case QVariant::UInt: case QVariant::Bool: case QVariant::Double: + case QVariant::Map: + case QVariant::List: object.insert(key, QJsonValue::fromVariant(variant)); break;