modelinglib: Remove foreach usage part 1

Change-Id: Ib185d0dbe7df2e5452502278d9a2c3151cf9812e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>

17 files changed, 49 insertions, 43 deletions

diff --git a/src/libs/modelinglib/qmt/controller/namecontroller.cpp b/src/libs/modelinglib/qmt/controller/namecontroller.cpp
index 3365642a49..7dea78ef43 100644
--- a/src/libs/modelinglib/qmt/controller/namecontroller.cpp
+++ b/src/libs/modelinglib/qmt/controller/namecontroller.cpp
@@ -102,7 +102,7 @@ QString NameController::calcRelativePath(const QString &absoluteFileName, const
 QString NameController::calcElementNameSearchId(const QString &elementName)
 {
     QString searchId;
-    foreach (const QChar &c, elementName) {
+    for (const QChar &c : elementName) {
         if (c.isLetterOrNumber())
             searchId += c.toLower();
     }
diff --git a/src/libs/modelinglib/qmt/controller/references.h b/src/libs/modelinglib/qmt/controller/references.h
index 4f43127590..daf479fd89 100644
--- a/src/libs/modelinglib/qmt/controller/references.h
+++ b/src/libs/modelinglib/qmt/controller/references.h
@@ -18,7 +18,7 @@ public:
 
     bool isEmpty() const { return m_elements.empty(); }
     int size() const { return m_elements.size(); }
-    QList<T *> elements() const { return m_elements; }
+    const QList<T *> elements() const { return m_elements; }
     void setElements(const QList<T *> &elements) { m_elements = elements; }
     void clear() { m_elements.clear(); }
     void append(T *element) { m_elements.append(element); }
diff --git a/src/libs/modelinglib/qmt/controller/selection.h b/src/libs/modelinglib/qmt/controller/selection.h
index d14cb95bf8..16b88882c1 100644
--- a/src/libs/modelinglib/qmt/controller/selection.h
+++ b/src/libs/modelinglib/qmt/controller/selection.h
@@ -36,7 +36,7 @@ public:
     ~Selection();
 
     bool isEmpty() const { return m_indices.isEmpty(); }
-    QList<Index> indices() const { return m_indices; }
+    const QList<Index> indices() const { return m_indices; }
     void setIndices(const QList<Index> &indices);
 
     void clear();
diff --git a/src/libs/modelinglib/qmt/diagram/dclass.h b/src/libs/modelinglib/qmt/diagram/dclass.h
index 5c0bdf86ad..380896b232 100644
--- a/src/libs/modelinglib/qmt/diagram/dclass.h
+++ b/src/libs/modelinglib/qmt/diagram/dclass.h
@@ -24,9 +24,9 @@ public:
 
     QString umlNamespace() const { return m_umlNamespace; }
     void setUmlNamespace(const QString &umlNamespace);
-    QList<QString> templateParameters() const { return m_templateParameters; }
+    const QList<QString> templateParameters() const { return m_templateParameters; }
     void setTemplateParameters(const QList<QString> &templateParameters);
-    QList<MClassMember> members() const { return m_members; }
+    const QList<MClassMember> members() const { return m_members; }
     void setMembers(const QList<MClassMember> &members);
     QSet<Uid> visibleMembers() const { return m_visibleMembers; }
     void setVisibleMembers(const QSet<Uid> &visibleMembers);
diff --git a/src/libs/modelinglib/qmt/diagram/drelation.h b/src/libs/modelinglib/qmt/diagram/drelation.h
index 93ce975d47..9e59f59f24 100644
--- a/src/libs/modelinglib/qmt/diagram/drelation.h
+++ b/src/libs/modelinglib/qmt/diagram/drelation.h
@@ -40,7 +40,7 @@ public:
     void setEndBUid(const Uid &uid);
     QString name() const { return m_name; }
     void setName(const QString &name);
-    QList<IntermediatePoint> intermediatePoints() const { return m_intermediatePoints; }
+    const QList<IntermediatePoint> intermediatePoints() const { return m_intermediatePoints; }
     void setIntermediatePoints(const QList<IntermediatePoint> &intermediatePoints);
 
     void accept(DVisitor *visitor) override;
diff --git a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h
index dc4054ffde..d2625abed9 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h
+++ b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h
@@ -65,7 +65,7 @@ public:
     void setModelController(ModelController *modelController);
     UndoController *undoController() const { return m_undoController; }
     void setUndoController(UndoController *undoController);
-    QList<MDiagram *> allDiagrams() const { return m_allDiagrams; }
+    const QList<MDiagram *> allDiagrams() const { return m_allDiagrams; }
 
 private:
     MDiagram *findDiagram(const Uid &diagramKey) const;
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
index a7c3aa9857..1d4f03a842 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
@@ -135,7 +135,7 @@ void DUpdateVisitor::visitMRelation(const MRelation *relation)
         (void) isUpdating(true);
         endAObject = nullptr;
         // TODO use DiagramController::findDelegate
-        foreach (DElement *diagramElement, m_diagram->diagramElements()) {
+        for (DElement *diagramElement : m_diagram->diagramElements()) {
             if (diagramElement->modelUid().isValid() && diagramElement->modelUid() == relation->endAUid()) {
                 endAObject = dynamic_cast<DObject *>(diagramElement);
                 break;
@@ -151,7 +151,7 @@ void DUpdateVisitor::visitMRelation(const MRelation *relation)
         (void) isUpdating(true);
         endBObject = nullptr;
         // TODO use DiagramController::findDelegate
-        foreach (DElement *diagramElement, m_diagram->diagramElements()) {
+        for (DElement *diagramElement : m_diagram->diagramElements()) {
             if (diagramElement->modelUid().isValid() && diagramElement->modelUid() == relation->endBUid()) {
                 endBObject = dynamic_cast<DObject *>(diagramElement);
                 break;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
index 5fce369752..73e8cfdb62 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
@@ -83,12 +83,12 @@ public:
     DObject *findTopmostObject(const QPointF &scenePos) const;
     ObjectItem *findTopmostObjectItem(const QPointF &scenePos) const;
 
-    QList<QGraphicsItem *> graphicsItems() const { return m_graphicsItems; }
+    const QList<QGraphicsItem *> graphicsItems() const { return m_graphicsItems; }
     QGraphicsItem *graphicsItem(DElement *element) const;
     QGraphicsItem *graphicsItem(const Uid &uid) const;
     QGraphicsItem *focusItem() const { return m_focusItem; }
     bool isSelectedItem(QGraphicsItem *item) const;
-    QSet<QGraphicsItem *> selectedItems() const { return m_selectedItems; }
+    const QSet<QGraphicsItem *> selectedItems() const { return m_selectedItems; }
     DElement *element(QGraphicsItem *item) const;
     bool isElementEditable(const DElement *element) const;
     bool isInFrontOf(const QGraphicsItem *frontItem, const QGraphicsItem *backItem);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
index 8d6ccf4311..e71aca8414 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
@@ -145,7 +145,7 @@ void DiagramSceneModel::UpdateVisitor::visitDObject(DObject *object)
 {
     if (!m_relatedElement) {
         // update all related relations
-        foreach (QGraphicsItem *item, m_diagramSceneModel->m_graphicsItems) {
+        for (QGraphicsItem *item : std::as_const(m_diagramSceneModel->m_graphicsItems)) {
             DElement *element = m_diagramSceneModel->m_itemToElementMap.value(item);
             QMT_CHECK(element);
             if (dynamic_cast<DRelation *>(element)) {
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
index 1d250256d0..974a396e02 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
@@ -403,7 +403,7 @@ QString ClassItem::buildDisplayName() const
         name = object()->name();
         name += QLatin1Char('<');
         bool first = true;
-        foreach (const QString &p, diagramClass->templateParameters()) {
+        for (const QString &p : diagramClass->templateParameters()) {
             if (!first)
                 name += QLatin1Char(',');
             name += p;
@@ -746,7 +746,7 @@ void ClassItem::updateMembers(const Style *style)
     auto dclass = dynamic_cast<DClass *>(object());
     QMT_ASSERT(dclass, return);
 
-    foreach (const MClassMember &member, dclass->members()) {
+    for (const MClassMember &member : dclass->members()) {
         switch (member.memberType()) {
         case MClassMember::MemberUndefined:
             QMT_ASSERT(false, return);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
index af2627cefd..938901e028 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
@@ -704,10 +704,10 @@ void ObjectItem::updateRelationStarter()
             else
                 elementType = m_elementType;
             StereotypeController *stereotypeController = diagramSceneModel()->stereotypeController();
-            QList<Toolbar> toolbars = stereotypeController->findToolbars(elementType);
+            const QList<Toolbar> toolbars = stereotypeController->findToolbars(elementType);
             if (!toolbars.isEmpty()) {
-                foreach (const Toolbar &toolbar, toolbars) {
-                    foreach (const Toolbar::Tool &tool, toolbar.tools()) {
+                for (const Toolbar &toolbar : toolbars) {
+                    for (const Toolbar::Tool &tool : toolbar.tools()) {
                         CustomRelation customRelation =
                                 stereotypeController->findCustomRelation(tool.m_elementType);
                         if (!customRelation.isNull())
@@ -836,13 +836,15 @@ void ObjectItem::updateAlignmentButtonsGeometry(const QRectF &objectRect)
     if (m_horizontalAlignButtons) {
         m_horizontalAlignButtons->clear();
         m_horizontalAlignButtons->setPos(mapToScene(QPointF(0.0, objectRect.top() - AlignButtonsItem::NormalButtonHeight - AlignButtonsItem::VerticalDistanceToObejct)));
-        foreach (const ILatchable::Latch &latch, horizontalLatches(ILatchable::Move, true))
+        const QList<ILatchable::Latch> latches = horizontalLatches(ILatchable::Move, true);
+        for (const ILatchable::Latch &latch : latches)
             m_horizontalAlignButtons->addButton(translateLatchTypeToAlignType(latch.m_latchType), latch.m_identifier, mapFromScene(QPointF(latch.m_pos, 0.0)).x());
     }
     if (m_verticalAlignButtons) {
         m_verticalAlignButtons->clear();
         m_verticalAlignButtons->setPos(mapToScene(QPointF(objectRect.left() - AlignButtonsItem::NormalButtonWidth - AlignButtonsItem::HorizontalDistanceToObject, 0.0)));
-        foreach (const ILatchable::Latch &latch, verticalLatches(ILatchable::Move, true))
+        const QList<ILatchable::Latch> latches = verticalLatches(ILatchable::Move, true);
+        for (const ILatchable::Latch &latch : latches)
             m_verticalAlignButtons->addButton(translateLatchTypeToAlignType(latch.m_latchType), latch.m_identifier, mapFromScene(QPointF(0.0, latch.m_pos)).y());
     }
 }
@@ -879,7 +881,9 @@ IAlignable::AlignType ObjectItem::translateLatchTypeToAlignType(ILatchable::Latc
 const Style *ObjectItem::adaptedStyle(const QString &stereotypeIconId)
 {
     QList<const DObject *> collidingObjects;
-    foreach (const QGraphicsItem *item, m_diagramSceneModel->collectCollidingObjectItems(this, DiagramSceneModel::CollidingItems)) {
+    const QList<QGraphicsItem *> items
+        = m_diagramSceneModel->collectCollidingObjectItems(this, DiagramSceneModel::CollidingItems);
+    for (const QGraphicsItem *item : items) {
         if (auto objectItem = dynamic_cast<const ObjectItem *>(item))
             collidingObjects.append(objectItem->object());
     }
@@ -909,7 +913,9 @@ bool ObjectItem::showContext() const
         QMT_ASSERT(mobject, return false);
         MObject *owner = mobject->owner();
         if (owner) {
-            foreach (QGraphicsItem *item, m_diagramSceneModel->collectCollidingObjectItems(this, DiagramSceneModel::CollidingOuterItems)) {
+            const QList<QGraphicsItem *> items = m_diagramSceneModel->collectCollidingObjectItems(
+                this, DiagramSceneModel::CollidingOuterItems);
+            for (QGraphicsItem *item : items) {
                 if (auto objectItem = dynamic_cast<ObjectItem *>(item)) {
                     if (objectItem->object()->modelUid().isValid() && objectItem->object()->modelUid() == owner->uid()) {
                         showContext = false;
@@ -1078,7 +1084,7 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 QSizeF ObjectItem::minimumSize(const QSet<QGraphicsItem *> &items) const
 {
     QSizeF minimumSize(0.0, 0.0);
-    foreach (QGraphicsItem *item, items) {
+    for (QGraphicsItem *item : items) {
         if (auto resizable = dynamic_cast<IResizable *>(item)) {
             QSizeF size = resizable->minimumSize();
             if (size.width() > minimumSize.width())
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
index 72c3debd00..eeb69cb08a 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
@@ -249,7 +249,7 @@ void RelationItem::moveDelta(const QPointF &delta)
 {
     m_diagramSceneModel->diagramController()->startUpdateElement(m_relation, m_diagramSceneModel->diagram(), DiagramController::UpdateGeometry);
     QList<DRelation::IntermediatePoint> points;
-    foreach (const DRelation::IntermediatePoint &point, m_relation->intermediatePoints())
+    for (const DRelation::IntermediatePoint &point : m_relation->intermediatePoints())
         points << DRelation::IntermediatePoint(point.pos() + delta);
     m_relation->setIntermediatePoints(points);
     m_diagramSceneModel->diagramController()->finishUpdateElement(m_relation, m_diagramSceneModel->diagram(), false);
@@ -259,7 +259,7 @@ void RelationItem::alignItemPositionToRaster(double rasterWidth, double rasterHe
 {
     m_diagramSceneModel->diagramController()->startUpdateElement(m_relation, m_diagramSceneModel->diagram(), DiagramController::UpdateGeometry);
     QList<DRelation::IntermediatePoint> points;
-    foreach (const DRelation::IntermediatePoint &point, m_relation->intermediatePoints()) {
+    for (const DRelation::IntermediatePoint &point : m_relation->intermediatePoints()) {
         QPointF pos = point.pos();
         double x = qRound(pos.x() / rasterWidth) * rasterWidth;
         double y = qRound(pos.y() / rasterHeight) * rasterHeight;
@@ -440,7 +440,7 @@ void RelationItem::update(const Style *style)
 
     QList<QPointF> points;
     points << (endAPos - endAPos);
-    foreach (const DRelation::IntermediatePoint &point, m_relation->intermediatePoints())
+    for (const DRelation::IntermediatePoint &point : m_relation->intermediatePoints())
         points << (point.pos() - endAPos);
     points << (endBPos - endAPos);
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp
index d43f93b9ac..df441fe627 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp
@@ -119,8 +119,8 @@ void LatchController::handleLatches()
     if (horizAction != ILatchable::Move || vertAction != ILatchable::Move)
         return;
 
-    QList<ILatchable::Latch> palpedHorizontals = palpedLatchable->horizontalLatches(horizAction, true);
-    QList<ILatchable::Latch> palpedVerticals = palpedLatchable->verticalLatches(vertAction, true);
+    const QList<ILatchable::Latch> palpedHorizontals = palpedLatchable->horizontalLatches(horizAction, true);
+    const QList<ILatchable::Latch> palpedVerticals = palpedLatchable->verticalLatches(vertAction, true);
 
     qreal horizMinDist = 10.0;
     ILatchable::Latch bestHorizLatch;
@@ -129,12 +129,12 @@ void LatchController::handleLatches()
     ILatchable::Latch bestVertLatch;
     bool foundBestVert = false;
 
-    foreach (QGraphicsItem *item, m_diagramSceneModel->graphicsItems()) {
+    for (QGraphicsItem *item : m_diagramSceneModel->graphicsItems()) {
         if (item != m_diagramSceneModel->focusItem() && !m_diagramSceneModel->isSelectedItem(item)) {
             if (auto latchable = dynamic_cast<ILatchable *>(item)) {
-                QList<ILatchable::Latch> horizontals = latchable->horizontalLatches(horizAction, false);
-                foreach (const ILatchable::Latch &palpedLatch, palpedHorizontals) {
-                    foreach (const ILatchable::Latch &latch, horizontals) {
+                const QList<ILatchable::Latch> horizontals = latchable->horizontalLatches(horizAction, false);
+                for (const ILatchable::Latch &palpedLatch : palpedHorizontals) {
+                    for (const ILatchable::Latch &latch : horizontals) {
                         if (palpedLatch.m_latchType == latch.m_latchType) {
                             // calculate distance and minimal distance with sign
                             // because this is needed later to move the objects
@@ -147,9 +147,9 @@ void LatchController::handleLatches()
                         }
                     }
                 }
-                QList<ILatchable::Latch> verticals = latchable->verticalLatches(vertAction, false);
-                foreach (const ILatchable::Latch &palpedLatch, palpedVerticals) {
-                    foreach (const ILatchable::Latch &latch, verticals) {
+                const QList<ILatchable::Latch> verticals = latchable->verticalLatches(vertAction, false);
+                for (const ILatchable::Latch &palpedLatch : palpedVerticals) {
+                    for (const ILatchable::Latch &latch : verticals) {
                         if (palpedLatch.m_latchType == latch.m_latchType) {
                             // calculate distance and minimal distance with sign
                             // because this is needed later to move the objects
@@ -227,7 +227,7 @@ void LatchController::applyLatches()
         case ILatchable::Left:
         case ILatchable::Right:
         case ILatchable::Hcenter:
-            foreach (QGraphicsItem *item, m_diagramSceneModel->selectedItems()) {
+            for (QGraphicsItem *item : m_diagramSceneModel->selectedItems()) {
                 DElement *element = m_diagramSceneModel->element(item);
                 if (auto selectedObject = dynamic_cast<DObject *>(element)) {
                     m_diagramSceneModel->diagramController()->startUpdateElement(selectedObject, m_diagramSceneModel->diagram(), DiagramController::UpdateGeometry);
@@ -252,7 +252,7 @@ void LatchController::applyLatches()
         case ILatchable::Top:
         case ILatchable::Bottom:
         case ILatchable::Vcenter:
-            foreach (QGraphicsItem *item, m_diagramSceneModel->selectedItems()) {
+            for (QGraphicsItem *item : m_diagramSceneModel->selectedItems()) {
                 DElement *element = m_diagramSceneModel->element(item);
                 if (auto selectedObject = dynamic_cast<DObject *>(element)) {
                     m_diagramSceneModel->diagramController()->startUpdateElement(selectedObject, m_diagramSceneModel->diagram(), DiagramController::UpdateGeometry);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
index 04af99ff41..64aed9e44f 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
@@ -153,7 +153,7 @@ QPainterPath PathSelectionItem::shape() const
 {
     QPainterPath shape;
     shape.setFillRule(Qt::WindingFill);
-    foreach (const GraphicsHandleItem *handle, m_handles)
+    for (const GraphicsHandleItem *handle : m_handles)
         shape.addPath(handle->shape());
     // TODO duplicate of ArrowItem::GraphicsShaftItem's shape
     QPolygonF polygon;
@@ -179,7 +179,7 @@ void PathSelectionItem::setPointSize(const QSizeF &size)
 QList<QPointF> PathSelectionItem::points() const
 {
     QList<QPointF> points;
-    foreach (GraphicsHandleItem *handle, m_handles)
+    for (GraphicsHandleItem *handle : m_handles)
         points.append(handle->pos());
     return points;
 }
@@ -195,7 +195,7 @@ void PathSelectionItem::setPoints(const QList<QPointF> &points)
         m_handles.removeLast();
     }
     int pointIndex = 0;
-    foreach (const QPointF &point, points) {
+    for (const QPointF &point : std::as_const(points)) {
         GraphicsHandleItem *handle;
         if (focusEndBItem && pointIndex == points.size() - 1) {
             handle = focusEndBItem;
@@ -254,7 +254,7 @@ void PathSelectionItem::update()
 {
     prepareGeometryChange();
     int i = 0;
-    foreach (GraphicsHandleItem *handle, m_handles) {
+    for (GraphicsHandleItem *handle : std::as_const(m_handles)) {
         handle->setPointSize(m_pointSize);
         handle->setSelection(m_isSecondarySelected
                              ? (isEndHandle(i) ? GraphicsHandleItem::NotSelected : GraphicsHandleItem::SecondarySelected)
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
index 2ac6aae847..2716367c28 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
@@ -72,7 +72,7 @@ void RelationStarter::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     if (m_currentPreviewArrow)
         return;
-    foreach (ArrowItem *item, m_arrows) {
+    for (ArrowItem *item : std::as_const(m_arrows)) {
         if (item->boundingRect().contains(mapToItem(item, event->pos()))) {
             prepareGeometryChange();
             m_currentPreviewArrowIntermediatePoints.clear();
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.cpp
index 9d042ec58a..e6416db84a 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.cpp
@@ -25,7 +25,7 @@ QString StereotypesItem::format(const QList<QString> &stereotypes)
     if (!stereotypes.isEmpty()) {
         text = QString::fromUtf8("«");
         bool first = true;
-        foreach (const QString &stereotype, stereotypes) {
+        for (const QString &stereotype : stereotypes) {
             if (!first)
                 text += ", ";
             text += stereotype;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.cpp
index fcf19640a2..81eb9cbaf1 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.cpp
@@ -55,7 +55,7 @@ void TemplateParameterBox::updateText()
 {
     QString templateText;
     bool first = true;
-    foreach (const QString &parameter, m_templateParameters) {
+    for (const QString &parameter : std::as_const(m_templateParameters)) {
         if (!first) {
             if (m_breakLines)
                 templateText += QLatin1Char('\n');