diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-06-12 14:43:59 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-12 14:51:23 +0200 |
commit | a3b88ec8988247c8d36a8786a557bd160a9131ba (patch) | |
tree | 639a2451014adcd08f0139cec8b29c4b3986d983 /src/qml/qml/v8/qv8engine_p.h | |
parent | 248855fdff62d6118ee72e245a641ad26a5242bf (diff) |
Remove some more v8 leftovers
Change-Id: Ie025cf45444bdf42936c588997c2baa3b0d4fd05
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8engine_p.h')
-rw-r--r-- | src/qml/qml/v8/qv8engine_p.h | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h index c69c692c91..61db8a79b3 100644 --- a/src/qml/qml/v8/qv8engine_p.h +++ b/src/qml/qml/v8/qv8engine_p.h @@ -87,35 +87,11 @@ namespace QV4 { // a handle, qFatal() is called. // #define QML_GLOBAL_HANDLE_DEBUGGING -#define V8ENGINE() ((QV8Engine *)v8::External::Cast(args.Data().get())->Value()) -#define V8FUNCTION(function, engine) v8::FunctionTemplate::New(function, v8::External::New((QV8Engine*)engine))->GetFunction() -#define V8THROW_ERROR(string) { \ - v8::ThrowException(v8::Exception::Error(v8::String::New(string))); \ - return v8::Handle<v8::Value>(); \ -} - #define V4THROW_ERROR(string) \ - v8::Isolate::GetEngine()->current->throwError(QString::fromUtf8(string)); + ctx->throwError(QString::fromUtf8(string)); #define V4THROW_TYPE(string) \ - v8::Isolate::GetEngine()->current->throwError(QStringLiteral(string)); - -#define V8ENGINE_ACCESSOR() ((QV8Engine *)v8::External::Cast(info.Data().get())->Value()); -#define V8THROW_ERROR_SETTER(string) { \ - v8::ThrowException(v8::Exception::Error(v8::String::New(string))); \ - return; \ -} - -#define V8ASSERT_TYPE(condition, string) \ - if (!(condition)) { \ - v8::ThrowException(v8::Exception::TypeError(v8::String::New(string))); \ - return v8::Handle<v8::Value>(); \ - } -#define V8ASSERT_TYPE_SETTER(condition, string) \ - if (!(condition)) { \ - v8::ThrowException(v8::Exception::TypeError(v8::String::New(string))); \ - return; \ - } + ctx->throwTypeError(QStringLiteral(string)); #define V8_DEFINE_EXTENSION(dataclass, datafunction) \ static inline dataclass *datafunction(QV8Engine *engine) \ |