1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

savegame ex.: use ranged instead of indexed loops

Browse Source 
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>
This commit is contained in:
Marc Mutz 2023-02-07 13:52:50 +01:00 committed by Qt Cherry-pick Bot
parent eb4d4c8f64
commit eba4899100
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/corelib/serialization/savegame/game.cpp
View File

@ -121,8 +121,8 @@ void Game::read(const QJsonObject &json)
QJsonArray levelArray = json["levels"].toArray(); QJsonArray levelArray = json["levels"].toArray();
mLevels.clear(); mLevels.clear();
mLevels.reserve(levelArray.size()); mLevels.reserve(levelArray.size());
for (int levelIndex = 0; levelIndex < levelArray.size(); ++levelIndex) { for (const QJsonValue &v : levelArray) {
QJsonObject levelObject = levelArray[levelIndex].toObject(); QJsonObject levelObject = v.toObject();
Level level; Level level;
level.read(levelObject); level.read(levelObject);
mLevels.append(level); mLevels.append(level);

4
examples/corelib/serialization/savegame/level.cpp
View File

@ -35,8 +35,8 @@ void Level::read(const QJsonObject &json)
QJsonArray npcArray = json["npcs"].toArray(); QJsonArray npcArray = json["npcs"].toArray();
mNpcs.clear(); mNpcs.clear();
mNpcs.reserve(npcArray.size()); mNpcs.reserve(npcArray.size());
for (int npcIndex = 0; npcIndex < npcArray.size(); ++npcIndex) { for (const QJsonValue &v : npcArray) {
QJsonObject npcObject = npcArray[npcIndex].toObject(); QJsonObject npcObject = v.toObject();
Character npc; Character npc;
npc.read(npcObject); npc.read(npcObject);
mNpcs.append(npc); mNpcs.append(npc);