Apply C++11 fixits

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

1 files changed, 11 insertions, 20 deletions

diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index e1bb10df..a66fb493 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -45,7 +45,7 @@ void registerChatClient(const std::string &token,
                         const std::string &name,
                         int level)
 {
-    ChatHandler::Pending *p = new ChatHandler::Pending;
+    auto p = new ChatHandler::Pending;
     p->character = name;
     p->level = level;
     chatHandler->mTokenCollector.addPendingConnect(token, p);
@@ -112,7 +112,7 @@ NetComputer *ChatHandler::computerConnected(ENetPeer *peer)
 
 void ChatHandler::computerDisconnected(NetComputer *comp)
 {
-    ChatClient *computer = static_cast< ChatClient * >(comp);
+    auto computer = static_cast< ChatClient * >(comp);
 
     if (computer->characterName.empty())
     {
@@ -377,12 +377,10 @@ void ChatHandler::handleEnterChannelMessage(ChatClient &client, MessageIn &msg)
             reply.writeString(channel->getAnnouncement());
             const ChatChannel::ChannelUsers &users = channel->getUserList();
 
-            for (ChatChannel::ChannelUsers::const_iterator i = users.begin(),
-                    i_end = users.end();
-                    i != i_end; ++i)
+            for (auto chatClient : users)
             {
-                reply.writeString((*i)->characterName);
-                reply.writeString(channel->getUserMode((*i)));
+                reply.writeString(chatClient->characterName);
+                reply.writeString(channel->getUserMode(chatClient));
             }
             // Send an CPMSG_UPDATE_CHANNEL to warn other clients a user went
             // in the channel.
@@ -533,7 +531,7 @@ void ChatHandler::handleListChannelsMessage(ChatClient &client, MessageIn &)
     std::list<const ChatChannel*> channels =
         chatChannelManager->getPublicChannels();
 
-    for (std::list<const ChatChannel*>::iterator i = channels.begin(),
+    for (auto i = channels.begin(),
             i_end = channels.end();
             i != i_end; ++i)
     {
@@ -564,8 +562,7 @@ void ChatHandler::handleListChannelUsersMessage(ChatClient &client,
 
         const ChatChannel::ChannelUsers &users = channel->getUserList();
 
-        for (ChatChannel::ChannelUsers::const_iterator
-             i = users.begin(), i_end = users.end(); i != i_end; ++i)
+        for (auto i = users.begin(), i_end = users.end(); i != i_end; ++i)
         {
             reply.writeString((*i)->characterName);
             reply.writeString(channel->getUserMode((*i)));
@@ -622,7 +619,7 @@ void ChatHandler::sayToPlayer(ChatClient &computer,
     MessageOut result(CPMSG_PRIVMSG);
     result.writeString(computer.characterName);
     result.writeString(text);
-    for (NetComputers::iterator i = clients.begin(), i_end = clients.end();
+    for (auto i = clients.begin(), i_end = clients.end();
          i != i_end; ++i) {
         if (static_cast< ChatClient * >(*i)->characterName == playerName)
         {
@@ -647,8 +644,7 @@ void ChatHandler::sendInChannel(ChatChannel *channel, MessageOut &msg)
 {
     const ChatChannel::ChannelUsers &users = channel->getUserList();
 
-    for (ChatChannel::ChannelUsers::const_iterator
-         i = users.begin(), i_end = users.end(); i != i_end; ++i)
+    for (auto i = users.begin(), i_end = users.end(); i != i_end; ++i)
     {
         (*i)->send(msg);
     }
@@ -656,11 +652,6 @@ void ChatHandler::sendInChannel(ChatChannel *channel, MessageOut &msg)
 
 ChatClient *ChatHandler::getClient(const std::string &name) const
 {
-    std::map<std::string, ChatClient*>::const_iterator itr
-            = mPlayerMap.find(name);
-
-    if (itr != mPlayerMap.end())
-        return itr->second;
-    else
-        return 0;
+    auto itr = mPlayerMap.find(name);
+    return (itr != mPlayerMap.end()) ? itr->second : nullptr;
 }