feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Write Key/Store to settings

Browse Source 
We claim that we still store QVariantMap to keep the format unchanged.

Change-Id: Ie7b0a83febfeb2cb3cfc9ee42b8423453cf3b1c4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-08-25 15:38:03 +02:00
parent e5afe02556
commit 52d1cd47cb
4 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/libs/utils/persistentsettings.cpp
View File

@@ -360,22 +360,21 @@ FilePath PersistentSettingsReader::filePath()
static void writeVariantValue(QXmlStreamWriter &w, const Context &ctx,
const QVariant &variant, const Key &key = {})
{
switch (static_cast<int>(variant.type())) {
case static_cast<int>(QVariant::StringList):
case static_cast<int>(QVariant::List): {
static const int storeId = qMetaTypeId<Store>();
const int variantType = variant.typeId();
if (variantType == QMetaType::QStringList || variantType == QMetaType::QVariantList) {
w.writeStartElement(ctx.valueListElement);
w.writeAttribute(ctx.typeAttribute, QLatin1String(QVariant::typeToName(QVariant::List)));
w.writeAttribute(ctx.typeAttribute, "QVariantList");
if (!key.isEmpty())
w.writeAttribute(ctx.keyAttribute, key);
const QList<QVariant> list = variant.toList();
for (const QVariant &var : list)
writeVariantValue(w, ctx, var);
w.writeEndElement();
break;
}
case static_cast<int>(QVariant::Map): {
} else if (variantType == storeId || variantType == QMetaType::QVariantMap) {
w.writeStartElement(ctx.valueMapElement);
w.writeAttribute(ctx.typeAttribute, QLatin1String(QVariant::typeToName(QVariant::Map)));
w.writeAttribute(ctx.typeAttribute, "QVariantMap");
if (!key.isEmpty())
w.writeAttribute(ctx.keyAttribute, key);
const Store varMap = storeFromVariant(variant);
@@ -383,12 +382,11 @@ static void writeVariantValue(QXmlStreamWriter &w, const Context &ctx,
for (Store::const_iterator i = varMap.constBegin(); i != cend; ++i)
writeVariantValue(w, ctx, i.value(), i.key());
w.writeEndElement();
}
break;
case static_cast<int>(QMetaType::QObjectStar): // ignore QObjects!
case static_cast<int>(QMetaType::VoidStar): // ignore void pointers!
break;
default:
} else if (variantType == QMetaType::QObjectStar) {
// ignore QObjects
} else if (variantType == QMetaType::VoidStar) {
// ignore void pointers
} else {
w.writeStartElement(ctx.valueElement);
w.writeAttribute(ctx.typeAttribute, QLatin1String(variant.typeName()));
if (!key.isEmpty())
@@ -402,7 +400,6 @@ static void writeVariantValue(QXmlStreamWriter &w, const Context &ctx,
break;
}
w.writeEndElement();
break;
}
}