aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickglobal.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-04-19 10:59:41 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-04-19 13:07:10 +0200
commit3e08aa42497f7d264be039f31f4eedf639eda307 (patch)
tree871ee4f38715ab0111fe8e2c49756ca60390898e /src/quick/util/qquickglobal.cpp
parent190b376859ae9709e887886fcbaa56d60495be66 (diff)
Rename QQmlV8Handle to QQmlV4Handle
The handle wraps a V4 Value, so this is the better name for it. Also added some accessor methods to convert to and from V4 Values. Change-Id: I327c83feb5bd3be59909001489979e5a3a9d9e67 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/util/qquickglobal.cpp')
-rw-r--r--src/quick/util/qquickglobal.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index 3ea1bc73ad..202c0b3def 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -309,11 +309,11 @@ public:
return QMatrix4x4();
}
- static QFont fontFromObject(QQmlV8Handle object, QV8Engine *e, bool *ok)
+ static QFont fontFromObject(QQmlV4Handle object, QV8Engine *e, bool *ok)
{
if (ok) *ok = false;
QFont retn;
- v8::Handle<v8::Object> obj = object.toHandle()->ToObject();
+ v8::Handle<v8::Object> obj = object.toV8Handle()->ToObject();
v8::Handle<v8::Value> vbold = obj->Get(v8::String::New("bold"));
v8::Handle<v8::Value> vcap = obj->Get(v8::String::New("capitalization"));
@@ -376,10 +376,10 @@ public:
return retn;
}
- static QMatrix4x4 matrix4x4FromObject(QQmlV8Handle object, bool *ok)
+ static QMatrix4x4 matrix4x4FromObject(QQmlV4Handle object, bool *ok)
{
if (ok) *ok = false;
- v8::Handle<v8::Object> obj = object.toHandle()->ToObject();
+ v8::Handle<v8::Object> obj = object.toV8Handle()->ToObject();
if (!obj->IsArray())
return QMatrix4x4();
@@ -746,10 +746,10 @@ public:
return false;
}
- bool variantFromJsObject(int type, QQmlV8Handle object, QV8Engine *e, QVariant *v)
+ bool variantFromJsObject(int type, QQmlV4Handle object, QV8Engine *e, QVariant *v)
{
// must be called with a valid v8 context.
- Q_ASSERT(object.toHandle()->IsObject());
+ Q_ASSERT(object.toV8Handle()->IsObject());
bool ok = false;
switch (type) {
case QMetaType::QFont: