Rename QQmlQPointer to QV4QPointer

You can wrap QObject pointers in plain JavaScript.

Change-Id: I246a72a7d5d7b2562e722bf9eafc7880b772a806
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

3 files changed, 5 insertions, 5 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;