2 files changed, 17 insertions, 17 deletions
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index b04d1604c..655a6d826 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -115,12 +115,13 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
     BLOCK_END("ChatHandler::handleMessage")
 }
 
-void ChatHandler::talk(const std::string &text, const std::string &channel)
+void ChatHandler::talk(const std::string &text,
+                       const std::string &channel) const
 {
     if (!player_node)
         return;
 
-    std::string mes = std::string(player_node->getName()).append(
+    const std::string mes = std::string(player_node->getName()).append(
         " : ").append(text);
 
     if (serverVersion >= 8 && channel.size() == 3)
@@ -142,7 +143,7 @@ void ChatHandler::talk(const std::string &text, const std::string &channel)
     }
 }
 
-void ChatHandler::talkRaw(const std::string &mes)
+void ChatHandler::talkRaw(const std::string &mes) const
 {
     MessageOut outMsg(CMSG_CHAT_MESSAGE);
     // Added + 1 in order to let eAthena parse admin commands correctly
@@ -160,12 +161,12 @@ void ChatHandler::privateMessage(const std::string &recipient,
     mSentWhispers.push(recipient);
 }
 
-void ChatHandler::who()
+void ChatHandler::who() const
 {
     MessageOut outMsg(CMSG_WHO_REQUEST);
 }
 
-void ChatHandler::sendRaw(const std::string &args)
+void ChatHandler::sendRaw(const std::string &args) const
 {
     std::string line = args;
     std::string str;
@@ -216,11 +217,10 @@ void ChatHandler::processRaw(MessageOut &outMsg, const std::string &line)
     }
     else
     {
-        std::string header = line.substr(0, pos);
-        std::string data = line.substr(pos + 1);
+        const std::string header = line.substr(0, pos);
         if (header.length() != 1)
             return;
-
+        std::string data = line.substr(pos + 1);
         int i = 0;
 
         switch (header[0])
@@ -274,13 +274,13 @@ void ChatHandler::processRaw(MessageOut &outMsg, const std::string &line)
     }
 }
 
-void ChatHandler::ignoreAll()
+void ChatHandler::ignoreAll() const
 {
     MessageOut outMsg(CMSG_IGNORE_ALL);
     outMsg.writeInt8(0);
 }
 
-void ChatHandler::unIgnoreAll()
+void ChatHandler::unIgnoreAll() const
 {
     MessageOut outMsg(CMSG_IGNORE_ALL);
     outMsg.writeInt8(1);
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 733010b37..d11b6ba32 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -42,22 +42,22 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 
         void handleMessage(Net::MessageIn &msg);
 
-        void talk(const std::string &text, const std::string &channel);
+        void talk(const std::string &text, const std::string &channel) const;
 
-        void talkRaw(const std::string &text);
+        void talkRaw(const std::string &text) const;
 
         void privateMessage(const std::string &recipient,
                             const std::string &text);
 
-        void who();
+        void who() const;
 
-        void sendRaw(const std::string &args);
+        void sendRaw(const std::string &args) const;
 
-        void ignoreAll();
+        void ignoreAll() const;
 
-        void unIgnoreAll();
+        void unIgnoreAll() const;
 
-        void processRaw(MessageOut &outMsg, const std::string &line);
+        static void processRaw(MessageOut &outMsg, const std::string &line);
 };
 
 } // namespace TmwAthena