diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-07-27 14:55:41 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-07-27 17:58:50 (GMT) |
| commit | 117802b5ca71478d01bb79f88aa3596729b0a590 (patch) | |
| tree | 9fb3b69a34c54017a1d1b2d68724d97c69d71f08 /src/script | |
| parent | b9026b5f2182db6f0e607035cb4ac3798bf09054 (diff) | |
| download | Qt-117802b5ca71478d01bb79f88aa3596729b0a590.zip Qt-117802b5ca71478d01bb79f88aa3596729b0a590.tar.gz Qt-117802b5ca71478d01bb79f88aa3596729b0a590.tar.bz2 | |
use engine's globalObject() instead of exec's lexicalGlobalObject()
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 5ea5df1..b065f5c 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -1168,7 +1168,7 @@ bool QObjectDelegate::getOwnPropertySlot(QScriptObject *object, JSC::ExecState * || (index >= meta->methodOffset())) { QtFunction *fun = new (exec)QtFunction( object, index, /*maybeOverloaded=*/false, - &exec->globalData(), exec->lexicalGlobalObject()->functionStructure(), + &exec->globalData(), eng->globalObject()->functionStructure(), propertyName); slot.setValue(fun); data->cachedMembers.insert(name, fun); @@ -1187,7 +1187,7 @@ bool QObjectDelegate::getOwnPropertySlot(QScriptObject *object, JSC::ExecState * if (GeneratePropertyFunctions) { QtPropertyFunction *fun = new (exec)QtPropertyFunction( meta, index, &exec->globalData(), - exec->lexicalGlobalObject()->functionStructure(), + eng->globalObject()->functionStructure(), propertyName); data->cachedMembers.insert(name, fun); slot.setGetterSlot(fun); @@ -1219,7 +1219,7 @@ bool QObjectDelegate::getOwnPropertySlot(QScriptObject *object, JSC::ExecState * && (methodName(method) == name)) { QtFunction *fun = new (exec)QtFunction( object, index, /*maybeOverloaded=*/true, - &exec->globalData(), exec->lexicalGlobalObject()->functionStructure(), + &exec->globalData(), eng->globalObject()->functionStructure(), propertyName); slot.setValue(fun); data->cachedMembers.insert(name, fun); @@ -1292,7 +1292,7 @@ void QObjectDelegate::put(QScriptObject *object, JSC::ExecState* exec, } else { fun = new (exec)QtPropertyFunction( meta, index, &exec->globalData(), - exec->lexicalGlobalObject()->functionStructure(), + eng->globalObject()->functionStructure(), propertyName); data->cachedMembers.insert(name, fun); } @@ -1547,6 +1547,7 @@ static JSC::JSValue JSC_HOST_CALL qobjectProtoFuncFindChildren(JSC::ExecState *e if (!delegate || (delegate->type() != QScriptObjectDelegate::QtObject)) return throwError(exec, JSC::TypeError, "this object is not a QObject"); const QObject *const obj = static_cast<QObjectDelegate*>(delegate)->value(); + QScriptEnginePrivate *engine = scriptEngineFromExec(exec); // find the children QList<QObject *> children; @@ -1561,7 +1562,7 @@ static JSC::JSValue JSC_HOST_CALL qobjectProtoFuncFindChildren(JSC::ExecState *e for (int i = 0; i < allChildrenCount; ++i) { QObject *const child = allChildren.at(i); const JSC::UString childName = qtStringToJSCUString(child->objectName()); - JSC::RegExpConstructor* regExpConstructor = exec->lexicalGlobalObject()->regExpConstructor(); + JSC::RegExpConstructor* regExpConstructor = engine->globalObject()->regExpConstructor(); int position; int length; regExpConstructor->performMatch(regexp->regExp(), childName, 0, position, length); @@ -1580,7 +1581,6 @@ static JSC::JSValue JSC_HOST_CALL qobjectProtoFuncFindChildren(JSC::ExecState *e JSC::JSArray *const result = JSC::constructEmptyArray(exec, length); QScriptEngine::QObjectWrapOptions opt = QScriptEngine::PreferExistingWrapperObject; - QScriptEnginePrivate *engine = scriptEngineFromExec(exec); for (int i = 0; i < length; ++i) { QObject *const child = children.at(i); result->put(exec, i, engine->newQObject(child, QScriptEngine::QtOwnership, opt)); @@ -1978,7 +1978,7 @@ void QObjectConnectionManager::execute(int slotIndex, void **argv) if (receiver && receiver.isObject()) thisObject = receiver; else - thisObject = exec->lexicalGlobalObject(); + thisObject = engine->globalObject(); JSC::CallData callData; JSC::CallType callType = slot.getCallData(callData); |