Merge pull request #514 from SaberUK/master+virtual-cleanup

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

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 0c68da1fb42445433e7777b1ef75cfe0d1190aab..36b21cd49c6d593c9948f2c4732cd668b70492fb 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -86,7 +86,6 @@ class joinfloodsettings
                locked = true;
                unlocktime = ServerInstance->Time() + 60;
        }
-
 };
 
 /** Handles channel mode +j
@@ -190,17 +189,15 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-
        JoinFlood jf;
 
  public:
-
        ModuleJoinFlood()
                : jf(this)
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(jf);
                ServerInstance->Modules->AddService(jf.ext);
@@ -208,7 +205,7 @@ class ModuleJoinFlood : public Module
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
                if (chan)
                {
@@ -222,7 +219,7 @@ class ModuleJoinFlood : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
+       void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE
        {
                /* We arent interested in JOIN events caused by a network burst */
                if (sync)
@@ -243,11 +240,7 @@ class ModuleJoinFlood : public Module
                }
        }
 
-       ~ModuleJoinFlood()
-       {
-       }
-
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides channel mode +j (join flood protection)", VF_VENDOR);
        }