Always set the topic in Channel::SetTopic(), move access checks into cmd_topic

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

diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 7d0d3a040a7af2df6530658cf773f01aa5eb0101..26b6339a3aa1415d9c98c0137dcc361438b5da0c 100644 (file)
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -82,7 +82,7 @@ class CommandProp : public Command
                                }
                        }
                }
-               ServerInstance->SendGlobalMode(modes, src);
+               ServerInstance->Modes->Process(modes, src);
                return CMD_SUCCESS;
        }
 };
@@ -105,7 +105,7 @@ class ModuleNamedModes : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(cmd);
                ServerInstance->Modules->AddService(dummyZ);
@@ -114,7 +114,7 @@ class ModuleNamedModes : public Module
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides the ability to manipulate modes via long names.",VF_VENDOR);
        }
@@ -124,7 +124,7 @@ class ModuleNamedModes : public Module
                ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
        }
 
-       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 (!channel)
                        return MOD_RES_PASSTHRU;
@@ -196,7 +196,7 @@ class ModuleNamedModes : public Module
                        }
                }
                newparms[1] = modelist;
-               ServerInstance->Modes->Process(newparms, source, false);
+               ServerInstance->Modes->Process(newparms, source);
                return MOD_RES_DENY;
        }
 };