diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-02-27 10:01:00 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-03-14 10:36:56 +0100 |
commit | e87768a8806ee6e79ceff2ce8cea133879ef9195 (patch) | |
tree | 94c6e647c1fd16e04b567500db38b12e44e1c139 /src/dbus | |
parent | f9a154e07f74199ba856ab7b0f7309a4ff93afe0 (diff) |
Use qsizetype for size related methods in QVarlengthArray
Change-Id: Ib94b9a4e6e17da21f592e71a36fd1b97d42dfe62
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusmetaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index dcbed5a6f8..01eb1aee3f 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -391,7 +391,7 @@ int QDBusMetaObjectGenerator::aggregateParameterCount(const QMap<QByteArray, Met QMap<QByteArray, Method>::const_iterator it; for (it = map.constBegin(); it != map.constEnd(); ++it) { const Method &m = it.value(); - sum += m.inputTypes.size() + qMax(1, m.outputTypes.size()); + sum += m.inputTypes.size() + qMax(qsizetype(1), m.outputTypes.size()); } return sum; } @@ -460,7 +460,7 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj) it != map.constEnd(); ++it) { const Method &mm = it.value(); - int argc = mm.inputTypes.size() + qMax(0, mm.outputTypes.size() - 1); + int argc = mm.inputTypes.size() + qMax(qsizetype(0), mm.outputTypes.size() - 1); idata[offset++] = strings.enter(mm.name); idata[offset++] = argc; |