games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Code style: formatting and refactoring of launcher code

Browse Source
This commit is contained in:
Arseniy Shestakov
2018-04-13 12:34:58 +07:00
committed by ArseniyShestakov
parent d9d5b7b6e5
commit 9da3f48274
18 changed files with 449 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
launcher/jsonutils.cpp
View File

@@ -14,7 +14,7 @@
static QVariantMap JsonToMap(const JsonMap & json)
{
QVariantMap map;
for (auto & entry : json)
for(auto & entry : json)
{
map.insert(QString::fromUtf8(entry.first.c_str()), JsonUtils::toVariant(entry.second));
}
@@ -24,7 +24,7 @@ static QVariantMap JsonToMap(const JsonMap & json)
static QVariantList JsonToList(const JsonVector & json)
{
QVariantList list;
for (auto & entry : json)
for(auto & entry : json)
{
list.push_back(JsonUtils::toVariant(entry));
}
@@ -34,7 +34,7 @@ static QVariantList JsonToList(const JsonVector & json)
static JsonVector VariantToList(QVariantList variant)
{
JsonVector vector;
for (auto & entry : variant)
for(auto & entry : variant)
{
vector.push_back(JsonUtils::toJson(entry));
}
@@ -44,7 +44,7 @@ static JsonVector VariantToList(QVariantList variant)
static JsonMap VariantToMap(QVariantMap variant)
{
JsonMap map;
for (auto & entry : variant.toStdMap())
for(auto & entry : variant.toStdMap())
{
map[entry.first.toUtf8().data()] = JsonUtils::toJson(entry.second);
}
@@ -56,14 +56,26 @@ namespace JsonUtils
QVariant toVariant(const JsonNode & node)
{
switch (node.getType())
switch(node.getType())
{
break; case JsonNode::JsonType::DATA_NULL: return QVariant();
break; case JsonNode::JsonType::DATA_BOOL: return QVariant(node.Bool());
break; case JsonNode::JsonType::DATA_FLOAT: return QVariant(node.Float());
break; case JsonNode::JsonType::DATA_STRING: return QVariant(QString::fromUtf8(node.String().c_str()));
break; case JsonNode::JsonType::DATA_VECTOR: return JsonToList(node.Vector());
break; case JsonNode::JsonType::DATA_STRUCT: return JsonToMap(node.Struct());
break;
case JsonNode::JsonType::DATA_NULL:
return QVariant();
break;
case JsonNode::JsonType::DATA_BOOL:
return QVariant(node.Bool());
break;
case JsonNode::JsonType::DATA_FLOAT:
return QVariant(node.Float());
break;
case JsonNode::JsonType::DATA_STRING:
return QVariant(QString::fromUtf8(node.String().c_str()));
break;
case JsonNode::JsonType::DATA_VECTOR:
return JsonToList(node.Vector());
break;
case JsonNode::JsonType::DATA_STRUCT:
return JsonToMap(node.Struct());
}
return QVariant();
}
@@ -74,7 +86,7 @@ QVariant JsonFromFile(QString filename)
file.open(QFile::ReadOnly);
auto data = file.readAll();
if (data.size() == 0)
if(data.size() == 0)
{
logGlobal->error("Failed to open file %s", filename.toUtf8().data());
return QVariant();
@@ -90,15 +102,15 @@ JsonNode toJson(QVariant object)
{
JsonNode ret;
if (object.canConvert<QVariantMap>())
if(object.canConvert<QVariantMap>())
ret.Struct() = VariantToMap(object.toMap());
else if (object.canConvert<QVariantList>())
else if(object.canConvert<QVariantList>())
ret.Vector() = VariantToList(object.toList());
else if (static_cast<QMetaType::Type>(object.type()) == QMetaType::QString)
else if(static_cast<QMetaType::Type>(object.type()) == QMetaType::QString)
ret.String() = object.toString().toUtf8().data();
else if (static_cast<QMetaType::Type>(object.type()) == QMetaType::Bool)
else if(static_cast<QMetaType::Type>(object.type()) == QMetaType::Bool)
ret.Bool() = object.toBool();
else if (object.canConvert<double>())
else if(object.canConvert<double>())
ret.Float() = object.toFloat();
return ret;