diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-20 17:12:44 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-20 17:15:19 (GMT) |
| commit | a9966a51c78e07e845a5764d8ce9d258baf6c471 (patch) | |
| tree | 60dd0f64732c080cb6e552f7f7ce2cc615d710af /src/script/api/qscriptengine.cpp | |
| parent | 82fc329f2176079d86070782fd89f80e894a8ec4 (diff) | |
| download | Qt-a9966a51c78e07e845a5764d8ce9d258baf6c471.zip Qt-a9966a51c78e07e845a5764d8ce9d258baf6c471.tar.gz Qt-a9966a51c78e07e845a5764d8ce9d258baf6c471.tar.bz2 | |
store the engine's d-pointer in QScriptValuePrivate
It's the d-pointer that we most frequently want to access, so store it
to avoid having to use QScriptEnginePrivate::get() all over the place.
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index c7729d7..230a8c5 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -848,12 +848,11 @@ QScriptEnginePrivate::~QScriptEnginePrivate() QScriptValue QScriptEnginePrivate::scriptValueFromJSCValue(JSC::JSValue value) { - Q_Q(QScriptEngine); if (!value) return QScriptValue(); QScriptValuePrivate *p_value = new QScriptValuePrivate(); - p_value->engine = q; + p_value->engine = this; p_value->initFrom(value); return QScriptValuePrivate::get(p_value); } @@ -864,9 +863,8 @@ JSC::JSValue QScriptEnginePrivate::scriptValueToJSCValue(const QScriptValue &val if (!vv) return JSC::JSValue(); if (vv->type != QScriptValuePrivate::JSC) { - Q_Q(QScriptEngine); - Q_ASSERT(!vv->engine || vv->engine == q); - vv->engine = q; + Q_ASSERT(!vv->engine || vv->engine == this); + vv->engine = this; if (vv->type == QScriptValuePrivate::Number) { vv->initFrom(JSC::jsNumber(currentFrame, vv->numberValue)); } else { //QScriptValuePrivate::String |