m_spanningtree Remove SpanningTreeUtilities* fields and parameters

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

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index a7453c2331de6f09272a94fdbf1b4d52a0de9243..a549f89a7a6484b4840a01bb46f5d900e44a5f57 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -20,8 +20,6 @@
  */
 
 
-/* $ModDesc: Provides command SAMODE to allow opers to change modes on channels and users */
-
 #include "inspircd.h"
 
 /** Handle /SAMODE
@@ -39,14 +37,14 @@ class CommandSamode : public Command
 
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
-               this->active = true;
                User* target = ServerInstance->FindNick(parameters[0]);
                if ((target) && (target != user))
                {
                        if (!user->HasPrivPermission("users/samode-usermodes", true))
                                return CMD_FAILURE;
                }
-               ServerInstance->Parser->CallHandler("MODE", parameters, user);
+               this->active = true;
+               ServerInstance->Modes->Process(parameters, user);
                if (ServerInstance->Modes->GetLastParse().length())
                        ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
                this->active = false;
@@ -63,22 +61,17 @@ class ModuleSaMode : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(cmd);
-               ServerInstance->Modules->Attach(I_OnPreMode, this);
-       }
-
-       ~ModuleSaMode()
-       {
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR);
        }
 
-       ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
+       ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
        {
                if (cmd.active)
                        return MOD_RES_ALLOW;