diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-05-21 00:05:52 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-21 10:13:52 +0200 |
commit | ff52a87fe35352c15e8d96caa244b3987a625b02 (patch) | |
tree | a1f44f21467b83cf096937387c0375c295eaa5cc /src/qml/qml/qqmljavascriptexpression.cpp | |
parent | 7fe54ee6d6eb44c630038229eb9a4bb1780eec77 (diff) |
Get rid of v8::TryCatch and v8::Message
They are now unused, so let's remove them from the v8 API.
Change-Id: I9c1b39632cb88785ae6fdda671580e0426ae97ba
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
-rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index e5525e59a3..bd74fd1471 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -305,30 +305,6 @@ void QQmlJavaScriptExpression::exceptionToError(const QV4::Exception &e, QQmlErr error.setDescription(e.value().toQString()); } -void QQmlJavaScriptExpression::exceptionToError(v8::Handle<v8::Message> message, QQmlError &error) -{ - Q_ASSERT(!message.IsEmpty()); - - v8::Handle<v8::Value> name = message->GetScriptResourceName(); - v8::Handle<v8::String> description = message->Get(); - int lineNumber = message->GetLineNumber(); - - v8::Handle<v8::String> file = name->IsString()?name->ToString():v8::Handle<v8::String>(); - if (file.IsEmpty() || file->Length() == 0) - error.setUrl(QUrl()); - else - error.setUrl(QUrl(file->v4Value().toQString())); - - error.setLine(lineNumber); - error.setColumn(-1); - - QString qDescription = description->v4Value().toQString(); - if (qDescription.startsWith(QLatin1String("Uncaught "))) - qDescription = qDescription.mid(9 /* strlen("Uncaught ") */); - - error.setDescription(qDescription); -} - // Callee owns the persistent handle QV4::PersistentValue QQmlJavaScriptExpression::evalFunction(QQmlContextData *ctxt, QObject *scope, |