From 93d55e71b137a43149775ac1283f20acea9a9947 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 23 Aug 2015 17:09:34 +0300
Subject: Move receive code from adminhandler into separate file.

---
 src/net/ea/admin.cpp        | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/net/ea/admin.h          | 41 +++++++++++++++++++++++++++++++++++++++++
 src/net/ea/adminhandler.cpp |  8 --------
 src/net/ea/adminhandler.h   |  3 ---
 4 files changed, 85 insertions(+), 11 deletions(-)
 create mode 100644 src/net/ea/admin.cpp
 create mode 100644 src/net/ea/admin.h

(limited to 'src/net/ea')

diff --git a/src/net/ea/admin.cpp b/src/net/ea/admin.cpp
new file mode 100644
index 000000000..fb6973c6e
--- /dev/null
+++ b/src/net/ea/admin.cpp
@@ -0,0 +1,44 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/ea/admin.h"
+
+#include "notifymanager.h"
+
+#include "enums/resources/notifytypes.h"
+
+#include "net/messagein.h"
+
+#include "debug.h"
+
+namespace Ea
+{
+
+void Admin::processKickAck(Net::MessageIn &msg)
+{
+    if (msg.readInt32("flag") == 0)
+        NotifyManager::notify(NotifyTypes::KICK_FAIL);
+    else
+        NotifyManager::notify(NotifyTypes::KICK_SUCCEED);
+}
+
+}  // namespace Ea
diff --git a/src/net/ea/admin.h b/src/net/ea/admin.h
new file mode 100644
index 000000000..c9beea3cb
--- /dev/null
+++ b/src/net/ea/admin.h
@@ -0,0 +1,41 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_EA_ADMIN_H
+#define NET_EA_ADMIN_H
+
+#include "localconsts.h"
+
+namespace Net
+{
+    class MessageIn;
+}
+
+namespace Ea
+{
+    namespace Admin
+    {
+        void processKickAck(Net::MessageIn &msg);
+    }  // namespace Admin
+}  // namespace Ea
+
+#endif  // NET_EA_ADMIN_H
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index 455f9acb2..d73019467 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -82,12 +82,4 @@ void AdminHandler::createItems(const int id,
         GENERAL_CHANNEL);
 }
 
-void AdminHandler::processKickAck(Net::MessageIn &msg)
-{
-    if (msg.readInt32("flag") == 0)
-        NotifyManager::notify(NotifyTypes::KICK_FAIL);
-    else
-        NotifyManager::notify(NotifyTypes::KICK_SUCCEED);
-}
-
 }  // namespace Ea
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index ab7b8c557..bf8ad7b06 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -63,9 +63,6 @@ class AdminHandler notfinal : public Net::AdminHandler
         void createItems(const int id,
                          const ItemColor color,
                          const int amount) const override final;
-
-    protected:
-        static void processKickAck(Net::MessageIn &msg);
 };
 
 }  // namespace Ea
-- 
cgit v1.2.3-60-g2f50