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/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | |
| parent | fd2685c2f0a219c091e028a98ba6cdd154986fec (diff) | |
| download | qtbase-aa37e67ef7f5ff22da0ef95fb5221bc1fff9b3ca.tar.gz | |
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/tools/qdbusxml2cpp/qdbusxml2cpp.cpp')
| -rw-r--r-- | src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp index 5479d7425a..4f23b8604d 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -498,13 +498,13 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf hs << "#include <QtDBus/QDBusPendingReply>" << Qt::endl; #endif - for (const QString &include : qAsConst(includes)) { + for (const QString &include : std::as_const(includes)) { hs << "#include \"" << include << "\"" << Qt::endl; if (headerName.isEmpty()) cs << "#include \"" << include << "\"" << Qt::endl; } - for (const QString &include : qAsConst(globalIncludes)) { + for (const QString &include : std::as_const(globalIncludes)) { hs << "#include <" << include << ">" << Qt::endl; if (headerName.isEmpty()) cs << "#include <" << include << ">" << Qt::endl; @@ -817,13 +817,13 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte hs << "#include <QtDBus/QDBusObjectPath>" << Qt::endl; #endif - for (const QString &include : qAsConst(includes)) { + for (const QString &include : std::as_const(includes)) { hs << "#include \"" << include << "\"" << Qt::endl; if (headerName.isEmpty()) cs << "#include \"" << include << "\"" << Qt::endl; } - for (const QString &include : qAsConst(globalIncludes)) { + for (const QString &include : std::as_const(globalIncludes)) { hs << "#include <" << include << ">" << Qt::endl; if (headerName.isEmpty()) cs << "#include <" << include << ">" << Qt::endl; |