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:
@@ -489,7 +489,7 @@ bool SessionManager::save()
|
||||
FilePaths projectFiles = Utils::transform(projects(), &Project::projectFilePath);
|
||||
// Restore information on projects that failed to load:
|
||||
// don't read projects to the list, which the user loaded
|
||||
for (const FilePath &failed : qAsConst(d->m_failedProjects)) {
|
||||
for (const FilePath &failed : std::as_const(d->m_failedProjects)) {
|
||||
if (!projectFiles.contains(failed))
|
||||
projectFiles << failed;
|
||||
}
|
||||
@@ -649,7 +649,7 @@ QStringList SessionManagerPrivate::dependenciesOrder() const
|
||||
// remove the handled projects from the dependency lists
|
||||
// of the remaining unordered projects
|
||||
for (int i = 0; i < unordered.count(); ++i) {
|
||||
for (const QString &pro : qAsConst(ordered)) {
|
||||
for (const QString &pro : std::as_const(ordered)) {
|
||||
QStringList depList = unordered.at(i).second;
|
||||
depList.removeAll(pro);
|
||||
unordered[i].second = depList;
|
||||
@@ -670,7 +670,7 @@ QList<Project *> SessionManager::projectOrder(const Project *project)
|
||||
else
|
||||
pros = d->dependenciesOrder();
|
||||
|
||||
for (const QString &proFile : qAsConst(pros)) {
|
||||
for (const QString &proFile : std::as_const(pros)) {
|
||||
for (Project *pro : projects()) {
|
||||
if (pro->projectFilePath().toString() == proFile) {
|
||||
result << pro;
|
||||
@@ -921,7 +921,7 @@ void SessionManagerPrivate::restoreStartupProject(const PersistentSettingsReader
|
||||
{
|
||||
const QString startupProject = reader.restoreValue(QLatin1String("StartupProject")).toString();
|
||||
if (!startupProject.isEmpty()) {
|
||||
for (Project *pro : qAsConst(m_projects)) {
|
||||
for (Project *pro : std::as_const(m_projects)) {
|
||||
if (pro->projectFilePath().toString() == startupProject) {
|
||||
m_instance->setStartupProject(pro);
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user