From 980e7fae0a010d519907a58ab891cc6ca94eb56a Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@theqtcompany.com>
Date: Tue, 4 Nov 2014 15:25:09 +0100
Subject: Move Data of Variant and ArgumentsObject into Heap namespace

Change-Id: Id2092a15c9fb5341d9b5cf4a9ac7a978308e4174
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/qml/jsruntime/qv4variantobject_p.h | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

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

diff --git a/src/qml/jsruntime/qv4variantobject_p.h b/src/qml/jsruntime/qv4variantobject_p.h
index d2dce35eba..5d68de1be3 100644
--- a/src/qml/jsruntime/qv4variantobject_p.h
+++ b/src/qml/jsruntime/qv4variantobject_p.h
@@ -56,20 +56,25 @@ QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
+namespace Heap {
+
+struct VariantObject : Object, public ExecutionEngine::ScarceResourceData
+{
+    VariantObject(InternalClass *ic);
+    VariantObject(QV4::ExecutionEngine *engine, const QVariant &value);
+    ~VariantObject() {
+        if (isScarce())
+            node.remove();
+    }
+    bool isScarce() const;
+    int vmePropertyReferenceCount;
+};
+
+}
+
 struct VariantObject : Object
 {
-    struct Data : Heap::Object, public ExecutionEngine::ScarceResourceData
-    {
-        Data(InternalClass *ic);
-        Data(ExecutionEngine *engine, const QVariant &value);
-        ~Data() {
-            if (isScarce())
-                node.remove();
-        }
-        bool isScarce() const;
-        int vmePropertyReferenceCount;
-    };
-    V4_OBJECT(Object)
+    V4_OBJECT2(VariantObject, Object)
 
     static QVariant toVariant(const ValueRef v);
 
-- 
cgit v1.2.3