diff options
Diffstat (limited to 'examples/widgets/widgets/charactermap/mainwindow.cpp')
| -rw-r--r-- | examples/widgets/widgets/charactermap/mainwindow.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
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); } |