diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-12-04 17:27:16 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-28 19:37:39 +0000 |
commit | 64b2eb7490f502feececec314eb215bbb7832858 (patch) | |
tree | 74cde25d3c12dbdc61647e2de986ba5ab8a36707 /examples/widgets/widgets/charactermap | |
parent | f9e6f8efda350689211286db9154677924df8aab (diff) |
Cleanup Widgets examples - replace foreach
Cleanup the Widget examples - replace foreach with a standard for loop
Change-Id: I59cb2bf4494201f9f0228b07a8bb936ce40da46f
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'examples/widgets/widgets/charactermap')
-rw-r--r-- | examples/widgets/widgets/charactermap/mainwindow.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/examples/widgets/widgets/charactermap/mainwindow.cpp b/examples/widgets/widgets/charactermap/mainwindow.cpp index 1b6f77bf30..e84ded5afb 100644 --- a/examples/widgets/widgets/charactermap/mainwindow.cpp +++ b/examples/widgets/widgets/charactermap/mainwindow.cpp @@ -170,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); @@ -201,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); } |