X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=f4532ecd1b5befc0a3b0bb198779aa4090a1ef76;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=56c57aee0e2245d591e9a4d216bae788c72b388b;hpb=a1a5c322ce3310cdb439bf4b05182ae8d31a93ea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 56c57aee0..f4532ecd1 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -174,30 +174,27 @@ class CommandShun : public Command
 
 class ModuleShun : public Module
 {
-	CommandShun* mycommand;
-	ShunFactory *f;
+	CommandShun cmd;
+	ShunFactory f;
 	std::set<std::string> ShunEnabledCommands;
 	bool NotifyOfShun;
 	bool affectopers;
 
  public:
-	ModuleShun(InspIRCd* Me) : Module(Me)
+	ModuleShun(InspIRCd* Me) : Module(Me), cmd(Me), f(Me)
 	{
-		f = new ShunFactory(ServerInstance);
-		ServerInstance->XLines->RegisterFactory(f);
-
-		mycommand = new CommandShun(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
+		ServerInstance->XLines->RegisterFactory(&f);
+		ServerInstance->AddCommand(&cmd);
 
 		Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 4);
-		OnRehash(NULL, "");
+		OnRehash(NULL);
 	}
 
 	virtual ~ModuleShun()
 	{
 		ServerInstance->XLines->DelAll("SHUN");
-		ServerInstance->XLines->UnregisterFactory(f);
+		ServerInstance->XLines->UnregisterFactory(&f);
 	}
 
 	virtual int OnStats(char symbol, User* user, string_list& out)
@@ -209,7 +206,7 @@ class ModuleShun : public Module
 		return 1;
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		ConfigReader MyConf(ServerInstance);
 		std::string cmds = MyConf.ReadValue("shun", "enabledcommands", 0);