Remove unused channel parameter from talk methods.s20180215

2 files changed, 10 insertions, 18 deletions

diff --git a/src/utils/chatutils.cpp b/src/utils/chatutils.cpp
index 0e2d7e2cb..db87e1644 100644
--- a/src/utils/chatutils.cpp
+++ b/src/utils/chatutils.cpp
@@ -54,7 +54,7 @@ void outStringNormal(ChatTab *const tab,
 
     if (tab == nullptr)
     {
-        chatHandler->talk(str, GENERAL_CHANNEL);
+        chatHandler->talk(str);
         return;
     }
 
@@ -112,7 +112,7 @@ void outStringNormal(ChatTab *const tab,
         case ChatTabType::LANG:
         case ChatTabType::GM:
         case ChatTabType::CHANNEL:
-            chatHandler->talk(def, GENERAL_CHANNEL);
+            chatHandler->talk(def);
             break;
     }
 }
diff --git a/src/utils/gmfunctions.cpp b/src/utils/gmfunctions.cpp
index 90e78f5ca..412f1a1a9 100644
--- a/src/utils/gmfunctions.cpp
+++ b/src/utils/gmfunctions.cpp
@@ -40,8 +40,7 @@ void runCommand(const std::string &command,
     {
         chatHandler->talk(std::string(
             settings.gmCommandSymbol).append(
-            command),
-            GENERAL_CHANNEL);
+            command));
     }
     else
     {
@@ -49,8 +48,7 @@ void runCommand(const std::string &command,
             settings.gmCommandSymbol).append(
             command).append(
             " ").append(
-            params),
-            GENERAL_CHANNEL);
+            params));
     }
 }
 
@@ -58,8 +56,7 @@ void runCommand(const std::string &command)
 {
     chatHandler->talk(std::string(
         settings.gmCommandSymbol).append(
-        command),
-        GENERAL_CHANNEL);
+        command));
 }
 
 void runCharCommand(const std::string &command,
@@ -72,8 +69,7 @@ void runCharCommand(const std::string &command,
         {
             chatHandler->talk(std::string(
                 settings.gmCommandSymbol).append(
-                command),
-                GENERAL_CHANNEL);
+                command));
         }
         else
         {
@@ -81,8 +77,7 @@ void runCharCommand(const std::string &command,
                 settings.gmCommandSymbol).append(
                 command).append(
                 " ").append(
-                params),
-                GENERAL_CHANNEL);
+                params));
         }
     }
     else
@@ -93,8 +88,7 @@ void runCharCommand(const std::string &command,
             " \"").append(
             name).append(
             "\" ").append(
-            params),
-            GENERAL_CHANNEL);
+            params));
     }
 }
 
@@ -105,8 +99,7 @@ void runCharCommand(const std::string &command,
     {
         chatHandler->talk(std::string(
             settings.gmCommandSymbol).append(
-            command),
-            GENERAL_CHANNEL);
+            command));
     }
     else
     {
@@ -114,8 +107,7 @@ void runCharCommand(const std::string &command,
             settings.gmCharCommandSymbol).append(
             command).append(
             " ").append(
-            name),
-            GENERAL_CHANNEL);
+            name));
     }
 }