From 36bbc3d36b2b9f3acb1e98b207cd0231c800d54b Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 7 Jan 2021 04:45:46 +0200 Subject: [PATCH] use qint16 type for KeyNameTblSize Signed-off-by: Ivailo Monev --- src/gui/kernel/qkeysequence.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 2dbaf6a4d..30700d926 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -399,7 +399,7 @@ static const struct KeyNameTblData { { Qt::Key_PreviousCandidate,QT_TRANSLATE_NOOP("QShortcut", "Previous Candidate") }, }; -static const short KeyNameTblSize = sizeof(KeyNameTbl) / sizeof(KeyNameTblData); +static const qint16 KeyNameTblSize = sizeof(KeyNameTbl) / sizeof(KeyNameTblData); // Table of key bindings, must be sorted by standard key priority const QKeyBinding QKeySequencePrivate::keyBindings[] = { @@ -889,7 +889,7 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence // For NativeText, check the traslation table first, // if we don't find anything then try it out with just the untranlated stuff. // PortableText will only try the untranlated table. - for (ushort i = 0; i < KeyNameTblSize; ++i) { + for (qint16 i = 0; i < KeyNameTblSize; ++i) { QString keyName(nativeText ? QShortcut::tr(KeyNameTbl[i].name) : QString::fromLatin1(KeyNameTbl[i].name)); @@ -943,7 +943,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat : QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1); } else if (key) { bool foundmatch = false; - for (ushort i = 0; i < KeyNameTblSize; i++) { + for (qint16 i = 0; i < KeyNameTblSize; i++) { if (KeyNameTbl[i].key == key) { p = nativeText ? QShortcut::tr(KeyNameTbl[i].name) : QString::fromLatin1(KeyNameTbl[i].name); -- 2.11.0