Rename property "tag" to "name" in tag definitions
This commit is contained in:
parent
ff63d29adb
commit
1eee2fc2b5
2 changed files with 13 additions and 9 deletions
|
@ -80,11 +80,15 @@ void EventList::load(const QJsonObject& json)
|
|||
{
|
||||
const auto& jsonTags = json["tags"].toArray();
|
||||
if (!jsonTags.isEmpty()) {
|
||||
// Map tag name to definition and remember tag order.
|
||||
tags = {};
|
||||
tagsOrder.clear();
|
||||
for (int i = 0; i < jsonTags.size(); i++) {
|
||||
const auto name = jsonTags[i]["tag"].toString();
|
||||
tags[name] = jsonTags[i].toObject();
|
||||
const auto& tag = jsonTags[i].toObject();
|
||||
// Compatibility with older tag definitions.
|
||||
const auto& nameKey = tag.contains("name") ? "name" : "tag";
|
||||
const auto name = tag[nameKey].toString();
|
||||
tags[name] = tag;
|
||||
tagsOrder.append(name);
|
||||
}
|
||||
emit tagsChanged();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue