Apply C++11 fixits

modernize-loop-convert
modernize-deprecated-headers

6 files changed, 41 insertions, 70 deletions

diff --git a/src/chat-server/chatchannel.cpp b/src/chat-server/chatchannel.cpp
index a85be8c8..2673bd18 100644
--- a/src/chat-server/chatchannel.cpp
+++ b/src/chat-server/chatchannel.cpp
@@ -71,23 +71,23 @@ bool ChatChannel::removeUser(ChatClient *user)
 {
     auto i_end = mRegisteredUsers.end(),
          i = std::find(mRegisteredUsers.begin(), i_end, user);
-    if (i == i_end) return false;
+    if (i == i_end)
+        return false;
     mRegisteredUsers.erase(i);
-    std::vector< ChatChannel * > &channels = user->channels;
+    std::vector<ChatChannel *> &channels = user->channels;
     channels.erase(std::find(channels.begin(), channels.end(), this));
-    std::map<ChatChannel*,std::string> &modes = user->userModes;
+    std::map<ChatChannel*, std::string> &modes = user->userModes;
     modes.erase(modes.begin(), modes.end());
     return true;
 }
 
 void ChatChannel::removeAllUsers()
 {
-    for (ChannelUsers::const_iterator i = mRegisteredUsers.begin(),
-         i_end = mRegisteredUsers.end(); i != i_end; ++i)
+    for (auto registeredUser : mRegisteredUsers)
     {
-        std::vector< ChatChannel * > &channels = (*i)->channels;
+        std::vector<ChatChannel *> &channels = registeredUser->channels;
         channels.erase(std::find(channels.begin(), channels.end(), this));
-        std::map<ChatChannel*,std::string> &modes = (*i)->userModes;
+        std::map<ChatChannel*,std::string> &modes = registeredUser->userModes;
         modes.erase(modes.begin(), modes.end());
     }
     mRegisteredUsers.clear();
@@ -114,11 +114,6 @@ void ChatChannel::setUserMode(ChatClient *user, unsigned char mode)
 
 std::string ChatChannel::getUserMode(ChatClient *user) const
 {
-    std::map<ChatChannel*, std::string>::const_iterator itr =
-            user->userModes.find(const_cast<ChatChannel*>(this));
-
-    if (itr != user->userModes.end())
-        return itr->second;
-
-    return nullptr;
+    auto itr = user->userModes.find(const_cast<ChatChannel*>(this));
+    return (itr != user->userModes.end()) ? itr->second : std::string();
 }
diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp
index 62b7b735..61d40de2 100644
--- a/src/chat-server/chatchannelmanager.cpp
+++ b/src/chat-server/chatchannelmanager.cpp
@@ -102,13 +102,11 @@ std::list<const ChatChannel*> ChatChannelManager::getPublicChannels() const
 {
     std::list<const ChatChannel*> channels;
 
-    for (auto i = mChatChannels.begin(),
-            i_end = mChatChannels.end();
-         i != i_end; ++i)
+    for (const auto &chatChannel : mChatChannels)
     {
-        if (i->second.canJoin())
+        if (chatChannel.second.canJoin())
         {
-            channels.push_back(&i->second);
+            channels.push_back(&chatChannel.second);
         }
     }
 
@@ -117,12 +115,10 @@ std::list<const ChatChannel*> ChatChannelManager::getPublicChannels() const
 
 int ChatChannelManager::getChannelId(const std::string &channelName) const
 {
-    for (auto i = mChatChannels.begin(),
-            i_end = mChatChannels.end();
-         i != i_end; ++i)
+    for (const auto &chatChannel : mChatChannels)
     {
-        if (i->second.getName() == channelName)
-            return i->first;
+        if (chatChannel.second.getName() == channelName)
+            return chatChannel.first;
     }
     return 0;
 }
@@ -137,11 +133,10 @@ ChatChannel *ChatChannelManager::getChannel(int channelId)
 
 ChatChannel *ChatChannelManager::getChannel(const std::string &name)
 {
-    for (auto i = mChatChannels.begin();
-         i != mChatChannels.end(); ++i)
+    for (auto &chatChannel : mChatChannels)
     {
-        if (i->second.getName() == name)
-            return &(i->second);
+        if (chatChannel.second.getName() == name)
+            return &(chatChannel.second);
     }
 
     return nullptr;
@@ -181,10 +176,9 @@ bool ChatChannelManager::channelExists(int channelId) const
 
 bool ChatChannelManager::channelExists(const std::string &channelName) const
 {
-    for (auto i = mChatChannels.begin();
-         i != mChatChannels.end(); ++i)
+    for (const auto &chatChannel : mChatChannels)
     {
-        if (i->second.getName() == channelName)
+        if (chatChannel.second.getName() == channelName)
             return true;
     }
     return false;
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);
     }
 }
 
diff --git a/src/chat-server/guild.cpp b/src/chat-server/guild.cpp
index b87860ae..05592ebc 100644
--- a/src/chat-server/guild.cpp
+++ b/src/chat-server/guild.cpp
@@ -54,10 +54,8 @@ void Guild::removeMember(int playerId)
     if (getOwner() == playerId)
     {
         // if the leader is leaving, assign next member as leader
-        for (auto it = mMembers.begin(),
-             it_end = mMembers.end(); it != it_end; ++it)
+        for (auto member : mMembers)
         {
-            GuildMember *member = *it;
             if (member->mId != playerId)
             {
                 setOwner(member->mId);
diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp
index 21235f8a..b6870699 100644
--- a/src/chat-server/guildhandler.cpp
+++ b/src/chat-server/guildhandler.cpp
@@ -59,11 +59,8 @@ void ChatHandler::sendGuildRejoin(ChatClient &client)
 
     client.guilds = guilds;
 
-    for (auto it = guilds.begin(),
-         it_end = guilds.end(); it != it_end; ++it)
+    for (auto guild : guilds)
     {
-        Guild *guild = *it;
-
         const int permissions = guild->getUserPermissions(client.characterId);
         const std::string guildName = guild->getName();
 
diff --git a/src/chat-server/guildmanager.cpp b/src/chat-server/guildmanager.cpp
index 4b350b2c..c2131ba4 100644
--- a/src/chat-server/guildmanager.cpp
+++ b/src/chat-server/guildmanager.cpp
@@ -36,10 +36,9 @@ GuildManager::GuildManager():
 
 GuildManager::~GuildManager()
 {
-    for (auto it = mGuilds.begin();
-            it != mGuilds.end(); ++it)
+    for (auto &guildIt : mGuilds)
     {
-        delete it->second;
+        delete guildIt.second;
     }
 }
 
@@ -117,11 +116,9 @@ Guild *GuildManager::findById(short id) const
 
 Guild *GuildManager::findByName(const std::string &name) const
 {
-    for (auto it = mGuilds.begin(),
-            it_end = mGuilds.end();
-            it != it_end; ++it)
+    for (auto guildIt : mGuilds)
     {
-        Guild *guild = it->second;
+        Guild *guild = guildIt.second;
         if (guild->getName() == name)
             return guild;
     }
@@ -136,12 +133,11 @@ bool GuildManager::doesExist(const std::string &name) const
 std::vector<Guild *> GuildManager::getGuildsForPlayer(int playerId) const
 {
     std::vector<Guild *> guilds;
-    for (auto it = mGuilds.begin();
-         it != mGuilds.end(); ++it)
+    for (auto guildIt : mGuilds)
     {
-        if (it->second->checkInGuild(playerId))
+        if (guildIt.second->checkInGuild(playerId))
         {
-            guilds.push_back(it->second);
+            guilds.push_back(guildIt.second);
         }
     }
     return guilds;