Merge branch 'master' of somweyr.de:ousia

Conflicts:
	application/src/core/model/Document.hpp

1 files changed, 14 insertions, 1 deletions

diff --git a/src/core/common/Variant.hpp b/src/core/common/Variant.hpp
index 27dfda8..e5bca4d 100644
--- a/src/core/common/Variant.hpp
+++ b/src/core/common/Variant.hpp
@@ -342,6 +342,19 @@ public:
 	Variant(mapType m) : ptrVal(nullptr) { setMap(std::move(m)); }
 
 	/**
+	 * Named constructor for object values.
+	 *
+	 * @param o is an object that can be converted to a Rooted handle.
+	 */
+	template<class T>
+	static Variant fromObject(T o)
+	{
+		Variant res;
+		res.setObject(o);
+		return res;
+	}
+
+	/**
 	 * Named constructor for function values.
 	 *
 	 * @param f is a shared pointer pointing at the Function instance.
@@ -900,7 +913,7 @@ public:
 	 * to a Rooted handle.
 	 */
 	template <class T>
-	void setObject(Handle<T> o)
+	void setObject(T o)
 	{
 		destroy();
 		type = VariantType::OBJECT;