From e18e3bdf005824b5875bda74053c116b6c4c059f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 29 Jan 2012 15:41:25 +0300
Subject: Fix possible hiding methods issues.

---
 src/net/manaserv/adminhandler.cpp   |  6 +++---
 src/net/manaserv/adminhandler.h     |  6 +++---
 src/net/manaserv/specialhandler.cpp | 10 +++++-----
 src/net/manaserv/specialhandler.h   |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/net/manaserv')

diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp
index 609c9e4f1..f44da97ff 100644
--- a/src/net/manaserv/adminhandler.cpp
+++ b/src/net/manaserv/adminhandler.cpp
@@ -62,7 +62,7 @@ void AdminHandler::kick(int playerId A_UNUSED)
     // TODO
 }
 
-void AdminHandler::kick(const std::string &name A_UNUSED)
+void AdminHandler::kickName(const std::string &name A_UNUSED)
 {
     // TODO
 }
@@ -72,7 +72,7 @@ void AdminHandler::ban(int playerId A_UNUSED)
     // TODO
 }
 
-void AdminHandler::ban(const std::string &name A_UNUSED)
+void AdminHandler::banName(const std::string &name A_UNUSED)
 {
     // TODO
 }
@@ -82,7 +82,7 @@ void AdminHandler::unban(int playerId A_UNUSED)
     // TODO
 }
 
-void AdminHandler::unban(const std::string &name A_UNUSED)
+void AdminHandler::unbanName(const std::string &name A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/adminhandler.h b/src/net/manaserv/adminhandler.h
index a4157b3b0..87c536c31 100644
--- a/src/net/manaserv/adminhandler.h
+++ b/src/net/manaserv/adminhandler.h
@@ -42,15 +42,15 @@ class AdminHandler : public Net::AdminHandler
 
         void kick(int playerId);
 
-        void kick(const std::string &name);
+        void kickName(const std::string &name);
 
         void ban(int playerId);
 
-        void ban(const std::string &name);
+        void banName(const std::string &name);
 
         void unban(int playerId);
 
-        void unban(const std::string &name);
+        void unbanName(const std::string &name);
 
         void mute(int playerId, int type, int limit);
 
diff --git a/src/net/manaserv/specialhandler.cpp b/src/net/manaserv/specialhandler.cpp
index 13c6f7613..73fa864a3 100644
--- a/src/net/manaserv/specialhandler.cpp
+++ b/src/net/manaserv/specialhandler.cpp
@@ -53,19 +53,19 @@ void SpecialHandler::use(int id)
     gameServerConnection->send(msg);
 }
 
-void SpecialHandler::use(int id A_UNUSED, int level A_UNUSED,
-                         int beingId A_UNUSED)
+void SpecialHandler::useBeing(int id A_UNUSED, int level A_UNUSED,
+                              int beingId A_UNUSED)
 {
     // TODO
 }
 
-void SpecialHandler::use(int id A_UNUSED, int level A_UNUSED, int x A_UNUSED,
-                         int y A_UNUSED)
+void SpecialHandler::usePos(int id A_UNUSED, int level A_UNUSED, int x A_UNUSED,
+                            int y A_UNUSED)
 {
     // TODO
 }
 
-void SpecialHandler::use(int id A_UNUSED, const std::string &map A_UNUSED)
+void SpecialHandler::useMap(int id A_UNUSED, const std::string &map A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/specialhandler.h b/src/net/manaserv/specialhandler.h
index f6a20e4ac..2f1ce4d07 100644
--- a/src/net/manaserv/specialhandler.h
+++ b/src/net/manaserv/specialhandler.h
@@ -39,11 +39,11 @@ class SpecialHandler : public MessageHandler, public Net::SpecialHandler
 
         void use(int id);
 
-        void use(int id, int level, int beingId);
+        void useBeing(int id, int level, int beingId);
 
-        void use(int id, int level, int x, int y);
+        void usePos(int id, int level, int x, int y);
 
-        void use(int id, const std::string &map);
+        void useMap(int id, const std::string &map);
 };
 
 } // namespace ManaServ
-- 
cgit v1.2.3-70-g09d2