diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-01 15:18:57 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-02-02 12:49:19 +0000 |
commit | df39627fa33392a71ab79aadaa57e5c5e650e79e (patch) | |
tree | 83a776716c9b8d9bea2e0a5c3282aa5e0cbcdb6d /examples/corelib | |
parent | 7847e6bc02552fa7fc7f518e5cb3336f667b5a6d (diff) |
Examples: cleanup foreach usage
Replace deprecated foreach macro with range-based for loop
Change-Id: If919ba1d1d4acddfc1c5460ce7aebf8c49e3ac38
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'examples/corelib')
4 files changed, 8 insertions, 5 deletions
diff --git a/examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp b/examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp index bc7ec17d1c..2e5c8069b8 100644 --- a/examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp +++ b/examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp @@ -185,7 +185,9 @@ void MainWindow::find() m_findMatches.clear(); m_findIndex = 0; - foreach (const QStandardItem *item, m_model->findItems(value, Qt::MatchContains | Qt::MatchFixedString | Qt::MatchRecursive)) + const QList<QStandardItem *> items = + m_model->findItems(value, Qt::MatchContains | Qt::MatchFixedString | Qt::MatchRecursive); + for (const QStandardItem *item : items) m_findMatches.append(m_model->indexFromItem(item)); statusBar()->showMessage(tr("%n mime types match \"%1\".", 0, m_findMatches.size()).arg(value)); updateFindActions(); diff --git a/examples/corelib/serialization/savegame/game.cpp b/examples/corelib/serialization/savegame/game.cpp index 4caec71a03..226f6fda11 100644 --- a/examples/corelib/serialization/savegame/game.cpp +++ b/examples/corelib/serialization/savegame/game.cpp @@ -185,7 +185,7 @@ void Game::write(QJsonObject &json) const json["player"] = playerObject; QJsonArray levelArray; - foreach (const Level level, mLevels) { + for (const Level level : mLevels) { QJsonObject levelObject; level.write(levelObject); levelArray.append(levelObject); diff --git a/examples/corelib/serialization/savegame/level.cpp b/examples/corelib/serialization/savegame/level.cpp index 8eda107f46..c7adc6c8ff 100644 --- a/examples/corelib/serialization/savegame/level.cpp +++ b/examples/corelib/serialization/savegame/level.cpp @@ -97,7 +97,7 @@ void Level::write(QJsonObject &json) const { json["name"] = mName; QJsonArray npcArray; - foreach (const Character npc, mNpcs) { + for (const Character npc : mNpcs) { QJsonObject npcObject; npc.write(npcObject); npcArray.append(npcObject); diff --git a/examples/corelib/threads/queuedcustomtype/window.cpp b/examples/corelib/threads/queuedcustomtype/window.cpp index 2cefba1e17..0d3f80aba4 100644 --- a/examples/corelib/threads/queuedcustomtype/window.cpp +++ b/examples/corelib/threads/queuedcustomtype/window.cpp @@ -89,9 +89,10 @@ Window::Window() void Window::loadImage() { QStringList formats; - foreach (QByteArray format, QImageReader::supportedImageFormats()) + const QList<QByteArray> supportedFormats = QImageReader::supportedImageFormats(); + for (const QByteArray &format : supportedFormats) if (format.toLower() == format) - formats.append("*." + format); + formats.append(QLatin1String("*.") + QString::fromLatin1(format)); QString newPath = QFileDialog::getOpenFileName(this, tr("Open Image"), path, tr("Image files (%1)").arg(formats.join(' '))); |