From 201d66ca502db6602911ce69288d2adb975bba2d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 7 Sep 2014 15:40:45 +0300
Subject: Move processWhisper from ea namespace into eathena and tmwa.

---
 src/net/ea/chathandler.cpp      | 15 ---------------
 src/net/ea/chathandler.h        |  2 --
 src/net/eathena/chathandler.cpp | 15 +++++++++++++++
 src/net/eathena/chathandler.h   |  2 ++
 src/net/tmwa/chathandler.cpp    | 15 +++++++++++++++
 src/net/tmwa/chathandler.h      |  2 ++
 6 files changed, 34 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index bd0adf77e..52e9a7873 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -135,21 +135,6 @@ void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
     BLOCK_END("ChatHandler::processWhisperResponse")
 }
 
-void ChatHandler::processWhisper(Net::MessageIn &msg) const
-{
-    BLOCK_START("ChatHandler::processWhisper")
-    const int chatMsgLength = msg.readInt16("len") - 28;
-    std::string nick = msg.readString(24, "message");
-
-    if (chatMsgLength <= 0)
-    {
-        BLOCK_END("ChatHandler::processWhisper")
-        return;
-    }
-
-    processWhisperContinue(nick, msg.readString(chatMsgLength, "message"));
-}
-
 void ChatHandler::processWhisperContinue(const std::string &nick,
                                          std::string chatMsg) const
 {
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index c541e0860..338d49b44 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -50,8 +50,6 @@ class ChatHandler notfinal : public Net::ChatHandler
 
         virtual void processWhisperResponse(Net::MessageIn &msg);
 
-        virtual void processWhisper(Net::MessageIn &msg) const;
-
         virtual void processBeingChat(Net::MessageIn &msg) const;
 
         virtual void processMVP(Net::MessageIn &msg) const;
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 1a5006166..f10f8fcfb 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -312,4 +312,19 @@ void ChatHandler::processChat(Net::MessageIn &msg)
     BLOCK_END("ChatHandler::processChat")
 }
 
+void ChatHandler::processWhisper(Net::MessageIn &msg) const
+{
+    BLOCK_START("ChatHandler::processWhisper")
+    const int chatMsgLength = msg.readInt16("len") - 28;
+    std::string nick = msg.readString(24, "nick");
+
+    if (chatMsgLength <= 0)
+    {
+        BLOCK_END("ChatHandler::processWhisper")
+        return;
+    }
+
+    processWhisperContinue(nick, msg.readString(chatMsgLength, "message"));
+}
+
 }  // namespace EAthena
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index 397f947ff..309216a5f 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -61,6 +61,8 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 
     protected:
         void processChat(Net::MessageIn &msg);
+
+        void processWhisper(Net::MessageIn &msg) const;
 };
 
 }  // namespace EAthena
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index dbe3c09a8..15f65fe90 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -365,4 +365,19 @@ void ChatHandler::processChat(Net::MessageIn &msg)
     BLOCK_END("ChatHandler::processChat")
 }
 
+void ChatHandler::processWhisper(Net::MessageIn &msg) const
+{
+    BLOCK_START("ChatHandler::processWhisper")
+    const int chatMsgLength = msg.readInt16("len") - 28;
+    std::string nick = msg.readString(24, "nick");
+
+    if (chatMsgLength <= 0)
+    {
+        BLOCK_END("ChatHandler::processWhisper")
+        return;
+    }
+
+    processWhisperContinue(nick, msg.readString(chatMsgLength, "message"));
+}
+
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index a9f5ce352..e548fbff9 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -61,6 +61,8 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 
     protected:
         void processChat(Net::MessageIn &msg);
+
+        void processWhisper(Net::MessageIn &msg) const;
 };
 
 }  // namespace TmwAthena
-- 
cgit v1.2.3-70-g09d2