Implemented conversion to more Variant types, implemented VariantConverter::convert method

1 files changed, 33 insertions, 1 deletions

diff --git a/src/core/common/Variant.cpp b/src/core/common/Variant.cpp
index 44a77d8..e199bc7 100644
--- a/src/core/common/Variant.cpp
+++ b/src/core/common/Variant.cpp
@@ -96,7 +96,7 @@ Variant::doubleType Variant::toDouble() const
 	return res.asDouble();
 }
 
-Variant::stringType Variant::toString(bool escape) const
+Variant::stringType Variant::toString() const
 {
 	ExceptionLogger logger;
 	Variant res{*this};
@@ -104,6 +104,38 @@ Variant::stringType Variant::toString(bool escape) const
 	return res.asString();
 }
 
+Variant::arrayType Variant::toArray() const
+{
+	ExceptionLogger logger;
+	Variant res{*this};
+	VariantConverter::toArray(res, RttiTypes::None, logger, VariantConverter::Mode::ALL);
+	return res.asArray();
+}
+
+Variant::arrayType Variant::toArray(const RttiType &innerType) const
+{
+	ExceptionLogger logger;
+	Variant res{*this};
+	VariantConverter::toArray(res, innerType, logger, VariantConverter::Mode::ALL);
+	return res.asArray();
+}
+
+Variant::mapType Variant::toMap() const
+{
+	ExceptionLogger logger;
+	Variant res{*this};
+	VariantConverter::toMap(res, RttiTypes::None, logger, VariantConverter::Mode::ALL);
+	return res.asMap();
+}
+
+Variant::mapType Variant::toMap(const RttiType &innerType) const
+{
+	ExceptionLogger logger;
+	Variant res{*this};
+	VariantConverter::toMap(res, innerType, logger, VariantConverter::Mode::ALL);
+	return res.asMap();
+}
+
 /* Type management */
 
 const RttiType& Variant::getRttiType() const