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/corelib/global | |
| 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/corelib/global')
| -rw-r--r-- | src/corelib/global/qforeach.h | 4 | ||||
| -rw-r--r-- | src/corelib/global/qforeach.qdoc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/global/qforeach.h b/src/corelib/global/qforeach.h index 228c128fa8..ab0e20b989 100644 --- a/src/corelib/global/qforeach.h +++ b/src/corelib/global/qforeach.h @@ -25,8 +25,8 @@ template <typename T> class QForeachContainer { Q_DISABLE_COPY_MOVE(QForeachContainer) public: - QForeachContainer(const T &t) : c(t), i(qAsConst(c).begin()), e(qAsConst(c).end()) {} - QForeachContainer(T &&t) : c(std::move(t)), i(qAsConst(c).begin()), e(qAsConst(c).end()) {} + QForeachContainer(const T &t) : c(t), i(std::as_const(c).begin()), e(std::as_const(c).end()) {} + QForeachContainer(T &&t) : c(std::move(t)), i(std::as_const(c).begin()), e(std::as_const(c).end()) {} T c; typename T::const_iterator i, e; diff --git a/src/corelib/global/qforeach.qdoc b/src/corelib/global/qforeach.qdoc index 278f1a1007..632c9dd676 100644 --- a/src/corelib/global/qforeach.qdoc +++ b/src/corelib/global/qforeach.qdoc @@ -54,9 +54,9 @@ \note Since Qt 5.7, the use of this macro is discouraged. It will be removed in a future version of Qt. Please use C++11 range-for, - possibly with qAsConst(), as needed. + possibly with std::as_const(), as needed. - \sa qAsConst() + \sa std::as_const() */ /*! @@ -70,7 +70,7 @@ \note Since Qt 5.7, the use of this macro is discouraged. It will be removed in a future version of Qt. Please use C++11 range-for, - possibly with qAsConst(), as needed. + possibly with std::as_const(), as needed. - \sa qAsConst() + \sa std::as_const() */ |