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/qqmlincubator.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/qqmlincubator.cpp')
-rw-r--r-- | src/qml/qml/qqmlincubator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp index 54d0b240f5..f8bc134147 100644 --- a/src/qml/qml/qqmlincubator.cpp +++ b/src/qml/qml/qqmlincubator.cpp @@ -64,8 +64,8 @@ void QQmlEnginePrivate::incubate(QQmlIncubator &i, QQmlContextData *forContext) QExplicitlySharedDataPointer<QQmlIncubatorPrivate> parentIncubator; QQmlContextData *cctxt = forContext; while (cctxt) { - if (cctxt->activeVMEData) { - parentIncubator = (QQmlIncubatorPrivate *)cctxt->activeVMEData; + if (cctxt->incubator) { + parentIncubator = cctxt->incubator; break; } cctxt = cctxt->parent; @@ -152,7 +152,7 @@ void QQmlIncubatorPrivate::clear() } enginePriv = 0; if (!rootContext.isNull()) { - rootContext->activeVMEData = 0; + rootContext->incubator = 0; rootContext = 0; } @@ -388,7 +388,7 @@ void QQmlIncubatorPrivate::cancel(QObject *object, QQmlContext *context) return; QQmlContextData *data = QQmlContextData::get(context); - QQmlIncubatorPrivate *p = (QQmlIncubatorPrivate *)data->activeVMEData; + QQmlIncubatorPrivate *p = data->incubator; if (!p) return; |