whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add QByteArrayView overloads for push_back and push_front 

Change-Id: If70f3ac6764958d92dcbab44432b4f4994d20405
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
bb10
Lars Knoll 2020-07-09 21:02:11 +02:00 committed by Mårten Nordheim
parent 8897aa071a
commit 95daeb2407
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/text/qbytearray.cpp
View File

@ -1037,6 +1037,13 @@ QByteArray qUncompress(const uchar* data, qsizetype nbytes)
to append(\a other).
*/
/*! \fn void QByteArray::push_back(QByteArrayView str)
\since 6.0
\overload
Same as append(\a str).
*/
/*! \fn void QByteArray::push_back(const char *str)
\overload
@ -1057,6 +1064,13 @@ QByteArray qUncompress(const uchar* data, qsizetype nbytes)
to prepend(\a other).
*/
/*! \fn void QByteArray::push_front(QByteArrayView str)
\since 6.0
\overload
Same as prepend(\a str).
*/
/*! \fn void QByteArray::push_front(const char *str)
\overload

34
src/corelib/text/qbytearray.h
View File

@ -427,12 +427,22 @@ public:
typedef char *pointer;
typedef const char *const_pointer;
typedef char value_type;
inline void push_back(char c);
inline void push_back(const char *c);
inline void push_back(const QByteArray &a);
inline void push_front(char c);
inline void push_front(const char *c);
inline void push_front(const QByteArray &a);
void push_back(char c)
{ append(c); }
void push_back(const char *s)
{ append(s); }
void push_back(const QByteArray &a)
{ append(a); }
void push_back(QByteArrayView a)
{ append(a); }
void push_front(char c)
{ prepend(c); }
void push_front(const char *c)
{ prepend(c); }
void push_front(const QByteArray &a)
{ prepend(a); }
void push_front(QByteArrayView a)
{ prepend(a); }
void shrink_to_fit() { squeeze(); }
static inline QByteArray fromStdString(const std::string &s);
@ -556,18 +566,6 @@ inline QByteArray &QByteArray::append(qsizetype n, char ch)
{ return insert(size(), n, ch); }
inline QByteArray &QByteArray::prepend(qsizetype n, char ch)
{ return insert(0, n, ch); }
inline void QByteArray::push_back(char c)
{ append(c); }
inline void QByteArray::push_back(const char *c)
{ append(c); }
inline void QByteArray::push_back(const QByteArray &a)
{ append(a); }
inline void QByteArray::push_front(char c)
{ prepend(c); }
inline void QByteArray::push_front(const char *c)
{ prepend(c); }
inline void QByteArray::push_front(const QByteArray &a)
{ prepend(a); }
inline bool QByteArray::contains(char c) const
{ return indexOf(c) != -1; }
inline bool QByteArray::contains(QByteArrayView bv) const