X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=ba0bc62fb73ce2e64d802c355e49c3bd67b5d49c;hb=f2cdf27dd9c45f91f4184b81ea3b9be7c5d88173;hp=bbc7ae3acf7a7bfe416da2fcf58f0431ae372670;hpb=eadffd640b96414f208c9bed4c290031811a764e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index bbc7ae3ac..ba0bc62fb 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -29,35 +29,13 @@ static std::map<irc::string, std::string> helpop_map;
 
 /** Handles user mode +h
  */
-class Helpop : public ModeHandler
+class Helpop : public SimpleUserModeHandler
 {
  public:
-	Helpop(Module* Creator) : ModeHandler(Creator, "helpop", 'h', PARAM_NONE, MODETYPE_USER)
+	Helpop(Module* Creator) : SimpleUserModeHandler(Creator, "helpop", 'h')
 	{
 		oper = true;
 	}
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-	{
-		if (adding)
-		{
-			if (!dest->IsModeSet('h'))
-			{
-				dest->SetMode('h',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (dest->IsModeSet('h'))
-			{
-				dest->SetMode('h',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
-	}
 };
 
 /** Handles /HELPOP
@@ -120,7 +98,6 @@ class CommandHelpop : public Command
 
 class ModuleHelpop : public Module
 {
-	private:
 		std::string  h_file;
 		CommandHelpop cmd;
 		Helpop ho;
@@ -131,13 +108,13 @@ class ModuleHelpop : public Module
 		{
 		}
 
-		void init()
+		void init() CXX11_OVERRIDE
 		{
 			ReadConfig();
 			ServerInstance->Modules->AddService(ho);
 			ServerInstance->Modules->AddService(cmd);
 			Implementation eventlist[] = { I_OnRehash, I_OnWhois };
-			ServerInstance->Modules->Attach(eventlist, this, 2);
+			ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		}
 
 		void ReadConfig()
@@ -173,20 +150,20 @@ class ModuleHelpop : public Module
 
 		}
 
-		void OnRehash(User* user)
+		void OnRehash(User* user) CXX11_OVERRIDE
 		{
 			ReadConfig();
 		}
 
-		void OnWhois(User* src, User* dst)
+		void OnWhois(User* src, User* dst) CXX11_OVERRIDE
 		{
-			if (dst->IsModeSet('h'))
+			if (dst->IsModeSet(ho))
 			{
-				ServerInstance->SendWhoisLine(src, dst, 310, std::string(src->nick)+" "+std::string(dst->nick)+" :is available for help.");
+				ServerInstance->SendWhoisLine(src, dst, 310, src->nick+" "+dst->nick+" :is available for help.");
 			}
 		}
 
-		Version GetVersion()
+		Version GetVersion() CXX11_OVERRIDE
 		{
 			return Version("Provides the /HELPOP command for useful information", VF_VENDOR);
 		}