X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=afbf7a8e263add0c9049fd62671baf945105abfc;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=535f6ec103e598e77feb44a7a053fde194a744eb;hpb=44e89aafb69fb266bdf780d12a31947bfff4e330;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 535f6ec10..afbf7a8e2 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -21,36 +21,27 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
-
-/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
+#include "modules/cap.h"
 
 class ModuleNamesX : public Module
 {
- public:
 	GenericCap cap;
+ public:
 	ModuleNamesX() : cap(this, "multi-prefix")
-	{
-		Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent, I_OnSendWhoLine };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
-	}
-
-
-	~ModuleNamesX()
 	{
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
 	}
 
-	void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		output.append(" NAMESX");
+		tokens["NAMESX"];
 	}
 
-	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
+	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
 	{
 		/* We don't actually create a proper command handler class for PROTOCTL,
 		 * because other modules might want to have PROTOCTL hooks too.
@@ -68,7 +59,7 @@ class ModuleNamesX : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
+	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) CXX11_OVERRIDE
 	{
 		if (!cap.ext.get(issuer))
 			return;
@@ -80,7 +71,7 @@ class ModuleNamesX : public Module
 		prefixes = memb->chan->GetAllPrefixChars(memb->user);
 	}
 
-	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
+	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line) CXX11_OVERRIDE
 	{
 		if (!cap.ext.get(source))
 			return;
@@ -105,7 +96,7 @@ class ModuleNamesX : public Module
 
 		// Try to find this channel
 		std::string channame = line.substr(a, b-a);
-		Channel* chan = ServerInstance->FindChan(channame.c_str());
+		Channel* chan = ServerInstance->FindChan(channame);
 		if (!chan)
 			return;
 
@@ -118,7 +109,7 @@ class ModuleNamesX : public Module
 		line.insert(pos, prefixes);
 	}
 
-	void OnEvent(Event& ev)
+	void OnEvent(Event& ev) CXX11_OVERRIDE
 	{
 		cap.HandleEvent(ev);
 	}