From 00a1a99261bd96c1ee928350656bb1012dea4d21 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Thu, 6 Jun 2013 01:16:49 +0200
Subject: [PATCH] Remove v8 usage in a few places
Change-Id: Ib9885d395dd799c0f9dc68e16efea44b60cb1418
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
src/quick/items/qquickloader.cpp | 16 ++++++++--------
src/quick/items/qquickloader_p_p.h | 2 +-
src/quick/items/qquicktextinput.cpp | 8 ++++----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index 8a597953cc..f3f428c1a8 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -571,15 +571,15 @@ void QQuickLoader::setSource(QQmlV4Function *args)
bool ipvError = false;
args->setReturnValue(QV4::Value::undefinedValue());
- v8::Handle<v8::Object> ipv = d->extractInitialPropertyValues(args, this, &ipvError);
+ QV4::Value ipv = d->extractInitialPropertyValues(args, this, &ipvError);
if (ipvError)
return;
d->clear();
QUrl sourceUrl = d->resolveSourceUrl(args);
- if (!ipv.IsEmpty()) {
+ if (!ipv.isEmpty()) {
d->disposeInitialPropertyValues();
- d->initialPropertyValues = ipv->v4Value();
+ d->initialPropertyValues = ipv;
d->qmlGlobalForIpv = args->qmlGlobal();
}
@@ -933,17 +933,17 @@ QUrl QQuickLoaderPrivate::resolveSourceUrl(QQmlV4Function *args)
return context->resolvedUrl(QUrl(arg));
}
-v8::Handle<v8::Object> QQuickLoaderPrivate::extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error)
+QV4::Value QQuickLoaderPrivate::extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error)
{
- v8::Handle<v8::Object> valuemap;
+ QV4::Value valuemap = QV4::Value::emptyValue();
if (args->length() >= 2) {
- v8::Handle<v8::Value> v = (*args)[1];
- if (!v->IsObject() || v->IsArray()) {
+ QV4::Value v = (*args)[1];
+ if (!v.isObject() || v.asArrayObject()) {
*error = true;
qmlInfo(loader) << QQuickLoader::tr("setSource: value is not an object");
} else {
*error = false;
- valuemap = v8::Handle<v8::Object>::Cast(v);
+ valuemap = v;
}
}
diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h
index 82b78ed25d..0f3bdc8811 100644
--- a/src/quick/items/qquickloader_p_p.h
+++ b/src/quick/items/qquickloader_p_p.h
@@ -99,7 +99,7 @@ public:
void setInitialState(QObject *o);
void disposeInitialPropertyValues();
QUrl resolveSourceUrl(QQmlV4Function *args);
- v8::Handle<v8::Object> extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error);
+ QV4::Value extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error);
virtual qreal getImplicitWidth() const;
virtual qreal getImplicitHeight() const;
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 5e1b786e17..989c0db3ab 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1411,17 +1411,17 @@ void QQuickTextInput::positionAt(QQmlV4Function *args) const
return;
int i = 0;
- v8::Handle<v8::Value> arg = (*args)[i];
- x = arg->NumberValue();
+ QV4::Value arg = (*args)[i];
+ x = arg.toNumber();
if (++i < args->length()) {
arg = (*args)[i];
- y = arg->NumberValue();
+ y = arg.toNumber();
}
if (++i < args->length()) {
arg = (*args)[i];
- position = QTextLine::CursorPosition(arg->Int32Value());
+ position = QTextLine::CursorPosition(arg.toInt32());
}
int pos = d->positionAt(x, y, position);
--
GitLab