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

Change JsonType to enum class (#393)

Browse Source 
Change enum JsonType to enum class JsonType
This commit is contained in:
Michał Kalinowski
2017-11-26 22:18:18 +01:00
committed by Alexander Shishkin
parent 6df536bb31
commit 26a222ac62
31 changed files with 200 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/JsonNode.h
View File

@@ -19,7 +19,7 @@ class ResourceID;
class DLL_LINKAGE JsonNode
{
public:
enum JsonType
enum class JsonType
{
DATA_NULL,
DATA_BOOL,
@@ -49,7 +49,7 @@ public:
std::string meta;
//Create empty node
JsonNode(JsonType Type = DATA_NULL);
JsonNode(JsonType Type = JsonType::DATA_NULL);
//Create tree from Json-formatted input
explicit JsonNode(const char * data, size_t datasize);
//Create tree from JSON file
@@ -117,16 +117,16 @@ public:
h & meta;
h & type;
switch (type) {
break; case DATA_NULL:
break; case DATA_BOOL: h & data.Bool;
break; case DATA_FLOAT: h & data.Float;
break; case DATA_STRING: h & data.String;
break; case DATA_VECTOR: h & data.Vector;
break; case DATA_STRUCT: h & data.Struct;
break; case JsonType::DATA_NULL:
break; case JsonType::DATA_BOOL: h & data.Bool;
break; case JsonType::DATA_FLOAT: h & data.Float;
break; case JsonType::DATA_STRING: h & data.String;
break; case JsonType::DATA_VECTOR: h & data.Vector;
break; case JsonType::DATA_STRUCT: h & data.Struct;
}
if(version >= 770)
{
if(type == DATA_INTEGER)
if(type == JsonType::DATA_INTEGER)
h & data.Integer;
}
}