General code cleanups

* Overall includes cleanup
* Use std::make_pair
* Make some functions const

5 files changed, 9 insertions, 12 deletions

diff --git a/src/chat-server/chatchannel.cpp b/src/chat-server/chatchannel.cpp
index 2673bd18..aee4eb8c 100644
--- a/src/chat-server/chatchannel.cpp
+++ b/src/chat-server/chatchannel.cpp
@@ -108,7 +108,7 @@ void ChatChannel::setUserMode(ChatClient *user, unsigned char mode)
     else
     {
         std::stringstream ss; ss << mode;
-        user->userModes.insert(std::pair<ChatChannel*, std::string>(this, ss.str()));
+        user->userModes.insert(std::make_pair(this, ss.str()));
     }
 }
 
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index a80d8404..a33d08a9 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -98,11 +98,10 @@ void ChatHandler::tokenMatched(ChatClient *client, Pending *p)
         msg.writeInt8(ERRMSG_OK);
 
         // Add chat client to player map
-        mPlayerMap.insert(std::pair<std::string, ChatClient*>(client->characterName, client));
+        mPlayerMap.insert(std::make_pair(client->characterName, client));
     }
 
     client->send(msg);
-
 }
 
 NetComputer *ChatHandler::computerConnected(ENetPeer *peer)
diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp
index b6870699..a47f8073 100644
--- a/src/chat-server/guildhandler.cpp
+++ b/src/chat-server/guildhandler.cpp
@@ -22,6 +22,7 @@
 #include "chatchannel.h"
 #include "chatchannelmanager.h"
 #include "chatclient.h"
+#include "common/defines.h"
 #include "guild.h"
 #include "guildmanager.h"
 
@@ -54,12 +55,9 @@ void ChatHandler::sendGuildInvite(const std::string &invitedName,
 void ChatHandler::sendGuildRejoin(ChatClient &client)
 {
     // Get list of guilds and check what rights they have.
-    std::vector<Guild *> guilds =
-            guildManager->getGuildsForPlayer(client.characterId);
+    client.guilds = guildManager->getGuildsForPlayer(client.characterId);
 
-    client.guilds = guilds;
-
-    for (auto guild : guilds)
+    for (auto guild : client.guilds)
     {
         const int permissions = guild->getUserPermissions(client.characterId);
         const std::string guildName = guild->getName();
diff --git a/src/chat-server/post.cpp b/src/chat-server/post.cpp
index aca1de65..cfd9506b 100644
--- a/src/chat-server/post.cpp
+++ b/src/chat-server/post.cpp
@@ -52,7 +52,7 @@ void Letter::addText(const std::string &text)
     mContents = text;
 }
 
-std::string Letter::getContents() const
+const std::string &Letter::getContents() const
 {
     return mContents;
 }
@@ -80,7 +80,7 @@ CharacterData *Letter::getSender() const
     return mSender;
 }
 
-std::vector<InventoryItem> Letter::getAttachments() const
+const std::vector<InventoryItem> &Letter::getAttachments() const
 {
     return mAttachments;
 }
diff --git a/src/chat-server/post.h b/src/chat-server/post.h
index 88a85489..de15bf1a 100644
--- a/src/chat-server/post.h
+++ b/src/chat-server/post.h
@@ -85,7 +85,7 @@ public:
      * Get the text contents of letter
      * @return String containing the text
      */
-    std::string getContents() const;
+    const std::string &getContents() const;
 
     /**
      * Add an attachment
@@ -109,7 +109,7 @@ public:
     /**
      * Get the attachments
      */
-    std::vector<InventoryItem> getAttachments() const;
+    const std::vector<InventoryItem> &getAttachments() const;
 
 private:
     unsigned mId;