From fcd8e06ade6116730630d9800523637b96aedf32 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sun, 11 Jan 2015 13:05:21 +0100
Subject: Renamed Variant::Type to VariantType to allow forward declaration

---
 src/core/common/Variant.cpp | 64 ++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'src/core/common/Variant.cpp')

diff --git a/src/core/common/Variant.cpp b/src/core/common/Variant.cpp
index b1a65ea..c5c7b80 100644
--- a/src/core/common/Variant.cpp
+++ b/src/core/common/Variant.cpp
@@ -30,7 +30,7 @@ namespace ousia {
 
 /* Class Variant::TypeException */
 
-Variant::TypeException::TypeException(Type actualType, Type requestedType)
+Variant::TypeException::TypeException(VariantType actualType, VariantType requestedType)
     : OusiaException(std::string("Variant: Requested \"") +
                      Variant::getTypeName(requestedType) +
                      std::string("\" but is \"") +
@@ -42,28 +42,28 @@ Variant::TypeException::TypeException(Type actualType, Type requestedType)
 
 /* Class Variant */
 
-const char *Variant::getTypeName(Type type)
+const char *Variant::getTypeName(VariantType type)
 {
 	switch (type) {
-		case Type::NULLPTR:
+		case VariantType::NULLPTR:
 			return "null";
-		case Type::BOOL:
+		case VariantType::BOOL:
 			return "boolean";
-		case Type::INT:
+		case VariantType::INT:
 			return "integer";
-		case Type::DOUBLE:
+		case VariantType::DOUBLE:
 			return "double";
-		case Type::STRING:
+		case VariantType::STRING:
 			return "string";
-		case Type::MAGIC:
+		case VariantType::MAGIC:
 			return "magic";
-		case Type::ARRAY:
+		case VariantType::ARRAY:
 			return "array";
-		case Type::MAP:
+		case VariantType::MAP:
 			return "map";
-		case Type::OBJECT:
+		case VariantType::OBJECT:
 			return "object";
-		case Type::FUNCTION:
+		case VariantType::FUNCTION:
 			return "function";
 	}
 	return "unknown";
@@ -118,24 +118,24 @@ bool operator<(const Variant &lhs, const Variant &rhs)
 		throw Variant::TypeException(lhs.getType(), rhs.getType());
 	}
 	switch (lhs.getType()) {
-		case Variant::Type::NULLPTR:
+		case VariantType::NULLPTR:
 			return false;
-		case Variant::Type::BOOL:
+		case VariantType::BOOL:
 			return lhs.boolVal < rhs.boolVal;
-		case Variant::Type::INT:
+		case VariantType::INT:
 			return lhs.intVal < rhs.intVal;
-		case Variant::Type::DOUBLE:
+		case VariantType::DOUBLE:
 			return lhs.doubleVal < rhs.doubleVal;
-		case Variant::Type::MAGIC:
-		case Variant::Type::STRING:
+		case VariantType::MAGIC:
+		case VariantType::STRING:
 			return lhs.asString() < rhs.asString();
-		case Variant::Type::ARRAY:
+		case VariantType::ARRAY:
 			return lhs.asArray() < rhs.asArray();
-		case Variant::Type::MAP:
+		case VariantType::MAP:
 			return lhs.asMap() < rhs.asMap();
-		case Variant::Type::OBJECT:
+		case VariantType::OBJECT:
 			return lhs.asObject().get() < rhs.asObject().get();
-		case Variant::Type::FUNCTION:
+		case VariantType::FUNCTION:
 			return lhs.asFunction() < rhs.asFunction();
 	}
 	throw OusiaException("Internal Error! Unknown type!");
@@ -162,24 +162,24 @@ bool operator==(const Variant &lhs, const Variant &rhs)
 		return false;
 	}
 	switch (lhs.getType()) {
-		case Variant::Type::NULLPTR:
+		case VariantType::NULLPTR:
 			return true;
-		case Variant::Type::BOOL:
+		case VariantType::BOOL:
 			return lhs.boolVal == rhs.boolVal;
-		case Variant::Type::INT:
+		case VariantType::INT:
 			return lhs.intVal == rhs.intVal;
-		case Variant::Type::DOUBLE:
+		case VariantType::DOUBLE:
 			return lhs.doubleVal == rhs.doubleVal;
-		case Variant::Type::STRING:
-		case Variant::Type::MAGIC:
+		case VariantType::STRING:
+		case VariantType::MAGIC:
 			return lhs.asString() == rhs.asString();
-		case Variant::Type::ARRAY:
+		case VariantType::ARRAY:
 			return lhs.asArray() == rhs.asArray();
-		case Variant::Type::MAP:
+		case VariantType::MAP:
 			return lhs.asMap() == rhs.asMap();
-		case Variant::Type::OBJECT:
+		case VariantType::OBJECT:
 			return lhs.asObject() == rhs.asObject();
-		case Variant::Type::FUNCTION:
+		case VariantType::FUNCTION:
 			return lhs.asFunction() == rhs.asFunction();
 	}
 	throw OusiaException("Internal Error! Unknown type!");
-- 
cgit v1.2.3