diff options
author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-11 13:05:21 +0100 |
---|---|---|
committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-11 13:05:21 +0100 |
commit | fcd8e06ade6116730630d9800523637b96aedf32 (patch) | |
tree | d398b587aa665c2fb25db2c4e7bac227dcce2b17 /src/core/common/VariantWriter.cpp | |
parent | 498fd2737a32fde11062c7177d8326c665f7feef (diff) |
Renamed Variant::Type to VariantType to allow forward declaration
Diffstat (limited to 'src/core/common/VariantWriter.cpp')
-rw-r--r-- | src/core/common/VariantWriter.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/common/VariantWriter.cpp b/src/core/common/VariantWriter.cpp index 39dfc3b..713ec01 100644 --- a/src/core/common/VariantWriter.cpp +++ b/src/core/common/VariantWriter.cpp @@ -106,19 +106,19 @@ static void writeJsonInternal(const Variant &var, std::ostream &stream, bool pretty, int level) { switch (var.getType()) { - case Variant::Type::NULLPTR: - case Variant::Type::BOOL: - case Variant::Type::INT: - case Variant::Type::DOUBLE: - case Variant::Type::FUNCTION: - case Variant::Type::OBJECT: + case VariantType::NULLPTR: + case VariantType::BOOL: + case VariantType::INT: + case VariantType::DOUBLE: + case VariantType::FUNCTION: + case VariantType::OBJECT: stream << var.toString(); return; - case Variant::Type::STRING: - case Variant::Type::MAGIC: + case VariantType::STRING: + case VariantType::MAGIC: writeJsonString(var.toString(), stream); return; - case Variant::Type::ARRAY: { + case VariantType::ARRAY: { stream << "["; writeLinebreak(stream, pretty); const Variant::arrayType &arr = var.asArray(); @@ -134,7 +134,7 @@ static void writeJsonInternal(const Variant &var, std::ostream &stream, stream << "]"; return; } - case Variant::Type::MAP: { + case VariantType::MAP: { writeIndentation(stream, pretty, level); stream << "{"; writeLinebreak(stream, pretty); |