X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_ircv3.cpp;h=7e8a1a8ffaa8f7ec0f4d729fdb98e2e7704d9b9e;hb=24623a5fe6ff986ad342e2b00d3576b4899a6033;hp=166bbbea70cfd937a5253a2e00afb20e778b4881;hpb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp
index 166bbbea7..7e8a1a8ff 100644
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -16,11 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $ModDesc: Provides support for extended-join, away-notify and account-notify CAP capabilities */
-
 #include "inspircd.h"
-#include "account.h"
-#include "m_cap.h"
+#include "modules/account.h"
+#include "modules/cap.h"
 
 class ModuleIRCv3 : public Module
 {
@@ -78,14 +76,14 @@ class ModuleIRCv3 : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		OnRehash(NULL);
 		Implementation eventlist[] = { I_OnUserJoin, I_OnPostJoin, I_OnSetAway, I_OnEvent, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	void OnRehash(User* user)
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
 		ConfigTag* conf = ServerInstance->Config->ConfValue("ircv3");
 		accountnotify = conf->getBool("accoutnotify", true);
@@ -93,7 +91,7 @@ class ModuleIRCv3 : public Module
 		extendedjoin = conf->getBool("extendedjoin", true);
 	}
 
-	void OnEvent(Event& ev)
+	void OnEvent(Event& ev) CXX11_OVERRIDE
 	{
 		if (awaynotify)
 			cap_awaynotify.HandleEvent(ev);
@@ -122,10 +120,10 @@ class ModuleIRCv3 : public Module
 		}
 	}
 
-	void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
+	void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE
 	{
 		// Remember who is not going to see the JOIN because of other modules
-		if ((awaynotify) && (IS_AWAY(memb->user)))
+		if ((awaynotify) && (memb->user->IsAway()))
 			last_excepts = excepts;
 
 		if (!extendedjoin)
@@ -195,7 +193,7 @@ class ModuleIRCv3 : public Module
 		}
 	}
 
-	ModResult OnSetAway(User* user, const std::string &awaymsg)
+	ModResult OnSetAway(User* user, const std::string &awaymsg) CXX11_OVERRIDE
 	{
 		if (awaynotify)
 		{
@@ -210,9 +208,9 @@ class ModuleIRCv3 : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnPostJoin(Membership *memb)
+	void OnPostJoin(Membership *memb) CXX11_OVERRIDE
 	{
-		if ((!awaynotify) || (!IS_AWAY(memb->user)))
+		if ((!awaynotify) || (!memb->user->IsAway()))
 			return;
 
 		std::string line = ":" + memb->user->GetFullHost() + " AWAY :" + memb->user->awaymsg;
@@ -236,7 +234,7 @@ class ModuleIRCv3 : public Module
 		ServerInstance->Modules->SetPriority(this, I_OnUserJoin, PRIORITY_LAST);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides support for extended-join, away-notify and account-notify CAP capabilities", VF_VENDOR);
 	}