From 4e3fef5528587c3a360c7e8057ad8d9328f9e4cc Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@theqtcompany.com>
Date: Fri, 13 Feb 2015 09:30:11 +0100
Subject: Get rid of Value::fromManaged()

Change-Id: Ifb889e4b270dee8350a9c8f7559c671413995e4b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/qml/jsruntime/qv4property_p.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/qml/jsruntime/qv4property_p.h')

diff --git a/src/qml/jsruntime/qv4property_p.h b/src/qml/jsruntime/qv4property_p.h
index 94167ca8f0..34d9cdadeb 100644
--- a/src/qml/jsruntime/qv4property_p.h
+++ b/src/qml/jsruntime/qv4property_p.h
@@ -72,8 +72,8 @@ struct Property {
 
     inline Heap::FunctionObject *getter() const { return value.isManaged() ? reinterpret_cast<Heap::FunctionObject *>(value.heapObject()) : 0; }
     inline Heap::FunctionObject *setter() const { return set.isManaged() ? reinterpret_cast<Heap::FunctionObject *>(set.heapObject()) : 0; }
-    inline void setGetter(FunctionObject *g) { value = Primitive::fromManaged(reinterpret_cast<Managed *>(g)); }
-    inline void setSetter(FunctionObject *s) { set = s ? Primitive::fromManaged(reinterpret_cast<Managed *>(s)) : Value::fromHeapObject(0); }
+    inline void setGetter(FunctionObject *g) { value = reinterpret_cast<Managed *>(g); }
+    inline void setSetter(FunctionObject *s) { set = (s ? reinterpret_cast<Managed *>(s) : 0); }
 
     void copy(const Property *other, PropertyAttributes attrs) {
         value = other->value;
@@ -84,8 +84,8 @@ struct Property {
     explicit Property()  { value = Encode::undefined(); set = Value::fromHeapObject(0); }
     explicit Property(Value v) : value(v) { set = Value::fromHeapObject(0); }
     Property(FunctionObject *getter, FunctionObject *setter) {
-        value = Primitive::fromManaged(reinterpret_cast<Managed *>(getter));
-        set = Primitive::fromManaged(reinterpret_cast<Managed *>(setter));
+        value = reinterpret_cast<Managed *>(getter);
+        set = reinterpret_cast<Managed *>(setter);
     }
     Property(Heap::FunctionObject *getter, Heap::FunctionObject *setter) {
         value.m = reinterpret_cast<Heap::Base *>(getter);
-- 
cgit v1.2.3