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/ns_set_autoop.cpp b/modules/core/ns_set_autoop.cpp
index da8b8ccb9..408110239 100644
--- a/modules/core/ns_set_autoop.cpp
+++ b/modules/core/ns_set_autoop.cpp
@@ -16,7 +16,7 @@
 class CommandNSSetAutoOp : public Command
 {
  public:
-	CommandNSSetAutoOp(const Anope::string &cname) : Command(cname, 2)
+	CommandNSSetAutoOp() : Command("AUTOOP", 2)
 	{
 	}
 
@@ -58,7 +58,7 @@ class CommandNSSetAutoOp : public Command
 class CommandNSSASetAutoOp : public Command
 {
  public:
-	CommandNSSASetAutoOp(const Anope::string &cname) : Command(cname, 2, 2, "nickserv/saset/autoop")
+	CommandNSSASetAutoOp() : Command("AUTOOP", 2, 2, "nickserv/saset/autoop")
 	{
 	}
 
@@ -105,6 +105,9 @@ class CommandNSSASetAutoOp : public Command
 
 class NSSetAutoOp : public Module
 {
+	CommandNSSetAutoOp commandnssetautoop;
+	CommandNSSASetAutoOp commandnssasetautoop;
+
  public:
 	NSSetAutoOp(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
 	{
@@ -113,22 +116,22 @@ class NSSetAutoOp : public Module
 
 		Command *c = FindCommand(NickServ, "SET");
 		if (c)
-			c->AddSubcommand(new CommandNSSetAutoOp("AUTOOP"));
+			c->AddSubcommand(&commandnssetautoop);
 
 		c = FindCommand(NickServ, "SASET");
 		if (c)
-			c->AddSubcommand(new CommandNSSASetAutoOp("AUTOOP"));
+			c->AddSubcommand(&commandnssasetautoop);
 	}
 
 	~NSSetAutoOp()
 	{
 		Command *c = FindCommand(NickServ, "SET");
 		if (c)
-			c->DelSubcommand("AUTOOP");
+			c->DelSubcommand(&commandnssetautoop);
 
 		c = FindCommand(NickServ, "SASET");
 		if (c)
-			c->DelSubcommand("AUTOOP");
+			c->DelSubcommand(&commandnssasetautoop);
 	}
 };