Move Encode into qv4value_p.h

This is where the class logically belongs.

Change-Id: I366013aad2c9b6324ae82ab5f3250f1d9c719da4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h
index 902f1f1..4338d67 100644 (file)
--- a/src/qml/jsruntime/qv4scopedvalue_p.h
+++ b/src/qml/jsruntime/qv4scopedvalue_p.h
@@ -580,51 +580,6 @@ private:
     CallData *ptr;
 };
 
-struct Encode {
-    static ReturnedValue undefined() {
-        return quint64(Value::Undefined_Type) << Value::Tag_Shift;
-    }
-    static ReturnedValue null() {
-        return quint64(Value::_Null_Type) << Value::Tag_Shift;
-    }
-
-    Encode(bool b) {
-        val = (quint64(Value::_Boolean_Type) << Value::Tag_Shift) | (uint)b;
-    }
-    Encode(double d) {
-        Value v;
-        v.setDouble(d);
-        val = v.val;
-    }
-    Encode(int i) {
-        val = (quint64(Value::_Integer_Type) << Value::Tag_Shift) | (uint)i;
-    }
-    Encode(uint i) {
-        if (i <= INT_MAX) {
-            val = (quint64(Value::_Integer_Type) << Value::Tag_Shift) | i;
-        } else {
-            Value v;
-            v.setDouble(i);
-            val = v.val;
-        }
-    }
-    Encode(ReturnedValue v) {
-        val = v;
-    }
-
-    template<typename T>
-    Encode(Returned<T> *t) {
-        val = t->getPointer()->asReturnedValue();
-    }
-
-    operator ReturnedValue() const {
-        return val;
-    }
-    quint64 val;
-private:
-    Encode(void *);
-};
-
 
 template <typename T>
 inline Value &Value::operator=(Returned<T> *t)

diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index e20cc66..07757ea 100644 (file)
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -41,6 +41,8 @@
 #ifndef QV4VALUE_P_H
 #define QV4VALUE_P_H
 
+#include <limits.h>
+
 #include <QtCore/QString>
 #include "qv4global_p.h"
 
@@ -449,6 +451,53 @@ struct TypedValue : public Value
 };
 typedef TypedValue<String> StringValue;
 
+
+struct Encode {
+    static ReturnedValue undefined() {
+        return quint64(Value::Undefined_Type) << Value::Tag_Shift;
+    }
+    static ReturnedValue null() {
+        return quint64(Value::_Null_Type) << Value::Tag_Shift;
+    }
+
+    Encode(bool b) {
+        val = (quint64(Value::_Boolean_Type) << Value::Tag_Shift) | (uint)b;
+    }
+    Encode(double d) {
+        Value v;
+        v.setDouble(d);
+        val = v.val;
+    }
+    Encode(int i) {
+        val = (quint64(Value::_Integer_Type) << Value::Tag_Shift) | (uint)i;
+    }
+    Encode(uint i) {
+        if (i <= INT_MAX) {
+            val = (quint64(Value::_Integer_Type) << Value::Tag_Shift) | i;
+        } else {
+            Value v;
+            v.setDouble(i);
+            val = v.val;
+        }
+    }
+    Encode(ReturnedValue v) {
+        val = v;
+    }
+
+    template<typename T>
+    Encode(Returned<T> *t) {
+        val = t->getPointer()->asReturnedValue();
+    }
+
+    operator ReturnedValue() const {
+        return val;
+    }
+    quint64 val;
+private:
+    Encode(void *);
+};
+
+
 template<typename T>
 T *value_cast(const Value &v)
 {