diff options
Diffstat (limited to 'src/corelib/tools/qbytearray.h')
| -rw-r--r-- | src/corelib/tools/qbytearray.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index a0e5c5478b..03bb9b5747 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -227,9 +227,9 @@ public: int count(const char *a) const; int count(const QByteArray &a) const; - QByteArray left(int len) const Q_REQUIRED_RESULT; - QByteArray right(int len) const Q_REQUIRED_RESULT; - QByteArray mid(int index, int len = -1) const Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT QByteArray left(int len) const; + Q_REQUIRED_RESULT QByteArray right(int len) const; + Q_REQUIRED_RESULT QByteArray mid(int index, int len = -1) const; bool startsWith(const QByteArray &a) const; bool startsWith(char c) const; @@ -250,34 +250,34 @@ public: # define Q_REQUIRED_RESULT # define Q_REQUIRED_RESULT_pushed # endif - Q_ALWAYS_INLINE QByteArray toLower() const & Q_REQUIRED_RESULT + Q_REQUIRED_RESULT Q_ALWAYS_INLINE QByteArray toLower() const & { return toLower_helper(*this); } - Q_ALWAYS_INLINE QByteArray toLower() && Q_REQUIRED_RESULT + Q_REQUIRED_RESULT Q_ALWAYS_INLINE QByteArray toLower() && { return toLower_helper(*this); } - Q_ALWAYS_INLINE QByteArray toUpper() const & Q_REQUIRED_RESULT + Q_REQUIRED_RESULT Q_ALWAYS_INLINE QByteArray toUpper() const & { return toUpper_helper(*this); } - Q_ALWAYS_INLINE QByteArray toUpper() && Q_REQUIRED_RESULT + Q_REQUIRED_RESULT Q_ALWAYS_INLINE QByteArray toUpper() && { return toUpper_helper(*this); } - Q_ALWAYS_INLINE QByteArray trimmed() const & Q_REQUIRED_RESULT + Q_REQUIRED_RESULT Q_ALWAYS_INLINE QByteArray trimmed() const & { return trimmed_helper(*this); } - Q_ALWAYS_INLINE QByteArray trimmed() && Q_REQUIRED_RESULT + Q_REQUIRED_RESULT Q_ALWAYS_INLINE QByteArray trimmed() && { return trimmed_helper(*this); } - Q_ALWAYS_INLINE QByteArray simplified() const & Q_REQUIRED_RESULT + Q_REQUIRED_RESULT Q_ALWAYS_INLINE QByteArray simplified() const & { return simplified_helper(*this); } - Q_ALWAYS_INLINE QByteArray simplified() && Q_REQUIRED_RESULT + Q_REQUIRED_RESULT Q_ALWAYS_INLINE QByteArray simplified() && { return simplified_helper(*this); } # ifdef Q_REQUIRED_RESULT_pushed # pragma pop_macro("Q_REQUIRED_RESULT") # endif #else - QByteArray toLower() const Q_REQUIRED_RESULT; - QByteArray toUpper() const Q_REQUIRED_RESULT; - QByteArray trimmed() const Q_REQUIRED_RESULT; - QByteArray simplified() const Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT QByteArray toLower() const; + Q_REQUIRED_RESULT QByteArray toUpper() const; + Q_REQUIRED_RESULT QByteArray trimmed() const; + Q_REQUIRED_RESULT QByteArray simplified() const; #endif - QByteArray leftJustified(int width, char fill = ' ', bool truncate = false) const Q_REQUIRED_RESULT; - QByteArray rightJustified(int width, char fill = ' ', bool truncate = false) const Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT QByteArray leftJustified(int width, char fill = ' ', bool truncate = false) const; + Q_REQUIRED_RESULT QByteArray rightJustified(int width, char fill = ' ', bool truncate = false) const; QByteArray &prepend(char c); QByteArray &prepend(int count, char c); @@ -312,7 +312,7 @@ public: QList<QByteArray> split(char sep) const; - QByteArray repeated(int times) const Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT QByteArray repeated(int times) const; #ifndef QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARN QByteArray &append(const QString &s); @@ -362,16 +362,16 @@ public: QByteArray &setNum(double, char f = 'g', int prec = 6); QByteArray &setRawData(const char *a, uint n); // ### Qt 6: use an int - static QByteArray number(int, int base = 10) Q_REQUIRED_RESULT; - static QByteArray number(uint, int base = 10) Q_REQUIRED_RESULT; - static QByteArray number(qlonglong, int base = 10) Q_REQUIRED_RESULT; - static QByteArray number(qulonglong, int base = 10) Q_REQUIRED_RESULT; - static QByteArray number(double, char f = 'g', int prec = 6) Q_REQUIRED_RESULT; - static QByteArray fromRawData(const char *, int size) Q_REQUIRED_RESULT; - static QByteArray fromBase64(const QByteArray &base64, Base64Options options) Q_REQUIRED_RESULT; - static QByteArray fromBase64(const QByteArray &base64) Q_REQUIRED_RESULT; // ### Qt6 merge with previous - static QByteArray fromHex(const QByteArray &hexEncoded) Q_REQUIRED_RESULT; - static QByteArray fromPercentEncoding(const QByteArray &pctEncoded, char percent = '%') Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT static QByteArray number(int, int base = 10); + Q_REQUIRED_RESULT static QByteArray number(uint, int base = 10); + Q_REQUIRED_RESULT static QByteArray number(qlonglong, int base = 10); + Q_REQUIRED_RESULT static QByteArray number(qulonglong, int base = 10); + Q_REQUIRED_RESULT static QByteArray number(double, char f = 'g', int prec = 6); + Q_REQUIRED_RESULT static QByteArray fromRawData(const char *, int size); + Q_REQUIRED_RESULT static QByteArray fromBase64(const QByteArray &base64, Base64Options options); + Q_REQUIRED_RESULT static QByteArray fromBase64(const QByteArray &base64); // ### Qt6 merge with previous + Q_REQUIRED_RESULT static QByteArray fromHex(const QByteArray &hexEncoded); + Q_REQUIRED_RESULT static QByteArray fromPercentEncoding(const QByteArray &pctEncoded, char percent = '%'); #if defined(Q_OS_DARWIN) || defined(Q_QDOC) static QByteArray fromCFData(CFDataRef data); |