diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-04 10:05:51 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-04 11:58:10 +0200 |
| commit | 19ded50946fa40146914771b1d8eaa22f51da803 (patch) | |
| tree | d0e10bdef5f6ec9ffa529eafde7fd3f5f9df4fff /src/qml/qml/qqmldata_p.h | |
| parent | 1dbbecda8b4e34196d07ecfea65de87b0bd8b83a (diff) | |
Cleanups in QObject bindings
* Rename v8object to jsWrapper in QQmlData
* Rename v8objectid to jsEngineId, as that's the identifier of the engine
that currently owns the primary JS wrapper
This is in preparation for moving newObject away from QV8QObjectWrapper
Change-Id: I6432365e849d159600e22f09e7e2ab2ae2117db6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmldata_p.h')
| -rw-r--r-- | src/qml/qml/qqmldata_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmldata_p.h b/src/qml/qml/qqmldata_p.h index 568a43e36e..7db822bbd4 100644 --- a/src/qml/qml/qqmldata_p.h +++ b/src/qml/qml/qqmldata_p.h @@ -84,7 +84,7 @@ public: hasTaintedV8Object(false), isQueuedForDeletion(false), rootObjectInCreation(false), hasVMEMetaObject(false), parentFrozen(false), notifyList(0), context(0), outerContext(0), bindings(0), signalHandlers(0), nextContextObject(0), prevContextObject(0), bindingBitsSize(0), bindingBits(0), - lineNumber(0), columnNumber(0), compiledData(0), deferredIdx(0), v8objectid(0), + lineNumber(0), columnNumber(0), compiledData(0), deferredIdx(0), jsEngineId(0), propertyCache(0), guards(0), extendedData(0) { init(); } @@ -178,8 +178,8 @@ public: QQmlCompiledData *compiledData; unsigned int deferredIdx; - quint32 v8objectid; - QV4::WeakValue v8object; + quint32 jsEngineId; // id of the engine that cerated the jsWrapper + QV4::WeakValue jsWrapper; QQmlPropertyCache *propertyCache; |