aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4variantobject_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/jsruntime/qv4variantobject_p.h')
-rw-r--r--src/qml/jsruntime/qv4variantobject_p.h29
1 files changed, 17 insertions, 12 deletions
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);