use qint16 where possible

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-06-22 01:34:46 +00:00
parent 0c8aa7ef2f
commit 43fc42cf72
5 changed files with 8 additions and 8 deletions

View file

@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
static bool containsTLDEntry(const QString &entry)
{
for (int i = 0; i < TLDTblSize; i++) {
for (qint16 i = 0; i < TLDTblSize; i++) {
QString currentEntry = QString::fromUtf8(TLDTbl[i]);
if (currentEntry == entry)
return true;

View file

@ -8830,7 +8830,7 @@ static const char* TLDTbl[] = {
"zone.id\0",
};
static const qint32 TLDTblSize = 8767;
static const qint16 TLDTblSize = 8767;
QT_END_NAMESPACE

View file

@ -736,12 +736,12 @@ static const struct KeyTblData {
XF86XK_LaunchF, Qt::Key_LaunchF,
// XF86XK_LaunchH, Qt::Key_LaunchH,
};
static const int KeyTblSize = sizeof(KeyTbl) / sizeof(KeyTblData);
static const qint16 KeyTblSize = sizeof(KeyTbl) / sizeof(KeyTblData);
static int translateKeySym(const uint key)
{
int code = -1;
for (int i = 0; i < KeyTblSize; i++) {
for (qint16 i = 0; i < KeyTblSize; i++) {
if (KeyTbl[i].x11key == key) {
code = KeyTbl[i].qtkey;
break;

View file

@ -261,11 +261,11 @@ static const struct RGBData {
};
#undef RGBCOLOR
static const int rgbTblSize = sizeof(rgbTbl) / sizeof(RGBData);
static const qint16 rgbTblSize = sizeof(rgbTbl) / sizeof(RGBData);
bool qt_get_named_rgb(const char *name, QRgb* rgb)
{
for (int i = 0; i < rgbTblSize; i++) {
for (qint16 i = 0; i < rgbTblSize; i++) {
if (qstrcmp(rgbTbl[i].name, name) == 0) {
*rgb = rgbTbl[i].value;
return true;
@ -278,7 +278,7 @@ QStringList qt_get_colornames()
{
static QStringList lst;
if (lst.isEmpty()) {
for (int i = 0; i < rgbTblSize; i++)
for (qint16 i = 0; i < rgbTblSize; i++)
lst << QString::fromLatin1(rgbTbl[i].name);
}
return lst;

View file

@ -109,7 +109,7 @@ int main(int argc, char **argv) {
outFile.write("] = {\n");
outFile.write(outDataBufferBA);
outFile.write("};\n\n");
outFile.write("static const qint32 TLDTblSize = ");
outFile.write("static const qint16 TLDTblSize = ");
outFile.write(QByteArray::number(lineCount));
outFile.write(";\n");
outFile.close();