X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uhnames.cpp;h=a8814b343cab8271b581372f3682e6e7aad1822d;hb=02838a09396a3626b61263791570e96324563fa0;hp=0a171c4dc7731a9a71e16217dbcd6b526fb90ac3;hpb=f62654a6859998f9d63eb22702c572d5ebcff15c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index 0a171c4dc..a8814b343 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -24,9 +24,9 @@
 
 class ModuleUHNames : public Module
 {
- public:
-	GenericCap cap;
+	Cap::Capability cap;
 
+ public:
 	ModuleUHNames() : cap(this, "userhost-in-names")
 	{
 	}
@@ -41,7 +41,7 @@ class ModuleUHNames : public Module
 		tokens["UHNAMES"];
 	}
 
-	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
 	{
 		/* We don't actually create a proper command handler class for PROTOCTL,
 		 * because other modules might want to have PROTOCTL hooks too.
@@ -52,7 +52,7 @@ class ModuleUHNames : public Module
 		{
 			if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"UHNAMES")))
 			{
-				cap.ext.set(user, 1);
+				cap.set(user, true);
 				return MOD_RES_DENY;
 			}
 		}
@@ -61,16 +61,11 @@ class ModuleUHNames : public Module
 
 	ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
 	{
-		if (cap.ext.get(issuer))
+		if (cap.get(issuer))
 			nick = memb->user->GetFullHost();
 
 		return MOD_RES_PASSTHRU;
 	}
-
-	void OnEvent(Event& ev) CXX11_OVERRIDE
-	{
-		cap.HandleEvent(ev);
-	}
 };
 
 MODULE_INIT(ModuleUHNames)