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_language.cpp b/modules/core/ns_set_language.cpp
index c76bf0fef..6535376e5 100644
--- a/modules/core/ns_set_language.cpp
+++ b/modules/core/ns_set_language.cpp
@@ -16,7 +16,7 @@
 class CommandNSSetLanguage : public Command
 {
  public:
-	CommandNSSetLanguage(const Anope::string &cname) : Command(cname, 1)
+	CommandNSSetLanguage() : Command("LANGUAGE", 1)
 	{
 	}
 
@@ -63,7 +63,7 @@ class CommandNSSetLanguage : public Command
 class CommandNSSASetLanguage : public Command
 {
  public:
-	CommandNSSASetLanguage(const Anope::string &cname) : Command(cname, 2, 2, "nickserv/saset/language")
+	CommandNSSASetLanguage() : Command("LANGUAGE", 2, 2, "nickserv/saset/language")
 	{
 	}
 
@@ -111,6 +111,9 @@ class CommandNSSASetLanguage : public Command
 
 class NSSetLanguage : public Module
 {
+	CommandNSSetLanguage commandnssetlanguage;
+	CommandNSSASetLanguage commandnssasetlanguage;
+
  public:
 	NSSetLanguage(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
 	{
@@ -119,22 +122,22 @@ class NSSetLanguage : public Module
 
 		Command *c = FindCommand(NickServ, "SET");
 		if (c)
-			c->AddSubcommand(new CommandNSSetLanguage("LANGUAGE"));
+			c->AddSubcommand(&commandnssetlanguage);
 
 		c = FindCommand(NickServ, "SASET");
 		if (c)
-			c->AddSubcommand(new CommandNSSASetLanguage("LANGUAGE"));
+			c->AddSubcommand(&commandnssasetlanguage);
 	}
 
 	~NSSetLanguage()
 	{
 		Command *c = FindCommand(NickServ, "SET");
 		if (c)
-			c->DelSubcommand("LANGUAGE");
+			c->DelSubcommand(&commandnssetlanguage);
 
 		c = FindCommand(NickServ, "SASET");
 		if (c)
-			c->DelSubcommand("LANGUAGE");
+			c->DelSubcommand(&commandnssasetlanguage);
 	}
 };