diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-10-06 11:42:43 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-06 18:20:23 +0200 |
commit | d6dfdf3ad3f68a97fd4fc2843a5d5fb424193b4b (patch) | |
tree | 2a9f9447f0a904174ead25287b1313fe728257b8 /src/qdoc/clangcodeparser.cpp | |
parent | c338447261878111df7198fbd96051926464e865 (diff) | |
download | qttools-d6dfdf3ad3f68a97fd4fc2843a5d5fb424193b4b.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.
Task-number: QTBUG-99313
Change-Id: I234704ba429750ddee958a82f6c941d041da0653
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src/qdoc/clangcodeparser.cpp')
-rw-r--r-- | src/qdoc/clangcodeparser.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp index d2d72abfe..3cf930f36 100644 --- a/src/qdoc/clangcodeparser.cpp +++ b/src/qdoc/clangcodeparser.cpp @@ -290,7 +290,7 @@ static Node *findNodeForCursor(QDocDatabase *qdb, CXCursor cur) auto numArg = clang_getNumArgTypes(funcType); bool isVariadic = clang_isFunctionTypeVariadic(funcType); QVarLengthArray<QString, 20> args; - for (Node *candidate : qAsConst(candidates)) { + for (Node *candidate : std::as_const(candidates)) { if (!candidate->isFunction(Node::CPP)) continue; auto fn = static_cast<FunctionNode *>(candidate); @@ -1056,7 +1056,7 @@ void ClangCodeParser::initializeParser() args.append(Utilities::getInternalIncludePaths(QStringLiteral("clang++"))); #endif m_includePaths.clear(); - for (const auto &path : qAsConst(args)) { + for (const auto &path : std::as_const(args)) { if (!path.isEmpty()) m_includePaths.append(path.toUtf8()); } @@ -1182,7 +1182,7 @@ void ClangCodeParser::getDefaultArgs() m_args.clear(); m_args.insert(m_args.begin(), std::begin(defaultArgs_), std::end(defaultArgs_)); // Add the defines from the qdocconf file. - for (const auto &p : qAsConst(m_defines)) + for (const auto &p : std::as_const(m_defines)) m_args.push_back(p.constData()); } @@ -1363,7 +1363,7 @@ void ClangCodeParser::precompileHeaders() { getDefaultArgs(); getMoreArgs(); - for (const auto &p : qAsConst(m_moreArgs)) + for (const auto &p : std::as_const(m_moreArgs)) m_args.push_back(p.constData()); flags_ = static_cast<CXTranslationUnit_Flags>(CXTranslationUnit_Incomplete @@ -1411,7 +1411,7 @@ void ClangCodeParser::parseSourceFile(const Location & /*location*/, const QStri m_args.push_back(m_pchName.constData()); } getMoreArgs(); - for (const auto &p : qAsConst(m_moreArgs)) + for (const auto &p : std::as_const(m_moreArgs)) m_args.push_back(p.constData()); CXTranslationUnit tu; @@ -1578,7 +1578,7 @@ Node *ClangCodeParser::parseFnArg(const Location &location, const QString &fnSig std::vector<const char *> args(std::begin(defaultArgs_), std::end(defaultArgs_)); // Add the defines from the qdocconf file. - for (const auto &p : qAsConst(m_defines)) + for (const auto &p : std::as_const(m_defines)) args.push_back(p.constData()); if (!m_pchName.isEmpty()) { args.push_back("-w"); @@ -1587,7 +1587,7 @@ Node *ClangCodeParser::parseFnArg(const Location &location, const QString &fnSig } CXTranslationUnit tu; s_fn.clear(); - for (const auto &ns : qAsConst(m_namespaceScope)) + for (const auto &ns : std::as_const(m_namespaceScope)) s_fn.prepend("namespace " + ns.toUtf8() + " {"); s_fn += fnSignature.toUtf8(); if (!s_fn.endsWith(";")) |