From 13e995b811e80dc48c0769274d3dca3a2221b843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Thu, 17 Aug 2017 23:02:50 +0200 Subject: Modernize src/c* src/d* and src/e* files (#6263) * Modernize src/c* src/d* and src/e* files * default operator * redundant init * delete default constructors on CraftDefinition childs (never used) * fix some missing init values * const ref fix reported by clang-tidy * ranged-based for loops * simple conditions & returns * empty stl function instead of size * emplace_back stl function instead of push_back + construct temp obj * auto for some iterators * code style fixes * c++ stl headers instead of C stl headers (stdio.h -> cstdio) --- src/database-postgresql.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/database-postgresql.cpp') diff --git a/src/database-postgresql.cpp b/src/database-postgresql.cpp index 78f59419f..de1601d0d 100644 --- a/src/database-postgresql.cpp +++ b/src/database-postgresql.cpp @@ -489,7 +489,8 @@ void PlayerDatabasePostgreSQL::savePlayer(RemotePlayer *player) std::vector inventory_lists = sao->getInventory()->getLists(); for (u16 i = 0; i < inventory_lists.size(); i++) { const InventoryList* list = inventory_lists[i]; - std::string name = list->getName(), width = itos(list->getWidth()), + const std::string &name = list->getName(); + std::string width = itos(list->getWidth()), inv_id = itos(i), lsize = itos(list->getSize()); const char* inv_values[] = { @@ -518,11 +519,11 @@ void PlayerDatabasePostgreSQL::savePlayer(RemotePlayer *player) execPrepared("remove_player_metadata", 1, rmvalues); const PlayerAttributes &attrs = sao->getExtendedAttributes(); - for (PlayerAttributes::const_iterator it = attrs.begin(); it != attrs.end(); ++it) { + for (const auto &attr : attrs) { const char *meta_values[] = { player->getName(), - it->first.c_str(), - it->second.c_str() + attr.first.c_str(), + attr.second.c_str() }; execPrepared("save_player_metadata", 3, meta_values); } @@ -622,7 +623,7 @@ void PlayerDatabasePostgreSQL::listPlayers(std::vector &res) int numrows = PQntuples(results); for (int row = 0; row < numrows; row++) - res.push_back(PQgetvalue(results, row, 0)); + res.emplace_back(PQgetvalue(results, row, 0)); PQclear(results); } -- cgit v1.2.3