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:
Marc Mutz
2022-10-07 14:46:06 +02:00
parent 90de29d530
commit 8eb4d52342
498 changed files with 1270 additions and 1270 deletions

View File

@@ -621,7 +621,7 @@ void SubmitEditorWidget::descriptionTextChanged()
wrapDescription();
trimDescription();
// append field entries
for (const SubmitFieldWidget *fw : qAsConst(d->m_fieldWidgets))
for (const SubmitFieldWidget *fw : std::as_const(d->m_fieldWidgets))
d->m_description += fw->fieldValues();
updateSubmitAction();
}
@@ -713,7 +713,7 @@ void SubmitEditorWidget::editorCustomContextMenuRequested(const QPoint &pos)
QScopedPointer<QMenu> menu(d->description->createStandardContextMenu());
// Extend
for (const SubmitEditorWidgetPrivate::AdditionalContextMenuAction &a :
qAsConst(d->descriptionEditContextMenuActions)) {
std::as_const(d->descriptionEditContextMenuActions)) {
if (a.second) {
if (a.first >= 0)
menu->insertAction(menu->actions().at(a.first), a.second);

View File

@@ -185,7 +185,7 @@ void SubmitFieldWidget::setHasBrowseButton(bool on)
if (d->hasBrowseButton == on)
return;
d->hasBrowseButton = on;
for (const FieldEntry &fe : qAsConst(d->fieldEntries))
for (const FieldEntry &fe : std::as_const(d->fieldEntries))
fe.browseButton->setVisible(on);
}
@@ -209,7 +209,7 @@ void SubmitFieldWidget::setCompleter(QCompleter *c)
if (c == d->completer)
return;
d->completer = c;
for (const FieldEntry &fe : qAsConst(d->fieldEntries))
for (const FieldEntry &fe : std::as_const(d->fieldEntries))
fe.lineEdit->setCompleter(c);
}
@@ -229,7 +229,7 @@ QString SubmitFieldWidget::fieldValues() const
const QChar newLine = QLatin1Char('\n');
// Format as "RevBy: value\nSigned-Off: value\n"
QString rc;
for (const FieldEntry &fe : qAsConst(d->fieldEntries)) {
for (const FieldEntry &fe : std::as_const(d->fieldEntries)) {
const QString value = fe.lineEdit->text().trimmed();
if (!value.isEmpty()) {
rc += fe.combo->currentText();

View File

@@ -572,7 +572,7 @@ void VcsBaseClient::statusParser(const QString &text)
QStringList rawStatusList = text.split(QLatin1Char('\n'));
for (const QString &string : qAsConst(rawStatusList)) {
for (const QString &string : std::as_const(rawStatusList)) {
const VcsBaseClient::StatusItem lineInfo = parseStatusLine(string);
if (!lineInfo.flags.isEmpty() && !lineInfo.file.isEmpty())
lineInfoList.append(lineInfo);

View File

@@ -560,7 +560,7 @@ VcsBaseEditorWidgetPrivate::VcsBaseEditorWidgetPrivate(VcsBaseEditorWidget *edit
AbstractTextCursorHandler *VcsBaseEditorWidgetPrivate::findTextCursorHandler(const QTextCursor &cursor)
{
for (AbstractTextCursorHandler *handler : qAsConst(m_textCursorHandlers)) {
for (AbstractTextCursorHandler *handler : std::as_const(m_textCursorHandlers)) {
if (handler->findContentsUnderCursor(cursor))
return handler;
}

View File

@@ -310,7 +310,7 @@ void VcsCommandPage::delayedInitialize()
m_startedStatus = runMessage;
QStringList extraArgs;
for (const QString &in : qAsConst(m_arguments)) {
for (const QString &in : std::as_const(m_arguments)) {
const QString tmp = wiz->expander()->expand(in);
if (tmp.isEmpty())
continue;
@@ -322,7 +322,7 @@ void VcsCommandPage::delayedInitialize()
VcsCommand *command = vc->createInitialCheckoutCommand(repo, FilePath::fromString(base),
name, extraArgs);
for (const JobData &job : qAsConst(m_additionalJobs)) {
for (const JobData &job : std::as_const(m_additionalJobs)) {
QTC_ASSERT(!job.job.isEmpty(), continue);
if (!JsonWizard::boolFromVariant(job.condition, wiz->expander()))