summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/dialogs
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-06-07 14:04:53 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-08 10:29:34 +0200
commit9e65808acfc82354188a67f23304f1c09074136c (patch)
tree219119736de4bb7c900ad032dc3861432ea7c6f4 /tests/auto/widgets/dialogs
parenta730b5fabf3d31e01abb058ed2ffffa3395e4fbf (diff)
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>
Diffstat (limited to 'tests/auto/widgets/dialogs')
-rw-r--r--tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp17
1 files changed, 12 insertions, 5 deletions
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index e36eaa5af2..0fe7c8ab75 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -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