feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Port from qAsConst() to std::as_const()

Browse Source 
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: I88edd91395849574436299b8badda21bb93bea39
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marc Mutz
2022-10-07 14:46:06 +02:00
parent 90de29d530
commit 8eb4d52342
498 changed files with 1270 additions and 1270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/languageclient/semantichighlightsupport.cpp
View File

@@ -235,7 +235,7 @@ void SemanticTokenSupport::setLegend(const LanguageServerProtocol::SemanticToken
void SemanticTokenSupport::updateFormatHash()
{
auto fontSettings = TextEditorSettings::fontSettings();
for (int tokenType : qAsConst(m_tokenTypes)) {
for (int tokenType : std::as_const(m_tokenTypes)) {
if (tokenType < 0)
continue;
TextStyle style;
@@ -364,7 +364,7 @@ void SemanticTokenSupport::handleSemanticTokensDelta(
const QList<int> &data = tokens.data();
int newDataSize = data.size();
for (const SemanticTokensEdit &edit : qAsConst(edits))
for (const SemanticTokensEdit &edit : std::as_const(edits))
newDataSize += edit.dataSize() - edit.deleteCount();
QList<int> newData;
newData.reserve(newDataSize);
@@ -373,7 +373,7 @@ void SemanticTokenSupport::handleSemanticTokensDelta(
const auto end = data.end();
qCDebug(LOGLSPHIGHLIGHT) << "Edit Tokens";
qCDebug(LOGLSPHIGHLIGHT) << "Data before edit " << data;
for (const SemanticTokensEdit &edit : qAsConst(edits)) {
for (const SemanticTokensEdit &edit : std::as_const(edits)) {
if (edit.start() > data.size()) // prevent edits after the previously reported data
return;
for (const auto start = data.begin() + edit.start(); it < start; ++it)
@@ -446,7 +446,7 @@ void SemanticTokenSupport::highlight(const Utils::FilePath &filePath, bool force
};
if (LOGLSPHIGHLIGHT().isDebugEnabled()) {
qCDebug(LOGLSPHIGHLIGHT) << "Expanded Tokens for " << filePath;
for (const ExpandedSemanticToken &token : qAsConst(expandedTokens)) {
for (const ExpandedSemanticToken &token : std::as_const(expandedTokens)) {
qCDebug(LOGLSPHIGHLIGHT)
<< token.line << token.column << token.length << token.type << token.modifiers;
}