diff options
author | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-05-19 09:09:47 +0200 |
---|---|---|
committer | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-06-20 15:33:58 +0200 |
commit | 65bff648ce5af00b11dcdd60679d4cde1d985dc9 (patch) | |
tree | 993de9e31108f17e4c569c1a3bf5dcd1c9d75bf1 | |
parent | 9b23f752d02cc0383a3f566860585cfc5fcc9979 (diff) |
Use new v8::Object calling functions.
Our V8 extensions; Object::Call and Object::NewInstance were replaced by
standard v8::Object API (CallAsFunction and CallAsConstructor).
-rw-r--r-- | src/script/api/qscriptqobject.cpp | 4 | ||||
-rw-r--r-- | src/script/api/qscriptvalue_impl_p.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/script/api/qscriptqobject.cpp b/src/script/api/qscriptqobject.cpp index 64326d1..32d62ed 100644 --- a/src/script/api/qscriptqobject.cpp +++ b/src/script/api/qscriptqobject.cpp @@ -675,7 +675,7 @@ void QScriptConnection::onSignal(void **argv) if (!obj) return; }*/ - m_callback->Call(receiver, argc, const_cast<v8::Handle<v8::Value>*>(jsArgv.constData())); + m_callback->CallAsFunction(receiver, argc, const_cast<v8::Handle<v8::Value>*>(jsArgv.constData())); if (tryCatch.HasCaught()) { v8::Local<v8::Value> result = tryCatch.Exception(); @@ -1329,7 +1329,7 @@ static v8::Handle<v8::Value> findChildrenWithRegExp(QScriptEnginePrivate *engine for (int i = 0, resultIndex = 0; i < children.length(); i++) { argv[0] = QScriptConverter::toString(children.at(i)->objectName()); - if (testFunction->Call(regExp, 1, argv)->IsTrue()) { + if (testFunction->CallAsFunction(regExp, 1, argv)->IsTrue()) { result->Set(resultIndex, engine->newQObject(children.at(i), QScriptEngine::QtOwnership, QScriptEngine::PreferExistingWrapperObject)); resultIndex++; diff --git a/src/script/api/qscriptvalue_impl_p.h b/src/script/api/qscriptvalue_impl_p.h index 9387824..8f32d6c 100644 --- a/src/script/api/qscriptvalue_impl_p.h +++ b/src/script/api/qscriptvalue_impl_p.h @@ -1075,7 +1075,7 @@ QScriptPassPointer<QScriptValuePrivate> QScriptValuePrivate::call(QScriptValuePr QScriptEnginePrivate::EvaluateScope evaluateScope(e); v8::TryCatch tryCatch; - v8::Handle<v8::Value> result = v8::Object::Cast(*m_value)->Call(recv, argc, argv); + v8::Handle<v8::Value> result = v8::Object::Cast(*m_value)->CallAsFunction(recv, argc, argv); if (result.IsEmpty()) { result = tryCatch.Exception(); @@ -1101,7 +1101,7 @@ inline QScriptPassPointer<QScriptValuePrivate> QScriptValuePrivate::construct(in QScriptEnginePrivate::EvaluateScope evaluateScope(e); v8::TryCatch tryCatch; - v8::Handle<v8::Value> result = v8::Object::Cast(*m_value)->NewInstance(argc, argv); + v8::Handle<v8::Value> result = v8::Object::Cast(*m_value)->CallAsConstructor(argc, argv); if (result.IsEmpty()) { result = tryCatch.Exception(); |