Qt Designer: Introduce more range-based for loops

Complements a5fda7eecc3ce4c0b0125224ac20ea8880c6450c.

Change-Id: I01c4975c2aa9f4c4b4975dde5cc9f4f816caa0d7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 6bb016e881afddea4d256a65e9008ce0e1b87001)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

39 files changed, 242 insertions, 340 deletions

diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.cpp b/src/designer/src/components/formeditor/deviceprofiledialog.cpp
index 1a21712f7..8e77b9ba3 100644
--- a/src/designer/src/components/formeditor/deviceprofiledialog.cpp
+++ b/src/designer/src/components/formeditor/deviceprofiledialog.cpp
@@ -59,9 +59,8 @@ DeviceProfileDialog::DeviceProfileDialog(QDesignerDialogGuiInterface *dlgGui, QW
     // Styles
     const QStringList styles = QStyleFactory::keys();
     m_ui->m_styleCombo->addItem(tr("Default"), QVariant(QString()));
-    const QStringList::const_iterator cend = styles.constEnd();
-    for (QStringList::const_iterator it = styles.constBegin(); it != cend; ++it)
-         m_ui->m_styleCombo->addItem(*it, *it);
+    for (const auto &s : styles)
+         m_ui->m_styleCombo->addItem(s, s);
 
     connect(m_ui->m_nameLineEdit, &QLineEdit::textChanged, this, &DeviceProfileDialog::nameChanged);
     connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.cpp b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
index 4ad88a848..d89b09d0d 100644
--- a/src/designer/src/components/formeditor/embeddedoptionspage.cpp
+++ b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
@@ -150,9 +150,8 @@ void EmbeddedOptionsControlPrivate::init(EmbeddedOptionsControl *q)
 QStringList EmbeddedOptionsControlPrivate::existingProfileNames() const
 {
     QStringList rc;
-    const DeviceProfileList::const_iterator dcend = m_sortedProfiles.constEnd();
-    for (DeviceProfileList::const_iterator it = m_sortedProfiles.constBegin(); it != dcend; ++it)
-        rc.push_back(it->name());
+    for (const auto &dp : m_sortedProfiles)
+        rc.append(dp.name());
     return rc;
 }
 
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index b85011508..2544bb8b8 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -179,9 +179,9 @@ WidgetSelection *FormWindow::Selection::addWidget(FormWindow* fw, QWidget *w)
         return rc;
     }
     // find a free one in the pool
-    for (auto it = m_selectionPool.constBegin(), pend = m_selectionPool.constEnd(); it != pend; ++it) {
-        if (! (*it)->isUsed()) {
-            rc = *it;
+    for (auto *s : std::as_const(m_selectionPool)) {
+        if (!s->isUsed()) {
+            rc = s;
             break;
         }
     }
@@ -924,13 +924,9 @@ bool FormWindow::isMainContainer(const QWidget *w) const
 void FormWindow::updateChildSelections(QWidget *w)
 {
     const QWidgetList l = w->findChildren<QWidget*>();
-    if (!l.isEmpty()) {
-        const QWidgetList::const_iterator lcend = l.constEnd();
-        for (QWidgetList::const_iterator it = l.constBegin(); it != lcend; ++it) {
-            QWidget *w = *it;
-            if (isManaged(w))
-                updateSelection(w);
-        }
+    for (auto *w : l) {
+        if (isManaged(w))
+            updateSelection(w);
     }
 }
 
@@ -1790,9 +1786,8 @@ static void positionPastedWidgetsAtMousePosition(FormWindow *fw, const QPoint &c
         cursorPos = grid.snapPoint(QPoint(0, 0));
     // Determine area of pasted widgets
     QRect pasteArea;
-    const QWidgetList::const_iterator lcend = l.constEnd();
-    for (QWidgetList::const_iterator it = l.constBegin(); it != lcend; ++it)
-        pasteArea =pasteArea.isNull() ? (*it)->geometry() : pasteArea.united((*it)->geometry());
+    for (auto *w : l)
+        pasteArea = pasteArea.isNull() ? w->geometry() : pasteArea.united(w->geometry());
 
     // Mouse on some child? (try to position bottomRight on a free spot to
     // get the stacked-offset effect of Designer 4.3, that is, offset by grid if Ctrl-V is pressed continuously
@@ -1804,8 +1799,8 @@ static void positionPastedWidgetsAtMousePosition(FormWindow *fw, const QPoint &c
     } while (true);
     // Move.
     const QPoint offset = cursorPos - pasteArea.topLeft();
-    for (QWidgetList::const_iterator it = l.constBegin(); it != lcend; ++it)
-        (*it)->move((*it)->pos() + offset);
+    for (auto *w : l)
+        w->move(w->pos() + offset);
 }
 
 void FormWindow::paste(PasteMode pasteMode)
@@ -1983,15 +1978,14 @@ void FormWindow::breakLayout(QWidget *w)
     // Find the first-order managed child widgets
     QWidgetList widgets;
 
-    const QObjectList children = w->children();
-    const QObjectList::const_iterator cend = children.constEnd();
     const QDesignerMetaDataBaseInterface *mdb = core()->metaDataBase();
-    for (QObjectList::const_iterator it =  children.constBegin(); it != cend; ++it)
-        if ( (*it)->isWidgetType())  {
-            QWidget *w = static_cast<QWidget*>(*it);
+    for (auto *o : w->children()) {
+        if (o->isWidgetType())  {
+            auto *w = static_cast<QWidget*>(o);
             if (mdb->item(w))
                 widgets.push_back(w);
         }
+    }
 
     BreakLayoutCommand *cmd = new BreakLayoutCommand(this);
     cmd->init(widgets, w);
@@ -2175,16 +2169,15 @@ void FormWindow::layoutContainer(QWidget *w, int type)
 
     w = core()->widgetFactory()->containerOfWidget(w);
 
-    const QObjectList l = w->children();
     // find managed widget children
     QWidgetList widgets;
-    const QObjectList::const_iterator ocend = l.constEnd();
-    for (QObjectList::const_iterator it = l.constBegin(); it != ocend; ++it)
-        if ( (*it)->isWidgetType() ) {
-            QWidget *widget = static_cast<QWidget*>(*it);
+    for (auto *o : w->children()) {
+        if (o->isWidgetType() ) {
+            auto *widget = static_cast<QWidget*>(o);
             if (widget->isVisibleTo(this) && isManaged(widget))
                 widgets.append(widget);
         }
+    }
 
     if (widgets.isEmpty()) // QTBUG-50563, observed when using hand-edited forms.
         return;
@@ -2413,9 +2406,7 @@ void FormWindow::simplifySelection(QWidgetList *sel) const
     }
     QWidgetList toBeRemoved;
     toBeRemoved.reserve(sel->size());
-    const QWidgetList::const_iterator scend = sel->constEnd();
-    for (QWidgetList::const_iterator it = sel->constBegin(); it != scend; ++it) {
-        QWidget *child = *it;
+    for (auto *child : std::as_const(*sel)) {
         for (QWidget *w = child; true ; ) { // Is any of the parents also selected?
             QWidget *parent = w->parentWidget();
             if (!parent || parent == mainC)
@@ -2429,11 +2420,8 @@ void FormWindow::simplifySelection(QWidgetList *sel) const
     }
     // Now we can actually remove the widgets that were marked
     // for removal in the previous pass.
-    if (!toBeRemoved.isEmpty()) {
-        const QWidgetList::const_iterator rcend = toBeRemoved.constEnd();
-        for (QWidgetList::const_iterator it = toBeRemoved.constBegin(); it != rcend; ++it)
-            sel->removeAll(*it);
-    }
+    for (auto *r : std::as_const(toBeRemoved))
+        sel->removeAll(r);
 }
 
 FormWindow *FormWindow::findFormWindow(QWidget *w)
diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp
index 2bdbf4b3c..ccb7473d2 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.cpp
+++ b/src/designer/src/components/formeditor/formwindowmanager.cpp
@@ -816,12 +816,11 @@ void FormWindowManager::slotUpdateActions()
             simplifiedSelection.append(mainContainer);
 
         // Always count the main container as unlaid-out
-        const QWidgetList::const_iterator cend = simplifiedSelection.constEnd();
-        for (QWidgetList::const_iterator it = simplifiedSelection.constBegin(); it != cend; ++it) {
-            if (*it == mainContainer || !LayoutInfo::isWidgetLaidout(m_core, *it))
+        for (auto *w : std::as_const(simplifiedSelection)) {
+            if (w == mainContainer || !LayoutInfo::isWidgetLaidout(m_core, w))
                 ++unlaidoutWidgetCount;
 
-            if (qobject_cast<const QLayoutWidget *>(*it) || qobject_cast<const Spacer *>(*it))
+            if (qobject_cast<const QLayoutWidget *>(w) || qobject_cast<const Spacer *>(w))
                 canChangeZOrder = false;
         }
 
diff --git a/src/designer/src/components/formeditor/previewactiongroup.cpp b/src/designer/src/components/formeditor/previewactiongroup.cpp
index 3f2d2a590..5d914d455 100644
--- a/src/designer/src/components/formeditor/previewactiongroup.cpp
+++ b/src/designer/src/components/formeditor/previewactiongroup.cpp
@@ -49,17 +49,16 @@ PreviewActionGroup::PreviewActionGroup(QDesignerFormEditorInterface *core, QObje
 
     // Add style actions
     const QStringList styles = QStyleFactory::keys();
-    const QStringList::const_iterator cend = styles.constEnd();
     // Make sure ObjectName  is unique in case toolbar solution is used.
     objNamePrefix = QStringLiteral("__qt_designer_style_");
     // Create styles. Set style name string as action data.
-    for (QStringList::const_iterator it = styles.constBegin(); it !=  cend ;++it) {
-        QAction *a = new QAction(tr("%1 Style").arg(*it), this);
+    for (const auto &s : styles) {
+        QAction *a = new QAction(tr("%1 Style").arg(s), this);
         QString objName = objNamePrefix;
-        objName += *it;
+        objName += s;
         objName += objNamePostfix;
         a->setObjectName(objName);
-        a->setData(*it);
+        a->setData(s);
         addAction(a);
     }
 }
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index 4b1d7567d..c04c39bec 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -640,11 +640,10 @@ QWidget *QDesignerResource::create(DomUI *ui, QWidget *parentWidget)
         QVariantMap designerFormData;
         if (ui->hasElementDesignerdata()) {
             const DomPropertyList domPropertyList = ui->elementDesignerdata()->elementProperty();
-            const DomPropertyList::const_iterator cend = domPropertyList.constEnd();
-            for (DomPropertyList::const_iterator it = domPropertyList.constBegin(); it != cend; ++it) {
-                const QVariant vprop = domPropertyToVariant(this, mainWidget->metaObject(), *it);
+            for (auto *prop : domPropertyList) {
+                const QVariant vprop = domPropertyToVariant(this, mainWidget->metaObject(), prop);
                 if (vprop.metaType().id() != QMetaType::UnknownType)
-                    designerFormData.insert((*it)->attributeName(), vprop);
+                    designerFormData.insert(prop->attributeName(), vprop);
             }
         }
         m_formWindow->setFormData(designerFormData);
@@ -683,13 +682,10 @@ QWidget *QDesignerResource::create(DomUI *ui, QWidget *parentWidget)
 
         // Register all button groups the form builder adds as children of the main container for them to be found
         // in the signal slot editor
-        const QObjectList mchildren = mainWidget->children();
-        if (!mchildren.isEmpty()) {
-            QDesignerMetaDataBaseInterface *mdb = core()->metaDataBase();
-            const QObjectList::const_iterator cend = mchildren.constEnd();
-            for (QObjectList::const_iterator it = mchildren.constBegin(); it != cend; ++it)
-                if (QButtonGroup *bg = qobject_cast<QButtonGroup*>(*it))
-                    mdb->add(bg);
+        auto *mdb = core()->metaDataBase();
+        for (auto *child : mainWidget->children()) {
+            if (QButtonGroup *bg = qobject_cast<QButtonGroup*>(child))
+                mdb->add(bg);
         }
         // Load tools
         for (int index = 0; index < m_formWindow->toolCount(); ++index) {
@@ -2211,15 +2207,14 @@ void QDesignerResource::applyAttributesToPropertySheet(const DomWidget *ui_widge
     if (attributes.isEmpty())
         return;
     QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(m_formWindow->core()->extensionManager(), widget);
-    const DomPropertyList::const_iterator acend = attributes.constEnd();
-    for (DomPropertyList::const_iterator it = attributes.constBegin(); it != acend; ++it) {
-        const QString name = (*it)->attributeName();
+    for (auto *prop : attributes) {
+        const QString name = prop->attributeName();
         const int index = sheet->indexOf(name);
         if (index == -1) {
             const QString msg = QString::fromUtf8("Unable to apply attributive property '%1' to '%2'. It does not exist.").arg(name, widget->objectName());
             designerWarning(msg);
         } else {
-            sheet->setProperty(index, domPropertyToVariant(this, widget->metaObject(), *it));
+            sheet->setProperty(index, domPropertyToVariant(this, widget->metaObject(), prop));
             sheet->setChanged(index, true);
         }
     }
diff --git a/src/designer/src/components/formeditor/templateoptionspage.cpp b/src/designer/src/components/formeditor/templateoptionspage.cpp
index b2ba95803..efd089c84 100644
--- a/src/designer/src/components/formeditor/templateoptionspage.cpp
+++ b/src/designer/src/components/formeditor/templateoptionspage.cpp
@@ -58,9 +58,8 @@ void TemplateOptionsWidget::setTemplatePaths(const QStringList &l)
         // disable button
         templatePathSelectionChanged();
     } else {
-        const QStringList::const_iterator cend = l.constEnd();
-        for (QStringList::const_iterator it = l.constBegin(); it != cend; ++it)
-            m_ui->m_templatePathListWidget->addItem(*it);
+        for (const auto &s : l)
+            m_ui->m_templatePathListWidget->addItem(s);
         m_ui->m_templatePathListWidget->setCurrentItem(m_ui->m_templatePathListWidget->item(0));
     }
 }
diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp
index 224763be3..159bf7c32 100644
--- a/src/designer/src/components/objectinspector/objectinspector.cpp
+++ b/src/designer/src/components/objectinspector/objectinspector.cpp
@@ -429,12 +429,12 @@ void ObjectInspector::ObjectInspectorPrivate::selectIndexRange(const QModelIndex
         selectFlags |= QItemSelectionModel::Current;
 
     QItemSelectionModel *selectionModel = m_treeView->selectionModel();
-    const QModelIndexList::const_iterator cend = indexes.constEnd();
-    for (QModelIndexList::const_iterator it = indexes.constBegin(); it != cend; ++it)
-        if (it->column() == 0) {
-            selectionModel->select(*it, selectFlags);
+    for (const auto &mi : indexes) {
+        if (mi.column() == 0) {
+            selectionModel->select(mi, selectFlags);
             selectFlags &= ~(QItemSelectionModel::Clear|QItemSelectionModel::Current);
         }
+    }
     if (flags & MakeCurrent)
         m_treeView->scrollTo(indexes.constFirst(), QAbstractItemView::EnsureVisible);
 }
@@ -571,10 +571,10 @@ QObjectList ObjectInspector::ObjectInspectorPrivate::indexesToObjects(const QMod
     if (indexes.isEmpty())
         return rc;
     rc.reserve(indexes.size());
-    const QModelIndexList::const_iterator icend = indexes.constEnd();
-    for (QModelIndexList::const_iterator it = indexes.constBegin(); it != icend; ++it)
-        if (it->column() == 0)
-            rc.append(objectAt(*it));
+    for (const auto &mi : indexes) {
+        if (mi.column() == 0)
+            rc.append(objectAt(mi));
+    }
     return rc;
 }
 
@@ -584,9 +584,8 @@ bool ObjectInspector::ObjectInspectorPrivate::checkManagedWidgetSelection(const
 {
     bool isManagedWidgetSelection = false;
     QItemSelectionModel *selectionModel = m_treeView->selectionModel();
-    const QModelIndexList::const_iterator cscend = rowSelection.constEnd();
-    for (QModelIndexList::const_iterator it = rowSelection.constBegin(); it != cscend; ++it) {
-        QObject *object = objectAt(*it);
+    for (const auto &mi : rowSelection) {
+        QObject *object = objectAt(mi);
         if (selectionType(m_formWindow, object) == ManagedWidgetSelection) {
             isManagedWidgetSelection = true;
             break;
@@ -597,10 +596,10 @@ bool ObjectInspector::ObjectInspectorPrivate::checkManagedWidgetSelection(const
         return false;
     // Need to unselect unmanaged ones
     const bool blocked = selectionModel->blockSignals(true);
-    for (QModelIndexList::const_iterator it = rowSelection.constBegin(); it != cscend; ++it) {
-        QObject *object = objectAt(*it);
+    for (const auto &mi : rowSelection) {
+        QObject *object = objectAt(mi);
         if (selectionType(m_formWindow, object) != ManagedWidgetSelection)
-            selectionModel->select(*it, QItemSelectionModel::Deselect|QItemSelectionModel::Rows);
+            selectionModel->select(mi, QItemSelectionModel::Deselect|QItemSelectionModel::Rows);
     }
     selectionModel->blockSignals(blocked);
     return true;
diff --git a/src/designer/src/components/taskmenu/button_taskmenu.cpp b/src/designer/src/components/taskmenu/button_taskmenu.cpp
index 0ba876548..96aac5263 100644
--- a/src/designer/src/components/taskmenu/button_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/button_taskmenu.cpp
@@ -86,18 +86,16 @@ void ButtonGroupCommand::addButtonsToGroup()
 {
     if (debugButtonMenu)
         qDebug() << "Adding " << m_buttonList << " to " << m_buttonGroup;
-    const ButtonList::const_iterator cend = m_buttonList.constEnd();
-    for (ButtonList::const_iterator it = m_buttonList.constBegin(); it != cend; ++it)
-        m_buttonGroup->addButton(*it);
+    for (auto *b : std::as_const(m_buttonList))
+        m_buttonGroup->addButton(b);
 }
 
 void ButtonGroupCommand::removeButtonsFromGroup()
 {
     if (debugButtonMenu)
         qDebug() << "Removing " << m_buttonList << " from " << m_buttonGroup;
-    const ButtonList::const_iterator cend = m_buttonList.constEnd();
-    for (ButtonList::const_iterator it = m_buttonList.constBegin(); it != cend; ++it)
-        m_buttonGroup->removeButton(*it);
+    for (auto *b : std::as_const(m_buttonList))
+        m_buttonGroup->removeButton(b);
 }
 
 void ButtonGroupCommand::createButtonGroup()
@@ -123,9 +121,8 @@ void ButtonGroupCommand::breakButtonGroup()
     // Button group was selected, that is, break was invoked via its context menu. Remove it from property editor, select the buttons
     if (core->propertyEditor()->object() == m_buttonGroup) {
         fw->clearSelection(false);
-        const ButtonList::const_iterator cend = m_buttonList.constEnd();
-        for (ButtonList::const_iterator it = m_buttonList.constBegin(); it != cend; ++it)
-            fw->selectWidget(*it, true);
+        for (auto *b : std::as_const(m_buttonList))
+            fw->selectWidget(b, true);
     }
     // Now remove and refresh object inspector
     removeButtonsFromGroup();
@@ -157,13 +154,13 @@ ButtonGroupList ButtonGroupCommand::managedButtonGroups(const QDesignerFormWindo
     const QDesignerMetaDataBaseInterface *mdb = formWindow->core()->metaDataBase();
     ButtonGroupList bl;
     // Check 1st order children for managed button groups
-    const QObjectList children = formWindow->mainContainer()->children();
-    const QObjectList::const_iterator cend =  children.constEnd();
-    for (QObjectList::const_iterator it =  children.constBegin(); it != cend; ++it) {
-        if (!(*it)->isWidgetType())
-            if (QButtonGroup *bg = qobject_cast<QButtonGroup *>(*it))
+    for (auto *o : formWindow->mainContainer()->children()) {
+        if (!o->isWidgetType()) {
+            if (QButtonGroup *bg = qobject_cast<QButtonGroup *>(o)) {
                 if (mdb->item(bg))
                     bl.push_back(bg);
+            }
+        }
     }
     return bl;
 }
@@ -302,10 +299,10 @@ void ButtonGroupMenu::selectGroup()
     // Select and make current button "current" again by selecting it last (if there is any)
     const ButtonList buttons = m_buttonGroup->buttons();
     m_formWindow->clearSelection(false);
-    const ButtonList::const_iterator cend = buttons.constEnd();
-    for (ButtonList::const_iterator it = buttons.constBegin(); it != cend; ++it)
-        if (*it != m_currentButton)
-            m_formWindow->selectWidget(*it, true);
+    for (auto *b : buttons) {
+        if (b != m_currentButton)
+            m_formWindow->selectWidget(b, true);
+    }
     if (m_currentButton)
         m_formWindow->selectWidget(m_currentButton, true);
 }
@@ -462,11 +459,8 @@ bool ButtonTaskMenu::refreshAssignMenu(const QDesignerFormWindowInterface *fw, i
         // Create a new action group
         m_assignActionGroup = new QActionGroup(this);
         connect(m_assignActionGroup, &QActionGroup::triggered, this, &ButtonTaskMenu::addToGroup);
-
-        const ButtonGroupList::const_iterator cend = bl.constEnd();
-        for (ButtonGroupList::const_iterator it = bl.constBegin(); it != cend; ++it) {
-            QButtonGroup *bg = *it;
-            if (*it != currentGroup) {
+        for (auto *bg : bl) {
+            if (bg != currentGroup) {
                 QAction *a = new QAction(bg->objectName(), m_assignGroupSubMenu);
                 a->setData(QVariant::fromValue(bg));
                 m_assignActionGroup->addAction(a);
diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
index dbc97a398..7aa37879c 100644
--- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
@@ -147,9 +147,8 @@ int WidgetBoxCategoryModel::indexOfWidget(const QString &name)
 QDesignerWidgetBoxInterface::Category WidgetBoxCategoryModel::category() const
 {
     QDesignerWidgetBoxInterface::Category rc;
-    const WidgetBoxCategoryEntrys::const_iterator cend = m_items.constEnd();
-    for (WidgetBoxCategoryEntrys::const_iterator it = m_items.constBegin(); it != cend; ++it)
-        rc.addWidget(it->widget);
+    for (const auto &c : m_items)
+        rc.addWidget(c.widget);
     return rc;
 }
 
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index 7b1a320fb..d4d6da34f 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -320,9 +320,8 @@ void WidgetBoxTreeWidget::addCustomCategories(bool replace)
     }
     // re-add
     const CategoryList customList = loadCustomCategoryList();
-    const CategoryList::const_iterator cend = customList.constEnd();
-    for (CategoryList::const_iterator it = customList.constBegin(); it != cend; ++it)
-        addCategory(*it);
+    for (const auto &c : customList)
+        addCategory(c);
 }
 
 static inline QString msgXmlError(const QString &fileName, const QXmlStreamReader &r)
diff --git a/src/designer/src/designer/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp
index 2b0047b53..50c8d4162 100644
--- a/src/designer/src/designer/appfontdialog.cpp
+++ b/src/designer/src/designer/appfontdialog.cpp
@@ -77,9 +77,8 @@ void AppFontManager::save(QDesignerSettingsInterface *s, const QString &prefix)
 {
     // Store as list of file names
     QStringList fontFiles;
-    const FileNameFontIdPairs::const_iterator cend = m_fonts.constEnd();
-    for (FileNameFontIdPairs::const_iterator it = m_fonts.constBegin(); it != cend; ++it)
-        fontFiles.push_back(it->first);
+    for (const auto &fnp : m_fonts)
+        fontFiles.push_back(fnp.first);
 
     s->beginGroup(prefix);
     s->setValue(QLatin1String(fontFileKeyC),  fontFiles);
@@ -100,10 +99,10 @@ void AppFontManager::restore(const QDesignerSettingsInterface *s, const QString
         qDebug() << "AppFontManager::restoring" << fontFiles.size() << "fonts from " << prefix;
     if (!fontFiles.isEmpty()) {
         QString errorMessage;
-        const QStringList::const_iterator cend = fontFiles.constEnd();
-        for (QStringList::const_iterator it = fontFiles.constBegin(); it != cend; ++it)
-            if (add(*it, &errorMessage) == -1)
+        for (const auto &ff : fontFiles) {
+            if (add(ff, &errorMessage) == -1)
                 qWarning("%s", qPrintable(errorMessage));
+        }
     }
 }
 
@@ -120,9 +119,8 @@ int AppFontManager::add(const QString &fontFile, QString *errorMessage)
     }
     const QString fullPath = inf.absoluteFilePath();
     // Check if already loaded
-    const FileNameFontIdPairs::const_iterator cend = m_fonts.constEnd();
-    for (FileNameFontIdPairs::const_iterator it = m_fonts.constBegin(); it != cend; ++it) {
-        if (it->first == fullPath) {
+    for (const auto &fnp : std::as_const(m_fonts)) {
+        if (fnp.first == fullPath) {
             *errorMessage = QCoreApplication::translate("AppFontManager", "The font file '%1' is already loaded.").arg(fontFile);
             return -1;
         }
@@ -205,9 +203,8 @@ void AppFontModel::init(const AppFontManager &mgr)
     using FileNameFontIdPairs = AppFontManager::FileNameFontIdPairs;
 
     const FileNameFontIdPairs &fonts = mgr.fonts();
-    const FileNameFontIdPairs::const_iterator cend = fonts.constEnd();
-    for (FileNameFontIdPairs::const_iterator it = fonts.constBegin(); it != cend; ++it)
-        add(it->first, it->second);
+    for (const auto &fnp : fonts)
+        add(fnp.first, fnp.second);
 }
 
 void AppFontModel::add(const QString &fontFile, int id)
@@ -223,11 +220,10 @@ void AppFontModel::add(const QString &fontFile, int id)
 
     appendRow(fileItem);
     const QStringList families = QFontDatabase::applicationFontFamilies(id);
-    const QStringList::const_iterator cend = families.constEnd();
-    for (QStringList::const_iterator it = families.constBegin(); it != cend; ++it) {
-        QStandardItem *familyItem = new QStandardItem(*it);
+    for (const auto &fam : families) {
+        QStandardItem *familyItem = new QStandardItem(fam);
         familyItem->setToolTip(fullPath);
-        familyItem->setFont(QFont(*it));
+        familyItem->setFont(QFont(fam));
         familyItem->setFlags(Qt::ItemIsEnabled);
         fileItem->appendRow(familyItem);
     }
@@ -291,11 +287,10 @@ void AppFontWidget::addFiles()
     QString errorMessage;
 
     AppFontManager &fmgr = AppFontManager::instance();
-    const QStringList::const_iterator cend = files.constEnd();
-    for (QStringList::const_iterator it = files.constBegin(); it != cend; ++it) {
-        const int id = fmgr.add(*it, &errorMessage);
+    for (const auto &f : files) {
+        const int id = fmgr.add(f, &errorMessage);
         if (id != -1) {
-            m_model->add(*it, id);
+            m_model->add(f, id);
         } else {
             QMessageBox::critical(this, tr("Error Adding Fonts"), errorMessage);
         }
@@ -314,12 +309,11 @@ static void removeFonts(const QModelIndexList &selectedIndexes, AppFontModel *mo
     rows.reserve(selectedIndexes.size());
 
     QString errorMessage;
-    const QModelIndexList::const_iterator cend = selectedIndexes.constEnd();
-    for (QModelIndexList::const_iterator it = selectedIndexes.constBegin(); it != cend; ++it) {
-        const int id = model->idAt(*it);
+    for (const auto &mi : selectedIndexes) {
+        const int id = model->idAt(mi);
         if (id != -1) {
             if (fmgr.remove(id, &errorMessage)) {
-                rows.push_back(it->row());
+                rows.append(mi.row());
             } else {
                 QMessageBox::critical(dialogParent, AppFontWidget::tr("Error Removing Fonts"), errorMessage);
             }
diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index 53f3fad41..40758529a 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -154,10 +154,8 @@ bool DockedMdiArea::event(QEvent *event)
     case QEvent::Drop: {
         QDropEvent *e = static_cast<QDropEvent*>(event);
         const QStringList files = uiFiles(e->mimeData());
-        const QStringList::const_iterator cend = files.constEnd();
-        for (QStringList::const_iterator it = files.constBegin(); it != cend; ++it) {
-            emit fileDropped(*it);
-        }
+        for (const auto &f : files)
+            emit fileDropped(f);
         e->acceptProposedAction();
         return true;
     }
@@ -314,13 +312,10 @@ QMdiSubWindow *DockedMainWindow::createMdiSubWindow(QWidget *fw, Qt::WindowFlags
     // designer menu actions
     if (designerCloseActionShortCut == QKeySequence(QKeySequence::Close)) {
         const ActionList systemMenuActions = rc->systemMenu()->actions();
-        if (!systemMenuActions.isEmpty()) {
-            const ActionList::const_iterator cend = systemMenuActions.constEnd();
-            for (ActionList::const_iterator it = systemMenuActions.constBegin(); it != cend; ++it) {
-                if ( (*it)->shortcut() == designerCloseActionShortCut) {
-                    (*it)->setShortcutContext(Qt::WidgetShortcut);
-                    break;
-                }
+        for (auto *a : systemMenuActions) {
+            if (a->shortcut() == designerCloseActionShortCut) {
+                a->setShortcutContext(Qt::WidgetShortcut);
+                break;
             }
         }
     }
diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp
index 3a92cd955..710e5de57 100644
--- a/src/designer/src/designer/qdesigner.cpp
+++ b/src/designer/src/designer/qdesigner.cpp
@@ -235,17 +235,14 @@ QDesigner::ParseArgumentsResult QDesigner::parseCommandLineArguments()
 
     m_suppressNewFormShow = m_workbench->readInBackup();
 
-    if (!options.files.isEmpty()) {
-        const QStringList::const_iterator cend = options.files.constEnd();
-        for (QStringList::const_iterator it = options.files.constBegin(); it != cend; ++it) {
-            // Ensure absolute paths for recent file list to be unique
-            QString fileName = *it;
-            const QFileInfo fi(fileName);
-            if (fi.exists() && fi.isRelative())
-                fileName = fi.absoluteFilePath();
-            m_workbench->readInForm(fileName);
-        }
+    for (auto fileName : std::as_const(options.files)) {
+        // Ensure absolute paths for recent file list to be unique
+        const QFileInfo fi(fileName);
+        if (fi.exists() && fi.isRelative())
+            fileName = fi.absoluteFilePath();
+        m_workbench->readInForm(fileName);
     }
+
     if ( m_workbench->formWindowCount())
         m_suppressNewFormShow = true;
 
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index b56144175..c8b137ac3 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -126,9 +126,8 @@ void QDesignerWorkbench::Position::applyTo(QDockWidget *dockWidget) const
 
 static inline void addActionsToMenu(QMenu *m, const ActionList &al)
 {
-    const ActionList::const_iterator cend = al.constEnd();
-    for (ActionList::const_iterator it = al.constBegin(); it != cend; ++it)
-        m->addAction(*it);
+    for (auto *a : al)
+        m->addAction(a);
 }
 
 static inline QMenu *addMenu(QMenuBar *mb, const QString &title, const ActionList &al)
diff --git a/src/designer/src/lib/extension/qextensionmanager.cpp b/src/designer/src/lib/extension/qextensionmanager.cpp
index 71d403dba..b146a51b3 100644
--- a/src/designer/src/lib/extension/qextensionmanager.cpp
+++ b/src/designer/src/lib/extension/qextensionmanager.cpp
@@ -118,15 +118,16 @@ QObject *QExtensionManager::extension(QObject *object, const QString &iid) const
 {
     const FactoryMap::const_iterator it = m_extensions.constFind(iid);
     if (it != m_extensions.constEnd()) {
-        const FactoryList::const_iterator fcend = it.value().constEnd();
-        for (FactoryList::const_iterator fit = it.value().constBegin(); fit != fcend; ++fit)
-            if (QObject *ext = (*fit)->extension(object, iid))
+        for (const auto &f : it.value()) {
+            if (QObject *ext = f->extension(object, iid))
                 return ext;
+        }
     }
-    const FactoryList::const_iterator gfcend =  m_globalExtension.constEnd();
-    for (FactoryList::const_iterator git = m_globalExtension.constBegin(); git != gfcend; ++git)
-        if (QObject *ext = (*git)->extension(object, iid))
+
+    for (const auto &gf : m_globalExtension) {
+        if (QObject *ext = gf->extension(object, iid))
             return ext;
+    }
 
     return nullptr;
 }
diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp
index db0100f01..4ef3a2b9f 100644
--- a/src/designer/src/lib/shared/formwindowbase.cpp
+++ b/src/designer/src/lib/shared/formwindowbase.cpp
@@ -292,10 +292,8 @@ static void recursiveUpdate(QWidget *w)
 {
     w->update();
 
-    const QObjectList &l = w->children();
-    const QObjectList::const_iterator cend = l.constEnd();
-    for (QObjectList::const_iterator it = l.constBegin(); it != cend; ++it) {
-        if (QWidget *w = qobject_cast<QWidget*>(*it))
+    for (auto *child : w->children()) {
+        if (QWidget *w = qobject_cast<QWidget*>(child))
             recursiveUpdate(w);
     }
 }
@@ -459,9 +457,8 @@ QMenu *FormWindowBase::createExtensionTaskMenu(QDesignerFormWindowInterface *fw,
         actions.push_back(a);
     }
     QMenu *rc = new QMenu;
-    const ActionList::const_iterator cend = actions.constEnd();
-    for (ActionList::const_iterator it = actions.constBegin(); it != cend; ++it)
-        rc->addAction(*it);
+    for (auto *a : std::as_const(actions))
+        rc->addAction(a);
     return rc;
 }
 
diff --git a/src/designer/src/lib/shared/layout.cpp b/src/designer/src/lib/shared/layout.cpp
index 4e5414215..a0e1b4bb7 100644
--- a/src/designer/src/lib/shared/layout.cpp
+++ b/src/designer/src/lib/shared/layout.cpp
@@ -487,9 +487,7 @@ void BoxLayout::doLayout()
 
     QDesignerWidgetItemInstaller wii; // Make sure we use QDesignerWidgetItem.
 
-    const  QWidgetList::const_iterator cend = widgets().constEnd();
-    for (QWidgetList::const_iterator it =  widgets().constBegin(); it != cend; ++it) {
-        QWidget *w = *it;
+    for (auto *w : widgets()) {
         if (needReparent)
             reparentToLayoutBase(w);
 
@@ -539,10 +537,7 @@ void SplitterLayout::doLayout()
     QSplitter *splitter = qobject_cast<QSplitter*>(layoutBaseWidget());
     Q_ASSERT(splitter != nullptr);
 
-
-    const  QWidgetList::const_iterator cend = widgets().constEnd();
-    for (QWidgetList::const_iterator it =  widgets().constBegin(); it != cend; ++it) {
-        QWidget *w = *it;
+    for (auto *w : widgets()) {
         if (needReparent)
             reparentToLayoutBase(w);
         splitter->addWidget(w);
@@ -915,9 +910,7 @@ bool Grid::shrinkFormLayoutSpans()
             widgets.insert(w);
     // Restrict the widget span: max horizontal span at column 0: 2, anything else: 1
     const int maxRowSpan = 1;
-    const WidgetSet::const_iterator cend = widgets.constEnd();
-    for (WidgetSet::const_iterator it = widgets.constBegin(); it != cend ; ++it) {
-        QWidget *w = *it;
+    for (auto *w : std::as_const(widgets)) {
         int row, col,  rowspan, colspan;
         if (!locateWidget(w, row, col, rowspan, colspan)) {
             qDebug("ooops, widget '%s' does not fit in layout", w->objectName().toUtf8().constData());
@@ -1070,9 +1063,7 @@ void GridLayout<GridLikeLayout, LayoutType, GridMode>::doLayout()
 
     QDesignerWidgetItemInstaller wii; // Make sure we use QDesignerWidgetItem.
 
-    const  QWidgetList::const_iterator cend = widgets().constEnd();
-    for (QWidgetList::const_iterator it =  widgets().constBegin(); it != cend; ++it) {
-        QWidget *w = *it;
+    for (auto *w : widgets()) {
         int r = 0, c = 0, rs = 0, cs = 0;
 
         if (m_grid.locateWidget(w, r, c, rs, cs)) {
diff --git a/src/designer/src/lib/shared/morphmenu.cpp b/src/designer/src/lib/shared/morphmenu.cpp
index 9d46d18bc..0b3e87d6d 100644
--- a/src/designer/src/lib/shared/morphmenu.cpp
+++ b/src/designer/src/lib/shared/morphmenu.cpp
@@ -573,10 +573,8 @@ bool MorphMenu::populateMenu(QWidget *w, QDesignerFormWindowInterface *fw)
     }
 
     // Add actions
-    const QStringList::const_iterator cend = c.constEnd();
-    for (QStringList::const_iterator it = c.constBegin(); it != cend; ++it) {
-        if (*it != oldClassName) {
-            const QString className = *it;
+    for (const auto &className : c) {
+        if (className != oldClassName) {
             m_menu->addAction(className,
                               this, [this, className] { this->slotMorph(className); });
         }
diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp
index 21ef81e3e..dbe1c0219 100644
--- a/src/designer/src/lib/shared/newformwidget.cpp
+++ b/src/designer/src/lib/shared/newformwidget.cpp
@@ -131,9 +131,8 @@ NewFormWidget::NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parent
     loadFrom(templatePath, true, uiExtension, formTemplate, selectedItem);
     // Additional template paths
     const QStringList formTemplatePaths = settings.formTemplatePaths();
-    const QStringList::const_iterator ftcend = formTemplatePaths.constEnd();
-    for (QStringList::const_iterator it = formTemplatePaths.constBegin(); it != ftcend; ++it)
-        loadFrom(*it, false, uiExtension, formTemplate, selectedItem);
+    for (const auto &ftp : formTemplatePaths)
+        loadFrom(ftp, false, uiExtension, formTemplate, selectedItem);
 
     // Widgets/custom widgets
     if (!lang) {
@@ -406,17 +405,16 @@ void NewFormWidget::loadFrom(const QString &path, bool resourceFile, const QStri
     root->setText(0, visiblePath.replace(underscore, blank));
     root->setToolTip(0, path);
 
-    const QFileInfoList::const_iterator lcend = list.constEnd();
-    for (QFileInfoList::const_iterator it = list.constBegin(); it != lcend; ++it) {
-        if (!it->isFile())
+    for (const auto &fi : list) {
+        if (!fi.isFile())
             continue;
 
         QTreeWidgetItem *item = new QTreeWidgetItem(root);
-        const QString text = it->baseName().replace(underscore, blank);
+        const QString text = fi.baseName().replace(underscore, blank);
         if (selectedItemFound == nullptr && text == selectedItem)
             selectedItemFound = item;
         item->setText(0, text);
-        item->setData(0, TemplateNameRole, it->absoluteFilePath());
+        item->setData(0, TemplateNameRole, fi.absoluteFilePath());
     }
 }
 
@@ -428,14 +426,12 @@ void NewFormWidget::loadFrom(const QString &title, const QStringList &nameList,
     QTreeWidgetItem *root = new QTreeWidgetItem(m_ui->treeWidget);
     root->setFlags(root->flags() & ~Qt::ItemIsSelectable);
     root->setText(0, title);
-    const QStringList::const_iterator cend = nameList.constEnd();
-    for (QStringList::const_iterator it = nameList.constBegin(); it != cend; ++it) {
-        const QString text = *it;
+    for (const auto &text : nameList) {
         QTreeWidgetItem *item = new QTreeWidgetItem(root);
         item->setText(0, text);
         if (selectedItemFound == nullptr && text == selectedItem)
             selectedItemFound = item;
-        item->setData(0, ClassNameRole, *it);
+        item->setData(0, ClassNameRole, text);
     }
 }
 
diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp
index a1baf0c81..4c6e822ad 100644
--- a/src/designer/src/lib/shared/pluginmanager.cpp
+++ b/src/designer/src/lib/shared/pluginmanager.cpp
@@ -561,15 +561,14 @@ QStringList QDesignerPluginManager::findPlugins(const QString &path)
     // Load symbolic links but make sure all file names are unique as not
     // to fall for something like 'libplugin.so.1 -> libplugin.so'
     QStringList result;
-    const QFileInfoList::const_iterator icend = infoList.constEnd();
-    for (QFileInfoList::const_iterator it = infoList.constBegin(); it != icend; ++it) {
+    for (const auto &fi : infoList) {
         QString fileName;
-        if (it->isSymLink()) {
-            const QFileInfo linkTarget = QFileInfo(it->symLinkTarget());
+        if (fi.isSymLink()) {
+            const QFileInfo linkTarget = QFileInfo(fi.symLinkTarget());
             if (linkTarget.exists() && linkTarget.isFile())
                 fileName = linkTarget.absoluteFilePath();
         } else {
-            fileName = it->absoluteFilePath();
+            fileName = fi.absoluteFilePath();
         }
         if (!fileName.isEmpty() && QLibrary::isLibrary(fileName) && !result.contains(fileName))
             result += fileName;
diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
index 143f85194..d8c8a81ce 100644
--- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp
+++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
@@ -46,9 +46,8 @@ static const Skins &defaultSkins() {
         const QFileInfoList list = dir.entryInfoList(QDir::Dirs|QDir::NoDotAndDotDot, QDir::Name);
         if (list.isEmpty())
             return rc;
-        const QFileInfoList::const_iterator lcend = list.constEnd();
-        for (QFileInfoList::const_iterator it = list.constBegin(); it != lcend; ++it)
-            rc.push_back(SkinNamePath(it->baseName(), it->filePath()));
+        for (const auto &fi : list)
+            rc.append(SkinNamePath(fi.baseName(), fi.filePath()));
     }
     return rc;
 }
@@ -147,14 +146,12 @@ void PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate::addUserSkins
 {
     if (files.isEmpty())
         return;
-    const QStringList ::const_iterator fcend = files.constEnd();
-    for (QStringList::const_iterator it = files.constBegin(); it != fcend; ++it) {
-        const QFileInfo fi(*it);
-        if (fi.isDir() && fi.isReadable()) {
-            m_ui.m_skinCombo->insertItem(m_browseSkinIndex++, fi.baseName(), QVariant(*it));
-        } else {
-            qWarning() << "Unable to access the skin directory '" << *it << "'.";
-        }
+    for (const auto &f : files) {
+        const QFileInfo fi(f);
+        if (fi.isDir() && fi.isReadable())
+            m_ui.m_skinCombo->insertItem(m_browseSkinIndex++, fi.baseName(), QVariant(f));
+        else
+            qWarning() << "Unable to access the skin directory '" << f << "'.";
     }
 }
 
diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp
index d6d26882b..c8f5a4484 100644
--- a/src/designer/src/lib/shared/previewmanager.cpp
+++ b/src/designer/src/lib/shared/previewmanager.cpp
@@ -771,15 +771,13 @@ QWidget *PreviewManager::showPreview(const QDesignerFormWindowInterface *fw,
 
 QWidget *PreviewManager::raise(const QDesignerFormWindowInterface *fw, const PreviewConfiguration &pc)
 {
-    using PreviewDataList = PreviewManagerPrivate::PreviewDataList;
     if (d->m_previews.isEmpty())
         return nullptr;
 
     // find matching window
-    const PreviewDataList::const_iterator cend =  d->m_previews.constEnd();
-    for (PreviewDataList::const_iterator it = d->m_previews.constBegin(); it !=  cend ;++it) {
-        QWidget * w = it->m_widget;
-        if (w && it->m_formWindow == fw && it->m_configuration == pc) {
+    for (const auto &pd : std::as_const(d->m_previews)) {
+        QWidget *w = pd.m_widget;
+        if (w && pd.m_formWindow == fw && pd.m_configuration == pc) {
             w->raise();
             w->activateWindow();
             return w;
@@ -793,9 +791,9 @@ void PreviewManager::closeAllPreviews()
     if (!d->m_previews.isEmpty()) {
         d->m_updateBlocked = true;
         d->m_activePreview = nullptr;
-        for (auto it = d->m_previews.constBegin(), cend = d->m_previews.constEnd(); it != cend ;++it) {
-            if (it->m_widget)
-                it->m_widget->close();
+        for (const auto &pd : std::as_const(d->m_previews)) {
+            if (pd.m_widget)
+                pd.m_widget->close();
         }
         d->m_previews.clear();
         d->m_updateBlocked = false;
diff --git a/src/designer/src/lib/shared/promotionmodel.cpp b/src/designer/src/lib/shared/promotionmodel.cpp
index 15f36a3c5..8d9851936 100644
--- a/src/designer/src/lib/shared/promotionmodel.cpp
+++ b/src/designer/src/lib/shared/promotionmodel.cpp
@@ -112,18 +112,18 @@ namespace qdesigner_internal {
         QDesignerWidgetDataBaseItemInterface *baseClass = nullptr;
         QStandardItem *baseItem = nullptr;
 
-        const PromotedClasses::const_iterator bcend = promotedClasses.constEnd();
-        for (PromotedClasses::const_iterator it = promotedClasses.constBegin(); it !=  bcend; ++it) {
+        for (auto &pi : promotedClasses) {
             // Start a new base class?
-            if (baseClass !=  it->baseItem) {
-                baseClass =  it->baseItem;
-                const StandardItemList baseRow = baseModelRow(it->baseItem);
+            if (baseClass != pi.baseItem) {
+                baseClass = pi.baseItem;
+                const StandardItemList baseRow = baseModelRow(pi.baseItem);
                 baseItem = baseRow.constFirst();
                 appendRow(baseRow);
             }
             Q_ASSERT(baseItem);
             // Append derived
-            baseItem->appendRow(promotedModelRow(it->baseItem, it->promotedItem, usedPromotedClasses.contains(it->promotedItem->name())));
+            baseItem->appendRow(promotedModelRow(pi.baseItem, pi.promotedItem,
+                                                 usedPromotedClasses.contains(pi.promotedItem->name())));
         }
     }
 
diff --git a/src/designer/src/lib/shared/promotiontaskmenu.cpp b/src/designer/src/lib/shared/promotiontaskmenu.cpp
index f62bcd91c..7cedb226b 100644
--- a/src/designer/src/lib/shared/promotiontaskmenu.cpp
+++ b/src/designer/src/lib/shared/promotiontaskmenu.cpp
@@ -121,10 +121,9 @@ PromotionTaskMenu::PromotionState  PromotionTaskMenu::createPromotionActions(QDe
 
     QMenu *candidatesMenu = new QMenu();
     // Create a sub menu
-    const WidgetDataBaseItemList::const_iterator cend = candidates.constEnd();
     // Set up actions and map class names
-    for (WidgetDataBaseItemList::const_iterator it = candidates.constBegin(); it != cend; ++it) {
-        const QString customClassName = (*it)->name();
+    for (auto *item : candidates) {
+        const QString customClassName = item->name();
         candidatesMenu->addAction(customClassName,
                                   this, [this, customClassName] { this->slotPromoteToCustomWidget(customClassName); });
     }
@@ -265,9 +264,7 @@ PromotionTaskMenu::PromotionSelectionList PromotionTaskMenu::promotionSelectionL
             designerObjectInspector->getSelection(s);
             // Find objects of similar state
             const QWidgetList &source = m_mode == ModeManagedMultiSelection ? s.managed : s.unmanaged;
-            const QWidgetList::const_iterator cend = source.constEnd();
-            for (QWidgetList::const_iterator it = source.constBegin(); it != cend; ++it) {
-                QWidget *w = *it;
+            for (auto *w : source) {
                 if (w != m_widget) {
                     // Selection state mismatch
                     if (intro->metaObject(w)->className() != className || isPromoted(core, w) !=  promoted)
diff --git a/src/designer/src/lib/shared/qdesigner_command.cpp b/src/designer/src/lib/shared/qdesigner_command.cpp
index b4ff1ea84..6f3aa74b3 100644
--- a/src/designer/src/lib/shared/qdesigner_command.cpp
+++ b/src/designer/src/lib/shared/qdesigner_command.cpp
@@ -128,10 +128,8 @@ static void recursiveUpdate(QWidget *w)
 {
     w->update();
 
-    const QObjectList &l = w->children();
-    const QObjectList::const_iterator cend = l.end();
-    for ( QObjectList::const_iterator it = l.begin(); it != cend; ++it) {
-        if (QWidget *w = qobject_cast<QWidget*>(*it))
+    for (auto *child : w->children()) {
+        if (QWidget *w = qobject_cast<QWidget*>(child))
             recursiveUpdate(w);
     }
 }
@@ -322,14 +320,11 @@ void ManageWidgetCommandHelper::init(const QDesignerFormWindowInterface *fw, QWi
     m_managedChildren.clear();
 
     const QWidgetList children = m_widget->findChildren<QWidget *>();
-    if (children.isEmpty())
-        return;
-
     m_managedChildren.reserve(children.size());
-    const QWidgetList::const_iterator lcend = children.constEnd();
-    for (QWidgetList::const_iterator it = children.constBegin(); it != lcend; ++it)
-        if (fw->isManaged(*it))
-            m_managedChildren.push_back(*it);
+    for (auto *w : children) {
+        if (fw->isManaged(w))
+            m_managedChildren.push_back(w);
+    }
 }
 
 void ManageWidgetCommandHelper::init(QWidget *widget, const QWidgetList &managedChildren)
@@ -666,11 +661,10 @@ void CursorSelectionState::restore(QDesignerFormWindowInterface *formWindow) con
     } else {
         // Select current as last
         formWindow->clearSelection(false);
-        const WidgetPointerList::const_iterator cend = m_selection.constEnd();
-        for (WidgetPointerList::const_iterator it = m_selection.constBegin(); it != cend; ++it)
-            if (QWidget *w = *it)
-                if (w != m_current)
-                    formWindow->selectWidget(*it, true);
+        for (const auto &wp : m_selection) {
+            if (!wp.isNull() && wp.data() != m_current)
+                formWindow->selectWidget(wp.data(), true);
+        }
         if (m_current)
             formWindow->selectWidget(m_current, true);
     }
@@ -2114,9 +2108,7 @@ static void copyRolesFromItem(ItemData *id, const T *item, bool editor)
 template<class T>
 static void copyRolesToItem(const ItemData *id, T *item, DesignerIconCache *iconCache, bool editor)
 {
-    QHash<int, QVariant>::const_iterator it = id->m_properties.constBegin(),
-            end = id->m_properties.constEnd();
-    for (; it != end; ++it)
+    for (auto it = id->m_properties.cbegin(), end = id->m_properties.cend(); it != end; ++it) {
         if (it.value().isValid()) {
             if (!editor && it.key() == ItemFlagsShadowRole) {
                 item->setFlags((Qt::ItemFlags)it.value().toInt());
@@ -2142,6 +2134,7 @@ static void copyRolesToItem(const ItemData *id, T *item, DesignerIconCache *icon
                 }
             }
         }
+    }
 
     if (editor)
         item->setFlags(item->flags() | Qt::ItemIsEditable);
@@ -2190,8 +2183,7 @@ ItemData::ItemData(const QTreeWidgetItem *item, int column)
 
 void ItemData::fillTreeItemColumn(QTreeWidgetItem *item, int column, DesignerIconCache *iconCache) const
 {
-    QHash<int, QVariant>::const_iterator it = m_properties.constBegin(), end = m_properties.constEnd();
-    for (; it != end; ++it)
+    for (auto it = m_properties.cbegin(), end = m_properties.cend(); it != end; ++it) {
         if (it.value().isValid()) {
             item->setData(column, it.key(), it.value());
             switch (it.key()) {
@@ -2213,6 +2205,7 @@ void ItemData::fillTreeItemColumn(QTreeWidgetItem *item, int column, DesignerIco
                 break;
             }
         }
+    }
 }
 
 ListContents::ListContents(const QTreeWidgetItem *item)
diff --git a/src/designer/src/lib/shared/qdesigner_dnditem.cpp b/src/designer/src/lib/shared/qdesigner_dnditem.cpp
index 4b838df9a..cfc5c0221 100644
--- a/src/designer/src/lib/shared/qdesigner_dnditem.cpp
+++ b/src/designer/src/lib/shared/qdesigner_dnditem.cpp
@@ -140,8 +140,8 @@ QDesignerMimeData::QDesignerMimeData(const QDesignerDnDItems &items, QDrag *drag
         QPainter painter(&image);
         QPainter maskPainter(&mask);
         decorationTopLeft = unitedGeometry.topLeft();
-        for (it = m_items.constBegin() ; it != cend; ++it ) {
-            QWidget *w = (*it)->decoration();
+        for (auto *item : std::as_const(m_items)) {
+            QWidget *w = item->decoration();
             const QPixmap wp = w->grab(QRect(0, 0, -1, -1));
             const QPoint pos = w->pos() - decorationTopLeft;
             painter.drawPixmap(pos, wp);
@@ -169,9 +169,7 @@ QDesignerMimeData::QDesignerMimeData(const QDesignerDnDItems &items, QDrag *drag
 
 QDesignerMimeData::~QDesignerMimeData()
 {
-    const QDesignerDnDItems::const_iterator cend = m_items.constEnd();
-    for (QDesignerDnDItems::const_iterator it = m_items.constBegin(); it != cend; ++it )
-        delete *it;
+    qDeleteAll(m_items);
 }
 
 Qt::DropAction QDesignerMimeData::proposedDropAction() const
@@ -189,11 +187,12 @@ Qt::DropAction QDesignerMimeData::execDrag(const QDesignerDnDItems &items, QWidg
 
     // Store pointers to widgets that are to be re-shown if a move operation is canceled
     QWidgetList reshowWidgets;
-    const QDesignerDnDItems::const_iterator cend = items.constEnd();
-    for (QDesignerDnDItems::const_iterator it = items.constBegin(); it != cend; ++it )
-        if (QWidget *w = (*it)->widget())
-            if ((*it)->type() ==  QDesignerDnDItemInterface::MoveDrop)
+    for (auto *item : items) {
+        if (QWidget *w = item->widget()) {
+            if (item->type() == QDesignerDnDItemInterface::MoveDrop)
                 reshowWidgets.push_back(w);
+        }
+    }
 
     const Qt::DropAction executedAction = drag->exec(Qt::CopyAction|Qt::MoveAction, mimeData->proposedDropAction());
 
@@ -209,9 +208,8 @@ Qt::DropAction QDesignerMimeData::execDrag(const QDesignerDnDItems &items, QWidg
 void QDesignerMimeData::moveDecoration(const QPoint &globalPos) const
 {
     const QPoint relativeDistance = globalPos - m_globalStartPos;
-    const QDesignerDnDItems::const_iterator cend = m_items.constEnd();
-    for (QDesignerDnDItems::const_iterator it =m_items.constBegin(); it != cend; ++it ) {
-        QWidget *w = (*it)->decoration();
+    for (auto *item : m_items) {
+        QWidget *w = item->decoration();
         w->move(w->pos() + relativeDistance);
     }
 }
@@ -221,12 +219,14 @@ void QDesignerMimeData::removeMovedWidgetsFromSourceForm(const QDesignerDnDItems
     typedef QMultiMap<FormWindowBase *, QWidget *> FormWidgetMap;
     FormWidgetMap formWidgetMap;
     // Find moved widgets per form
-    const QDesignerDnDItems::const_iterator cend = items.constEnd();
-    for (QDesignerDnDItems::const_iterator it = items.constBegin(); it != cend; ++it )
-        if ((*it)->type() ==  QDesignerDnDItemInterface::MoveDrop)
-            if (QWidget *w = (*it)->widget())
-                if (FormWindowBase *fb = qobject_cast<FormWindowBase *>((*it)->source()))
+    for (auto *item : items) {
+        if (item->type() == QDesignerDnDItemInterface::MoveDrop) {
+            if (QWidget *w = item->widget()) {
+                if (FormWindowBase *fb = qobject_cast<FormWindowBase *>(item->source()))
                     formWidgetMap.insert(fb, w);
+            }
+        }
+    }
 
     const auto &formWindows = formWidgetMap.uniqueKeys();
     for (FormWindowBase *fb : formWindows)
diff --git a/src/designer/src/lib/shared/qdesigner_membersheet.cpp b/src/designer/src/lib/shared/qdesigner_membersheet.cpp
index eb48d65d3..31f92bb1d 100644
--- a/src/designer/src/lib/shared/qdesigner_membersheet.cpp
+++ b/src/designer/src/lib/shared/qdesigner_membersheet.cpp
@@ -10,14 +10,11 @@
 #include <QtWidgets/qwidget.h>
 QT_BEGIN_NAMESPACE
 
-static QList<QByteArray> stringListToByteArray(const QStringList &l)
-{
-    if (l.isEmpty())
-        return QList<QByteArray>();
-    QList<QByteArray> rc;
-    const QStringList::const_iterator cend = l.constEnd();
-    for (QStringList::const_iterator it = l.constBegin(); it != cend; ++it)
-        rc += it->toUtf8();
+static QByteArrayList stringListToByteArray(const QStringList &l)
+{
+    QByteArrayList rc;
+    for (const auto &s : l)
+        rc += s.toUtf8();
     return rc;
 }
 
diff --git a/src/designer/src/lib/shared/qdesigner_menubar.cpp b/src/designer/src/lib/shared/qdesigner_menubar.cpp
index cc8f458f1..bc6792357 100644
--- a/src/designer/src/lib/shared/qdesigner_menubar.cpp
+++ b/src/designer/src/lib/shared/qdesigner_menubar.cpp
@@ -387,9 +387,8 @@ bool QDesignerMenuBar::handleContextMenuEvent(QWidget *, QContextMenuEvent *even
 
     QMenu menu;
     const ActionList al = contextMenuActions();
-    const ActionList::const_iterator acend = al.constEnd();
-    for (ActionList::const_iterator it =  al.constBegin(); it != acend; ++it)
-        menu.addAction(*it);
+    for (auto *a : al)
+        menu.addAction(a);
     menu.exec(event->globalPos());
     return true;
 }
diff --git a/src/designer/src/lib/shared/qdesigner_promotion.cpp b/src/designer/src/lib/shared/qdesigner_promotion.cpp
index 91cd16418..d02336f27 100644
--- a/src/designer/src/lib/shared/qdesigner_promotion.cpp
+++ b/src/designer/src/lib/shared/qdesigner_promotion.cpp
@@ -240,11 +240,10 @@ namespace qdesigner_internal {
             if (!scratchPadClasses.isEmpty()) {
                 // Check whether these are actually promoted
                 QDesignerWidgetDataBaseInterface *widgetDataBase = m_core->widgetDataBase();
-                QStringList::const_iterator cend = scratchPadClasses.constEnd();
-                for (QStringList::const_iterator it = scratchPadClasses.constBegin(); it != cend; ++it ) {
-                    const int index = widgetDataBase->indexOfClassName(*it);
+                for (const auto &scItem : scratchPadClasses) {
+                    const int index = widgetDataBase->indexOfClassName(scItem);
                     if (index != -1 && widgetDataBase->item(index)->isPromoted())
-                        rc += *it;
+                        rc.insert(scItem);
                 }
             }
         }
@@ -276,12 +275,12 @@ namespace qdesigner_internal {
         // class B will depend on it. When removing QWebView, the base class of B will
         // be changed to that of QWebView by the below code.
         const PromotedClasses promotedList = promotedClasses();
-        for (PromotedClasses::const_iterator it = promotedList.constBegin(), end = promotedList.constEnd(); it != end; ++it) {
-            if (it->baseItem->name() == className) {
+        for (const auto &pc : promotedList) {
+            if (pc.baseItem->name() == className) {
                 const QString extends = widgetDataBase->item(index)->extends();
-                qWarning().nospace() << "Warning: Promoted class " << it->promotedItem->name()
+                qWarning().nospace() << "Warning: Promoted class " << pc.promotedItem->name()
                     << " extends " << className << ", changing its base class to " <<  extends << '.';
-                it->promotedItem->setExtends(extends);
+                pc.promotedItem->setExtends(extends);
             }
         }
         widgetDataBase->remove(index);
diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
index a3ffad07d..9f209c758 100644
--- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
+++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
@@ -281,10 +281,8 @@ namespace qdesigner_internal {
         if (rc.isEmpty()) {
             // Convert the item list into a string list.
             const WidgetDataBaseItemList dbItems =  promotion->promotionBaseClasses();
-            const WidgetDataBaseItemList::const_iterator cend =  dbItems.constEnd();
-            for (WidgetDataBaseItemList::const_iterator it = dbItems.constBegin() ; it != cend; ++it) {
-                rc.push_back( (*it)->name());
-            }
+            for (auto *item : dbItems)
+                rc.append(item->name());
         }
         return rc;
     }
diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
index d856b9b8d..31369ae40 100644
--- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
@@ -656,17 +656,12 @@ QDesignerPropertySheet::QDesignerPropertySheet(QObject *object, QObject *parent)
         createFakeProperty(QStringLiteral("floating"));
     }
 
-    using ByteArrayList = QList<QByteArray>;
-    const ByteArrayList names = object->dynamicPropertyNames();
-    if (!names.isEmpty()) {
-        const ByteArrayList::const_iterator cend =  names.constEnd();
-        for (ByteArrayList::const_iterator it = names.constBegin(); it != cend; ++it) {
-            const char* cName = it->constData();
-            const QString name = QString::fromLatin1(cName);
-            const int idx = addDynamicProperty(name, object->property(cName));
-            if (idx != -1)
-                d->ensureInfo(idx).kind = QDesignerPropertySheetPrivate::DefaultDynamicProperty;
-        }
+    const QByteArrayList names = object->dynamicPropertyNames();
+    for (const auto &nameB : names) {
+        const QString name = QString::fromLatin1(nameB);
+        const int idx = addDynamicProperty(name, object->property(nameB.constData()));
+        if (idx != -1)
+            d->ensureInfo(idx).kind = QDesignerPropertySheetPrivate::DefaultDynamicProperty;
     }
 }
 
diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp
index bcc97f25b..51067d997 100644
--- a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp
+++ b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp
@@ -677,10 +677,10 @@ template <class Container>
     Selection s;
     designerObjectInspector->getSelection(s);
     const QWidgetList &source = fw->isManaged(current) ? s.managed : s.unmanaged;
-    const QWidgetList::const_iterator cend = source.constEnd();
-    for ( QWidgetList::const_iterator it = source.constBegin(); it != cend; ++it)
-        if (*it != current) // was first
-            c->push_back(*it);
+    for (auto *w : source) {
+        if (w != current) // was first
+            c->append(w);
+    }
 }
 
 QObjectList QDesignerTaskMenu::applicableObjects(const QDesignerFormWindowInterface *fw, PropertyMode pm) const
diff --git a/src/designer/src/lib/shared/qdesigner_toolbar.cpp b/src/designer/src/lib/shared/qdesigner_toolbar.cpp
index ff52096f9..32e9cad87 100644
--- a/src/designer/src/lib/shared/qdesigner_toolbar.cpp
+++ b/src/designer/src/lib/shared/qdesigner_toolbar.cpp
@@ -148,9 +148,8 @@ bool ToolBarEventFilter::handleContextMenuEvent(QContextMenuEvent * event )
     const ActionList al = contextMenuActions(event->globalPos());
 
     QMenu menu(nullptr);
-    const ActionList::const_iterator acend = al.constEnd();
-    for (ActionList::const_iterator it = al.constBegin(); it != acend; ++it)
-        menu.addAction(*it);
+    for (auto *a : al)
+        menu.addAction(a);
     menu.exec(globalPos);
     return true;
 }
diff --git a/src/designer/src/lib/shared/qdesigner_utils.cpp b/src/designer/src/lib/shared/qdesigner_utils.cpp
index 0370d55f3..8913e6637 100644
--- a/src/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/src/designer/src/lib/shared/qdesigner_utils.cpp
@@ -198,14 +198,13 @@ namespace qdesigner_internal
 
         const QChar delimiter = QLatin1Char('|');
         QString rc;
-        const QStringList::const_iterator cend = flagIds.constEnd();
-        for (QStringList::const_iterator it = flagIds.constBegin(); it != cend; ++it) {
+        for (const auto &id : flagIds) {
             if (!rc.isEmpty())
                 rc += delimiter ;
             if (sm == FullyQualified)
-                appendQualifiedName(*it, rc);
+                appendQualifiedName(id, rc);
             else
-                rc += *it;
+                rc += id;
         }
         return rc;
     }
@@ -220,9 +219,9 @@ namespace qdesigner_internal
         }
         uint flags = 0;
         bool valueOk = true;
-        QStringList keys = s.split(QString(QLatin1Char('|')));
-        for (auto it = keys.constBegin(), cend = keys.constEnd(); it != cend; ++it) {
-            const uint flagValue = keyToValue(*it, &valueOk);
+        const QStringList keys = s.split(QString(QLatin1Char('|')));
+        for (const QString &key : keys) {
+            const uint flagValue = keyToValue(key, &valueOk);
             if (!valueOk) {
                 flags = 0;
                 break;
diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp
index 895def83b..6e7ebe5ec 100644
--- a/src/designer/src/lib/shared/qlayout_widget.cpp
+++ b/src/designer/src/lib/shared/qlayout_widget.cpp
@@ -510,11 +510,10 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const
 
     QLayoutItem *BoxLayoutHelper::findItemOfWidget(const LayoutItemVector &lv, QWidget *w)
     {
-        const LayoutItemVector::const_iterator cend = lv.constEnd();
-        for (LayoutItemVector::const_iterator it = lv.constBegin(); it != cend; ++it)
-            if ( (*it)->widget() == w)
-                return *it;
-
+        for (auto *l : lv) {
+            if (l->widget() == w)
+                 return l;
+        }
         return nullptr;
     }
 
diff --git a/src/designer/src/lib/shared/shared_settings.cpp b/src/designer/src/lib/shared/shared_settings.cpp
index 5fb581427..70f6ee69f 100644
--- a/src/designer/src/lib/shared/shared_settings.cpp
+++ b/src/designer/src/lib/shared/shared_settings.cpp
@@ -299,9 +299,8 @@ QDesignerSharedSettings::DeviceProfileList QDesignerSharedSettings::deviceProfil
     // De-serialize
     QString errorMessage;
     DeviceProfile dp;
-    const QStringList::const_iterator scend = xmls.constEnd();
-    for (QStringList::const_iterator it = xmls.constBegin(); it != scend; ++it) {
-        if (dp.fromXml(*it, &errorMessage)) {
+    for (const auto &xml : xmls) {
+        if (dp.fromXml(xml, &errorMessage)) {
             rc.push_back(dp);
         } else {
             designerWarning(msgWarnDeviceProfileXml(errorMessage));
@@ -310,12 +309,11 @@ QDesignerSharedSettings::DeviceProfileList QDesignerSharedSettings::deviceProfil
     return rc;
 }
 
-void QDesignerSharedSettings::setDeviceProfiles(const DeviceProfileList &dp)
+void QDesignerSharedSettings::setDeviceProfiles(const DeviceProfileList &dpl)
 {
     QStringList l;
-    const DeviceProfileList::const_iterator dcend = dp.constEnd();
-    for (DeviceProfileList::const_iterator it = dp.constBegin(); it != dcend; ++it)
-        l.push_back(it->toXml());
+    for (const auto &dp : dpl)
+        l.push_back(dp.toXml());
     m_settings->setValue(QLatin1String(deviceProfilesKey), l);
 }
 }
diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp
index 2ee087779..7942f4cc8 100644
--- a/src/designer/src/lib/shared/widgetfactory.cpp
+++ b/src/designer/src/lib/shared/widgetfactory.cpp
@@ -796,9 +796,8 @@ void WidgetFactory::applyStyleToTopLevel(QStyle *style, QWidget *widget)
     widget->setStyle(style);
     widget->setPalette(standardPalette);
     const QWidgetList lst = widget->findChildren<QWidget*>();
-    const QWidgetList::const_iterator cend = lst.constEnd();
-    for (QWidgetList::const_iterator it = lst.constBegin(); it != cend; ++it)
-        (*it)->setStyle(style);
+    for (auto *w : lst)
+        w->setStyle(style);
 }
 
 // Check for 'interactor' click on a tab bar,
diff --git a/src/designer/src/lib/uilib/formbuilderextra.cpp b/src/designer/src/lib/uilib/formbuilderextra.cpp
index fc1961aa9..38e4327b9 100644
--- a/src/designer/src/lib/uilib/formbuilderextra.cpp
+++ b/src/designer/src/lib/uilib/formbuilderextra.cpp
@@ -181,10 +181,9 @@ bool QFormBuilderExtra::applyBuddy(const QString &buddyName, BuddyMode applyMode
         return false;
     }
 
-    const QWidgetList::const_iterator cend = widgets.constEnd();
-    for ( QWidgetList::const_iterator it =  widgets.constBegin(); it !=  cend; ++it) {
-        if (applyMode == BuddyApplyAll || !(*it)->isHidden()) {
-            label->setBuddy(*it);
+    for (auto *w : widgets) {
+        if (applyMode == BuddyApplyAll || !w->isHidden()) {
+            label->setBuddy(w);
             return true;
         }
     }