diff options
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qvarlengtharray.h | 11 | ||||
-rw-r--r-- | src/corelib/tools/qvarlengtharray.qdoc | 28 |
2 files changed, 39 insertions, 0 deletions
diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index ae2c75e7df..5d0231417b 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -165,6 +165,16 @@ public: } } + void append(T &&t) { + if (s == a) + realloc(s, s << 1); + const int idx = s++; + if (QTypeInfo<T>::isComplex) + new (ptr + idx) T(std::move(t)); + else + ptr[idx] = std::move(t); + } + void append(const T *buf, int size); inline QVarLengthArray<T, Prealloc> &operator<<(const T &t) { append(t); return *this; } @@ -218,6 +228,7 @@ public: // STL compatibility: inline bool empty() const { return isEmpty(); } inline void push_back(const T &t) { append(t); } + void push_back(T &&t) { append(std::move(t)); } inline void pop_back() { removeLast(); } inline T &front() { return first(); } inline const T &front() const { return first(); } diff --git a/src/corelib/tools/qvarlengtharray.qdoc b/src/corelib/tools/qvarlengtharray.qdoc index 5e53a969e8..127afcd069 100644 --- a/src/corelib/tools/qvarlengtharray.qdoc +++ b/src/corelib/tools/qvarlengtharray.qdoc @@ -303,6 +303,34 @@ */ /*! + \fn void QVarLengthArray::append(T &&t) + \overload append + \since 5.9 + + \note Unlike the lvalue overload of append(), passing a reference to + an object that is already an element of \c *this leads to undefined + behavior: + + \code + vla.append(std::move(vla[0])); // BUG: passing an object that is already in the container + \endcode +*/ + +/*! + \fn void QVarLengthArray::push_back(T &&t) + \overload push_back + \since 5.9 + + \note Unlike the lvalue overload of push_back(), passing a reference to + an object that is already an element of \c *this leads to undefined + behavior: + + \code + vla.push_back(std::move(vla[0])); // BUG: passing an object that is already in the container + \endcode +*/ + +/*! \fn inline void QVarLengthArray::removeLast() \since 4.5 |