diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-05-03 14:14:57 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-03 14:40:38 +0200 |
commit | e537722604e41577dbf5625a35542a88d2576d63 (patch) | |
tree | 8dcade24c43e2e02fe5d01f3ec161621cc28fc52 /src/qml/qml/v8 | |
parent | bf51873870f94f56e8dccf25fea67b120f2db98f (diff) |
Remove v8::HandleScope
This class never made sense with v4... :)
Change-Id: Id597d791d1adf52cc821d6d46f57cb24d1acd343
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8')
-rw-r--r-- | src/qml/qml/v8/qjsengine.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8bindings.cpp | 3 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8include.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8qobjectwrapper.cpp | 2 |
6 files changed, 0 insertions, 13 deletions
diff --git a/src/qml/qml/v8/qjsengine.cpp b/src/qml/qml/v8/qjsengine.cpp index 658f6f3bcd..36bd688e44 100644 --- a/src/qml/qml/v8/qjsengine.cpp +++ b/src/qml/qml/v8/qjsengine.cpp @@ -319,7 +319,6 @@ QJSValue QJSEngine::newQObject(QObject *object) { // ### Q_D(QJSEngine); - v8::HandleScope handleScope; return d->scriptValueFromInternal(d->newQObject(object, QV8Engine::JavaScriptOwnership)); } @@ -345,7 +344,6 @@ QJSValue QJSEngine::globalObject() const QJSValue QJSEngine::create(int type, const void *ptr) { Q_D(QJSEngine); - v8::HandleScope handleScope; return new QJSValuePrivate(QV8Engine::getV4(d), d->metaTypeToJS(type, ptr)); } diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index f08a06fbc4..038006569e 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -110,8 +110,6 @@ static QString jsStack() { v8::Handle<v8::Value> console(ConsoleLogTypes logType, const v8::Arguments &args, bool printStack = false) { - v8::HandleScope handleScope; - QString result; QV8Engine *engine = V8ENGINE(); for (int i = 0; i < args.Length(); ++i) { diff --git a/src/qml/qml/v8/qv8bindings.cpp b/src/qml/qml/v8/qv8bindings.cpp index e9a0ef9cb9..43d1e8654f 100644 --- a/src/qml/qml/v8/qv8bindings.cpp +++ b/src/qml/qml/v8/qv8bindings.cpp @@ -170,7 +170,6 @@ void QV8Bindings::Binding::update(QQmlPropertyPrivate::WriteFlags flags) DeleteWatcher watcher(this); ep->referenceScarceResources(); - v8::HandleScope handle_scope; v8::Local<v8::Value> result = evaluate(context, v8::Handle<v8::Function>::Cast(parent->functions()->Get(instruction->value)), @@ -242,8 +241,6 @@ QV8Bindings::QV8Bindings(QQmlCompiledData::V8Program *program, QV8Engine *engine = QQmlEnginePrivate::getV8Engine(context->engine); if (program->bindings.IsEmpty()) { - v8::HandleScope handle_scope; - v8::Local<v8::Script> script; bool compileFailed = false; { diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index b7abe17783..7d84b324be 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -149,7 +149,6 @@ QV8Engine::QV8Engine(QJSEngine* qq) ensurePerThreadIsolate(); - v8::HandleScope handle_scope; m_context = v8::Persistent<v8::Context>::New(v8::Context::GetCurrent()); qPersistentRegister(m_context); @@ -869,7 +868,6 @@ void QV8Engine::ensurePerThreadIsolate() void QV8Engine::initQmlGlobalObject() { - v8::HandleScope handels; initializeGlobal(QV4::Value::fromObject(m_v4Engine->globalObject)); freezeObject(QV4::Value::fromObject(m_v4Engine->globalObject)); } diff --git a/src/qml/qml/v8/qv8include.cpp b/src/qml/qml/v8/qv8include.cpp index 1c3895106b..0d76050298 100644 --- a/src/qml/qml/v8/qv8include.cpp +++ b/src/qml/qml/v8/qv8include.cpp @@ -125,8 +125,6 @@ void QV8Include::finished() } } - v8::HandleScope handle_scope; - if (m_reply->error() == QNetworkReply::NoError) { QByteArray data = m_reply->readAll(); diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp index 424e90328c..f13e2d6eed 100644 --- a/src/qml/qml/v8/qv8qobjectwrapper.cpp +++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp @@ -1309,8 +1309,6 @@ int QV8QObjectConnectionList::qt_metacall(QMetaObject::Call method, int index, v QVarLengthArray<int, 9> dummy; int *argsTypes = QQmlPropertyCache::methodParameterTypes(data(), index, dummy, 0); - v8::HandleScope handle_scope; - int argCount = argsTypes?argsTypes[0]:0; QVarLengthArray<v8::Handle<v8::Value>, 9> args(argCount); |