From 64b2eb7490f502feececec314eb215bbb7832858 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Tue, 4 Dec 2018 17:27:16 +0100 Subject: Cleanup Widgets examples - replace foreach Cleanup the Widget examples - replace foreach with a standard for loop Change-Id: I59cb2bf4494201f9f0228b07a8bb936ce40da46f Reviewed-by: Samuel Gaist Reviewed-by: Konstantin Shegunov Reviewed-by: Edward Welbourne Reviewed-by: Paul Wicking --- examples/widgets/widgets/charactermap/mainwindow.cpp | 11 ++++++----- examples/widgets/widgets/icons/mainwindow.cpp | 16 ++++++++++------ examples/widgets/widgets/imageviewer/imageviewer.cpp | 2 +- examples/widgets/widgets/scribble/mainwindow.cpp | 7 ++++--- examples/widgets/widgets/tooltips/sortingbox.cpp | 2 +- examples/widgets/widgets/validators/localeselector.cpp | 4 +++- 6 files changed, 25 insertions(+), 17 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 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 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/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp index 904245494c..0cf11c978d 100644 --- a/examples/widgets/widgets/icons/mainwindow.cpp +++ b/examples/widgets/widgets/icons/mainwindow.cpp @@ -122,7 +122,8 @@ void MainWindow::changeStyle(bool checked) Q_ASSERT(style); QApplication::setStyle(style); - foreach (QAbstractButton *button, sizeButtonGroup->buttons()) { + const QList buttons = sizeButtonGroup->buttons(); + for (QAbstractButton *button : buttons) { const QStyle::PixelMetric metric = static_cast(sizeButtonGroup->id(button)); const int value = style->pixelMetric(metric); switch (metric) { @@ -230,7 +231,8 @@ void MainWindow::addImages(const QString &directory) { QFileDialog fileDialog(this, tr("Open Images"), directory); QStringList mimeTypeFilters; - foreach (const QByteArray &mimeTypeName, QImageReader::supportedMimeTypes()) + const QList mimeTypes = QImageReader::supportedMimeTypes(); + for (const QByteArray &mimeTypeName : mimeTypes) mimeTypeFilters.append(mimeTypeName); mimeTypeFilters.sort(); fileDialog.setMimeTypeFilters(mimeTypeFilters); @@ -246,7 +248,7 @@ void MainWindow::addImages(const QString &directory) void MainWindow::loadImages(const QStringList &fileNames) { - foreach (const QString &fileName, fileNames) { + for (const QString &fileName : fileNames) { const int row = imagesTable->rowCount(); imagesTable->setRowCount(row + 1); //! [13] @@ -469,7 +471,8 @@ void MainWindow::createActions() QMenu *viewMenu = menuBar()->addMenu(tr("&View")); styleActionGroup = new QActionGroup(this); - foreach (const QString &styleName, QStyleFactory::keys()) { + const QStringList styleKeys = QStyleFactory::keys(); + for (const QString &styleName : styleKeys) { QAction *action = new QAction(tr("%1 Style").arg(styleName), styleActionGroup); action->setData(styleName); action->setCheckable(true); @@ -508,8 +511,9 @@ void MainWindow::createContextMenu() //! [31] void MainWindow::checkCurrentStyle() { - foreach (QAction *action, styleActionGroup->actions()) { - QString styleName = action->data().toString(); + const QList actions = styleActionGroup->actions(); + for (QAction *action : actions) { + const QString styleName = action->data().toString(); QScopedPointer candidate(QStyleFactory::create(styleName)); Q_ASSERT(!candidate.isNull()); if (candidate->metaObject()->className() diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp index b1346d9ccb..70623dc7cb 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.cpp +++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp @@ -151,7 +151,7 @@ static void initializeImageFileDialog(QFileDialog &dialog, QFileDialog::AcceptMo QStringList mimeTypeFilters; const QByteArrayList supportedMimeTypes = acceptMode == QFileDialog::AcceptOpen ? QImageReader::supportedMimeTypes() : QImageWriter::supportedMimeTypes(); - foreach (const QByteArray &mimeTypeName, supportedMimeTypes) + for (const QByteArray &mimeTypeName : supportedMimeTypes) mimeTypeFilters.append(mimeTypeName); mimeTypeFilters.sort(); dialog.setMimeTypeFilters(mimeTypeFilters); diff --git a/examples/widgets/widgets/scribble/mainwindow.cpp b/examples/widgets/widgets/scribble/mainwindow.cpp index 58dc42c076..44afa64b94 100644 --- a/examples/widgets/widgets/scribble/mainwindow.cpp +++ b/examples/widgets/widgets/scribble/mainwindow.cpp @@ -153,8 +153,9 @@ void MainWindow::createActions() openAct->setShortcuts(QKeySequence::Open); connect(openAct, &QAction::triggered, this, &MainWindow::open); - foreach (QByteArray format, QImageWriter::supportedImageFormats()) { - QString text = tr("%1...").arg(QString(format).toUpper()); + const QList imageFormats = QImageWriter::supportedImageFormats(); + for (const QByteArray &format : imageFormats) { + QString text = tr("%1...").arg(QString::fromLatin1(format).toUpper()); QAction *action = new QAction(text, this); action->setData(format); @@ -193,7 +194,7 @@ void MainWindow::createMenus() //! [15] //! [16] { saveAsMenu = new QMenu(tr("&Save As"), this); - foreach (QAction *action, saveAsActs) + for (QAction *action : qAsConst(saveAsActs)) saveAsMenu->addAction(action); fileMenu = new QMenu(tr("&File"), this); diff --git a/examples/widgets/widgets/tooltips/sortingbox.cpp b/examples/widgets/widgets/tooltips/sortingbox.cpp index 5f8d96f110..838083c399 100644 --- a/examples/widgets/widgets/tooltips/sortingbox.cpp +++ b/examples/widgets/widgets/tooltips/sortingbox.cpp @@ -140,7 +140,7 @@ void SortingBox::paintEvent(QPaintEvent * /* event */) { QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); - foreach (ShapeItem shapeItem, shapeItems) { + for (const ShapeItem &shapeItem : qAsConst(shapeItems)) { //! [8] //! [9] painter.translate(shapeItem.position()); //! [9] //! [10] diff --git a/examples/widgets/widgets/validators/localeselector.cpp b/examples/widgets/widgets/validators/localeselector.cpp index 7253fea9ec..1382da0cc9 100644 --- a/examples/widgets/widgets/validators/localeselector.cpp +++ b/examples/widgets/widgets/validators/localeselector.cpp @@ -59,7 +59,9 @@ LocaleSelector::LocaleSelector(QWidget *parent) int index = 0; for (int _lang = QLocale::C; _lang <= QLocale::LastLanguage; ++_lang) { QLocale::Language lang = static_cast(_lang); - foreach (const QLocale &l, QLocale::matchingLocales(lang, QLocale::AnyScript, QLocale::AnyCountry)) { + const QList locales = + QLocale::matchingLocales(lang, QLocale::AnyScript, QLocale::AnyCountry); + for (const QLocale &l : locales) { QString label = QLocale::languageToString(l.language()); label += QLatin1Char('/'); label += QLocale::countryToString(l.country()); -- cgit v1.2.3