diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-09 09:44:14 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-21 12:03:30 +0200 |
| commit | 47313e5181e87fd904e6de41c75dfc844ec3f278 (patch) | |
| tree | 3042c547d99bf6ce11df2152a82496085910f189 /src/qml/qml | |
| parent | e60ac3f16ac3acb3a94a75566e07d302d87b8d09 (diff) | |
Rename QQmlQPointer to QV4QPointer
You can wrap QObject pointers in plain JavaScript.
Change-Id: I246a72a7d5d7b2562e722bf9eafc7880b772a806
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmllistwrapper_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmltypewrapper_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 64e2c9a90e..279befb351 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1237,7 +1237,7 @@ namespace Heap { Member(class, HeapValue, HeapValue, statusChanged) \ Member(class, Pointer, QmlContext *, qmlContext) \ Member(class, NoMark, QQmlComponentIncubator *, incubator) \ - Member(class, NoMark, QQmlQPointer<QObject>, parent) + Member(class, NoMark, QV4QPointer<QObject>, parent) DECLARE_HEAP_OBJECT(QmlIncubatorObject, Object) { DECLARE_MARKOBJECTS(QmlIncubatorObject); diff --git a/src/qml/qml/qqmllistwrapper_p.h b/src/qml/qml/qqmllistwrapper_p.h index c185122ad9..26a5023e6b 100644 --- a/src/qml/qml/qqmllistwrapper_p.h +++ b/src/qml/qml/qqmllistwrapper_p.h @@ -68,7 +68,7 @@ namespace Heap { struct QmlListWrapper : Object { void init(); void destroy(); - QQmlQPointer<QObject> object; + QV4QPointer<QObject> object; QQmlListProperty<QObject> &property() { return *reinterpret_cast<QQmlListProperty<QObject>*>(propertyData); diff --git a/src/qml/qml/qqmltypewrapper_p.h b/src/qml/qml/qqmltypewrapper_p.h index 7dc3f55310..595e362a41 100644 --- a/src/qml/qml/qqmltypewrapper_p.h +++ b/src/qml/qml/qqmltypewrapper_p.h @@ -77,7 +77,7 @@ struct QQmlTypeWrapper : Object { void init(); void destroy(); TypeNameMode mode; - QQmlQPointer<QObject> object; + QV4QPointer<QObject> object; QQmlType type() const; diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index 1bc1674fae..aeee32bc7b 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -78,7 +78,7 @@ struct QQmlValueTypeReference : QQmlValueTypeWrapper object.destroy(); QQmlValueTypeWrapper::destroy(); } - QQmlQPointer<QObject> object; + QV4QPointer<QObject> object; int property; }; @@ -598,7 +598,7 @@ bool QQmlValueTypeWrapper::virtualPut(Managed *m, PropertyKey id, const Value &v if (reference) { QV4::ScopedFunctionObject f(scope, value); - const QQmlQPointer<QObject> &referenceObject = reference->d()->object; + const QV4QPointer<QObject> &referenceObject = reference->d()->object; const int referencePropertyIndex = reference->d()->property; if (f) { |