whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_qfilesystemmodel: Fix warnings about comparing int/bool. 

warning C4804: '<=' : unsafe use of type 'bool' in operation

Remove outer loop and replace ugly ROW_NAME macro by
inline function.

Change-Id: Id7e4ef047adaf8017b8c21621d19c151993cc6dd
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
bb10
Friedemann Kleint 2013-06-07 14:04:53 +02:00 committed by The Qt Project
parent a730b5fabf
commit 9e65808acf
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
View File

@ -1033,6 +1033,14 @@ void tst_QFileSystemModel::roleNames()
QVERIFY(values.contains(roleName));
}
static inline QByteArray permissionRowName(bool readOnly, int permission)
{
QByteArray result = readOnly ? QByteArrayLiteral("ro") : QByteArrayLiteral("rw");
result += QByteArrayLiteral("-0");
result += QByteArray::number(permission, 16);
return result;
}
void tst_QFileSystemModel::permissions_data()
{
QTest::addColumn<int>("permissions");
@ -1043,11 +1051,10 @@ void tst_QFileSystemModel::permissions_data()
QFile::ReadOwner,
QFile::WriteOwner|QFile::ReadOwner,
};
#define ROW_NAME(i) qPrintable(QString().sprintf("%s-0%04x", readOnly ? "ro" : "rw", permissions[i]))
for (int readOnly = false ; readOnly <= true; ++readOnly)
for (size_t i = 0; i < sizeof permissions / sizeof *permissions; ++i)
QTest::newRow(ROW_NAME(i)) << permissions[i] << bool(readOnly);
#undef ROW_NAME
for (size_t i = 0; i < sizeof permissions / sizeof *permissions; ++i) {
QTest::newRow(permissionRowName(false, permissions[i]).constData()) << permissions[i] << false;
QTest::newRow(permissionRowName(true, permissions[i]).constData()) << permissions[i] << true;
}
}
void tst_QFileSystemModel::permissions() // checks QTBUG-20503