diff options
author | Attila Molnar <attilamolnar@hush.com> | 2013-05-15 13:48:02 -0700 |
---|---|---|
committer | Attila Molnar <attilamolnar@hush.com> | 2013-05-15 13:48:02 -0700 |
commit | 4b41feea830fc84e8c1b2fd0982f3e8d8840af96 (patch) | |
tree | d9cf047483dd4bf6c21c9465ae51e842ca1e7b50 /src/modules/m_channames.cpp | |
parent | e586aaab7c4f7b03514c83451d73b73f55dc6998 (diff) | |
parent | 4ab1c43c1eee708fc50a4808f714a731891b75e8 (diff) |
Merge pull request #514 from SaberUK/master+virtual-cleanup
Remove virtual keyword from a ton of methods which don't need it, introduce CXX11_OVERRIDE.
Diffstat (limited to 'src/modules/m_channames.cpp')
-rw-r--r-- | src/modules/m_channames.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp index c2bf9feec..f1704a528 100644 --- a/src/modules/m_channames.cpp +++ b/src/modules/m_channames.cpp @@ -27,8 +27,8 @@ class NewIsChannelHandler : public HandlerBase2<bool, const std::string&, size_t { public: NewIsChannelHandler() { } - virtual ~NewIsChannelHandler() { } - virtual bool Call(const std::string&, size_t); + ~NewIsChannelHandler() { } + bool Call(const std::string&, size_t); }; bool NewIsChannelHandler::Call(const std::string& channame, size_t max) @@ -57,7 +57,7 @@ class ModuleChannelNames : public Module { } - void init() + void init() CXX11_OVERRIDE { ServerInstance->IsChannel = &myhandler; Implementation eventlist[] = { I_OnRehash, I_OnUserKick }; @@ -94,7 +94,7 @@ class ModuleChannelNames : public Module badchan = false; } - virtual void OnRehash(User* user) + void OnRehash(User* user) CXX11_OVERRIDE { ConfigTag* tag = ServerInstance->Config->ConfValue("channames"); std::string denyToken = tag->getString("denyrange"); @@ -118,7 +118,7 @@ class ModuleChannelNames : public Module ValidateChans(); } - virtual void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except_list) + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except_list) CXX11_OVERRIDE { if (badchan) { @@ -129,13 +129,13 @@ class ModuleChannelNames : public Module } } - virtual ~ModuleChannelNames() + ~ModuleChannelNames() { ServerInstance->IsChannel = rememberer; ValidateChans(); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { return Version("Implements config tags which allow changing characters allowed in channel names", VF_VENDOR); } |