summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-09-10 09:01:57 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2020-09-11 09:40:20 +0300
commit1ff0ec46770254328e5ec492cbce1364936eda72 (patch)
tree12e34fef7c4f760220fb7cd69253a73bb59a860b
parente4e958a68ffc0c9167e1ac22236410a30db15144 (diff)
Use qMin
QByteArray::size() is now qsizetype in Qt6 Change-Id: Ib73c9e08c072ed5de99cb9e43cf14b972350a347 Reviewed-by: Kari Oikarinen <kari.oikarinen@kapsi.fi>
-rw-r--r--libqdb/stream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libqdb/stream.cpp b/libqdb/stream.cpp
index f634971..ba1798c 100644
--- a/libqdb/stream.cpp
+++ b/libqdb/stream.cpp
@@ -57,7 +57,7 @@ bool Stream::write(const StreamPacket &packet)
Q_ASSERT(packet.size() > 0); // writing nothing to the stream does not make sense
QByteArray data = wrapPacket(packet);
while (data.size() > 0) {
- const int splitSize = std::min(data.size(), qdbMaxPayloadSize);
+ const int splitSize = qMin(data.size(), qdbMaxPayloadSize);
m_connection->enqueueMessage(QdbMessage{QdbMessage::Write, m_hostId, m_deviceId,
data.left(splitSize)});
data = data.mid(splitSize);