diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-07-04 11:36:34 +0200 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-07-08 11:49:55 +0000 |
commit | 9db09b47000301bc3589278b076abdc111276304 (patch) | |
tree | 01dbdb4db4dc72b69d0efd0db650906cf97b9274 /src/testlib | |
parent | 2300629df599938d67c13ed134e788db0fe8b21a (diff) |
Fix modernize-use-bool-literals issues
Reported by clang-tidy. Skipped fixes in implementation files, only
changed headers.
Change-Id: I5cfd266b3d4046f90baebc0c538b1b6ab03a02d2
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/qtestassert.h | 4 | ||||
-rw-r--r-- | src/testlib/qtestcase.h | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h index 21d3ffaef8..6498ea84ef 100644 --- a/src/testlib/qtestassert.h +++ b/src/testlib/qtestassert.h @@ -45,9 +45,9 @@ QT_BEGIN_NAMESPACE -#define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (0) +#define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) -#define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (0) +#define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) QT_END_NAMESPACE diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index a7e825396a..a59eb4ecb3 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -63,13 +63,13 @@ class QRegularExpression; do {\ if (!QTest::qVerify(static_cast<bool>(statement), #statement, "", __FILE__, __LINE__))\ return;\ -} while (0) +} while (false) #define QFAIL(message) \ do {\ QTest::qFail(message, __FILE__, __LINE__);\ return;\ -} while (0) +} while (false) #define QVERIFY2(statement, description) \ do {\ @@ -80,13 +80,13 @@ do {\ if (!QTest::qVerify(false, #statement, (description), __FILE__, __LINE__))\ return;\ }\ -} while (0) +} while (false) #define QCOMPARE(actual, expected) \ do {\ if (!QTest::qCompare(actual, expected, #actual, #expected, __FILE__, __LINE__))\ return;\ -} while (0) +} while (false) #ifndef QT_NO_EXCEPTIONS @@ -111,7 +111,7 @@ do {\ " but unknown exception caught", __FILE__, __LINE__);\ return;\ }\ - } while (0) + } while (false) #else // QT_NO_EXCEPTIONS @@ -158,7 +158,7 @@ do {\ do { \ QTRY_IMPL((expr), timeout);\ QVERIFY(expr); \ -} while (0) +} while (false) #define QTRY_VERIFY(expr) QTRY_VERIFY_WITH_TIMEOUT((expr), 5000) @@ -167,7 +167,7 @@ do { \ do { \ QTRY_IMPL((expr), timeout);\ QVERIFY2(expr, messageExpression); \ -} while (0) +} while (false) #define QTRY_VERIFY2(expr, messageExpression) QTRY_VERIFY2_WITH_TIMEOUT((expr), (messageExpression), 5000) @@ -176,7 +176,7 @@ do { \ do { \ QTRY_IMPL(((expr) == (expected)), timeout);\ QCOMPARE((expr), expected); \ -} while (0) +} while (false) #define QTRY_COMPARE(expr, expected) QTRY_COMPARE_WITH_TIMEOUT((expr), expected, 5000) @@ -184,7 +184,7 @@ do { \ do {\ QTest::qSkip(statement, __FILE__, __LINE__);\ return;\ -} while (0) +} while (false) #ifdef Q_COMPILER_VARIADIC_MACROS @@ -200,7 +200,7 @@ do {\ do {\ if (!QTest::qExpectFail(dataIndex, comment, QTest::mode, __FILE__, __LINE__))\ return;\ -} while (0) +} while (false) #define QFETCH(Type, name)\ Type name = *static_cast<Type *>(QTest::qData(#name, ::qMetaTypeId<typename std::remove_cv<Type >::type>())) @@ -212,7 +212,7 @@ do {\ do {\ if (!QTest::qTest(actual, testElement, #actual, #testElement, __FILE__, __LINE__))\ return;\ -} while (0) +} while (false) #define QWARN(msg)\ QTest::qWarn(msg, __FILE__, __LINE__) |