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

14
src/plugins/coreplugin/dialogs/settingsdialog.cpp
View File

@@ -195,11 +195,11 @@ void CategoryModel::ensurePages(Category *category)
{
if (!category->providerPagesCreated) {
QList<IOptionsPage *> createdPages;
for (const IOptionsPageProvider *provider : qAsConst(category->providers))
for (const IOptionsPageProvider *provider : std::as_const(category->providers))
createdPages += provider->pages();
// check for duplicate ids
for (const IOptionsPage *page : qAsConst(createdPages)) {
for (const IOptionsPage *page : std::as_const(createdPages)) {
QTC_ASSERT(!m_pageIds.contains(page->id()),
qWarning("duplicate options page id '%s'", qPrintable(page->id().toString())));
}
@@ -585,7 +585,7 @@ void SettingsDialog::ensureCategoryWidget(Category *category)
m_model.ensurePages(category);
auto tabWidget = new QTabWidget;
tabWidget->tabBar()->setObjectName("qc_settings_main_tabbar"); // easier lookup in Squish
for (IOptionsPage *page : qAsConst(category->pages)) {
for (IOptionsPage *page : std::as_const(category->pages)) {
QWidget *widget = page->widget();
ICore::setupScreenShooter(page->displayName(), widget);
auto ssa = new SmartScrollArea(this);
@@ -677,9 +677,9 @@ void SettingsDialog::accept()
m_finished = true;
disconnectTabWidgets();
m_applied = true;
for (IOptionsPage *page : qAsConst(m_visitedPages))
for (IOptionsPage *page : std::as_const(m_visitedPages))
page->apply();
for (IOptionsPage *page : qAsConst(m_pages))
for (IOptionsPage *page : std::as_const(m_pages))
page->finish();
done(QDialog::Accepted);
}
@@ -690,14 +690,14 @@ void SettingsDialog::reject()
return;
m_finished = true;
disconnectTabWidgets();
for (IOptionsPage *page : qAsConst(m_pages))
for (IOptionsPage *page : std::as_const(m_pages))
page->finish();
done(QDialog::Rejected);
}
void SettingsDialog::apply()
{
for (IOptionsPage *page : qAsConst(m_visitedPages))
for (IOptionsPage *page : std::as_const(m_visitedPages))
page->apply();
m_applied = true;
}