From bbec7aaf3a8cf81f28810db2270c787cc9910268 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 7 Sep 2020 14:45:42 +0200 Subject: Fix a number of MSVC integer conversion warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mostly related to qstrlen(). Change-Id: I69e2052c83766e4fc466ed398d0d0eac011a77ec Reviewed-by: Mårten Nordheim Reviewed-by: Oliver Wolff --- src/corelib/kernel/qmetaobject.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/corelib/kernel/qmetaobject.cpp') diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index ef042317c1..be32921273 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -263,7 +263,7 @@ QObject *QMetaObject::newInstance(QGenericArgument val0, int paramCount; for (paramCount = 0; paramCount < MaximumParamCount; ++paramCount) { - int len = qstrlen(typeNames[paramCount]); + int len = int(qstrlen(typeNames[paramCount])); if (len <= 0) break; sig.append(typeNames[paramCount], len); @@ -1184,8 +1184,8 @@ bool QMetaObject::checkConnectArgs(const char *signal, const char *method) while (*s2++ != '(') { } if (*s2 == ')' || qstrcmp(s1,s2) == 0) // method has no args or return true; // exact match - int s1len = qstrlen(s1); - int s2len = qstrlen(s2); + const auto s1len = qstrlen(s1); + const auto s2len = qstrlen(s2); if (s2len < s1len && strncmp(s1,s2,s2len-1)==0 && s1[s2len-1]==',') return true; // method has less args return false; @@ -1414,7 +1414,7 @@ bool QMetaObject::invokeMethod(QObject *obj, return false; QVarLengthArray sig; - int len = qstrlen(member); + int len = int(qstrlen(member)); if (len <= 0) return false; sig.append(member, len); @@ -1426,7 +1426,7 @@ bool QMetaObject::invokeMethod(QObject *obj, int paramCount; for (paramCount = 1; paramCount < MaximumParamCount; ++paramCount) { - len = qstrlen(typeNames[paramCount]); + len = int(qstrlen(typeNames[paramCount])); if (len <= 0) break; sig.append(typeNames[paramCount], len); -- cgit v1.2.3