1 files changed, 12 insertions, 21 deletions

diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index a66fb493..a80d8404 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -528,15 +528,11 @@ void ChatHandler::handleListChannelsMessage(ChatClient &client, MessageIn &)
 {
     MessageOut reply(CPMSG_LIST_CHANNELS_RESPONSE);
 
-    std::list<const ChatChannel*> channels =
-        chatChannelManager->getPublicChannels();
-
-    for (auto i = channels.begin(),
-            i_end = channels.end();
-            i != i_end; ++i)
+    const auto channels = chatChannelManager->getPublicChannels();
+    for (auto &channel : channels)
     {
-        reply.writeString((*i)->getName());
-        reply.writeInt16((*i)->getUserList().size());
+        reply.writeString(channel->getName());
+        reply.writeInt16(channel->getUserList().size());
     }
 
     client.send(reply);
@@ -560,12 +556,10 @@ void ChatHandler::handleListChannelUsersMessage(ChatClient &client,
     {
         reply.writeString(channel->getName());
 
-        const ChatChannel::ChannelUsers &users = channel->getUserList();
-
-        for (auto i = users.begin(), i_end = users.end(); i != i_end; ++i)
+        for (auto user : channel->getUserList())
         {
-            reply.writeString((*i)->characterName);
-            reply.writeString(channel->getUserMode((*i)));
+            reply.writeString(user->characterName);
+            reply.writeString(channel->getUserMode(user));
         }
 
         client.send(reply);
@@ -619,11 +613,10 @@ void ChatHandler::sayToPlayer(ChatClient &computer,
     MessageOut result(CPMSG_PRIVMSG);
     result.writeString(computer.characterName);
     result.writeString(text);
-    for (auto i = clients.begin(), i_end = clients.end();
-         i != i_end; ++i) {
-        if (static_cast< ChatClient * >(*i)->characterName == playerName)
+    for (auto &client : clients) {
+        if (static_cast< ChatClient * >(client)->characterName == playerName)
         {
-            (*i)->send(result);
+            client->send(result);
             break;
         }
     }
@@ -642,11 +635,9 @@ void ChatHandler::warnUsersAboutPlayerEventInChat(ChatChannel *channel,
 
 void ChatHandler::sendInChannel(ChatChannel *channel, MessageOut &msg)
 {
-    const ChatChannel::ChannelUsers &users = channel->getUserList();
-
-    for (auto i = users.begin(), i_end = users.end(); i != i_end; ++i)
+    for (auto user : channel->getUserList())
     {
-        (*i)->send(msg);
+        user->send(msg);
     }
 }