More cleanups in qv4value_p.h

Change-Id: Ie48dc8f95daa4738e690902b5d33010afa7b974f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 42 insertions, 24 deletions

diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index 7deb2098ac..aeaefb3d70 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -287,7 +287,7 @@ struct Q_QML_PRIVATE_EXPORT Value
     inline int toInt32() const;
     inline unsigned int toUInt32() const;
 
-    inline bool toBoolean() const;
+    bool toBoolean() const;
     double toInteger() const;
     inline double toNumber() const;
     double toNumberImpl() const;
@@ -334,7 +334,7 @@ struct Q_QML_PRIVATE_EXPORT Value
     }
 
     inline uint asArrayIndex() const;
-    inline uint asArrayLength(bool *ok) const;
+    uint asArrayLength(bool *ok) const;
 
     ReturnedValue asReturnedValue() const { return val; }
     static Value fromReturnedValue(ReturnedValue val) { Value v; v.val = val; return v; }
@@ -428,34 +428,52 @@ inline Primitive Primitive::emptyValue()
     return v;
 }
 
-template <typename T>
-struct TypedValue : public Value
+inline Primitive Primitive::nullValue()
 {
-    template<typename X>
-    TypedValue &operator =(X *x) {
-        m = x;
-#if QT_POINTER_SIZE == 4
-        tag = Managed_Type;
+    Primitive v;
+#if QT_POINTER_SIZE == 8
+    v.val = quint64(_Null_Type) << Tag_Shift;
+#else
+    v.tag = _Null_Type;
+    v.int_32 = 0;
 #endif
-        return *this;
-    }
-    TypedValue &operator =(T *t);
-    TypedValue &operator =(const Scoped<T> &v);
-//    TypedValue &operator =(const ManagedRef<T> &v);
-
-    TypedValue &operator =(const TypedValue<T> &t);
+    return v;
+}
 
-    bool operator!() const { return !managed(); }
+inline Primitive Primitive::fromBoolean(bool b)
+{
+    Primitive v;
+    v.tag = _Boolean_Type;
+    v.int_32 = (bool)b;
+    return v;
+}
 
-    operator T *() { return static_cast<T *>(managed()); }
-    T *operator->() { return static_cast<T *>(managed()); }
-    const T *operator->() const { return static_cast<T *>(managed()); }
-    T *getPointer() const { return static_cast<T *>(managed()); }
+inline Primitive Primitive::fromDouble(double d)
+{
+    Primitive v;
+    v.setDouble(d);
+    return v;
+}
 
-    void mark(ExecutionEngine *e) { if (managed()) managed()->mark(e); }
-};
-typedef TypedValue<String> StringValue;
+inline Primitive Primitive::fromInt32(int i)
+{
+    Primitive v;
+    v.tag = _Integer_Type;
+    v.int_32 = i;
+    return v;
+}
 
+inline Primitive Primitive::fromUInt32(uint i)
+{
+    Primitive v;
+    if (i < INT_MAX) {
+        v.tag = _Integer_Type;
+        v.int_32 = (int)i;
+    } else {
+        v.setDouble(i);
+    }
+    return v;
+}
 
 struct Encode {
     static ReturnedValue undefined() {