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

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

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index e9f4dae90e09684c37d9286e23543ca9d636817a..1d165f9355e427db5cfff61310c1b4d872eab87e 100644 (file)
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -19,7 +19,7 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
+#include "modules/cap.h"
 
 /* $ModDesc: Provides the CAP negotiation mechanism seen in ratbox-derived ircds */
 
@@ -132,7 +132,7 @@ class ModuleCAP : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(cmd);
                ServerInstance->Modules->AddService(cmd.reghold);
@@ -141,7 +141,7 @@ class ModuleCAP : public Module
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       ModResult OnCheckReady(LocalUser* user)
+       ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE
        {
                /* Users in CAP state get held until CAP END */
                if (cmd.reghold.get(user))
@@ -150,15 +150,10 @@ class ModuleCAP : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ~ModuleCAP()
-       {
-       }
-
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Client CAP extension support", VF_VENDOR);
        }
 };
 
 MODULE_INIT(ModuleCAP)
-