From 225dd568af0c594dd0efacbad7b6568309a9cb7c Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 13 Jun 2019 11:42:26 +0200 Subject: QTestLib: Introduce nullptr Apply Fixits by Qt Creator with some amendments. Task-number: QTBUG-69413 Change-Id: I620e40a277dc2b20b0ec26fc32577e66b0456bb3 Reviewed-by: Frederik Gladhorn --- src/testlib/qtestlog.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/testlib/qtestlog.cpp') diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index ddebf1105f..f3ebf343c5 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -166,7 +166,7 @@ namespace QTest { IgnoreResultList *next = nullptr; }; - static IgnoreResultList *ignoreResultList = 0; + static IgnoreResultList *ignoreResultList = nullptr; static QVector loggers; static bool loggerUsingStdout = false; @@ -181,7 +181,7 @@ namespace QTest { { if (!ignoreResultList) return false; - IgnoreResultList *last = 0; + IgnoreResultList *last = nullptr; IgnoreResultList *list = ignoreResultList; while (list) { if (list->matches(type, message)) { @@ -191,7 +191,7 @@ namespace QTest { else if (list->next) ignoreResultList = list->next; else - ignoreResultList = 0; + ignoreResultList = nullptr; delete list; return true; @@ -438,11 +438,11 @@ void QTestLog::stopLogging() void QTestLog::addLogger(LogMode mode, const char *filename) { if (filename && strcmp(filename, "-") == 0) - filename = 0; + filename = nullptr; if (!filename) QTest::loggerUsingStdout = true; - QAbstractTestLogger *logger = 0; + QAbstractTestLogger *logger = nullptr; switch (mode) { case QTestLog::Plain: logger = new QPlainTestLogger(filename); -- cgit v1.2.3