3 files changed, 14 insertions, 22 deletions
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 8edea1666..6e1d9ef44 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -110,8 +110,7 @@ void CommandHandler::callFunc(const CommandInfo &info,
         inputManager.executeAction(info.actionId);
 }
 
-void CommandHandler::invokeCommand(const int type,
-                                   const bool warn)
+void CommandHandler::invokeCommand(const int type)
 {
     if (type < 0 || type >= END_COMMANDS)
         return;
@@ -119,8 +118,7 @@ void CommandHandler::invokeCommand(const int type,
 }
 
 void CommandHandler::invokeCommand(const int type,
-                                   ChatTab *const tab,
-                                   const bool warn)
+                                   ChatTab *const tab)
 {
     if (type < 0 || type >= END_COMMANDS)
         return;
@@ -128,8 +126,7 @@ void CommandHandler::invokeCommand(const int type,
 }
 
 void CommandHandler::invokeCommand(const int type,
-                                   const std::string &args,
-                                   const bool warn)
+                                   const std::string &args)
 {
     if (type < 0 || type >= END_COMMANDS)
         return;
@@ -138,8 +135,7 @@ void CommandHandler::invokeCommand(const int type,
 
 void CommandHandler::invokeCommand(const int type,
                                    const std::string &args,
-                                   ChatTab *const tab,
-                                   const bool warn)
+                                   ChatTab *const tab)
 {
     if (type < 0 || type >= END_COMMANDS)
         return;
diff --git a/src/commandhandler.h b/src/commandhandler.h
index 9ddc567e8..ec75d220f 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -71,21 +71,17 @@ class CommandHandler final
                            ChatTab *const tab,
                            const bool warn = false);
 
-        void invokeCommand(const int type,
-                           const bool warn = false);
+        void invokeCommand(const int type);
 
         void invokeCommand(const int type,
                            const std::string &args,
-                           ChatTab *const tab,
-                           const bool warn = false);
+                           ChatTab *const tab);
 
         void invokeCommand(const int type,
-                           const std::string &args,
-                           const bool warn = false);
+                           const std::string &args);
 
         void invokeCommand(const int type,
-                           ChatTab *const tab,
-                           const bool warn = false);
+                           ChatTab *const tab);
 
     protected:
         friend class ChatTab;
diff --git a/src/commands.cpp b/src/commands.cpp
index 857212aa3..da771ede4 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -1144,7 +1144,7 @@ impHandler1(execute)
     execFile(name, name, params, "");
 }
 
-impHandler1(enableHighlight)
+impHandler2(enableHighlight)
 {
     if (tab)
     {
@@ -1154,7 +1154,7 @@ impHandler1(enableHighlight)
     }
 }
 
-impHandler1(disableHighlight)
+impHandler2(disableHighlight)
 {
     if (tab)
     {
@@ -1164,28 +1164,28 @@ impHandler1(disableHighlight)
     }
 }
 
-impHandler1(dontRemoveName)
+impHandler2(dontRemoveName)
 {
     tab->setRemoveNames(false);
     if (chatWindow)
         chatWindow->saveState();
 }
 
-impHandler1(removeName)
+impHandler2(removeName)
 {
     tab->setRemoveNames(true);
     if (chatWindow)
         chatWindow->saveState();
 }
 
-impHandler1(disableAway)
+impHandler2(disableAway)
 {
     tab->setNoAway(true);
     if (chatWindow)
         chatWindow->saveState();
 }
 
-impHandler1(enableAway)
+impHandler2(enableAway)
 {
     tab->setNoAway(false);
     if (chatWindow)