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, 5 insertions, 3 deletions

diff --git a/modules/core/cs_saset_noexpire.cpp b/modules/core/cs_saset_noexpire.cpp
index a89f30c36..449239983 100644
--- a/modules/core/cs_saset_noexpire.cpp
+++ b/modules/core/cs_saset_noexpire.cpp
@@ -16,7 +16,7 @@
 class CommandCSSASetNoexpire : public Command
 {
  public:
-	CommandCSSASetNoexpire(const Anope::string &cname) : Command(cname, 2, 2, "chanserv/saset/noexpire")
+	CommandCSSASetNoexpire() : Command("NOEXPIRE", 2, 2, "chanserv/saset/noexpire")
 	{
 	}
 
@@ -61,6 +61,8 @@ class CommandCSSASetNoexpire : public Command
 
 class CSSetNoexpire : public Module
 {
+	CommandCSSASetNoexpire commandcssasetnoexpire;
+
  public:
 	CSSetNoexpire(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
 	{
@@ -69,14 +71,14 @@ class CSSetNoexpire : public Module
 
 		Command *c = FindCommand(ChanServ, "SASET");
 		if (c)
-			c->AddSubcommand(new CommandCSSASetNoexpire("NOEXPIRE"));
+			c->AddSubcommand(&commandcssasetnoexpire);
 	}
 
 	~CSSetNoexpire()
 	{
 		Command *c = FindCommand(ChanServ, "SASET");
 		if (c)
-			c->DelSubcommand("NOEXPIRE");
+			c->DelSubcommand(&commandcssasetnoexpire);
 	}
 };