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/qbytearray.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/qbytearray.cpp')
| -rw-r--r-- | src/corelib/text/qbytearray.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index e0f720bc86..c138765e15 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -1675,7 +1675,7 @@ QByteArray &QByteArray::fill(char ch, int size) void QByteArray::reallocData(uint alloc, Data::ArrayOptions options) { if (d->needsDetach()) { - DataPointer dd(Data::allocate(alloc, options), qMin(int(alloc) - 1, d.size)); + DataPointer dd(Data::allocate(alloc, options), qMin(qsizetype(alloc) - 1, d.size)); ::memcpy(dd.data(), d.data(), dd.size); dd.data()[dd.size] = 0; d = dd; |