diff options
-rw-r--r-- | src/qml/jsruntime/qv4qmlcontext_p.h | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper_p.h | 6 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4sequenceobject.cpp | 2 | ||||
-rw-r--r-- | src/qml/memory/qv4heap_p.h | 8 | ||||
-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 |
8 files changed, 14 insertions, 14 deletions
diff --git a/src/qml/jsruntime/qv4qmlcontext_p.h b/src/qml/jsruntime/qv4qmlcontext_p.h index ba7c5da146..83d90a08fd 100644 --- a/src/qml/jsruntime/qv4qmlcontext_p.h +++ b/src/qml/jsruntime/qv4qmlcontext_p.h @@ -77,7 +77,7 @@ DECLARE_HEAP_OBJECT(QQmlContextWrapper, Object) { // This has to be a plain pointer because object needs to be a POD type. QQmlContextData *context; - QQmlQPointer<QObject> scopeObject; + QV4QPointer<QObject> scopeObject; }; #define QmlContextMembers(class, Member) diff --git a/src/qml/jsruntime/qv4qobjectwrapper_p.h b/src/qml/jsruntime/qv4qobjectwrapper_p.h index 6d12271eb8..bc6fa09d4f 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper_p.h +++ b/src/qml/jsruntime/qv4qobjectwrapper_p.h @@ -92,12 +92,12 @@ struct Q_QML_EXPORT QObjectWrapper : Object { static void markObjects(Heap::Base *that, MarkStack *markStack); private: - QQmlQPointer<QObject> qObj; + QV4QPointer<QObject> qObj; }; #define QObjectMethodMembers(class, Member) \ Member(class, Pointer, QQmlValueTypeWrapper *, valueTypeWrapper) \ - Member(class, NoMark, QQmlQPointer<QObject>, qObj) \ + Member(class, NoMark, QV4QPointer<QObject>, qObj) \ Member(class, NoMark, QQmlPropertyCache *, _propertyCache) \ Member(class, NoMark, int, index) @@ -149,7 +149,7 @@ struct QmlSignalHandler : Object { void setObject(QObject *o) { qObj = o; } private: - QQmlQPointer<QObject> qObj; + QV4QPointer<QObject> qObj; }; } diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp index 0031d65761..191e3fd275 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -243,7 +243,7 @@ struct QV4Sequence : Object { } mutable Container *container; - QQmlQPointer<QObject> object; + QV4QPointer<QObject> object; int propertyIndex; bool isReference : 1; bool isReadOnly : 1; diff --git a/src/qml/memory/qv4heap_p.h b/src/qml/memory/qv4heap_p.h index d7cfa193e6..d9c607aea4 100644 --- a/src/qml/memory/qv4heap_p.h +++ b/src/qml/memory/qv4heap_p.h @@ -204,11 +204,11 @@ Base *Pointer<T, o>::base() { #ifdef QT_NO_QOBJECT template <class T> -struct QQmlQPointer { +struct QV4QPointer { }; #else template <class T> -struct QQmlQPointer { +struct QV4QPointer { void init() { d = nullptr; @@ -238,7 +238,7 @@ struct QQmlQPointer { } operator T*() const { return data(); } inline T* operator->() const { return data(); } - QQmlQPointer &operator=(T *o) + QV4QPointer &operator=(T *o) { if (d) destroy(); @@ -254,7 +254,7 @@ private: QtSharedPointer::ExternalRefCountData *d; QObject *qObject; }; -Q_STATIC_ASSERT(std::is_trivial< QQmlQPointer<QObject> >::value); +Q_STATIC_ASSERT(std::is_trivial< QV4QPointer<QObject> >::value); #endif } 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) { |