From cde9bed5a6ea01fb28b9d1681bb5a57f62ceb87d Mon Sep 17 00:00:00 2001 From: Aleksandar Kazandzhiev Date: Sat, 20 Jul 2024 12:16:13 +0300 Subject: [PATCH] Use std::vector::empty for non-zero size checking. Use auto type for ocontainers iterations. --- client/mainmenu/CMainMenu.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/mainmenu/CMainMenu.cpp b/client/mainmenu/CMainMenu.cpp index f63607d88..cfac9fcb3 100644 --- a/client/mainmenu/CMainMenu.cpp +++ b/client/mainmenu/CMainMenu.cpp @@ -485,9 +485,9 @@ const std::vector CMultiMode::getPlayersNames() playerNameStr = CGI->generaltexth->translate("core.genrltxt.434"); playerNames.push_back(playerNameStr); - for (JsonNode playerName : settings["general"]["multiPlayerNames"].Vector()) + for (const auto & playerName : settings["general"]["multiPlayerNames"].Vector()) { - std::string &nameStr = playerName.String(); + const std::string &nameStr = playerName.String(); if (!nameStr.empty()) { playerNames.push_back(nameStr); @@ -549,10 +549,10 @@ void CMultiPlayers::enterSelectionScreen() Settings playerName = settings.write["general"]["playerName"]; Settings multiPlayerNames = settings.write["general"]["multiPlayerNames"]; multiPlayerNames->Vector().clear(); - if (playerNames.size() > 0) + if (!playerNames.empty()) { playerName->String() = playerNames.front(); - for (std::vector::iterator playerNameIt = playerNames.begin()+1; playerNameIt != playerNames.end(); playerNameIt++) + for (auto playerNameIt = playerNames.begin()+1; playerNameIt != playerNames.end(); playerNameIt++) { multiPlayerNames->Vector().push_back(JsonNode(*playerNameIt)); }