diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-13 11:42:26 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-11 14:41:50 +0200 |
commit | 225dd568af0c594dd0efacbad7b6568309a9cb7c (patch) | |
tree | 9d243de1160cd93653c68b95363f728f659a1530 /src/testlib/qtestresult.cpp | |
parent | 2d8d738657b64c853316b605176e002b9e616fcf (diff) |
QTestLib: Introduce nullptr
Apply Fixits by Qt Creator with some amendments.
Task-number: QTBUG-69413
Change-Id: I620e40a277dc2b20b0ec26fc32577e66b0456bb3
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/testlib/qtestresult.cpp')
-rw-r--r-- | src/testlib/qtestresult.cpp | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp index 8d65bff5c4..eeae7ef0f4 100644 --- a/src/testlib/qtestresult.cpp +++ b/src/testlib/qtestresult.cpp @@ -49,33 +49,33 @@ #include <stdio.h> #include <string.h> -static const char *currentAppName = 0; +static const char *currentAppName = nullptr; QT_BEGIN_NAMESPACE namespace QTest { - static QTestData *currentTestData = 0; - static QTestData *currentGlobalTestData = 0; - static const char *currentTestFunc = 0; - static const char *currentTestObjectName = 0; + static QTestData *currentTestData = nullptr; + static QTestData *currentGlobalTestData = nullptr; + static const char *currentTestFunc = nullptr; + static const char *currentTestObjectName = nullptr; static bool failed = false; static bool skipCurrentTest = false; static bool blacklistCurrentTest = false; - static const char *expectFailComment = 0; + static const char *expectFailComment = nullptr; static int expectFailMode = 0; } void QTestResult::reset() { - QTest::currentTestData = 0; - QTest::currentGlobalTestData = 0; - QTest::currentTestFunc = 0; - QTest::currentTestObjectName = 0; + QTest::currentTestData = nullptr; + QTest::currentGlobalTestData = nullptr; + QTest::currentTestFunc = nullptr; + QTest::currentTestObjectName = nullptr; QTest::failed = false; - QTest::expectFailComment = 0; + QTest::expectFailComment = nullptr; QTest::expectFailMode = 0; QTest::blacklistCurrentTest = false; @@ -127,18 +127,18 @@ static void clearExpectFail() { QTest::expectFailMode = 0; delete [] const_cast<char *>(QTest::expectFailComment); - QTest::expectFailComment = 0; + QTest::expectFailComment = nullptr; } void QTestResult::finishedCurrentTestData() { if (QTest::expectFailMode) - addFailure("QEXPECT_FAIL was called without any subsequent verification statements", 0, 0); + addFailure("QEXPECT_FAIL was called without any subsequent verification statements", nullptr, 0); clearExpectFail(); if (!QTest::failed && QTestLog::unhandledIgnoreMessages()) { QTestLog::printUnhandledIgnoreMessages(); - addFailure("Not all expected messages were received", 0, 0); + addFailure("Not all expected messages were received", nullptr, 0); } QTestLog::clearIgnoreMessages(); } @@ -158,7 +158,7 @@ void QTestResult::finishedCurrentTestDataCleanup() void QTestResult::finishedCurrentTestFunction() { - QTest::currentTestFunc = 0; + QTest::currentTestFunc = nullptr; QTest::failed = false; QTestLog::leaveTestFunction(); @@ -171,14 +171,12 @@ const char *QTestResult::currentTestFunction() const char *QTestResult::currentDataTag() { - return QTest::currentTestData ? QTest::currentTestData->dataTag() - : static_cast<const char *>(0); + return QTest::currentTestData ? QTest::currentTestData->dataTag() : nullptr; } const char *QTestResult::currentGlobalDataTag() { - return QTest::currentGlobalTestData ? QTest::currentGlobalTestData->dataTag() - : static_cast<const char *>(0); + return QTest::currentGlobalTestData ? QTest::currentGlobalTestData->dataTag() : nullptr; } static bool isExpectFailData(const char *dataIndex) |