1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix signed/unsigned comparison warnings in tst_QArrayData

Browse Source 
QArrayDataPointer<>::size is now a qsizetype, not the uint it used to be.

Pick-to: 6.2
Change-Id: I09d7e5a50401b46a12f29f93b2b39d646b771cfc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
This commit is contained in:
Edward Welbourne 2021-10-28 11:29:43 +02:00
parent ee487c6b89
commit 3b51b8c31d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the test suite of the Qt Toolkit. ** This file is part of the test suite of the Qt Toolkit.
@ -1797,7 +1797,7 @@ void tst_QArrayData::literals()
{ {
{ {
QArrayDataPointer<char> d = Q_ARRAY_LITERAL(char, "ABCDEFGHIJ"); QArrayDataPointer<char> d = Q_ARRAY_LITERAL(char, "ABCDEFGHIJ");
QCOMPARE(d.size, 10u + 1u); QCOMPARE(d.size, 10 + 1);
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
QCOMPARE(d.data()[i], char('A' + i)); QCOMPARE(d.data()[i], char('A' + i));
} }
@ -1820,7 +1820,7 @@ void tst_QArrayData::literals()
{ {
// wchar_t is not necessarily 2-bytes // wchar_t is not necessarily 2-bytes
QArrayDataPointer<wchar_t> d = Q_ARRAY_LITERAL(wchar_t, L"ABCDEFGHIJ"); QArrayDataPointer<wchar_t> d = Q_ARRAY_LITERAL(wchar_t, L"ABCDEFGHIJ");
QCOMPARE(d.size, 10u + 1u); QCOMPARE(d.size, 10 + 1);
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
QCOMPARE(d.data()[i], wchar_t('A' + i)); QCOMPARE(d.data()[i], wchar_t('A' + i));
} }
@ -1861,7 +1861,7 @@ void tst_QArrayData::variadicLiterals()
{ {
QArrayDataPointer<int> d = QArrayDataPointer<int> d =
Q_ARRAY_LITERAL(int, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9); Q_ARRAY_LITERAL(int, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
QCOMPARE(d.size, 10u); QCOMPARE(d.size, 10);
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
QCOMPARE(d.data()[i], i); QCOMPARE(d.data()[i], i);
} }
@ -1869,7 +1869,7 @@ void tst_QArrayData::variadicLiterals()
{ {
QArrayDataPointer<char> d = Q_ARRAY_LITERAL(char, QArrayDataPointer<char> d = Q_ARRAY_LITERAL(char,
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J'); 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J');
QCOMPARE(d.size, 10u); QCOMPARE(d.size, 10);
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
QCOMPARE(d.data()[i], char('A' + i)); QCOMPARE(d.data()[i], char('A' + i));
} }
@ -1877,7 +1877,7 @@ void tst_QArrayData::variadicLiterals()
{ {
QArrayDataPointer<const char *> d = Q_ARRAY_LITERAL(const char *, QArrayDataPointer<const char *> d = Q_ARRAY_LITERAL(const char *,
"A", "B", "C", "D", "E", "F", "G", "H", "I", "J"); "A", "B", "C", "D", "E", "F", "G", "H", "I", "J");
QCOMPARE(d.size, 10u); QCOMPARE(d.size, 10);
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {
QCOMPARE(d.data()[i][0], char('A' + i)); QCOMPARE(d.data()[i][0], char('A' + i));
QCOMPARE(d.data()[i][1], '\0'); QCOMPARE(d.data()[i][1], '\0');