From 30d928c4903bb36ee78ff846384feff9cc9aa952 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 29 Jul 2016 00:49:17 +0300
Subject: Remove macro impHandlerE.

---
 src/actions/actiondef.h  |  2 --
 src/actions/actions.cpp  |  2 +-
 src/actions/commands.cpp | 18 +++++++++---------
 3 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'src/actions')

diff --git a/src/actions/actiondef.h b/src/actions/actiondef.h
index 18c276e3c..f3ac4f7bd 100644
--- a/src/actions/actiondef.h
+++ b/src/actions/actiondef.h
@@ -30,8 +30,6 @@ SETTINGS_H
 INPUT_INPUTMANAGER_H
 
 #define impHandler(name) bool name(InputEvent &event)
-#define impHandlerE(name) bool name(InputEvent &event)
-
 #define impHandler0(name) bool name(InputEvent &event A_UNUSED)
 #define impHandlerVoid(name) bool name(InputEvent &event A_UNUSED) \
     { \
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 6ad192223..eb652d9b7 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -1677,7 +1677,7 @@ impHandler0(testInfo)
     return false;
 }
 
-impHandlerE(craftKey)
+impHandler(craftKey)
 {
     const int slot = (event.action - InputAction::CRAFT_1);
     if (slot >= 0 && slot < 9)
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 4699aabd7..ce4093110 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -896,7 +896,7 @@ impHandler(serverUnIgnoreWhisper)
     return false;
 }
 
-impHandlerE(setHomunculusName)
+impHandler(setHomunculusName)
 {
     const std::string args = event.args;
     if (args.empty())
@@ -956,7 +956,7 @@ impHandler(warp)
     return false;
 }
 
-impHandlerE(homunTalk)
+impHandler(homunTalk)
 {
     if (!serverFeatures || !serverFeatures->haveTalkPet())
         return false;
@@ -972,7 +972,7 @@ impHandlerE(homunTalk)
     return false;
 }
 
-impHandlerE(homunEmote)
+impHandler(homunEmote)
 {
     if (!serverFeatures || !serverFeatures->haveTalkPet())
         return false;
@@ -992,7 +992,7 @@ impHandlerE(homunEmote)
     return false;
 }
 
-impHandlerE(commandHomunEmote)
+impHandler(commandHomunEmote)
 {
     if (!serverFeatures || !serverFeatures->haveTalkPet())
         return false;
@@ -1006,7 +1006,7 @@ impHandlerE(commandHomunEmote)
     return false;
 }
 
-impHandlerE(createPublicChatRoom)
+impHandler(createPublicChatRoom)
 {
     if (!chatHandler || event.args.empty())
         return false;
@@ -1014,7 +1014,7 @@ impHandlerE(createPublicChatRoom)
     return true;
 }
 
-impHandlerE(joinChatRoom)
+impHandler(joinChatRoom)
 {
     if (!chatHandler)
         return false;
@@ -1154,7 +1154,7 @@ impHandler(skill)
     return true;
 }
 
-impHandlerE(craft)
+impHandler(craft)
 {
     const std::string args = event.args;
     if (args.empty() || !inventoryWindow)
@@ -1560,7 +1560,7 @@ impHandler(commandGuildRecall)
     return true;
 }
 
-impHandlerE(mailTo)
+impHandler(mailTo)
 {
     if (!mailWindow)
         return false;
@@ -1568,7 +1568,7 @@ impHandlerE(mailTo)
     return true;
 }
 
-impHandlerE(adoptChild)
+impHandler(adoptChild)
 {
     const std::string nick = getNick(event);
     Being *const being = actorManager->findBeingByName(
-- 
cgit v1.2.3-70-g09d2