1 files changed, 16 insertions, 15 deletions

diff --git a/examples/widgets/painting/fontsampler/mainwindow.cpp b/examples/widgets/painting/fontsampler/mainwindow.cpp
index 6344806f29..a464eee3ff 100644
--- a/examples/widgets/painting/fontsampler/mainwindow.cpp
+++ b/examples/widgets/painting/fontsampler/mainwindow.cpp
@@ -86,9 +86,10 @@ void MainWindow::setupFontTree()
 {
     QFontDatabase database;
     fontTree->setColumnCount(1);
-    fontTree->setHeaderLabels(QStringList() << tr("Font"));
+    fontTree->setHeaderLabels({ tr("Font") });
 
-    foreach (QString family, database.families()) {
+    const QStringList fontFamilies = database.families();
+    for (const QString &family : fontFamilies) {
         const QStringList styles = database.styles(family);
         if (styles.isEmpty())
             continue;
@@ -98,7 +99,7 @@ void MainWindow::setupFontTree()
         familyItem->setCheckState(0, Qt::Unchecked);
         familyItem->setFlags(familyItem->flags() | Qt::ItemIsAutoTristate);
 
-        foreach (QString style, styles) {
+        for (const QString &style : styles) {
             QTreeWidgetItem *styleItem = new QTreeWidgetItem(familyItem);
             styleItem->setText(0, style);
             styleItem->setCheckState(0, Qt::Unchecked);
@@ -110,10 +111,10 @@ void MainWindow::setupFontTree()
 
 void MainWindow::on_clearAction_triggered()
 {
-    QTreeWidgetItem *currentItem = fontTree->currentItem();
-    foreach (QTreeWidgetItem *item, fontTree->selectedItems())
-        fontTree->setItemSelected(item, false);
-    fontTree->setItemSelected(currentItem, true);
+    const QList<QTreeWidgetItem *> items = fontTree->selectedItems();
+    for (QTreeWidgetItem *item : items)
+        item->setSelected(false);
+    fontTree->currentItem()->setSelected(true);
 }
 
 void MainWindow::on_markAction_triggered()
@@ -128,8 +129,8 @@ void MainWindow::on_unmarkAction_triggered()
 
 void MainWindow::markUnmarkFonts(Qt::CheckState state)
 {
-    QList<QTreeWidgetItem *> items = fontTree->selectedItems();
-    foreach (QTreeWidgetItem *item, items) {
+    const QList<QTreeWidgetItem *> items = fontTree->selectedItems();
+    for (QTreeWidgetItem *item : items) {
         if (item->checkState(0) != state)
             item->setCheckState(0, state);
     }
@@ -295,19 +296,19 @@ void MainWindow::on_printPreviewAction_triggered()
 void MainWindow::printPage(int index, QPainter *painter, QPrinter *printer)
 {
 #if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog)
-    QString family = pageMap.keys()[index];
-    StyleItems items = pageMap[family];
+    const QString family = (pageMap.begin() + index).key();
+    const StyleItems items = pageMap.value(family);
 
     // Find the dimensions of the text on each page.
     qreal width = 0.0;
     qreal height = 0.0;
-    foreach (QTreeWidgetItem *item, items) {
+    for (const QTreeWidgetItem *item : items) {
         QString style = item->text(0);
         int weight = item->data(0, Qt::UserRole).toInt();
         bool italic = item->data(0, Qt::UserRole + 1).toBool();
 
         // Calculate the maximum width and total height of the text.
-        foreach (int size, sampleSizes) {
+        for (int size : qAsConst(sampleSizes)) {
             QFont font(family, size, weight, italic);
             font.setStyleName(style);
             font = QFont(font, painter->device());
@@ -335,13 +336,13 @@ void MainWindow::printPage(int index, QPainter *painter, QPrinter *printer)
     qreal x = -width / 2.0;
     qreal y = -height / 2.0 - remainingHeight / 4.0 + spaceHeight;
 
-    foreach (QTreeWidgetItem *item, items) {
+    for (const QTreeWidgetItem *item : items) {
         QString style = item->text(0);
         int weight = item->data(0, Qt::UserRole).toInt();
         bool italic = item->data(0, Qt::UserRole + 1).toBool();
 
         // Draw each line of text.
-        foreach (int size, sampleSizes) {
+        for (int size : qAsConst(sampleSizes)) {
             QFont font(family, size, weight, italic);
             font.setStyleName(style);
             font = QFont(font, painter->device());