diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-07 09:58:00 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2013-05-07 12:26:18 +0200 |
commit | 40d2e435cfa29ba7465adc0486e6dabcdfc49773 (patch) | |
tree | dfd55b8444ef8af1463d7b0c58293c2981cae7a9 /src | |
parent | e021ff7ba2b6f017805b8c838b95269ec695def5 (diff) |
Replace v8::True()/False() with QV4::Value equivalents
Change-Id: I8d4ff185e8d33ce3d6ee11dd9a709138e35d6a48
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/qml/v4/qv4v8.cpp | 15 | ||||
-rw-r--r-- | src/qml/qml/v4/qv4v8_p.h | 6 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8worker.cpp | 4 |
3 files changed, 2 insertions, 23 deletions
diff --git a/src/qml/qml/v4/qv4v8.cpp b/src/qml/qml/v4/qv4v8.cpp index b41e3722fe..7b2345112b 100644 --- a/src/qml/qml/v4/qv4v8.cpp +++ b/src/qml/qml/v4/qv4v8.cpp @@ -1822,21 +1822,6 @@ ObjectTemplate::ObjectTemplate() m_useUserComparison = false; } -Handle<Boolean> True() -{ - Handle<Primitive> val; - val.val = QV4::Value::fromBoolean(true).val; - return val; -} - -Handle<Boolean> False() -{ - Handle<Primitive> val; - val.val = QV4::Value::fromBoolean(false).val; - return val; -} - - Handle<Value> ThrowException(Handle<Value> exception) { __qmljs_throw(currentEngine()->current, exception->v4Value()); diff --git a/src/qml/qml/v4/qv4v8_p.h b/src/qml/qml/v4/qv4v8_p.h index 2135258e09..113ac11615 100644 --- a/src/qml/qml/v4/qv4v8_p.h +++ b/src/qml/qml/v4/qv4v8_p.h @@ -2019,12 +2019,6 @@ class V8EXPORT ObjectTemplate : public Template { DEFINE_REFCOUNTED_HANDLE_OPERATIONS(ObjectTemplate) -// --- Statics --- - - -Handle<Boolean> V8EXPORT True(); -Handle<Boolean> V8EXPORT False(); - // --- Exceptions --- diff --git a/src/qml/qml/v8/qv8worker.cpp b/src/qml/qml/v8/qv8worker.cpp index 9986cee3c6..3b653cee29 100644 --- a/src/qml/qml/v8/qv8worker.cpp +++ b/src/qml/qml/v8/qv8worker.cpp @@ -297,9 +297,9 @@ v8::Handle<v8::Value> QV8Worker::deserialize(const char *&data, QV8Engine *engin case WorkerNull: return QV4::Value::nullValue(); case WorkerTrue: - return v8::True(); + return QV4::Value::fromBoolean(true); case WorkerFalse: - return v8::False(); + return QV4::Value::fromBoolean(false); case WorkerString: { quint32 size = headersize(header); |