X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.cpp;h=1d165f9355e427db5cfff61310c1b4d872eab87e;hb=4b41feea830fc84e8c1b2fd0982f3e8d8840af96;hp=662e128a4aa18c385ef2ef1e182bc07a355dd341;hpb=f89e68d78684dab66f9c99aaf8bd8a37ec62bfce;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 662e128a4..1d165f935 100644
--- 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 */
 
@@ -130,14 +130,18 @@ class ModuleCAP : public Module
 	ModuleCAP()
 		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
-		ServerInstance->Extensions.Register(&cmd.reghold);
+	}
+
+	void init() CXX11_OVERRIDE
+	{
+		ServerInstance->Modules->AddService(cmd);
+		ServerInstance->Modules->AddService(cmd.reghold);
 
 		Implementation eventlist[] = { I_OnCheckReady };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		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))
@@ -146,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)
-