X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=3a5934a6781c6bf8773381ee3124399af774a64f;hb=94afde43b086f092bf8128d76d418cb63840e8eb;hp=b1028a042943671cbcdfbb92023d4df691853222;hpb=a27e9d92fa18e216cdea71934c20b11eac0737cd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index b1028a042..3a5934a67 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -24,7 +24,7 @@ class Helpop : public ModeHandler
  public:
 	Helpop(InspIRCd* Instance) : ModeHandler(Instance, 'h', 0, 0, false, MODETYPE_USER, true) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -49,16 +49,16 @@ class Helpop : public ModeHandler
 
 /** Handles /HELPOP
  */
-class cmd_helpop : public command_t
+class CommandHelpop : public Command
 {
  public:
-	cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 0)
+	CommandHelpop (InspIRCd* Instance) : Command(Instance, "HELPOP", 0, 0)
 	{
 		this->source = "m_helpop.so";
 		syntax = "<any-text>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		irc::string parameter("start");
 		if (pcnt > 0)
@@ -106,7 +106,7 @@ class ModuleHelpop : public Module
 {
 	private:
 		std::string  h_file;
-		cmd_helpop* mycommand;
+		CommandHelpop* mycommand;
 		Helpop* ho;
 
 	public:
@@ -115,10 +115,12 @@ class ModuleHelpop : public Module
 		{
 			ReadConfig();
 			ho = new Helpop(ServerInstance);
-			if (!ServerInstance->AddMode(ho, 'h'))
+			if (!ServerInstance->AddMode(ho))
 				throw ModuleException("Could not add new modes!");
-			mycommand = new cmd_helpop(ServerInstance);
+			mycommand = new CommandHelpop(ServerInstance);
 			ServerInstance->AddCommand(mycommand);
+		Implementation eventlist[] = { I_OnRehash, I_OnWhois };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
 		virtual void ReadConfig()
@@ -153,17 +155,13 @@ class ModuleHelpop : public Module
 
 		}
 
-		void Implements(char* List)
-		{
-			List[I_OnRehash] = List[I_OnWhois] = 1;
-		}
 
-		virtual void OnRehash(userrec* user, const std::string &parameter)
+		virtual void OnRehash(User* user, const std::string &parameter)
 		{
 			ReadConfig();
 		}
 
-		virtual void OnWhois(userrec* src, userrec* dst)
+		virtual void OnWhois(User* src, User* dst)
 		{
 			if (dst->IsModeSet('h'))
 			{
@@ -174,7 +172,7 @@ class ModuleHelpop : public Module
 		virtual ~ModuleHelpop()
 		{
 			ServerInstance->Modes->DelMode(ho);
-			DELETE(ho);
+			delete ho;
 		}
 	
 		virtual Version GetVersion()