diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-08-15 12:33:04 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-23 10:45:04 +0000 |
commit | df102ad1b548653bb9d6e072452e49578723f518 (patch) | |
tree | 915c93cbf284d86478bfd707796ef1c79047dd99 /src/qml/qml/qqmlobjectcreator.cpp | |
parent | 43472c1e8218ed692aaf3bb32c325d018e6a4527 (diff) |
Clean up void * usage
Don't use void * in our internals, when we can simply pass
a typed pointer.
Change-Id: Id02033c7e66df7e041c079d3546f9dd6027ef8d5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
-rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index 45f7c5333a..b34c2ea5e6 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -70,14 +70,15 @@ struct ActiveOCRestorer }; } -QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QV4::CompiledData::CompilationUnit *compilationUnit, QQmlContextData *creationContext, void *activeVMEDataForRootContext) +QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QV4::CompiledData::CompilationUnit *compilationUnit, QQmlContextData *creationContext, + QQmlIncubatorPrivate *incubator) : phase(Startup) , compilationUnit(compilationUnit) , resolvedTypes(compilationUnit->resolvedTypes) , propertyCaches(&compilationUnit->propertyCaches) , sharedState(new QQmlObjectCreatorSharedState) , topLevelCreator(true) - , activeVMEDataForRootContext(activeVMEDataForRootContext) + , incubator(incubator) { init(parentContext); @@ -104,7 +105,7 @@ QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QV4::Compil , propertyCaches(&compilationUnit->propertyCaches) , sharedState(inheritedSharedState) , topLevelCreator(false) - , activeVMEDataForRootContext(0) + , incubator(0) { init(parentContext); } @@ -176,7 +177,7 @@ QObject *QQmlObjectCreator::create(int subComponentIndex, QObject *parent, QQmlI if (!sharedState->rootContext) { sharedState->rootContext = context; - sharedState->rootContext->activeVMEData = activeVMEDataForRootContext; + sharedState->rootContext->incubator = incubator; sharedState->rootContext->isRootObjectInCreation = true; } |