diff options
Diffstat (limited to 'src/corelib/tools/qbytearray.cpp')
| -rw-r--r-- | src/corelib/tools/qbytearray.cpp | 97 |
1 files changed, 64 insertions, 33 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index fb92d82f07..088a7c1769 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -48,6 +48,7 @@ #include "qlocale_p.h" #include "qscopedpointer.h" #include <qdatastream.h> +#include <qmath.h> #ifndef QT_NO_COMPRESS #include <zlib.h> @@ -67,24 +68,12 @@ int qFindByteArray( const char *needle0, int needleLen); -int qAllocMore(int alloc, int extra) +int qAllocMore(int alloc, int extra) Q_DECL_NOTHROW { Q_ASSERT(alloc >= 0 && extra >= 0); Q_ASSERT_X(alloc < (1 << 30) - extra, "qAllocMore", "Requested size is too large!"); - unsigned nalloc = alloc + extra; - - // Round up to next power of 2 - - // Assuming container is growing, always overshoot - //--nalloc; - - nalloc |= nalloc >> 1; - nalloc |= nalloc >> 2; - nalloc |= nalloc >> 4; - nalloc |= nalloc >> 8; - nalloc |= nalloc >> 16; - ++nalloc; + unsigned nalloc = qNextPowerOfTwo(alloc + extra); Q_ASSERT(nalloc > unsigned(alloc + extra)); @@ -2677,19 +2666,22 @@ QByteArray QByteArray::right(int len) const QByteArray QByteArray::mid(int pos, int len) const { - if ((d->size == 0 && d->ref.isStatic()) || pos > d->size) + using namespace QtPrivate; + switch (QContainerImplHelper::mid(size(), &pos, &len)) { + case QContainerImplHelper::Null: return QByteArray(); - if (len < 0) - len = d->size - pos; - if (pos < 0) { - len += pos; - pos = 0; + case QContainerImplHelper::Empty: + { + QByteArrayDataPtr empty = { Data::allocate(0) }; + return QByteArray(empty); } - if (len + pos > d->size) - len = d->size - pos; - if (pos == 0 && len == d->size) + case QContainerImplHelper::Full: return *this; - return QByteArray(d->data() + pos, len); + case QContainerImplHelper::Subset: + return QByteArray(d->data() + pos, len); + } + Q_UNREACHABLE(); + return QByteArray(); } /*! @@ -2705,8 +2697,9 @@ QByteArray QByteArray::toLower() const { QByteArray s(*this); uchar *p = reinterpret_cast<uchar *>(s.data()); + uchar *e = reinterpret_cast<uchar *>(s.end()); if (p) { - while (*p) { + while (p != e) { *p = QChar::toLower((ushort)*p); p++; } @@ -2728,8 +2721,9 @@ QByteArray QByteArray::toUpper() const { QByteArray s(*this); uchar *p = reinterpret_cast<uchar *>(s.data()); + uchar *e = reinterpret_cast<uchar *>(s.end()); if (p) { - while (*p) { + while (p != e) { *p = QChar::toUpper((ushort)*p); p++; } @@ -3119,7 +3113,7 @@ QDataStream &operator>>(QDataStream &in, QByteArray &ba) replaced with a single space. Whitespace means any character for which the standard C++ - isspace() function returns \c true. This includes the ASCII + isspace() function returns \c true in the C locale. This includes the ASCII characters '\\t', '\\n', '\\v', '\\f', '\\r', and ' '. Example: @@ -3137,9 +3131,9 @@ QByteArray QByteArray::simplified() const int outc=0; char *to = result.d->data(); for (;;) { - while (from!=fromend && isspace(uchar(*from))) + while (from!=fromend && ascii_isspace(uchar(*from))) from++; - while (from!=fromend && !isspace(uchar(*from))) + while (from!=fromend && !ascii_isspace(uchar(*from))) to[outc++] = *from++; if (from!=fromend) to[outc++] = ' '; @@ -3157,7 +3151,7 @@ QByteArray QByteArray::simplified() const and the end. Whitespace means any character for which the standard C++ - isspace() function returns \c true. This includes the ASCII + isspace() function returns \c true in the C locale. This includes the ASCII characters '\\t', '\\n', '\\v', '\\f', '\\r', and ' '. Example: @@ -3172,14 +3166,14 @@ QByteArray QByteArray::trimmed() const if (d->size == 0) return *this; const char *s = d->data(); - if (!isspace(uchar(*s)) && !isspace(uchar(s[d->size-1]))) + if (!ascii_isspace(uchar(*s)) && !ascii_isspace(uchar(s[d->size-1]))) return *this; int start = 0; int end = d->size - 1; - while (start<=end && isspace(uchar(s[start]))) // skip white space from start + while (start<=end && ascii_isspace(uchar(s[start]))) // skip white space from start start++; if (start <= end) { // only white space - while (end && isspace(uchar(s[end]))) // skip white space from end + while (end && ascii_isspace(uchar(s[end]))) // skip white space from end end--; } int l = end - start + 1; @@ -4186,6 +4180,27 @@ QByteArray QByteArray::fromPercentEncoding(const QByteArray &input, char percent return tmp; } +/*! \fn QByteArray QByteArray::fromStdString(const std::string &str) + \since 5.4 + + Returns a copy of the \a str string as a QByteArray. + + \sa toStdString(), QString::fromStdString() +*/ + +/*! + \fn std::string QByteArray::toStdString() const + \since 5.4 + + Returns a std::string object with the data contained in this + QByteArray. + + This operator is mostly useful to pass a QByteArray to a function + that accepts a std::string object. + + \sa fromStdString(), QString::toStdString() +*/ + /*! \fn QByteArray QByteArray::fromCFData(CFDataRef data) \since 5.3 @@ -4410,6 +4425,14 @@ QByteArray QByteArray::toPercentEncoding(const QByteArray &exclude, const QByteA \internal */ +/*! \typedef QByteArray::size_type + \internal +*/ + +/*! \typedef QByteArray::difference_type + \internal +*/ + /*! \typedef QByteArray::const_reference \internal */ @@ -4418,6 +4441,14 @@ QByteArray QByteArray::toPercentEncoding(const QByteArray &exclude, const QByteA \internal */ +/*! \typedef QByteArray::const_pointer + \internal +*/ + +/*! \typedef QByteArray::pointer + \internal +*/ + /*! \typedef QByteArray::value_type \internal */ |