Apply C++11 fixits

modernize-loop-convert
modernize-deprecated-headers

1 files changed, 22 insertions, 29 deletions

diff --git a/src/account-server/storage.cpp b/src/account-server/storage.cpp
index d243b1e7..919238b0 100644
--- a/src/account-server/storage.cpp
+++ b/src/account-server/storage.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <cassert>
-#include <time.h>
+#include <ctime>
 
 #include "account-server/storage.h"
 
@@ -39,7 +39,7 @@
 #include "utils/throwerror.h"
 #include "utils/xml.h"
 
-#include <stdint.h>
+#include <cstdint>
 
 static const char *DEFAULT_ITEM_FILE = "items.xml";
 
@@ -292,15 +292,14 @@ void Storage::fixCharactersSlot(int accountId)
             dal::PerformTransaction transaction(mDb);
 
             // Update the slots in database.
-            for (auto i = slotsToUpdate.begin(),
-                i_end = slotsToUpdate.end(); i != i_end; ++i)
+            for (auto &i : slotsToUpdate)
             {
                 // Update the character slot.
                 sql.clear();
                 sql.str("");
                 sql << "UPDATE " << CHARACTERS_TBL_NAME
-                    << " SET slot = " << i->second
-                    << " where id = " << i->first;
+                    << " SET slot = " << i.second
+                    << " where id = " << i.first;
                 mDb->execSql(sql.str());
             }
 
@@ -834,16 +833,15 @@ bool Storage::updateCharacter(CharacterData *character)
 
         const Possessions &poss = character->getPossessions();
         const InventoryData &inventoryData = poss.getInventory();
-        for (auto itemIt = inventoryData.begin(),
-             j_end = inventoryData.end(); itemIt != j_end; ++itemIt)
+        for (const auto &itemIt : inventoryData)
         {
             sql.str("");
-            unsigned short slot = itemIt->first;
-            unsigned itemId = itemIt->second.itemId;
-            unsigned amount = itemIt->second.amount;
+            unsigned short slot = itemIt.first;
+            unsigned itemId = itemIt.second.itemId;
+            unsigned amount = itemIt.second.amount;
             assert(itemId);
             sql << base << slot << ", " << itemId << ", " << amount << ", "
-                << itemIt->second.equipmentSlot << ");";
+                << itemIt.second.equipmentSlot << ");";
             mDb->execSql(sql.str());
         }
 
@@ -968,10 +966,9 @@ void Storage::flush(const Account &account)
         const Characters &characters = account.getCharacters();
 
         // Insert or update the characters.
-        for (auto it = characters.begin(),
-             it_end = characters.end(); it != it_end; ++it)
+        for (auto it : characters)
         {
-            CharacterData *character = (*it).second;
+            CharacterData *character = it.second;
             if (character->getDatabaseID() >= 0)
             {
                 updateCharacter(character);
@@ -1039,10 +1036,9 @@ void Storage::flush(const Account &account)
         for (unsigned i = 0; i < charInMemInfo.rows(); ++i) // In database
         {
             charFound = false;
-            for (auto it = characters.begin(),
-                 it_end = characters.end(); it != it_end; ++it) // In memory
+            for (auto character : characters) // In memory
             {
-                if (charInMemInfo(i, 0) == (*it).second->getName())
+                if (charInMemInfo(i, 0) == character.second->getName())
                 {
                     charFound = true;
                     break;
@@ -1411,12 +1407,11 @@ std::map<int, Guild*> Storage::getGuildList()
     std::stringstream sql;
     string_to<short> toShort;
 
-
     // Get the guilds stored in the db.
     try
     {
         sql << "select id, name from " << GUILDS_TBL_NAME << ";";
-        const dal::RecordSet& guildInfo = mDb->execSql(sql.str());
+        const dal::RecordSet &guildInfo = mDb->execSql(sql.str());
 
         // Check that at least 1 guild was returned
         if (guildInfo.isEmpty())
@@ -1432,30 +1427,28 @@ std::map<int, Guild*> Storage::getGuildList()
         string_to< unsigned > toUint;
 
         // Add the members to the guilds.
-        for (auto it = guilds.begin();
-             it != guilds.end(); ++it)
+        for (auto &guild : guilds)
         {
             std::ostringstream memberSql;
             memberSql << "select member_id, rights from "
                       << GUILD_MEMBERS_TBL_NAME
-                      << " where guild_id = '" << it->second->getId() << "';";
+                      << " where guild_id = '" << guild.second->getId() << "';";
             const dal::RecordSet& memberInfo = mDb->execSql(memberSql.str());
 
             std::list<std::pair<int, int> > members;
             for (unsigned j = 0; j < memberInfo.rows(); ++j)
             {
                 members.push_back(std::pair<int, int>(toUint(memberInfo(j, 0)),
-                                                     toUint(memberInfo(j, 1))));
+                                                      toUint(memberInfo(j, 1))));
             }
 
-            std::list<std::pair<int, int> >::const_iterator i, i_end;
-            for (i = members.begin(), i_end = members.end(); i != i_end; ++i)
+            for (auto i : members)
             {
-                CharacterData *character = getCharacter((*i).first, nullptr);
+                CharacterData *character = getCharacter(i.first, nullptr);
                 if (character)
                 {
-                    character->addGuild(it->second->getName());
-                    it->second->addMember(character->getDatabaseID(), (*i).second);
+                    character->addGuild(guild.second->getName());
+                    guild.second->addMember(character->getDatabaseID(), i.second);
                 }
             }
         }