diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-05-24 08:35:39 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-19 19:54:44 +0200 |
| commit | ed116aa3b39c54ce78468f50f10c2d4cc7b02816 (patch) | |
| tree | b6834f5cfaec12868a83a6baa1b767ff864eaec6 /src/corelib | |
| parent | 77fc6d30f1bd4bdd8894dd98e12373211241a091 (diff) | |
QVarLengthArray: provide STL-compatible member function names
This allows, among other things, to use QVarLengthArray as the target of
a std::back_insert_iterator.
Change-Id: I507f612a23da854bf865780aa0a7e6312f4a896b
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qvarlengtharray.h | 9 | ||||
| -rw-r--r-- | src/corelib/tools/qvarlengtharray.qdoc | 41 |
2 files changed, 50 insertions, 0 deletions
diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index ba24541d2d..9d52da8250 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -172,6 +172,15 @@ public: iterator erase(const_iterator begin, const_iterator end); inline iterator erase(const_iterator pos) { return erase(pos, pos+1); } + // STL compatibility: + inline bool empty() const { return isEmpty(); } + inline void push_back(const T &t) { append(t); } + inline void pop_back() { removeLast(); } + inline T &front() { return first(); } + inline const T &front() const { return first(); } + inline T &back() { return last(); } + inline const T &back() const { return last(); } + private: friend class QPodList<T, Prealloc>; void realloc(int size, int alloc); diff --git a/src/corelib/tools/qvarlengtharray.qdoc b/src/corelib/tools/qvarlengtharray.qdoc index 45eab98731..05e16d636e 100644 --- a/src/corelib/tools/qvarlengtharray.qdoc +++ b/src/corelib/tools/qvarlengtharray.qdoc @@ -141,6 +141,18 @@ \overload */ +/*! \fn T& QVarLengthArray::front() + \since 5.0 + + Same as first(). Provided for STL-compatibility. +*/ + +/*! \fn const T& QVarLengthArray::front() const + \since 5.0 + + \overload +*/ + /*! \fn T& QVarLengthArray::last() Returns a reference to the last item in the array. The array must @@ -155,7 +167,17 @@ \overload */ +/*! \fn T& QVarLengthArray::back() + \since 5.0 + Same as last(). Provided for STL-compatibility. +*/ + +/*! \fn const T& QVarLengthArray::back() const + \since 5.0 + + \overload +*/ /*! \fn bool QVarLengthArray::isEmpty() const @@ -164,6 +186,12 @@ \sa size(), resize() */ +/*! \fn bool QVarLengthArray::empty() const + \since 5.0 + + Same as isEmpty(). Provided for STL-compatibility. +*/ + /*! \fn void QVarLengthArray::clear() Removes all the elements from the array. @@ -239,6 +267,12 @@ \sa removeLast() */ +/*! + \fn void QVarLengthArray::push_back(const T &t) + \since 5.0 + + Same as append(). Provided for STL-compatibility. +*/ /*! \fn inline void QVarLengthArray::removeLast() @@ -250,6 +284,13 @@ */ /*! + \fn void QVarLengthArray::pop_back() + \since 5.0 + + Same as removeLast(). Provided for STL-compatibility. +*/ + +/*! \fn void QVarLengthArray::append(const T *buf, int size) Appends \a size amount of items referenced by \a buf to this array. |