diff options
-rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmlobjectcreator_p.h | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index e14d30effb..ff75e587ef 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -88,7 +88,7 @@ QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QQmlCompile { init(parentContext); - sharedState = new SharedState; + sharedState = new QQmlObjectCreatorSharedState; sharedState.setFlag(); // We own it, so we must delete it sharedState->componentAttached = 0; sharedState->allCreatedBindings.allocate(compiledData->totalBindingsCount); @@ -97,7 +97,7 @@ QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QQmlCompile sharedState->rootContext = 0; } -QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledData *compiledData, SharedState *inheritedSharedState) +QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledData *compiledData, QQmlObjectCreatorSharedState *inheritedSharedState) : compiledData(compiledData) , resolvedTypes(compiledData->resolvedTypes) , propertyCaches(compiledData->propertyCaches) diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index d72b9ec065..5b7ee039c4 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -54,10 +54,19 @@ class QQmlAbstractBinding; struct QQmlTypeCompiler; class QQmlInstantiationInterrupt; +struct QQmlObjectCreatorSharedState +{ + QQmlContextData *rootContext; + QQmlContextData *creationContext; + QFiniteStack<QQmlAbstractBinding*> allCreatedBindings; + QFiniteStack<QQmlParserStatus*> allParserStatusCallbacks; + QQmlComponentAttached *componentAttached; + QList<QQmlEnginePrivate::FinalizeCallback> finalizeCallbacks; +}; + class QQmlObjectCreator { Q_DECLARE_TR_FUNCTIONS(QQmlObjectCreator) - struct SharedState; public: QQmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledData *compiledData, QQmlContextData *creationContext); ~QQmlObjectCreator(); @@ -74,7 +83,7 @@ public: QQmlContextData *parentContextData() const { return parentContext; } private: - QQmlObjectCreator(QQmlContextData *contextData, QQmlCompiledData *compiledData, SharedState *inheritedSharedState); + QQmlObjectCreator(QQmlContextData *contextData, QQmlCompiledData *compiledData, QQmlObjectCreatorSharedState *inheritedSharedState); void init(QQmlContextData *parentContext); @@ -92,15 +101,6 @@ private: QString stringAt(int idx) const { return qmlUnit->header.stringAt(idx); } void recordError(const QV4::CompiledData::Location &location, const QString &description); - struct SharedState { - QQmlContextData *rootContext; - QQmlContextData *creationContext; - QFiniteStack<QQmlAbstractBinding*> allCreatedBindings; - QFiniteStack<QQmlParserStatus*> allParserStatusCallbacks; - QQmlComponentAttached *componentAttached; - QList<QQmlEnginePrivate::FinalizeCallback> finalizeCallbacks; - }; - QQmlEngine *engine; QQmlCompiledData *compiledData; const QV4::CompiledData::QmlUnit *qmlUnit; @@ -110,7 +110,7 @@ private: const QVector<QQmlPropertyCache *> &propertyCaches; const QVector<QByteArray> &vmeMetaObjectData; QHash<int, int> objectIndexToId; - QFlagPointer<SharedState> sharedState; + QFlagPointer<QQmlObjectCreatorSharedState> sharedState; QObject *_qobject; QObject *_scopeObject; |