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

16
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -477,7 +477,7 @@ void DocumentManager::renamedFile(const Utils::FilePath &from, const Utils::File
}
// rename the IDocuments
for (IDocument *document : qAsConst(documentsToRename)) {
for (IDocument *document : std::as_const(documentsToRename)) {
d->m_blockedIDocument = document;
removeFileInfo(document);
document->setFilePath(to);
@@ -572,7 +572,7 @@ QList<IDocument *> DocumentManager::modifiedDocuments()
modified << document;
}
for (IDocument *document : qAsConst(d->m_documentsWithoutWatch)) {
for (IDocument *document : std::as_const(d->m_documentsWithoutWatch)) {
if (document->isModified())
modified << document;
}
@@ -682,7 +682,7 @@ static bool saveModifiedFilesHelper(const QList<IDocument *> &documents,
}
// Check for files without write permissions.
QList<IDocument *> roDocuments;
for (IDocument *document : qAsConst(documentsToSave)) {
for (IDocument *document : std::as_const(documentsToSave)) {
if (document->isFileReadOnly())
roDocuments << document;
}
@@ -699,7 +699,7 @@ static bool saveModifiedFilesHelper(const QList<IDocument *> &documents,
return false;
}
}
for (IDocument *document : qAsConst(documentsToSave)) {
for (IDocument *document : std::as_const(documentsToSave)) {
if (!EditorManagerPrivate::saveDocument(document)) {
if (cancelled)
*cancelled = true;
@@ -1088,7 +1088,7 @@ void DocumentManager::checkForReload()
QMap<FilePath, FileStateItem> currentStates;
QMap<FilePath, IDocument::ChangeType> changeTypes;
QSet<IDocument *> changedIDocuments;
for (const FilePath &filePath : qAsConst(d->m_changedFiles)) {
for (const FilePath &filePath : std::as_const(d->m_changedFiles)) {
const FilePath fileKey = filePathKey(filePath, KeepLinks);
qCDebug(log) << "handling file change for" << filePath << "(" << fileKey << ")";
IDocument::ChangeType type = IDocument::TypeContents;
@@ -1119,7 +1119,7 @@ void DocumentManager::checkForReload()
// if the resolved names are different when unexpectFileChange is called
// we would end up with never-unexpected file names
QSet<FilePath> expectedFileKeys;
for (const FilePath &filePath : qAsConst(d->m_expectedFileNames)) {
for (const FilePath &filePath : std::as_const(d->m_expectedFileNames)) {
const FilePath cleanAbsFilePath = filePathKey(filePath, KeepLinks);
expectedFileKeys.insert(filePathKey(filePath, KeepLinks));
const FilePath resolvedCleanAbsFilePath = cleanAbsFilePath.canonicalPath();
@@ -1130,7 +1130,7 @@ void DocumentManager::checkForReload()
// handle the IDocuments
QStringList errorStrings;
QStringList filesToDiff;
for (IDocument *document : qAsConst(changedIDocuments)) {
for (IDocument *document : std::as_const(changedIDocuments)) {
IDocument::ChangeTrigger trigger = IDocument::TriggerInternal;
std::optional<IDocument::ChangeType> type;
bool changed = false;
@@ -1355,7 +1355,7 @@ void DocumentManager::saveSettings()
{
QVariantList recentFiles;
QStringList recentEditorIds;
for (const RecentFile &file : qAsConst(d->m_recentFiles)) {
for (const RecentFile &file : std::as_const(d->m_recentFiles)) {
recentFiles.append(file.first.toVariant());
recentEditorIds.append(file.second.toString());
}