diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-30 19:16:21 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-30 20:55:47 +0200 |
| commit | 80ec004e7c6411997e2476a2f2c9c9f4fb41217a (patch) | |
| tree | 6c0b89f7c2c5c7d6178bab564b428a74991e1e7e /src/qml | |
| parent | 07c7c419cc2231112ddb39b11c709bf3843ace6d (diff) | |
Smaller cleanups
Change-Id: I7c3ec27b2910a98f667d13011192cbe57bb1d7c7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper.cpp | 8 | ||||
| -rw-r--r-- | src/qml/qml/qqmlxmlhttprequest.cpp | 4 | ||||
| -rw-r--r-- | src/qml/qml/v8/qv4domerrors_p.h | 7 |
3 files changed, 2 insertions, 17 deletions
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index 31c95e6a53..b6535ae61b 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -190,14 +190,6 @@ void QmlValueTypeWrapper::destroy(Managed *that) static_cast<QmlValueTypeCopy *>(w)->~QmlValueTypeCopy(); } -//QVariant QV8ValueTypeWrapper::toVariant(v8::Handle<v8::Object> obj, int typeHint, bool *succeeded) -//{ -// // NOTE: obj must not be an external resource object (ie, wrapper object) -// // instead, it is a normal js object which one of the value-type providers -// // may know how to convert to the given type. -// return QQml_valueTypeProvider()->createVariantFromJsObject(typeHint, QQmlV4Handle(obj->v4Value()), m_engine, succeeded); -//} - bool QmlValueTypeWrapper::isEqual(const QVariant& value) { if (objectType == QmlValueTypeWrapper::Reference) { diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index 60968f55d2..af34e99204 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -1677,7 +1677,7 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_status(v8::Handle<v8::String> /* if (r->readyState() == QQmlXMLHttpRequest::Unsent || r->readyState() == QQmlXMLHttpRequest::Opened) - V8THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state"); + V4THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state"); if (r->errorFlag()) return QV4::Value::fromInt32(0); @@ -1696,7 +1696,7 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_statusText(v8::Handle<v8::String> if (r->readyState() == QQmlXMLHttpRequest::Unsent || r->readyState() == QQmlXMLHttpRequest::Opened) - V8THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state"); + V4THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state"); if (r->errorFlag()) return engine->toString(QString()); diff --git a/src/qml/qml/v8/qv4domerrors_p.h b/src/qml/qml/v8/qv4domerrors_p.h index 268df7e26e..db029066f8 100644 --- a/src/qml/qml/v8/qv4domerrors_p.h +++ b/src/qml/qml/v8/qv4domerrors_p.h @@ -76,13 +76,6 @@ QT_BEGIN_NAMESPACE #define DOMEXCEPTION_VALIDATION_ERR 16 #define DOMEXCEPTION_TYPE_MISMATCH_ERR 17 -#define V8THROW_DOM(error, string) { \ - v8::Handle<v8::Value> v = v8::Exception::Error(v8::String::New(string)); \ - v->ToObject()->Set(v8::String::New("code"), QV4::Value::fromInt32(error)); \ - v8::ThrowException(v); \ - return v8::Handle<v8::Value>(); \ -} - #define V4THROW_DOM(error, string) { \ QV4::ExecutionContext *ctx = v8::Isolate::GetEngine()->current; \ QV4::Value v = QV4::Value::fromString(ctx, QStringLiteral(string)); \ |