diff options
author | Marc Mutz <marc.mutz@qt.io> | 2023-02-07 13:52:50 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-08 13:51:32 +0000 |
commit | eba4899100d042ee467d8218d41d8151c522e156 (patch) | |
tree | 1188e305f8ca4bcd5b660d1796bd13e8f38baeab | |
parent | eb4d4c8f64c0ceb34256b310719321dde66c8d4e (diff) |
savegame ex.: use ranged instead of indexed loops
Modernizes the code, and fixes qsizetype/int mismatch.
Task-number: QTBUG-108857
Change-Id: Id4262ee0bcb673d62135a81c30976903eef3e5e2
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 44933343937d7a6d9f6afe1f8e0b0f93a387b100)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | examples/corelib/serialization/savegame/game.cpp | 4 | ||||
-rw-r--r-- | examples/corelib/serialization/savegame/level.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/corelib/serialization/savegame/game.cpp b/examples/corelib/serialization/savegame/game.cpp index 111fbfc6ea..a2427ee124 100644 --- a/examples/corelib/serialization/savegame/game.cpp +++ b/examples/corelib/serialization/savegame/game.cpp @@ -121,8 +121,8 @@ void Game::read(const QJsonObject &json) QJsonArray levelArray = json["levels"].toArray(); mLevels.clear(); mLevels.reserve(levelArray.size()); - for (int levelIndex = 0; levelIndex < levelArray.size(); ++levelIndex) { - QJsonObject levelObject = levelArray[levelIndex].toObject(); + for (const QJsonValue &v : levelArray) { + QJsonObject levelObject = v.toObject(); Level level; level.read(levelObject); mLevels.append(level); diff --git a/examples/corelib/serialization/savegame/level.cpp b/examples/corelib/serialization/savegame/level.cpp index 04edadf7f6..c2f88c3434 100644 --- a/examples/corelib/serialization/savegame/level.cpp +++ b/examples/corelib/serialization/savegame/level.cpp @@ -35,8 +35,8 @@ void Level::read(const QJsonObject &json) QJsonArray npcArray = json["npcs"].toArray(); mNpcs.clear(); mNpcs.reserve(npcArray.size()); - for (int npcIndex = 0; npcIndex < npcArray.size(); ++npcIndex) { - QJsonObject npcObject = npcArray[npcIndex].toObject(); + for (const QJsonValue &v : npcArray) { + QJsonObject npcObject = v.toObject(); Character npc; npc.read(npcObject); mNpcs.append(npc); |