diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-05-22 11:26:21 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-07-06 21:30:47 +0200 |
| commit | 0341bf2e979264b9f7606bd57e594a41c27a38cc (patch) | |
| tree | 226be567b0eee672a38dd9b83494815d4bc0d110 /src/corelib/text/qstring.cpp | |
| parent | c129362b4d9512bd33004d430bc3b817546cb1b7 (diff) | |
Make QArrayDataPointer::size a qsizetype
This is a next step towards making QList, QString
and QByteArray able to deal with large sizes.
Change-Id: Icad49b33f503401ac4912678b2f88584c6f91a63
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/text/qstring.cpp')
| -rw-r--r-- | src/corelib/text/qstring.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index 8e572691c62..c98b1f82b64 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -2364,7 +2364,7 @@ void QString::reallocData(uint alloc, bool grow) allocOptions |= QArrayData::GrowsForward; if (d->needsDetach()) { - DataPointer dd(Data::allocate(alloc, allocOptions), qMin(int(alloc) - 1, d.size)); + DataPointer dd(Data::allocate(alloc, allocOptions), qMin(qsizetype(alloc) - 1, d.size)); ::memcpy(dd.data(), d.data(), dd.size * sizeof(QChar)); dd.data()[dd.size] = 0; d = dd; @@ -2595,7 +2595,7 @@ QString& QString::insert(int i, const QChar *unicode, int size) if (Q_UNLIKELY(i > int(d.size))) resize(i + size, QLatin1Char(' ')); else - resize(d.size + size); + resize(int(d.size) + size); ::memmove(d.data() + i + size, d.data() + i, (d.size - i - size) * sizeof(QChar)); memcpy(d.data() + i, s, size * sizeof(QChar)); |