diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-10-06 11:08:21 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-11 23:17:18 +0200 |
commit | aa37e67ef7f5ff22da0ef95fb5221bc1fff9b3ca (patch) | |
tree | be5e1a9733987aed8602eb47618cd1673a594570 /examples/widgets | |
parent | fd2685c2f0a219c091e028a98ba6cdd154986fec (diff) |
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, with manual
unstaging of the actual definition and documentation in dist/,
src/corelib/doc/ and src/corelib/global/.
Task-number: QTBUG-99313
Change-Id: I4c7114444a325ad4e62d0fcbfd347d2bbfb21541
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'examples/widgets')
17 files changed, 29 insertions, 29 deletions
diff --git a/examples/widgets/dialogs/standarddialogs/dialog.cpp b/examples/widgets/dialogs/standarddialogs/dialog.cpp index 1775a4231a..443101e421 100644 --- a/examples/widgets/dialogs/standarddialogs/dialog.cpp +++ b/examples/widgets/dialogs/standarddialogs/dialog.cpp @@ -52,7 +52,7 @@ void DialogOptionsWidget::addSpacer() int DialogOptionsWidget::value() const { int result = 0; - for (const CheckBoxEntry &checkboxEntry : qAsConst(checkBoxEntries)) { + for (const CheckBoxEntry &checkboxEntry : std::as_const(checkBoxEntries)) { if (checkboxEntry.first->isChecked()) result |= checkboxEntry.second; } diff --git a/examples/widgets/graphicsview/diagramscene/diagramitem.cpp b/examples/widgets/graphicsview/diagramscene/diagramitem.cpp index fe9e7584e3..82b832837b 100644 --- a/examples/widgets/graphicsview/diagramscene/diagramitem.cpp +++ b/examples/widgets/graphicsview/diagramscene/diagramitem.cpp @@ -105,7 +105,7 @@ void DiagramItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) QVariant DiagramItem::itemChange(GraphicsItemChange change, const QVariant &value) { if (change == QGraphicsItem::ItemPositionChange) { - for (Arrow *arrow : qAsConst(arrows)) + for (Arrow *arrow : std::as_const(arrows)) arrow->updatePosition(); } diff --git a/examples/widgets/graphicsview/diagramscene/mainwindow.cpp b/examples/widgets/graphicsview/diagramscene/mainwindow.cpp index dc77b500cb..d6a389af38 100644 --- a/examples/widgets/graphicsview/diagramscene/mainwindow.cpp +++ b/examples/widgets/graphicsview/diagramscene/mainwindow.cpp @@ -87,7 +87,7 @@ void MainWindow::buttonGroupClicked(QAbstractButton *button) void MainWindow::deleteItem() { QList<QGraphicsItem *> selectedItems = scene->selectedItems(); - for (QGraphicsItem *item : qAsConst(selectedItems)) { + for (QGraphicsItem *item : std::as_const(selectedItems)) { if (item->type() == Arrow::Type) { scene->removeItem(item); Arrow *arrow = qgraphicsitem_cast<Arrow *>(item); @@ -98,7 +98,7 @@ void MainWindow::deleteItem() } selectedItems = scene->selectedItems(); - for (QGraphicsItem *item : qAsConst(selectedItems)) { + for (QGraphicsItem *item : std::as_const(selectedItems)) { if (item->type() == DiagramItem::Type) qgraphicsitem_cast<DiagramItem *>(item)->removeArrows(); scene->removeItem(item); diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp index 3d8ca8e972..ede3d23137 100644 --- a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp +++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp @@ -123,11 +123,11 @@ void GraphWidget::timerEvent(QTimerEvent *event) nodes << node; } - for (Node *node : qAsConst(nodes)) + for (Node *node : std::as_const(nodes)) node->calculateForces(); bool itemsMoved = false; - for (Node *node : qAsConst(nodes)) { + for (Node *node : std::as_const(nodes)) { if (node->advancePosition()) itemsMoved = true; } diff --git a/examples/widgets/graphicsview/elasticnodes/node.cpp b/examples/widgets/graphicsview/elasticnodes/node.cpp index fd8df0b32b..eb102f0aa4 100644 --- a/examples/widgets/graphicsview/elasticnodes/node.cpp +++ b/examples/widgets/graphicsview/elasticnodes/node.cpp @@ -67,7 +67,7 @@ void Node::calculateForces() //! [4] // Now subtract all forces pulling items together double weight = (edgeList.size() + 1) * 10; - for (const Edge *edge : qAsConst(edgeList)) { + for (const Edge *edge : std::as_const(edgeList)) { QPointF vec; if (edge->sourceNode() == this) vec = mapToItem(edge->destNode(), 0, 0); @@ -148,7 +148,7 @@ QVariant Node::itemChange(GraphicsItemChange change, const QVariant &value) { switch (change) { case ItemPositionHasChanged: - for (Edge *edge : qAsConst(edgeList)) + for (Edge *edge : std::as_const(edgeList)) edge->adjust(); graph->itemMoved(); break; diff --git a/examples/widgets/graphicsview/flowlayout/flowlayout.cpp b/examples/widgets/graphicsview/flowlayout/flowlayout.cpp index 1f9fb25e75..ab5f4717b3 100644 --- a/examples/widgets/graphicsview/flowlayout/flowlayout.cpp +++ b/examples/widgets/graphicsview/flowlayout/flowlayout.cpp @@ -102,7 +102,7 @@ QSizeF FlowLayout::minSize(const QSizeF &constraint) const } else if (constraint.height() >= 0) { // width for height? // not supported } else { - for (const QGraphicsLayoutItem *item : qAsConst(m_items)) + for (const QGraphicsLayoutItem *item : std::as_const(m_items)) size = size.expandedTo(item->effectiveSizeHint(Qt::MinimumSize)); size += QSizeF(left + right, top + bottom); } @@ -116,7 +116,7 @@ QSizeF FlowLayout::prefSize() const qreal maxh = 0; qreal totalWidth = 0; - for (const QGraphicsLayoutItem *item : qAsConst(m_items)) { + for (const QGraphicsLayoutItem *item : std::as_const(m_items)) { if (totalWidth > 0) totalWidth += spacing(Qt::Horizontal); QSizeF pref = item->effectiveSizeHint(Qt::PreferredSize); @@ -135,7 +135,7 @@ QSizeF FlowLayout::maxSize() const { qreal totalWidth = 0; qreal totalHeight = 0; - for (const QGraphicsLayoutItem *item : qAsConst(m_items)) { + for (const QGraphicsLayoutItem *item : std::as_const(m_items)) { if (totalWidth > 0) totalWidth += spacing(Qt::Horizontal); if (totalHeight > 0) diff --git a/examples/widgets/itemviews/addressbook/addresswidget.cpp b/examples/widgets/itemviews/addressbook/addresswidget.cpp index 955a766750..6be8867a94 100644 --- a/examples/widgets/itemviews/addressbook/addresswidget.cpp +++ b/examples/widgets/itemviews/addressbook/addresswidget.cpp @@ -164,7 +164,7 @@ void AddressWidget::readFromFile(const QString &fileName) QMessageBox::information(this, tr("No contacts in file"), tr("The file you are attempting to open contains no contacts.")); } else { - for (const auto &contact: qAsConst(contacts)) + for (const auto &contact: std::as_const(contacts)) addEntry(contact.name, contact.address); } } diff --git a/examples/widgets/itemviews/editabletreemodel/treeitem.cpp b/examples/widgets/itemviews/editabletreemodel/treeitem.cpp index 5784202b93..942ba277a3 100644 --- a/examples/widgets/itemviews/editabletreemodel/treeitem.cpp +++ b/examples/widgets/itemviews/editabletreemodel/treeitem.cpp @@ -88,7 +88,7 @@ bool TreeItem::insertColumns(int position, int columns) for (int column = 0; column < columns; ++column) itemData.insert(position, QVariant()); - for (TreeItem *child : qAsConst(childItems)) + for (TreeItem *child : std::as_const(childItems)) child->insertColumns(position, columns); return true; @@ -123,7 +123,7 @@ bool TreeItem::removeColumns(int position, int columns) for (int column = 0; column < columns; ++column) itemData.remove(position); - for (TreeItem *child : qAsConst(childItems)) + for (TreeItem *child : std::as_const(childItems)) child->removeColumns(position, columns); return true; diff --git a/examples/widgets/layouts/dynamiclayouts/dialog.cpp b/examples/widgets/layouts/dynamiclayouts/dialog.cpp index 8dc3d069bc..28b4fc2f7f 100644 --- a/examples/widgets/layouts/dynamiclayouts/dialog.cpp +++ b/examples/widgets/layouts/dynamiclayouts/dialog.cpp @@ -57,7 +57,7 @@ void Dialog::rotateWidgets() { Q_ASSERT(rotatableWidgets.count() % 2 == 0); - for (QWidget *widget : qAsConst(rotatableWidgets)) + for (QWidget *widget : std::as_const(rotatableWidgets)) rotatableLayout->removeWidget(widget); rotatableWidgets.enqueue(rotatableWidgets.dequeue()); diff --git a/examples/widgets/layouts/flowlayout/flowlayout.cpp b/examples/widgets/layouts/flowlayout/flowlayout.cpp index b4cba9fe69..0565053096 100644 --- a/examples/widgets/layouts/flowlayout/flowlayout.cpp +++ b/examples/widgets/layouts/flowlayout/flowlayout.cpp @@ -108,7 +108,7 @@ QSize FlowLayout::sizeHint() const QSize FlowLayout::minimumSize() const { QSize size; - for (const QLayoutItem *item : qAsConst(itemList)) + for (const QLayoutItem *item : std::as_const(itemList)) size = size.expandedTo(item->minimumSize()); const QMargins margins = contentsMargins(); @@ -129,7 +129,7 @@ int FlowLayout::doLayout(const QRect &rect, bool testOnly) const //! [9] //! [10] - for (QLayoutItem *item : qAsConst(itemList)) { + for (QLayoutItem *item : std::as_const(itemList)) { const QWidget *wid = item->widget(); int spaceX = horizontalSpacing(); if (spaceX == -1) diff --git a/examples/widgets/painting/fontsampler/mainwindow.cpp b/examples/widgets/painting/fontsampler/mainwindow.cpp index 1b1b816395..e2bd768f79 100644 --- a/examples/widgets/painting/fontsampler/mainwindow.cpp +++ b/examples/widgets/painting/fontsampler/mainwindow.cpp @@ -260,7 +260,7 @@ void MainWindow::printPage(int index, QPainter *painter, QPrinter *printer) bool italic = item->data(0, Qt::UserRole + 1).toBool(); // Calculate the maximum width and total height of the text. - for (int size : qAsConst(sampleSizes)) { + for (int size : std::as_const(sampleSizes)) { QFont font(family, size, weight, italic); font.setStyleName(style); font = QFont(font, painter->device()); @@ -294,7 +294,7 @@ void MainWindow::printPage(int index, QPainter *painter, QPrinter *printer) bool italic = item->data(0, Qt::UserRole + 1).toBool(); // Draw each line of text. - for (int size : qAsConst(sampleSizes)) { + for (int size : std::as_const(sampleSizes)) { QFont font(family, size, weight, italic); font.setStyleName(style); font = QFont(font, painter->device()); diff --git a/examples/widgets/painting/gradients/gradients.cpp b/examples/widgets/painting/gradients/gradients.cpp index dcedd250cf..538d851eb8 100644 --- a/examples/widgets/painting/gradients/gradients.cpp +++ b/examples/widgets/painting/gradients/gradients.cpp @@ -534,7 +534,7 @@ void GradientRenderer::paint(QPainter *p) g = QConicalGradient(pts.at(0), angle); } - for (const auto &stop : qAsConst(m_stops)) + for (const auto &stop : std::as_const(m_stops)) g.setColorAt(stop.first, stop.second); g.setSpread(m_spread); diff --git a/examples/widgets/painting/painterpaths/window.cpp b/examples/widgets/painting/painterpaths/window.cpp index 4fc3e8efd9..01b62d6988 100644 --- a/examples/widgets/painting/painterpaths/window.cpp +++ b/examples/widgets/painting/painterpaths/window.cpp @@ -156,7 +156,7 @@ Window::Window() connect(penColorComboBox, &QComboBox::activated, this, &Window::penColorChanged); - for (RenderArea *area : qAsConst(renderAreas)) { + for (RenderArea *area : std::as_const(renderAreas)) { connect(penWidthSpinBox, &QSpinBox::valueChanged, area, &RenderArea::setPenWidth); connect(rotationAngleSpinBox, &QSpinBox::valueChanged, @@ -167,7 +167,7 @@ Window::Window() QGridLayout *topLayout = new QGridLayout; int i = 0; - for (RenderArea *area : qAsConst(renderAreas)) { + for (RenderArea *area : std::as_const(renderAreas)) { topLayout->addWidget(area, i / 3, i % 3); ++i; } @@ -204,7 +204,7 @@ void Window::fillRuleChanged() { Qt::FillRule rule = (Qt::FillRule)currentItemData(fillRuleComboBox).toInt(); - for (RenderArea *area : qAsConst(renderAreas)) + for (RenderArea *area : std::as_const(renderAreas)) area->setFillRule(rule); } //! [19] @@ -215,7 +215,7 @@ void Window::fillGradientChanged() QColor color1 = qvariant_cast<QColor>(currentItemData(fillColor1ComboBox)); QColor color2 = qvariant_cast<QColor>(currentItemData(fillColor2ComboBox)); - for (RenderArea *area : qAsConst(renderAreas)) + for (RenderArea *area : std::as_const(renderAreas)) area->setFillGradient(color1, color2); } //! [20] @@ -225,7 +225,7 @@ void Window::penColorChanged() { QColor color = qvariant_cast<QColor>(currentItemData(penColorComboBox)); - for (RenderArea *area : qAsConst(renderAreas)) + for (RenderArea *area : std::as_const(renderAreas)) area->setPenColor(color); } //! [21] diff --git a/examples/widgets/painting/shared/hoverpoints.cpp b/examples/widgets/painting/shared/hoverpoints.cpp index 7d2bb81538..87e1eb4415 100644 --- a/examples/widgets/painting/shared/hoverpoints.cpp +++ b/examples/widgets/painting/shared/hoverpoints.cpp @@ -268,7 +268,7 @@ void HoverPoints::paintPoints() p.setPen(m_pointPen); p.setBrush(m_pointBrush); - for (const auto &point : qAsConst(m_points)) { + for (const auto &point : std::as_const(m_points)) { QRectF bounds = pointBoundingRect(point); if (m_shape == CircleShape) p.drawEllipse(bounds); diff --git a/examples/widgets/richtext/syntaxhighlighter/highlighter.cpp b/examples/widgets/richtext/syntaxhighlighter/highlighter.cpp index 11e203c333..d78de20a7d 100644 --- a/examples/widgets/richtext/syntaxhighlighter/highlighter.cpp +++ b/examples/widgets/richtext/syntaxhighlighter/highlighter.cpp @@ -72,7 +72,7 @@ Highlighter::Highlighter(QTextDocument *parent) //! [7] void Highlighter::highlightBlock(const QString &text) { - for (const HighlightingRule &rule : qAsConst(highlightingRules)) { + for (const HighlightingRule &rule : std::as_const(highlightingRules)) { QRegularExpressionMatchIterator matchIterator = rule.pattern.globalMatch(text); while (matchIterator.hasNext()) { QRegularExpressionMatch match = matchIterator.next(); diff --git a/examples/widgets/widgets/scribble/mainwindow.cpp b/examples/widgets/widgets/scribble/mainwindow.cpp index b7e08598f7..0a0a658265 100644 --- a/examples/widgets/widgets/scribble/mainwindow.cpp +++ b/examples/widgets/widgets/scribble/mainwindow.cpp @@ -153,7 +153,7 @@ void MainWindow::createMenus() //! [15] //! [16] { saveAsMenu = new QMenu(tr("&Save As"), this); - for (QAction *action : qAsConst(saveAsActs)) + for (QAction *action : std::as_const(saveAsActs)) saveAsMenu->addAction(action); fileMenu = new QMenu(tr("&File"), this); diff --git a/examples/widgets/widgets/tooltips/sortingbox.cpp b/examples/widgets/widgets/tooltips/sortingbox.cpp index 2b9127f5bd..1f6de0bd8c 100644 --- a/examples/widgets/widgets/tooltips/sortingbox.cpp +++ b/examples/widgets/widgets/tooltips/sortingbox.cpp @@ -97,7 +97,7 @@ void SortingBox::paintEvent(QPaintEvent * /* event */) { QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); - for (const ShapeItem &shapeItem : qAsConst(shapeItems)) { + for (const ShapeItem &shapeItem : std::as_const(shapeItems)) { //! [8] //! [9] painter.translate(shapeItem.position()); //! [9] //! [10] |