Minor cleanup in QQmlRefPointer

Add rvalue constructor and assignment operator, to reduce the amount of
atomic operations as a consequence of the typeloader changes that
replace the manual reference counting with QQmlRefPointer usage.

Change-Id: Id36be54e717cf2e83b0027b818f11e20b4fde0ce
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 16 insertions, 0 deletions

diff --git a/src/qml/qml/ftw/qqmlrefcount_p.h b/src/qml/qml/ftw/qqmlrefcount_p.h
index e8fa1ff2a6..d32a08e0f5 100644
--- a/src/qml/qml/ftw/qqmlrefcount_p.h
+++ b/src/qml/qml/ftw/qqmlrefcount_p.h
@@ -85,9 +85,11 @@ public:
     inline QQmlRefPointer();
     inline QQmlRefPointer(T *, Mode m = AddRef);
     inline QQmlRefPointer(const QQmlRefPointer<T> &);
+    inline QQmlRefPointer(QQmlRefPointer<T> &&);
     inline ~QQmlRefPointer();
 
     inline QQmlRefPointer<T> &operator=(const QQmlRefPointer<T> &o);
+    inline QQmlRefPointer<T> &operator=(QQmlRefPointer<T> &&o);
 
     inline bool isNull() const { return !o; }
 
@@ -158,6 +160,12 @@ QQmlRefPointer<T>::QQmlRefPointer(const QQmlRefPointer<T> &other)
     if (o) o->addref();
 }
 
+template <class T>
+QQmlRefPointer<T>::QQmlRefPointer(QQmlRefPointer<T> &&other)
+    : o(other.take())
+{
+}
+
 template<class T>
 QQmlRefPointer<T>::~QQmlRefPointer()
 {
@@ -173,6 +181,14 @@ QQmlRefPointer<T> &QQmlRefPointer<T>::operator=(const QQmlRefPointer<T> &other)
     return *this;
 }
 
+template <class T>
+QQmlRefPointer<T> &QQmlRefPointer<T>::operator=(QQmlRefPointer<T> &&other)
+{
+    QQmlRefPointer<T> m(std::move(other));
+    qSwap(o, m.o);
+    return *this;
+}
+
 /*!
 Takes ownership of \a other.  take() does *not* add a reference, as it assumes ownership
 of the callers reference of other.