Replace hardcoded mode letters, part 3

[user/henk/code/inspircd.git] / src / modules / m_sakick.cpp

diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index 197b4b271d077600d782e7e148e8152f16587fde..e7dd86d6f6c0eb3ccbbd20769a9847adb8de943b 100644 (file)
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -20,8 +20,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides a SAKICK command */
-
 /** Handle /SAKICK
  */
 class CommandSakick : public Command
@@ -30,7 +28,7 @@ class CommandSakick : public Command
        CommandSakick(Module* Creator) : Command(Creator,"SAKICK", 2, 3)
        {
                flags_needed = 'o'; Penalty = 0; syntax = "<channel> <nick> [reason]";
-               TRANSLATE4(TR_TEXT, TR_NICK, TR_TEXT, TR_END);
+               TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT);
        }
 
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -68,7 +66,7 @@ class CommandSakick : public Command
                                if (n && n->HasUser(dest))
                                {
                                        /* Sort-of-bug: If the command was issued remotely, this message won't be sent */
-                                       user->WriteServ("NOTICE %s :*** Unable to kick %s from %s", user->nick.c_str(), dest->nick.c_str(), parameters[0].c_str());
+                                       user->WriteNotice("*** Unable to kick " + dest->nick + " from " + parameters[0]);
                                        return CMD_FAILURE;
                                }
                        }
@@ -83,7 +81,7 @@ class CommandSakick : public Command
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick.c_str());
+                       user->WriteNotice("*** Invalid nickname or channel");
                }
 
                return CMD_FAILURE;
@@ -107,12 +105,12 @@ class ModuleSakick : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(cmd);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides a SAKICK command", VF_OPTCOMMON|VF_VENDOR);
        }