Don't dynamically allocate commands in modules anymore, instead made them members of modules. This means the commands are automatically destructed when the module is unloaded. Cleans up some old ugly code.

1 files changed, 9 insertions, 6 deletions

diff --git a/modules/core/cs_set_xop.cpp b/modules/core/cs_set_xop.cpp
index c7d4017b0..1c4c2f431 100644
--- a/modules/core/cs_set_xop.cpp
+++ b/modules/core/cs_set_xop.cpp
@@ -17,7 +17,7 @@
 class CommandCSSetXOP : public Command
 {
  public:
-	CommandCSSetXOP(const Anope::string &cname, const Anope::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetXOP(const Anope::string &cpermission = "") : Command("XOP", 2, 2, cpermission)
 	{
 	}
 
@@ -100,7 +100,7 @@ class CommandCSSetXOP : public Command
 class CommandCSSASetXOP : public CommandCSSetXOP
 {
  public:
-	CommandCSSASetXOP(const Anope::string &cname) : CommandCSSetXOP(cname, "chanserv/saset/xop")
+	CommandCSSASetXOP() : CommandCSSetXOP("chanserv/saset/xop")
 	{
 	}
 
@@ -118,6 +118,9 @@ class CommandCSSASetXOP : public CommandCSSetXOP
 
 class CSSetXOP : public Module
 {
+	CommandCSSetXOP commandcssetxop;
+	CommandCSSASetXOP commandcssasetxop;
+
  public:
 	CSSetXOP(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
 	{
@@ -126,22 +129,22 @@ class CSSetXOP : public Module
 
 		Command *c = FindCommand(ChanServ, "SET");
 		if (c)
-			c->AddSubcommand(new CommandCSSetXOP("XOP"));
+			c->AddSubcommand(&commandcssetxop);
 
 		c = FindCommand(ChanServ, "SASET");
 		if (c)
-			c->AddSubcommand(new CommandCSSASetXOP("XOP"));
+			c->AddSubcommand(&commandcssasetxop);
 	}
 
 	~CSSetXOP()
 	{
 		Command *c = FindCommand(ChanServ, "SET");
 		if (c)
-			c->DelSubcommand("XOP");
+			c->DelSubcommand(&commandcssetxop);
 
 		c = FindCommand(ChanServ, "SASET");
 		if (c)
-			c->DelSubcommand("XOP");
+			c->DelSubcommand(&commandcssasetxop);
 	}
 };