diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-20 17:50:56 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-20 17:50:56 (GMT) |
| commit | 1a1a3dcff288b9f4256357aa376596f12e661d2e (patch) | |
| tree | 5bfd61f251a29f38f72483828239dbfe6c4662be /src/script/api/qscriptengine_p.h | |
| parent | a9966a51c78e07e845a5764d8ce9d258baf6c471 (diff) | |
| download | Qt-1a1a3dcff288b9f4256357aa376596f12e661d2e.zip Qt-1a1a3dcff288b9f4256357aa376596f12e661d2e.tar.gz Qt-1a1a3dcff288b9f4256357aa376596f12e661d2e.tar.bz2 | |
use a list to keep track of registered script values
Get rid of the hash.
Diffstat (limited to 'src/script/api/qscriptengine_p.h')
| -rw-r--r-- | src/script/api/qscriptengine_p.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h index 8a7dd1a..0d034f5 100644 --- a/src/script/api/qscriptengine_p.h +++ b/src/script/api/qscriptengine_p.h @@ -122,7 +122,6 @@ public: QScriptValue scriptValueFromJSCValue(JSC::JSValue value); JSC::JSValue scriptValueToJSCValue(const QScriptValue &value); - void releaseJSCValue(JSC::JSValue value); QScriptValue scriptValueFromVariant(const QVariant &value); QVariant scriptValueToVariant(const QScriptValue &value, int targetType); @@ -212,10 +211,7 @@ public: JSC::JSValue function); void registerScriptValue(QScriptValuePrivate *value); - void unregisterScriptValue(QScriptValuePrivate *value) - { - attachedScriptValues.remove(value); - } + void unregisterScriptValue(QScriptValuePrivate *value); void detachAllRegisteredScriptValues(); // private slots @@ -240,7 +236,7 @@ public: QList<QScriptEngineAgent*> ownedAgents; QScriptEngineAgent *activeAgent; int agentLineNumber; - QHash<JSC::JSCell*, QBasicAtomicInt> keepAliveValues; + QList<QScriptValuePrivate*> registeredScriptValues; QHash<int, QScriptTypeInfo*> m_typeInfos; int processEventsInterval; QScriptValue abortResult; @@ -249,8 +245,6 @@ public: QSet<QString> importedExtensions; QSet<QString> extensionsBeingImported; - QSet<QScriptValuePrivate*> attachedScriptValues; //keep trace to all QScriptValue evalueted - #ifndef QT_NO_QOBJECT QHash<QObject*, QScript::QObjectData*> m_qobjectData; #endif |