forked from qt-creator/qt-creator
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: I88edd91395849574436299b8badda21bb93bea39 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -299,7 +299,7 @@ void Document::setLastModified(const QDateTime &lastModified)
|
||||
QStringList Document::includedFiles() const
|
||||
{
|
||||
QStringList files;
|
||||
for (const Include &i : qAsConst(_resolvedIncludes))
|
||||
for (const Include &i : std::as_const(_resolvedIncludes))
|
||||
files.append(i.resolvedFileName());
|
||||
files.removeDuplicates();
|
||||
return files;
|
||||
@@ -488,7 +488,7 @@ Symbol *Document::lastVisibleSymbolAt(int line, int column) const
|
||||
|
||||
const Macro *Document::findMacroDefinitionAt(int line) const
|
||||
{
|
||||
for (const Macro ¯o : qAsConst(_definedMacros)) {
|
||||
for (const Macro ¯o : std::as_const(_definedMacros)) {
|
||||
if (macro.line() == line)
|
||||
return ¯o;
|
||||
}
|
||||
@@ -497,7 +497,7 @@ const Macro *Document::findMacroDefinitionAt(int line) const
|
||||
|
||||
const Document::MacroUse *Document::findMacroUseAt(int utf16charsOffset) const
|
||||
{
|
||||
for (const Document::MacroUse &use : qAsConst(_macroUses)) {
|
||||
for (const Document::MacroUse &use : std::as_const(_macroUses)) {
|
||||
if (use.containsUtf16charOffset(utf16charsOffset)
|
||||
&& (utf16charsOffset < use.utf16charsBegin() + use.macro().nameToQString().size())) {
|
||||
return &use;
|
||||
@@ -508,7 +508,7 @@ const Document::MacroUse *Document::findMacroUseAt(int utf16charsOffset) const
|
||||
|
||||
const Document::UndefinedMacroUse *Document::findUndefinedMacroUseAt(int utf16charsOffset) const
|
||||
{
|
||||
for (const Document::UndefinedMacroUse &use : qAsConst(_undefinedMacroUses)) {
|
||||
for (const Document::UndefinedMacroUse &use : std::as_const(_undefinedMacroUses)) {
|
||||
if (use.containsUtf16charOffset(utf16charsOffset)
|
||||
&& (utf16charsOffset < use.utf16charsBegin()
|
||||
+ QString::fromUtf8(use.name(), use.name().size()).length()))
|
||||
|
||||
Reference in New Issue
Block a user