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/memory | |
| 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/memory')
| -rw-r--r-- | src/qml/memory/qv4heap_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
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 } |