Fixed a few code style issues

Also renamed Guild::totalMembers to Guild::memberCount

7 files changed, 58 insertions, 61 deletions

diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp
index 7ec8007..1e90438 100644
--- a/src/chat-server/chatchannelmanager.cpp
+++ b/src/chat-server/chatchannelmanager.cpp
@@ -89,15 +89,16 @@ bool ChatChannelManager::tryNewPublicChannel(const std::string &name)
 
 bool ChatChannelManager::removeChannel(int channelId)
 {
-    ChatChannelIterator i = mChatChannels.find(channelId);
-    if (i == mChatChannels.end()) return false;
+    ChatChannels::iterator i = mChatChannels.find(channelId);
+    if (i == mChatChannels.end())
+        return false;
     i->second.removeAllUsers();
     mChatChannels.erase(i);
     mChannelsNoLongerUsed.push_back(channelId);
     return true;
 }
 
-std::list<const ChatChannel*> ChatChannelManager::getPublicChannels()
+std::list<const ChatChannel*> ChatChannelManager::getPublicChannels() const
 {
     std::list<const ChatChannel*> channels;
 
@@ -114,7 +115,7 @@ std::list<const ChatChannel*> ChatChannelManager::getPublicChannels()
     return channels;
 }
 
-int ChatChannelManager::getChannelId(const std::string &channelName)
+int ChatChannelManager::getChannelId(const std::string &channelName) const
 {
     for (ChatChannels::const_iterator i = mChatChannels.begin(),
             i_end = mChatChannels.end();
@@ -125,16 +126,17 @@ int ChatChannelManager::getChannelId(const std::string &channelName)
     return 0;
 }
 
-ChatChannel* ChatChannelManager::getChannel(int channelId)
+ChatChannel *ChatChannelManager::getChannel(int channelId)
 {
-    ChatChannelIterator i = mChatChannels.find(channelId);
-    if (i != mChatChannels.end()) return &i->second;
+    ChatChannels::iterator i = mChatChannels.find(channelId);
+    if (i != mChatChannels.end())
+        return &i->second;
     return NULL;
 }
 
-ChatChannel* ChatChannelManager::getChannel(const std::string &name)
+ChatChannel *ChatChannelManager::getChannel(const std::string &name)
 {
-    for (ChatChannelIterator i = mChatChannels.begin();
+    for (ChatChannels::iterator i = mChatChannels.begin();
          i != mChatChannels.end(); ++i)
     {
         if (i->second.getName() == name)
@@ -148,8 +150,8 @@ ChatChannel* ChatChannelManager::getChannel(const std::string &name)
 
 void ChatChannelManager::setChannelTopic(int channelId, const std::string &topic)
 {
-    ChatChannelIterator i = mChatChannels.find(channelId);
-    if(i == mChatChannels.end())
+    ChatChannels::iterator i = mChatChannels.find(channelId);
+    if (i == mChatChannels.end())
         return;
 
     i->second.setAnnouncement(topic);
@@ -173,7 +175,7 @@ void ChatChannelManager::removeUserFromAllChannels(ChatClient *user)
     }
 }
 
-bool ChatChannelManager::channelExists(int channelId)
+bool ChatChannelManager::channelExists(int channelId) const
 {
     return mChatChannels.find(channelId) != mChatChannels.end();
 }
diff --git a/src/chat-server/chatchannelmanager.hpp b/src/chat-server/chatchannelmanager.hpp
index aab2f1d..71c8fb2 100644
--- a/src/chat-server/chatchannelmanager.hpp
+++ b/src/chat-server/chatchannelmanager.hpp
@@ -51,9 +51,9 @@ class ChatChannelManager
          * @return the ID of the registered channel
          */
         int createNewChannel(const std::string &channelName,
-                                    const std::string &channelAnnouncement,
-                                    const std::string &channelPassword,
-                                    bool joinable);
+                             const std::string &channelAnnouncement,
+                             const std::string &channelPassword,
+                             bool joinable);
 
         /**
          * Try to create a new public channel with the given name.
@@ -72,28 +72,28 @@ class ChatChannelManager
          *
          * @return a list of all public channels
          */
-        std::list<const ChatChannel*> getPublicChannels();
+        std::list<const ChatChannel*> getPublicChannels() const;
 
         /**
          * Get the id of a channel from its name.
          *
          * @return the id of the channel, 0 if it was unsuccessful.
          */
-        int getChannelId(const std::string &channelName);
+        int getChannelId(const std::string &channelName) const;
 
         /**
          * Returns the chat channel with the given channel ID.
          *
          * @return The chat channel, or NULL when it doesn't exist.
          */
-        ChatChannel* getChannel(int channelId);
+        ChatChannel *getChannel(int channelId);
 
         /**
          * Returns the chat channel with the given channel name.
          *
          * @return The chat channel, or NULL when it doesn't exist.
          */
-        ChatChannel* getChannel(const std::string &name);
+        ChatChannel *getChannel(const std::string &name);
 
         /**
          * Remove a user from all channels. Used at logout.
@@ -114,7 +114,7 @@ class ChatChannelManager
          *
          * @param channelId a channel ID
          */
-        bool channelExists(int channelId);
+        bool channelExists(int channelId) const;
         bool channelExists(const std::string &channelName);
 
         /**
@@ -124,7 +124,6 @@ class ChatChannelManager
 
     private:
         typedef std::map<unsigned short, ChatChannel> ChatChannels;
-        typedef ChatChannels::iterator ChatChannelIterator;
 
         /**
          * The map keeping all the chat channels. The channel id must be
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index c1387ce..147107a 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -398,8 +398,8 @@ void ChatHandler::handleEnterChannelMessage(ChatClient &client, MessageIn &msg)
     std::string channelName = msg.readString();
     std::string givenPassword = msg.readString();
     ChatChannel *channel = NULL;
-    if(chatChannelManager->channelExists(channelName) ||
-       chatChannelManager->tryNewPublicChannel(channelName))
+    if (chatChannelManager->channelExists(channelName) ||
+        chatChannelManager->tryNewPublicChannel(channelName))
     {
         channel = chatChannelManager->getChannel(channelName);
     }
@@ -573,7 +573,7 @@ ChatHandler::handleQuitChannelMessage(ChatClient &client, MessageIn &msg)
         trans.mMessage = "User left " + channel->getName();
         storage->addTransaction(trans);
 
-        if(channel->getUserList().empty())
+        if (channel->getUserList().empty())
         {
             chatChannelManager->removeChannel(channel->getId());
         }
@@ -647,7 +647,7 @@ ChatHandler::handleTopicChange(ChatClient &client, MessageIn &msg)
     std::string topic = msg.readString();
     ChatChannel *channel = chatChannelManager->getChannel(channelId);
 
-    if(!guildManager->doesExist(channel->getName()))
+    if (!guildManager->doesExist(channel->getName()))
     {
         chatChannelManager->setChannelTopic(channelId, topic);
     }
diff --git a/src/chat-server/guild.hpp b/src/chat-server/guild.hpp
index 2638738..b0bc744 100644
--- a/src/chat-server/guild.hpp
+++ b/src/chat-server/guild.hpp
@@ -105,13 +105,13 @@ class Guild
         /**
          * Returns a list of the members in this guild.
          */
-        std::list<GuildMember*> getMembers()
+        std::list<GuildMember*> getMembers() const
         { return mMembers; }
 
         /**
-         * Returns the total number of members in the guild.
+         * Returns the number of members in the guild.
          */
-        int totalMembers() const
+        int memberCount() const
         { return mMembers.size(); }
 
         /**
diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp
index 9d2c159..1c8294b 100644
--- a/src/chat-server/guildhandler.cpp
+++ b/src/chat-server/guildhandler.cpp
@@ -26,13 +26,13 @@
 #include "guild.hpp"
 #include "guildmanager.hpp"
 
-#include "../account-server/character.hpp"
-#include "../account-server/dalstorage.hpp"
+#include "account-server/character.hpp"
+#include "account-server/dalstorage.hpp"
 
-#include "../net/messagein.hpp"
-#include "../net/messageout.hpp"
+#include "net/messagein.hpp"
+#include "net/messageout.hpp"
 
-#include "../defines.h"
+#include "defines.h"
 
 void ChatHandler::sendGuildInvite(const std::string &invitedName,
                                   const std::string &inviterName,
@@ -85,7 +85,7 @@ void ChatHandler::sendGuildRejoin(ChatClient &client)
     }
 }
 
-ChatChannel* ChatHandler::joinGuildChannel(const std::string &guildName, ChatClient &client)
+ChatChannel *ChatHandler::joinGuildChannel(const std::string &guildName, ChatClient &client)
 {
     // Automatically make the character join the guild chat channel
     ChatChannel *channel = chatChannelManager->getChannel(guildName);
@@ -137,8 +137,8 @@ void ChatHandler::sendGuildListUpdate(const std::string &guildName,
     }
 }
 
-void
-ChatHandler::handleGuildCreation(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleGuildCreation(ChatClient &client,
+                                      MessageIn &msg)
 {
     MessageOut reply(CPMSG_GUILD_CREATE_RESPONSE);
 
@@ -173,8 +173,8 @@ ChatHandler::handleGuildCreation(ChatClient &client, MessageIn &msg)
     client.send(reply);
 }
 
-void
-ChatHandler::handleGuildInvitation(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleGuildInvitation(ChatClient &client,
+                                        MessageIn &msg)
 {
     MessageOut reply(CPMSG_GUILD_INVITE_RESPONSE);
     MessageOut invite(CPMSG_GUILD_INVITED);
@@ -221,8 +221,8 @@ ChatHandler::handleGuildInvitation(ChatClient &client, MessageIn &msg)
     client.send(reply);
 }
 
-void
-ChatHandler::handleGuildAcceptInvite(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleGuildAcceptInvite(ChatClient &client,
+                                          MessageIn &msg)
 {
     MessageOut reply(CPMSG_GUILD_ACCEPT_RESPONSE);
     std::string guildName = msg.readString();
@@ -261,8 +261,8 @@ ChatHandler::handleGuildAcceptInvite(ChatClient &client, MessageIn &msg)
     client.send(reply);
 }
 
-void
-ChatHandler::handleGuildRetrieveMembers(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleGuildRetrieveMembers(ChatClient &client,
+                                             MessageIn &msg)
 {
     MessageOut reply(CPMSG_GUILD_GET_MEMBERS_RESPONSE);
     short guildId = msg.readShort();
@@ -279,8 +279,8 @@ ChatHandler::handleGuildRetrieveMembers(ChatClient &client, MessageIn &msg)
             reply.writeShort(guildId);
             std::list<GuildMember*> memberList = guild->getMembers();
             std::list<GuildMember*>::const_iterator itr_end = memberList.end();
-            for(std::list<GuildMember*>::iterator itr = memberList.begin();
-                itr != itr_end; ++itr)
+            for (std::list<GuildMember*>::iterator itr = memberList.begin();
+                 itr != itr_end; ++itr)
             {
                 Character *c = storage->getCharacter((*itr)->mId, NULL);
                 std::string memberName = c->getName();
@@ -297,8 +297,8 @@ ChatHandler::handleGuildRetrieveMembers(ChatClient &client, MessageIn &msg)
     client.send(reply);
 }
 
-void
-ChatHandler::handleGuildMemberLevelChange(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleGuildMemberLevelChange(ChatClient &client,
+                                               MessageIn &msg)
 {
     // get the guild, the user to change the permissions, and the new permission
     // check theyre valid, and then change them
@@ -351,8 +351,7 @@ void ChatHandler::handleGuildMemberKick(ChatClient &client, MessageIn &msg)
     client.send(reply);
 }
 
-void
-ChatHandler::handleGuildQuit(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleGuildQuit(ChatClient &client, MessageIn &msg)
 {
     MessageOut reply(CPMSG_GUILD_QUIT_RESPONSE);
     short guildId = msg.readShort();
@@ -369,7 +368,7 @@ ChatHandler::handleGuildQuit(ChatClient &client, MessageIn &msg)
             reply.writeShort(guildId);
 
             // Check if there are no members left, remove the guild channel
-            if (guild->totalMembers() == 0)
+            if (guild->memberCount() == 0)
             {
                 chatChannelManager->removeChannel(chatChannelManager->getChannelId(guild->getName()));
             }
@@ -392,15 +391,12 @@ ChatHandler::handleGuildQuit(ChatClient &client, MessageIn &msg)
     client.send(reply);
 }
 
-void
-ChatHandler::guildChannelTopicChange(ChatChannel *channel, int playerId, const std::string &topic)
+void ChatHandler::guildChannelTopicChange(ChatChannel *channel, int playerId,
+                                          const std::string &topic)
 {
     Guild *guild = guildManager->findByName(channel->getName());
-    if (guild)
+    if (guild && guild->getUserPermissions(playerId) & GAL_TOPIC_CHANGE)
     {
-        if(guild->getUserPermissions(playerId) & GAL_TOPIC_CHANGE)
-        {
-            chatChannelManager->setChannelTopic(channel->getId(), topic);
-        }
+        chatChannelManager->setChannelTopic(channel->getId(), topic);
     }
 }
diff --git a/src/chat-server/guildmanager.cpp b/src/chat-server/guildmanager.cpp
index b275ee8..84cd425 100644
--- a/src/chat-server/guildmanager.cpp
+++ b/src/chat-server/guildmanager.cpp
@@ -90,7 +90,7 @@ void GuildManager::removeGuildMember(Guild *guild, int playerId)
     guild->removeMember(playerId);
 
     // if theres no more members left delete the guild
-    if(guild->totalMembers() == 0)
+    if (guild->memberCount() == 0)
     {
         removeGuild(guild);
     }
@@ -144,14 +144,14 @@ bool GuildManager::doesExist(const std::string &name)
     return findByName(name) != NULL;
 }
 
-std::vector<Guild*> GuildManager::getGuildsForPlayer(int playerId)
+std::vector<Guild*> GuildManager::getGuildsForPlayer(int playerId) const
 {
     std::vector<Guild*> guildList;
 
-    for (std::list<Guild*>::iterator itr = mGuilds.begin();
+    for (std::list<Guild*>::const_iterator itr = mGuilds.begin();
             itr != mGuilds.end(); ++itr)
     {
-        if((*itr)->checkInGuild(playerId))
+        if ((*itr)->checkInGuild(playerId))
         {
             guildList.push_back((*itr));
         }
diff --git a/src/chat-server/guildmanager.hpp b/src/chat-server/guildmanager.hpp
index 0fb5146..26fe48c 100644
--- a/src/chat-server/guildmanager.hpp
+++ b/src/chat-server/guildmanager.hpp
@@ -90,7 +90,7 @@ class GuildManager
         /**
          * Return the guilds a character is in
          */
-        std::vector<Guild*> getGuildsForPlayer(int playerId);
+        std::vector<Guild*> getGuildsForPlayer(int playerId) const;
 
         /**
          * Inform guild members that a player has disconnected.