From 1a21f967e71660f9c48b7cbd93e315ff40316994 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 8 Sep 2014 13:50:18 +0300
Subject: Move processLangReuqest from tmwa namespace into ea.

---
 src/net/ea/npchandler.cpp   | 9 +++++++++
 src/net/ea/npchandler.h     | 2 ++
 src/net/tmwa/npchandler.cpp | 9 ---------
 src/net/tmwa/npchandler.h   | 2 --
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 05f12c2bb..5a2140f7a 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -26,6 +26,8 @@
 
 #include "net/messagein.h"
 
+#include "utils/langs.h"
+
 #include "debug.h"
 
 namespace Ea
@@ -114,4 +116,11 @@ void NpcHandler::processNpcStrInput(Net::MessageIn &msg A_UNUSED)
         mDialog->textRequest("");
 }
 
+void NpcHandler::processLangReuqest(Net::MessageIn &msg A_UNUSED,
+                                    const int npcId)
+{
+    mRequestLang = false;
+    stringInput(npcId, getLangSimple());
+}
+
 }  // namespace Ea
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index 81e92d84a..11ffacb59 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -63,6 +63,8 @@ class NpcHandler notfinal : public Net::NpcHandler
 
         void processNpcStrInput(Net::MessageIn &msg);
 
+        void processLangReuqest(Net::MessageIn &msg, const int npcId);
+
     protected:
         NpcHandler();
 
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 4c96eac21..5339666be 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -33,8 +33,6 @@
 
 #include "net/ea/eaprotocol.h"
 
-#include "utils/langs.h"
-
 #include "debug.h"
 
 extern Net::NpcHandler *npcHandler;
@@ -345,13 +343,6 @@ void NpcHandler::processNpcCommand(Net::MessageIn &msg)
     }
 }
 
-void NpcHandler::processLangReuqest(Net::MessageIn &msg A_UNUSED,
-                                    const int npcId)
-{
-    mRequestLang = false;
-    stringInput(npcId, getLangSimple());
-}
-
 void NpcHandler::processChangeTitle(Net::MessageIn &msg)
 {
     const int npcId = getNpc(msg);
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index a7684ff07..aeb1410e3 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -69,8 +69,6 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
 
         void processNpcCommand(Net::MessageIn &msg);
 
-        void processLangReuqest(Net::MessageIn &msg, const int npcId);
-
         void processChangeTitle(Net::MessageIn &msg);
 };
 
-- 
cgit v1.2.3-70-g09d2