From 95daeb24076c01e8f91dd590d89f063ca68b3427 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 9 Jul 2020 21:02:11 +0200 Subject: [PATCH] Add QByteArrayView overloads for push_back and push_front MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If70f3ac6764958d92dcbab44432b4f4994d20405 Reviewed-by: Lars Knoll Reviewed-by: Qt CI Bot Reviewed-by: Mårten Nordheim Reviewed-by: Sona Kurazyan --- src/corelib/text/qbytearray.cpp | 14 ++++++++++++++ src/corelib/text/qbytearray.h | 34 ++++++++++++++++----------------- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index 9b58136c0d..8cc45d4500 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -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 diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h index a71ae9e892..855f3f3eed 100644 --- a/src/corelib/text/qbytearray.h +++ b/src/corelib/text/qbytearray.h @@ -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