summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-09-21 14:03:21 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-09-22 09:51:15 +0200
commit631eed68d0ea5e1e8e5c2ad7d56b3dcbfbcb4aa0 (patch)
tree5f54dbcd548b781a029af3fda0baab0180c6cdc4 /src
parent1b0e6b909f7d508f5c2eb0247ee3d6e5d0d5325c (diff)
Fix some MSVC conversion warnings
Change-Id: Ib2c1fdb7b84f89201136438362ab5962126ec929 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qprocess_win.cpp4
-rw-r--r--src/corelib/text/qbytearray.cpp2
-rw-r--r--src/corelib/text/qstringconverter.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp
index 148c6378c6..2663316de0 100644
--- a/src/corelib/io/qprocess_win.cpp
+++ b/src/corelib/io/qprocess_win.cpp
@@ -452,7 +452,7 @@ static QByteArray qt_create_environment(const QProcessEnvironmentPrivate::Map &e
copy.insert(rootKey, QString::fromLocal8Bit(systemRoot));
}
- int pos = 0;
+ qsizetype pos = 0;
auto it = copy.constBegin();
const auto end = copy.constEnd();
@@ -460,7 +460,7 @@ static QByteArray qt_create_environment(const QProcessEnvironmentPrivate::Map &e
static const wchar_t nul = L'\0';
for ( ; it != end; ++it) {
- uint tmpSize = sizeof(wchar_t) * (it.key().length() + it.value().length() + 2);
+ qsizetype tmpSize = sizeof(wchar_t) * (it.key().length() + it.value().length() + 2);
// ignore empty strings
if (tmpSize == sizeof(wchar_t) * 2)
continue;
diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp
index 1c40bba377..46902bdec8 100644
--- a/src/corelib/text/qbytearray.cpp
+++ b/src/corelib/text/qbytearray.cpp
@@ -647,7 +647,7 @@ QByteArray qUncompress(const uchar* data, qsizetype nbytes)
return invalidCompressedData();
forever {
- ulong alloc = len;
+ const auto alloc = len;
int res = ::uncompress((uchar*)d.data(), reinterpret_cast<uLongf*>(&len),
data+4, nbytes-4);
diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp
index 4af4a1af9d..755c20d7aa 100644
--- a/src/corelib/text/qstringconverter.cpp
+++ b/src/corelib/text/qstringconverter.cpp
@@ -1790,7 +1790,7 @@ std::optional<QStringConverter::Encoding> QStringConverter::encodingForHtml(cons
if (pos != -1) {
pos = header.indexOf("charset=", pos);
if (pos != -1) {
- pos += qstrlen("charset=");
+ pos += int(qstrlen("charset="));
if (pos < header.size() && (header.at(pos) == '\"' || header.at(pos) == '\''))
++pos;