Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

4 files changed, 15 insertions, 14 deletions

diff --git a/examples/widgets/widgets/charactermap/characterwidget.cpp b/examples/widgets/widgets/charactermap/characterwidget.cpp
index 5bab921516..061c0164b0 100644
--- a/examples/widgets/widgets/charactermap/characterwidget.cpp
+++ b/examples/widgets/widgets/charactermap/characterwidget.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "characterwidget.h"
 
+#include <QtWidgets>
+
 //! [0]
 CharacterWidget::CharacterWidget(QWidget *parent)
     : QWidget(parent), columns(16), lastKey(-1)
diff --git a/examples/widgets/widgets/charactermap/characterwidget.h b/examples/widgets/widgets/charactermap/characterwidget.h
index 53add51e6f..d12a46aa15 100644
--- a/examples/widgets/widgets/charactermap/characterwidget.h
+++ b/examples/widgets/widgets/charactermap/characterwidget.h
@@ -52,7 +52,6 @@
 #define CHARACTERWIDGET_H
 
 #include <QFont>
-#include <QPoint>
 #include <QSize>
 #include <QString>
 #include <QWidget>
@@ -68,7 +67,7 @@ class CharacterWidget : public QWidget
     Q_OBJECT
 
 public:
-    CharacterWidget(QWidget *parent = 0);
+    CharacterWidget(QWidget *parent = nullptr);
     QSize sizeHint() const override;
 
 public slots:
diff --git a/examples/widgets/widgets/charactermap/mainwindow.cpp b/examples/widgets/widgets/charactermap/mainwindow.cpp
index d3ac55483c..77aad145e7 100644
--- a/examples/widgets/widgets/charactermap/mainwindow.cpp
+++ b/examples/widgets/widgets/charactermap/mainwindow.cpp
@@ -57,7 +57,8 @@
 
 Q_DECLARE_METATYPE(QFontComboBox::FontFilter)
 
-MainWindow::MainWindow()
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
 {
     QMenu *fileMenu = menuBar()->addMenu(tr("File"));
     fileMenu->addAction(tr("Quit"), this, &QWidget::close);
@@ -113,9 +114,9 @@ MainWindow::MainWindow()
             this, &MainWindow::findSizes);
     connect(fontCombo, &QFontComboBox::currentFontChanged,
             characterWidget, &CharacterWidget::updateFont);
-    connect(sizeCombo, QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
+    connect(sizeCombo, &QComboBox::currentTextChanged,
             characterWidget, &CharacterWidget::updateSize);
-    connect(styleCombo, QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
+    connect(styleCombo, &QComboBox::currentTextChanged,
             characterWidget, &CharacterWidget::updateStyle);
 //! [4] //! [5]
     connect(characterWidget, &CharacterWidget::characterSelected,
@@ -169,8 +170,8 @@ void MainWindow::findStyles(const QFont &font)
 //! [7]
 
 //! [8]
-    QString style;
-    foreach (style, fontDatabase.styles(font.family()))
+    const QStringList styles = fontDatabase.styles(font.family());
+    for (const QString &style : styles)
         styleCombo->addItem(style);
 
     int styleIndex = styleCombo->findText(currentItem);
@@ -187,7 +188,7 @@ void MainWindow::filterChanged(int f)
     const QFontComboBox::FontFilter filter =
         filterCombo->itemData(f).value<QFontComboBox::FontFilter>();
     fontCombo->setFontFilters(filter);
-    statusBar()->showMessage(tr("%n font(s) found", 0, fontCombo->count()));
+    statusBar()->showMessage(tr("%n font(s) found", nullptr, fontCombo->count()));
 }
 
 void MainWindow::findSizes(const QFont &font)
@@ -200,15 +201,16 @@ void MainWindow::findSizes(const QFont &font)
         // sizeCombo signals are now blocked until end of scope
         sizeCombo->clear();
 
-        int size;
         if (fontDatabase.isSmoothlyScalable(font.family(), fontDatabase.styleString(font))) {
-            foreach (size, QFontDatabase::standardSizes()) {
+            const QList<int> sizes = QFontDatabase::standardSizes();
+            for (const int size : sizes) {
                 sizeCombo->addItem(QVariant(size).toString());
                 sizeCombo->setEditable(true);
             }
 
         } else {
-            foreach (size, fontDatabase.smoothSizes(font.family(), fontDatabase.styleString(font))) {
+            const QList<int> sizes = fontDatabase.smoothSizes(font.family(), fontDatabase.styleString(font));
+            for (const int size : sizes ) {
                 sizeCombo->addItem(QVariant(size).toString());
                 sizeCombo->setEditable(false);
             }
diff --git a/examples/widgets/widgets/charactermap/mainwindow.h b/examples/widgets/widgets/charactermap/mainwindow.h
index eac16b35fa..79fe9f9cc8 100644
--- a/examples/widgets/widgets/charactermap/mainwindow.h
+++ b/examples/widgets/widgets/charactermap/mainwindow.h
@@ -70,7 +70,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    MainWindow();
+    MainWindow(QWidget *parent = nullptr);
 
 public slots:
     void filterChanged(int);