Apply C++11 fixits

modernize-loop-convert
modernize-deprecated-headers

6 files changed, 54 insertions, 71 deletions

diff --git a/src/account-server/account.cpp b/src/account-server/account.cpp
index 6fd86842..11773c47 100644
--- a/src/account-server/account.cpp
+++ b/src/account-server/account.cpp
@@ -24,10 +24,9 @@
 
 Account::~Account()
 {
-    for (auto i = mCharacters.begin(),
-         i_end = mCharacters.end(); i != i_end; ++i)
+    for (auto &character : mCharacters)
     {
-        delete (*i).second;
+        delete character.second;
     }
 }
 
diff --git a/src/account-server/account.h b/src/account-server/account.h
index 175d4bcd..2eb582c2 100644
--- a/src/account-server/account.h
+++ b/src/account-server/account.h
@@ -23,7 +23,7 @@
 
 #include <string>
 #include <vector>
-#include <time.h>
+#include <ctime>
 
 #include "account-server/character.h"
 
diff --git a/src/account-server/character.cpp b/src/account-server/character.cpp
index e22a84e9..c61be1f6 100644
--- a/src/account-server/character.cpp
+++ b/src/account-server/character.cpp
@@ -106,14 +106,13 @@ void CharacterData::serialize(MessageOut &msg)
     const EquipData &equipData = poss.getEquipment();
 
     const InventoryData &inventoryData = poss.getInventory();
-    for (auto itemIt = inventoryData.begin(),
-         itemIt_end = inventoryData.end(); itemIt != itemIt_end; ++itemIt)
+    for (const auto &itemIt : inventoryData)
     {
-        int slot = itemIt->first;
+        int slot = itemIt.first;
         msg.writeInt16(slot);
-        msg.writeInt16(itemIt->second.itemId);
-        msg.writeInt16(itemIt->second.amount);
-        if (equipData.find(itemIt->first) != equipData.end())
+        msg.writeInt16(itemIt.second.itemId);
+        msg.writeInt16(itemIt.second.amount);
+        if (equipData.find(itemIt.first) != equipData.end())
             msg.writeInt8(1); // equipped
         else
             msg.writeInt8(0); // not equipped
diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp
index 9d3a800a..73382f23 100644
--- a/src/account-server/main-account.cpp
+++ b/src/account-server/main-account.cpp
@@ -49,7 +49,7 @@
 
 #include <cstdlib>
 #include <getopt.h>
-#include <signal.h>
+#include <csignal>
 #include <iostream>
 #include <fstream>
 #include <physfs.h>
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index 49aa2839..cc53eace 100644
--- a/src/account-server/serverhandler.cpp
+++ b/src/account-server/serverhandler.cpp
@@ -129,11 +129,9 @@ void ServerHandler::computerDisconnected(NetComputer *comp)
 
 static GameServer *getGameServerFromMap(int mapId)
 {
-    for (ServerHandler::NetComputers::const_iterator
-         i = serverHandler->clients.begin(),
-         i_end = serverHandler->clients.end(); i != i_end; ++i)
+    for (auto client : serverHandler->clients)
     {
-        auto server = static_cast< GameServer * >(*i);
+        auto server = static_cast< GameServer * >(client);
         ServerStatistics::const_iterator it = server->maps.find(mapId);
         if (it == server->maps.end()) continue;
         return server;
@@ -234,11 +232,10 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
                      << " asks for maps to activate.");
 
             const std::map<int, std::string> &maps = MapManager::getMaps();
-            for (auto it = maps.begin(),
-                 it_end = maps.end(); it != it_end; ++it)
+            for (const auto &it : maps)
             {
-                int id = it->first;
-                const std::string &reservedServer = it->second;
+                int id = it.first;
+                const std::string &reservedServer = it.second;
                 if (reservedServer == server->name)
                 {
                     MessageOut outMsg(AGMSG_ACTIVE_MAP);
@@ -267,13 +264,12 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
                     outMsg.writeInt16(items.size()); //number of floor items
 
                     // Send each map item: item_id, amount, pos_x, pos_y
-                    for (auto i = items.begin();
-                         i != items.end(); ++i)
+                    for (auto &item : items)
                     {
-                        outMsg.writeInt32(i->getItemId());
-                        outMsg.writeInt16(i->getItemAmount());
-                        outMsg.writeInt16(i->getPosX());
-                        outMsg.writeInt16(i->getPosY());
+                        outMsg.writeInt32(item.getItemId());
+                        outMsg.writeInt16(item.getItemAmount());
+                        outMsg.writeInt16(item.getPosX());
+                        outMsg.writeInt16(item.getPosY());
                     }
 
                     comp->send(outMsg);
@@ -487,10 +483,10 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
                     result.writeString(letter->getSender()->getName());
                     result.writeString(letter->getContents());
                     std::vector<InventoryItem> items = letter->getAttachments();
-                    for (unsigned j = 0; j < items.size(); ++j)
+                    for (auto &item : items)
                     {
-                        result.writeInt16(items[j].itemId);
-                        result.writeInt16(items[j].amount);
+                        result.writeInt16(item.itemId);
+                        result.writeInt16(item.amount);
                     }
                 }
 
@@ -538,11 +534,11 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
             LOG_DEBUG("Creating letter");
             auto letter = new Letter(0, sender, receiver);
             letter->addText(contents);
-            for (unsigned i = 0; i < items.size(); ++i)
+            for (auto &i : items)
             {
                 InventoryItem item;
-                item.itemId = items[i].first;
-                item.amount = items[i].second;
+                item.itemId = i.first;
+                item.amount = i.second;
                 letter->addAttachment(item);
             }
             postalManager->addLetter(letter);
@@ -616,27 +612,23 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
 
 void GameServerHandler::dumpStatistics(std::ostream &os)
 {
-    for (ServerHandler::NetComputers::const_iterator
-         i = serverHandler->clients.begin(),
-         i_end = serverHandler->clients.end(); i != i_end; ++i)
+    for (auto client : serverHandler->clients)
     {
-        auto server = static_cast< GameServer * >(*i);
+        auto server = static_cast< GameServer * >(client);
         if (!server->port)
             continue;
 
         os << "<gameserver address=\"" << server->address << "\" port=\""
            << server->port << "\">\n";
 
-        for (ServerStatistics::const_iterator j = server->maps.begin(),
-             j_end = server->maps.end(); j != j_end; ++j)
+        for (const auto &j : server->maps)
         {
-            const MapStatistics &m = j->second;
-            os << "<map id=\"" << j->first << "\" nb_entities=\"" << m.nbEntities
+            const MapStatistics &m = j.second;
+            os << "<map id=\"" << j.first << "\" nb_entities=\"" << m.nbEntities
                << "\" nb_monsters=\"" << m.nbMonsters << "\">\n";
-            for (auto k = m.players.begin(),
-                 k_end = m.players.end(); k != k_end; ++k)
+            for (int player : m.players)
             {
-                os << "<character id=\"" << *k << "\"/>\n";
+                os << "<character id=\"" << player << "\"/>\n";
             }
             os << "</map>\n";
         }
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);
                 }
             }
         }