Convert HelpServ (useless crap..) and HostServ.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1554 5417fbe8-f217-4b02-8779-1006273d7864

10 files changed, 138 insertions, 263 deletions

diff --git a/src/core/he_help.c b/src/core/he_help.c
index 0739e92b2..573e120f1 100644
--- a/src/core/he_help.c
+++ b/src/core/he_help.c
@@ -17,33 +17,21 @@
 
 int do_help(User * u);
 
-/**
- * Create the help command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class HEHelp : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
-
-    c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
-    moduleAddCommand(HELPSERV, c, MOD_UNIQUE);
+ public:
+	HEHelp(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    return MOD_CONT;
-}
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
+		moduleAddCommand(HELPSERV, c, MOD_UNIQUE);
+	}
+};
 
 
 
@@ -75,4 +63,4 @@ int do_help(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("he_help")
+MODULE_INIT(HEHelp)
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index 5c12457b9..f45a93b75 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -18,36 +18,24 @@
 int do_del(User * u);
 void myHostServHelp(User * u);
 
-/**
- * Create the off command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class HSDel : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	HSDel(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("DEL", do_del, is_host_remover, HOST_HELP_DEL, -1,
-                      -1, -1, -1);
-    moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetHostHelp(myHostServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("DEL", do_del, is_host_remover, HOST_HELP_DEL, -1, -1, -1, -1);
+		moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
+		moduleSetHostHelp(myHostServHelp);
+	}
+};
 
-}
 
 
 
@@ -90,4 +78,4 @@ int do_del(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("hs_del")
+MODULE_INIT(HSDel)
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index e5eee9a6f..884f8e155 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -18,36 +18,24 @@
 int do_delall(User * u);
 void myHostServHelp(User * u);
 
-/**
- * Create the off command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class HSDelAll : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	HSDelAll(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("DELALL", do_delall, is_host_remover,
-                      HOST_HELP_DELALL, -1, -1, -1, -1);
-    moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetHostHelp(myHostServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("DELALL", do_delall, is_host_remover, HOST_HELP_DELALL, -1, -1, -1, -1);
+		moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
+		moduleSetHostHelp(myHostServHelp);
+	}
+};
 
-}
 
 
 
@@ -95,4 +83,4 @@ int do_delall(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("hs_delall")
+MODULE_INIT(HSDelAll)
diff --git a/src/core/hs_group.c b/src/core/hs_group.c
index 3946fcc94..454ef95f4 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.c
@@ -21,36 +21,23 @@ extern int do_hs_sync(NickCore * nc, char *vIdent, char *hostmask,
                       char *creator, time_t time);
 
 
-/**
- * Create the off command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class HSGroup : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	HSGroup(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("GROUP", do_group, NULL, HOST_HELP_GROUP, -1, -1, -1,
-                      -1);
-    moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetHostHelp(myHostServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("GROUP", do_group, NULL, HOST_HELP_GROUP, -1, -1, -1, -1);
+		moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetHostHelp(myHostServHelp);
+	}
+};
 
 
 
@@ -123,4 +110,4 @@ int do_group(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("hs_group")
+MODULE_INIT(HSGroup)
diff --git a/src/core/hs_help.c b/src/core/hs_help.c
index 008d62082..041678ea6 100644
--- a/src/core/hs_help.c
+++ b/src/core/hs_help.c
@@ -17,33 +17,21 @@
 
 int do_help(User * u);
 
-/**
- * Create the help command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class HSHelp : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	HSHelp(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
-    moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
-
-    return MOD_CONT;
-}
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
+		moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
+	}
+};
 
 
 
@@ -65,4 +53,4 @@ int do_help(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("hs_help")
+MODULE_INIT(HSHelp)
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index 68c1f6be4..a0e1a807a 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -18,35 +18,22 @@
 int listOut(User * u);
 void myHostServHelp(User * u);
 
-/**
- * Create the off command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class HSList : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	HSList(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("LIST", listOut, is_services_oper, -1, -1,
-                      HOST_HELP_LIST, HOST_HELP_LIST, HOST_HELP_LIST);
-    moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
-    moduleSetHostHelp(myHostServHelp);
-
-    return MOD_CONT;
-}
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		c = createCommand("LIST", listOut, is_services_oper, -1, -1, HOST_HELP_LIST, HOST_HELP_LIST, HOST_HELP_LIST);
+		moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
+		moduleSetHostHelp(myHostServHelp);
+	}
+};
 
 
 
@@ -186,4 +173,4 @@ int listOut(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("hs_list")
+MODULE_INIT(HSList)
diff --git a/src/core/hs_off.c b/src/core/hs_off.c
index 40e2c324a..76f38961e 100644
--- a/src/core/hs_off.c
+++ b/src/core/hs_off.c
@@ -18,35 +18,23 @@
 int do_off(User * u);
 void myHostServHelp(User * u);
 
-/**
- * Create the off command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class HSOff : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	HSOff(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("OFF", do_off, NULL, HOST_HELP_OFF, -1, -1, -1, -1);
-    moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetHostHelp(myHostServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("OFF", do_off, NULL, HOST_HELP_OFF, -1, -1, -1, -1);
+		moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetHostHelp(myHostServHelp);
+	}
+};
 
 
 
@@ -86,4 +74,4 @@ int do_off(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("hs_off")
+MODULE_INIT(HSOff)
diff --git a/src/core/hs_on.c b/src/core/hs_on.c
index 6b12fd8f5..3dc07d6b8 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.c
@@ -18,35 +18,23 @@
 int do_on(User * u);
 void myHostServHelp(User * u);
 
-/**
- * Create the off command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class HSOn : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	HSOn(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("ON", do_on, NULL, HOST_HELP_ON, -1, -1, -1, -1);
-    moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetHostHelp(myHostServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("ON", do_on, NULL, HOST_HELP_ON, -1, -1, -1, -1);
+		moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetHostHelp(myHostServHelp);
+	}
+};
 
 
 
@@ -101,4 +89,4 @@ int do_on(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("hs_on")
+MODULE_INIT(HSOn)
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index 26a9141dd..67323b6e1 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -18,36 +18,23 @@
 int myDoSet(User * u);
 void myHostServHelp(User * u);
 
-/**
- * Create the off command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class HSSet : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	HSSet(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("SET", myDoSet, is_host_setter, HOST_HELP_SET, -1,
-                      -1, -1, -1);
-    moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetHostHelp(myHostServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("SET", myDoSet, is_host_setter, HOST_HELP_SET, -1, -1, -1, -1);
+		moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetHostHelp(myHostServHelp);
+	}
+};
 
 
 
@@ -177,4 +164,4 @@ int myDoSet(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("hs_set")
+MODULE_INIT(HSSet)
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index 902112663..d534801a0 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -20,35 +20,22 @@ void myHostServHelp(User * u);
 extern int do_hs_sync(NickCore * nc, char *vIdent, char *hostmask,
                       char *creator, time_t time);
 
-/**
- * Create the off command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class HSSetAll : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
-
-    c = createCommand("SETALL", do_setall, is_host_setter,
-                      HOST_HELP_SETALL, -1, -1, -1, -1);
-    moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
-    moduleSetHostHelp(myHostServHelp);
-
-    return MOD_CONT;
-}
+ public:
+	HSSetAll(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-}
+		c = createCommand("SETALL", do_setall, is_host_setter, HOST_HELP_SETALL, -1, -1, -1, -1);
+		moduleAddCommand(HOSTSERV, c, MOD_UNIQUE);
+		moduleSetHostHelp(myHostServHelp);
+	}
+};
 
 
 
@@ -70,7 +57,6 @@ void myHostServHelp(User * u)
  **/
 int do_setall(User * u)
 {
-
     char *nick = (char *)strtok(NULL, " ");
     char *rawhostmask = strtok(NULL, " ");
     char *hostmask = (char *)smalloc(HOSTMAX);
@@ -179,4 +165,4 @@ int do_setall(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("hs_setall")
+MODULE_INIT(HSSetAll)