Apply C++11 fixits

modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using

1 files changed, 13 insertions, 13 deletions

diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index 273642b2..49aa2839 100644
--- a/src/account-server/serverhandler.cpp
+++ b/src/account-server/serverhandler.cpp
@@ -51,14 +51,14 @@ struct MapStatistics
   unsigned short nbMonsters;
 };
 
-typedef std::map<unsigned short, MapStatistics> ServerStatistics;
+using ServerStatistics = std::map<unsigned short, MapStatistics>;
 
 /**
  * Stores address, maps, and statistics, of a connected game server.
  */
 struct GameServer: NetComputer
 {
-    GameServer(ENetPeer *peer): NetComputer(peer), server(0), port(0) {}
+    GameServer(ENetPeer *peer): NetComputer(peer), server(nullptr), port(0) {}
 
     std::string name;
     std::string address;
@@ -81,18 +81,18 @@ class ServerHandler: public ConnectionHandler
         /**
          * Processes server messages.
          */
-        void processMessage(NetComputer *computer, MessageIn &message);
+        void processMessage(NetComputer *computer, MessageIn &message) override;
 
         /**
          * Called when a game server connects. Initializes a simple NetComputer
          * as these connections are stateless.
          */
-        NetComputer *computerConnected(ENetPeer *peer);
+        NetComputer *computerConnected(ENetPeer *peer) override;
 
         /**
          * Called when a game server disconnects.
          */
-        void computerDisconnected(NetComputer *comp);
+        void computerDisconnected(NetComputer *comp) override;
 };
 
 static ServerHandler *serverHandler;
@@ -133,7 +133,7 @@ static GameServer *getGameServerFromMap(int mapId)
          i = serverHandler->clients.begin(),
          i_end = serverHandler->clients.end(); i != i_end; ++i)
     {
-        GameServer *server = static_cast< GameServer * >(*i);
+        auto server = static_cast< GameServer * >(*i);
         ServerStatistics::const_iterator it = server->maps.find(mapId);
         if (it == server->maps.end()) continue;
         return server;
@@ -175,7 +175,7 @@ void GameServerHandler::registerClient(const std::string &token,
 
 void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
 {
-    GameServer *server = static_cast<GameServer *>(comp);
+    auto server = static_cast<GameServer *>(comp);
 
     switch (msg.getId())
     {
@@ -234,7 +234,7 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
                      << " asks for maps to activate.");
 
             const std::map<int, std::string> &maps = MapManager::getMaps();
-            for (std::map<int, std::string>::const_iterator it = maps.begin(),
+            for (auto it = maps.begin(),
                  it_end = maps.end(); it != it_end; ++it)
             {
                 int id = it->first;
@@ -267,7 +267,7 @@ 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 (std::list<FloorItem>::iterator i = items.begin();
+                    for (auto i = items.begin();
                          i != items.end(); ++i)
                     {
                         outMsg.writeInt32(i->getItemId());
@@ -431,7 +431,7 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
             while (msg.getUnreadLength())
             {
                 int mapId = msg.readInt16();
-                ServerStatistics::iterator i = server->maps.find(mapId);
+                auto i = server->maps.find(mapId);
                 if (i == server->maps.end())
                 {
                     LOG_ERROR("Server " << server->address << ':'
@@ -536,7 +536,7 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
 
             // save the letter
             LOG_DEBUG("Creating letter");
-            Letter *letter = new Letter(0, sender, receiver);
+            auto letter = new Letter(0, sender, receiver);
             letter->addText(contents);
             for (unsigned i = 0; i < items.size(); ++i)
             {
@@ -620,7 +620,7 @@ void GameServerHandler::dumpStatistics(std::ostream &os)
          i = serverHandler->clients.begin(),
          i_end = serverHandler->clients.end(); i != i_end; ++i)
     {
-        GameServer *server = static_cast< GameServer * >(*i);
+        auto server = static_cast< GameServer * >(*i);
         if (!server->port)
             continue;
 
@@ -633,7 +633,7 @@ void GameServerHandler::dumpStatistics(std::ostream &os)
             const MapStatistics &m = j->second;
             os << "<map id=\"" << j->first << "\" nb_entities=\"" << m.nbEntities
                << "\" nb_monsters=\"" << m.nbMonsters << "\">\n";
-            for (std::vector< int >::const_iterator k = m.players.begin(),
+            for (auto k = m.players.begin(),
                  k_end = m.players.end(); k != k_end; ++k)
             {
                 os << "<character id=\"" << *k << "\"/>\n";