From 5963aead75991ea8b0fded251e18ef75f099ab8f Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Tue, 7 May 2013 11:22:52 +0200
Subject: More steps towards eliminating the v8 layer

* Changed the return type of the InvocationCallback from a v8 handle to a QV4::Value
* Removed v4 auto tests and fixed build of other tests

Change-Id: Ic927b925923ca8785170689a5c260969fd1cb794
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/particles/qquickv8particledata.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/particles')

diff --git a/src/particles/qquickv8particledata.cpp b/src/particles/qquickv8particledata.cpp
index 3ca88208d5..08fc1415ec 100644
--- a/src/particles/qquickv8particledata.cpp
+++ b/src/particles/qquickv8particledata.cpp
@@ -43,6 +43,7 @@
 #include "qquickv8particledata_p.h"
 #include "qquickparticlesystem_p.h"//for QQuickParticleData
 #include <QDebug>
+#include <private/qv4engine_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -286,33 +287,33 @@ public:
     v8::Persistent<v8::Function> constructor;
 };
 
-static v8::Handle<v8::Value> particleData_discard(const v8::Arguments &args)
+static QV4::Value particleData_discard(const v8::Arguments &args)
 {
     QV8ParticleDataResource *r = v8_resource_cast<QV8ParticleDataResource>(args.This());
 
     if (!r || !r->datum)
-        V8THROW_ERROR("Not a valid ParticleData object");
+        V4THROW_ERROR("Not a valid ParticleData object");
 
     r->datum->lifeSpan = 0; //Don't kill(), because it could still be in the middle of being created
     return QV4::Value::undefinedValue();
 }
 
-static v8::Handle<v8::Value> particleData_lifeLeft(const v8::Arguments &args)
+static QV4::Value particleData_lifeLeft(const v8::Arguments &args)
 {
     QV8ParticleDataResource *r = v8_resource_cast<QV8ParticleDataResource>(args.This());
     if (!r || !r->datum)
-        V8THROW_ERROR("Not a valid ParticleData object");
+        V4THROW_ERROR("Not a valid ParticleData object");
 
-    return v8::Number::New(r->datum->lifeLeft());
+    return QV4::Value::fromDouble(r->datum->lifeLeft());
 }
 
-static v8::Handle<v8::Value> particleData_curSize(const v8::Arguments &args)
+static QV4::Value particleData_curSize(const v8::Arguments &args)
 {
     QV8ParticleDataResource *r = v8_resource_cast<QV8ParticleDataResource>(args.This());
     if (!r || !r->datum)
-        V8THROW_ERROR("Not a valid ParticleData object");
+        V4THROW_ERROR("Not a valid ParticleData object");
 
-    return v8::Number::New(r->datum->curSize());
+    return QV4::Value::fromDouble(r->datum->curSize());
 }
 #define COLOR_GETTER_AND_SETTER(VAR, NAME) static v8::Handle<v8::Value> particleData_get_ ## NAME (v8::Handle<v8::String>, const v8::AccessorInfo &info) \
 { \
-- 
cgit v1.2.3