diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-10-06 11:08:21 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-11 23:17:18 +0200 |
| commit | aa37e67ef7f5ff22da0ef95fb5221bc1fff9b3ca (patch) | |
| tree | be5e1a9733987aed8602eb47618cd1673a594570 /src/testlib | |
| parent | fd2685c2f0a219c091e028a98ba6cdd154986fec (diff) | |
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.
Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace, with manual
unstaging of the actual definition and documentation in dist/,
src/corelib/doc/ and src/corelib/global/.
Task-number: QTBUG-99313
Change-Id: I4c7114444a325ad4e62d0fcbfd347d2bbfb21541
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestaccessible.h | 2 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 2 | ||||
| -rw-r--r-- | src/testlib/qtestlog.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h index 5db348fd22..a9b237bd5d 100644 --- a/src/testlib/qtestaccessible.h +++ b/src/testlib/qtestaccessible.h @@ -115,7 +115,7 @@ public: return res; } static bool containsEvent(QAccessibleEvent *event) { - for (const QAccessibleEvent *ev : qAsConst(eventList())) { + for (const QAccessibleEvent *ev : std::as_const(eventList())) { if (*ev == *event) return true; } diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index d9ffefa775..d3858267bc 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2319,7 +2319,7 @@ int QTest::qRun() bool seenBad = false; TestMethods::MetaMethods commandLineMethods; commandLineMethods.reserve(static_cast<size_t>(QTest::testFunctions.size())); - for (const QString &tf : qAsConst(QTest::testFunctions)) { + for (const QString &tf : std::as_const(QTest::testFunctions)) { const QByteArray tfB = tf.toLatin1(); const QByteArray signature = tfB + QByteArrayLiteral("()"); QMetaMethod m = TestMethods::findMethod(currentTestObject, signature.constData()); diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index 9867e8c5b2..44480cbc04 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -70,7 +70,7 @@ static void saveCoverageTool(const char * appname, bool testfailed, bool install Q_CONSTINIT static QElapsedTimer elapsedFunctionTime; Q_CONSTINIT static QElapsedTimer elapsedTotalTime; -#define FOREACH_TEST_LOGGER for (const auto &logger : qAsConst(*QTest::loggers())) +#define FOREACH_TEST_LOGGER for (const auto &logger : std::as_const(*QTest::loggers())) namespace QTest { |