summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-09-04 09:20:56 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-09-05 02:03:49 +0200
commit455d811b5803abc12ad66529ca27579f4a6b6774 (patch)
tree79e096046c88b9c492fbc09b2ab1a69be4e06dad /src/gui
parent78695bbf190bd93915d44386a7b96866dbbd29b5 (diff)
Fix compiler warnings from using deprecated qChecksum overload
Change-Id: Ib7a6d0e752dc662a42abe38f2010da3f2b4626f1 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/image/qpaintengine_pic.cpp4
-rw-r--r--src/gui/image/qpicture.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/image/qpaintengine_pic.cpp b/src/gui/image/qpaintengine_pic.cpp
index e89cac452a..224938bd9c 100644
--- a/src/gui/image/qpaintengine_pic.cpp
+++ b/src/gui/image/qpaintengine_pic.cpp
@@ -140,8 +140,8 @@ bool QPicturePaintEngine::end()
}
d->s << (quint32) d->pic_d->trecs; // write number of records
d->pic_d->pictb.seek(cs_start);
- QByteArray buf = d->pic_d->pictb.buffer();
- quint16 cs = (quint16) qChecksum(buf.constData() + data_start, pos - data_start);
+ const QByteArray buf = d->pic_d->pictb.buffer();
+ quint16 cs = (quint16) qChecksum(QByteArrayView(buf.constData() + data_start, pos - data_start));
d->s << cs; // write checksum
d->pic_d->pictb.close();
setActive(false);
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 77f3e7ffc8..d2ca2bbd22 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -1038,10 +1038,10 @@ bool QPicturePrivate::checkFormat()
int cs_start = sizeof(quint32); // pos of checksum word
int data_start = cs_start + sizeof(quint16);
quint16 cs,ccs;
- QByteArray buf = pictb.buffer(); // pointer to data
+ const QByteArray buf = pictb.buffer(); // pointer to data
s >> cs; // read checksum
- ccs = (quint16) qChecksum(buf.constData() + data_start, buf.size() - data_start);
+ ccs = (quint16) qChecksum(QByteArrayView(buf.constData() + data_start, buf.size() - data_start));
if (ccs != cs) {
qWarning("QPicturePaintEngine::checkFormat: Invalid checksum %x, %x expected",
ccs, cs);