diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-07 14:45:42 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-10 03:16:34 +0200 |
| commit | bbec7aaf3a8cf81f28810db2270c787cc9910268 (patch) | |
| tree | 1a9fc258a1f7bddd3d9ff271eb9a928694363656 /src/corelib/kernel | |
| parent | d49a7412f55390e461773f4ffc36a82958d59b6d (diff) | |
Fix a number of MSVC integer conversion warnings
Mostly related to qstrlen().
Change-Id: I69e2052c83766e4fc466ed398d0d0eac011a77ec
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 10 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
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<char, 512> 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); diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 964901fc48..553929955d 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -2342,7 +2342,7 @@ static inline int qMetaTypeTypeImpl(const char *typeName, int length) */ Q_CORE_EXPORT int qMetaTypeTypeInternal(const char *typeName) { - return qMetaTypeTypeImpl</*tryNormalizedType=*/false>(typeName, qstrlen(typeName)); + return qMetaTypeTypeImpl</*tryNormalizedType=*/false>(typeName, int(qstrlen(typeName))); } /*! diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 5bb225d396..be9d088e7c 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3574,7 +3574,7 @@ void QMetaObject::connectSlotsByName(QObject *o) // chosen 'at random' (order of declaration in source file) QList<QByteArray> compatibleSignals; const QMetaObject *smo = co->metaObject(); - int sigLen = qstrlen(signal) - 1; // ignore the trailing ')' + int sigLen = int(qstrlen(signal)) - 1; // ignore the trailing ')' for (int k = QMetaObjectPrivate::absoluteSignalCount(smo)-1; k >= 0; --k) { const QMetaMethod method = QMetaObjectPrivate::signal(smo, k); if (!qstrncmp(method.methodSignature().constData(), signal, sigLen)) { |