summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstringview.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2017-04-16 00:12:41 +0200
committerMarc Mutz <marc.mutz@kdab.com>2017-04-18 09:43:39 +0000
commit0a807c2ab69d06195d0ed7a6f1388990d6a784c5 (patch)
tree67214be90454b383505adc3bfb40aca4e47a78f7 /src/corelib/tools/qstringview.h
parenta21a9efacbcd5e180aeb6718519368a871c6970e (diff)
QStringView: plaster API with Q_REQUIRED_RESULT
There's no reason to use it only on some functions with return values and not others. Change-Id: If50a669f49e9e2f71173dea94465a5de58a7783e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools/qstringview.h')
-rw-r--r--src/corelib/tools/qstringview.h54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/corelib/tools/qstringview.h b/src/corelib/tools/qstringview.h
index 3318d2f7ef..7aef056dee 100644
--- a/src/corelib/tools/qstringview.h
+++ b/src/corelib/tools/qstringview.h
@@ -205,13 +205,13 @@ public:
QStringView(const StdBasicString &str) Q_DECL_NOTHROW
: QStringView(str.data(), qssize_t(str.size())) {}
- QString toString() const { return Q_ASSERT(size() == length()), QString(data(), length()); }
+ QString toString() const Q_REQUIRED_RESULT { return Q_ASSERT(size() == length()), QString(data(), length()); }
- Q_DECL_CONSTEXPR qssize_t size() const Q_DECL_NOTHROW { return m_size; }
- const_pointer data() const Q_DECL_NOTHROW { return reinterpret_cast<const_pointer>(m_data); }
- Q_DECL_CONSTEXPR const storage_type *utf16() const Q_DECL_NOTHROW { return m_data; }
+ Q_DECL_CONSTEXPR qssize_t size() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return m_size; }
+ const_pointer data() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return reinterpret_cast<const_pointer>(m_data); }
+ Q_DECL_CONSTEXPR const storage_type *utf16() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return m_data; }
- Q_DECL_CONSTEXPR QChar operator[](qssize_t n) const
+ Q_DECL_CONSTEXPR QChar operator[](qssize_t n) const Q_REQUIRED_RESULT
{ return Q_ASSERT(n >= 0), Q_ASSERT(n < size()), QChar(m_data[n]); }
//
@@ -223,15 +223,15 @@ public:
QByteArray toLocal8Bit() const Q_REQUIRED_RESULT { return qConvertToLocal8Bit(*this); }
inline QVector<uint> toUcs4() const Q_REQUIRED_RESULT;
- Q_DECL_CONSTEXPR QChar at(qssize_t n) const { return (*this)[n]; }
+ Q_DECL_CONSTEXPR QChar at(qssize_t n) const Q_REQUIRED_RESULT { return (*this)[n]; }
- Q_DECL_CONSTEXPR QStringView mid(qssize_t pos) const
+ Q_DECL_CONSTEXPR QStringView mid(qssize_t pos) const Q_REQUIRED_RESULT
{ return Q_ASSERT(pos >= 0), Q_ASSERT(pos <= size()), QStringView(m_data + pos, m_size - pos); }
- Q_DECL_CONSTEXPR QStringView mid(qssize_t pos, qssize_t n) const
+ Q_DECL_CONSTEXPR QStringView mid(qssize_t pos, qssize_t n) const Q_REQUIRED_RESULT
{ return Q_ASSERT(pos >= 0), Q_ASSERT(n >= 0), Q_ASSERT(pos + n <= size()), QStringView(m_data + pos, n); }
- Q_DECL_CONSTEXPR QStringView left(qssize_t n) const
+ Q_DECL_CONSTEXPR QStringView left(qssize_t n) const Q_REQUIRED_RESULT
{ return Q_ASSERT(n >= 0), Q_ASSERT(n <= size()), QStringView(m_data, n); }
- Q_DECL_CONSTEXPR QStringView right(qssize_t n) const
+ Q_DECL_CONSTEXPR QStringView right(qssize_t n) const Q_REQUIRED_RESULT
{ return Q_ASSERT(n >= 0), Q_ASSERT(n <= size()), QStringView(m_data + m_size - n, n); }
Q_DECL_CONSTEXPR QStringView chopped(qssize_t n) const Q_REQUIRED_RESULT
{ return Q_ASSERT(n >= 0), Q_ASSERT(n <= size()), QStringView(m_data, m_size - n); }
@@ -244,28 +244,28 @@ public:
//
// STL compatibility API:
//
- const_iterator begin() const Q_DECL_NOTHROW { return data(); }
- const_iterator end() const Q_DECL_NOTHROW { return data() + size(); }
- const_iterator cbegin() const Q_DECL_NOTHROW { return begin(); }
- const_iterator cend() const Q_DECL_NOTHROW { return end(); }
- const_reverse_iterator rbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
- const_reverse_iterator rend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
- const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return rbegin(); }
- const_reverse_iterator crend() const Q_DECL_NOTHROW { return rend(); }
-
- Q_DECL_CONSTEXPR bool empty() const Q_DECL_NOTHROW { return size() == 0; }
- Q_DECL_CONSTEXPR QChar front() const { return Q_ASSERT(!empty()), QChar(m_data[0]); }
- Q_DECL_CONSTEXPR QChar back() const { return Q_ASSERT(!empty()), QChar(m_data[m_size - 1]); }
+ const_iterator begin() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return data(); }
+ const_iterator end() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return data() + size(); }
+ const_iterator cbegin() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return begin(); }
+ const_iterator cend() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return end(); }
+ const_reverse_iterator rbegin() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return const_reverse_iterator(end()); }
+ const_reverse_iterator rend() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return const_reverse_iterator(begin()); }
+ const_reverse_iterator crbegin() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return rbegin(); }
+ const_reverse_iterator crend() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return rend(); }
+
+ Q_DECL_CONSTEXPR bool empty() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return size() == 0; }
+ Q_DECL_CONSTEXPR QChar front() const Q_REQUIRED_RESULT { return Q_ASSERT(!empty()), QChar(m_data[0]); }
+ Q_DECL_CONSTEXPR QChar back() const Q_REQUIRED_RESULT { return Q_ASSERT(!empty()), QChar(m_data[m_size - 1]); }
//
// Qt compatibility API:
//
- Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW { return !m_data; }
- Q_DECL_CONSTEXPR bool isEmpty() const Q_DECL_NOTHROW { return empty(); }
- Q_DECL_CONSTEXPR int length() const /* not nothrow! */
+ Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return !m_data; }
+ Q_DECL_CONSTEXPR bool isEmpty() const Q_DECL_NOTHROW Q_REQUIRED_RESULT { return empty(); }
+ Q_DECL_CONSTEXPR int length() const /* not nothrow! */ Q_REQUIRED_RESULT
{ return Q_ASSERT(int(size()) == size()), int(size()); }
- Q_DECL_CONSTEXPR QChar first() const { return front(); }
- Q_DECL_CONSTEXPR QChar last() const { return back(); }
+ Q_DECL_CONSTEXPR QChar first() const Q_REQUIRED_RESULT { return front(); }
+ Q_DECL_CONSTEXPR QChar last() const Q_REQUIRED_RESULT { return back(); }
private:
qssize_t m_size;
const storage_type *m_data;