diff options
148 files changed, 160 insertions, 160 deletions
diff --git a/include/modules.h b/include/modules.h index 328c6f96e..73bff568e 100644 --- a/include/modules.h +++ b/include/modules.h @@ -132,7 +132,7 @@ struct ModuleLang_ { char **argv; }; -class Module +CoreExport class Module { public: // XXX :( @@ -164,6 +164,11 @@ class Module /** Destroys a module, freeing resources it has allocated. */ ~Module(); + + /** Sets a given type (CORE,PROTOCOL,3RD etc) on a module. + * @param type The type to set the module as. + */ + void SetType(MODType type); }; struct ModuleHash_ { @@ -302,12 +307,6 @@ MDE int moduleAddRegHelp(Command * c, int (*func) (User * u)); MDE int moduleAddOperHelp(Command * c, int (*func) (User * u)); MDE int moduleAddAdminHelp(Command * c, int (*func) (User * u)); MDE int moduleAddRootHelp(Command * c, int (*func) (User * u)); - -/** Sets a given type (CORE,PROTOCOL,3RD etc) on a module. - * @param m The module to set the type for - * @param type The type to set the module as. - */ -MDE void moduleSetType(Module *m, MODType type); extern MDE Module *mod_current_module; extern MDE const char *mod_current_module_name; extern MDE char *mod_current_buffer; diff --git a/src/core/bs_act.c b/src/core/bs_act.c index 2257c851c..324c10778 100644 --- a/src/core/bs_act.c +++ b/src/core/bs_act.c @@ -27,7 +27,7 @@ class BSAct : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("ACT", do_act, NULL, BOT_HELP_ACT, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index 40f3c2aba..c9519ceff 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -27,7 +27,7 @@ class BSAssign : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("ASSIGN", do_assign, NULL, BOT_HELP_ASSIGN, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c index 575a024dc..4322944c1 100644 --- a/src/core/bs_badwords.c +++ b/src/core/bs_badwords.c @@ -30,7 +30,7 @@ class BSBadwords : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("BADWORDS", do_badwords, NULL, BOT_HELP_BADWORDS, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index 910a21e31..c85a94ac4 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -27,7 +27,7 @@ class BSBot : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("BOT", do_bot, is_services_admin, -1, -1, -1, BOT_SERVADMIN_HELP_BOT, BOT_SERVADMIN_HELP_BOT); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c index 6c991ef85..93aabdfe7 100644 --- a/src/core/bs_botlist.c +++ b/src/core/bs_botlist.c @@ -27,7 +27,7 @@ class BSBotList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("BOTLIST", do_botlist, NULL, BOT_HELP_BOTLIST, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_fantasy.c b/src/core/bs_fantasy.c index f5272a2bc..5632fbc2b 100644 --- a/src/core/bs_fantasy.c +++ b/src/core/bs_fantasy.c @@ -26,7 +26,7 @@ class BSFantasy : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy); moduleAddEventHook(hook); } diff --git a/src/core/bs_fantasy_kick.c b/src/core/bs_fantasy_kick.c index 79200ec2b..bc482dca4 100644 --- a/src/core/bs_fantasy_kick.c +++ b/src/core/bs_fantasy_kick.c @@ -26,7 +26,7 @@ class BSFantasyKick : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy); moduleAddEventHook(hook); diff --git a/src/core/bs_fantasy_kickban.c b/src/core/bs_fantasy_kickban.c index 4e3e5fe2a..d35a6b6be 100644 --- a/src/core/bs_fantasy_kickban.c +++ b/src/core/bs_fantasy_kickban.c @@ -26,7 +26,7 @@ class BSFantasyKickBan : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy); moduleAddEventHook(hook); diff --git a/src/core/bs_fantasy_owner.c b/src/core/bs_fantasy_owner.c index 08ee98c1f..a74a71e77 100644 --- a/src/core/bs_fantasy_owner.c +++ b/src/core/bs_fantasy_owner.c @@ -26,7 +26,7 @@ class BSFantasyOwner : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); /* No need to load of we don't support owner */ if (!ircd->owner) diff --git a/src/core/bs_fantasy_seen.c b/src/core/bs_fantasy_seen.c index ed5495f1c..9999ed651 100644 --- a/src/core/bs_fantasy_seen.c +++ b/src/core/bs_fantasy_seen.c @@ -26,7 +26,7 @@ class BSFantasySeen : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy); moduleAddEventHook(hook); diff --git a/src/core/bs_help.c b/src/core/bs_help.c index ce360be36..522217dfc 100644 --- a/src/core/bs_help.c +++ b/src/core/bs_help.c @@ -26,7 +26,7 @@ class BSHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); } diff --git a/src/core/bs_info.c b/src/core/bs_info.c index d65d0e078..38d348694 100644 --- a/src/core/bs_info.c +++ b/src/core/bs_info.c @@ -28,7 +28,7 @@ class BSInfo : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("INFO", do_info, NULL, BOT_HELP_INFO, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c index cbbb0f9ab..e6df8200e 100644 --- a/src/core/bs_kick.c +++ b/src/core/bs_kick.c @@ -28,7 +28,7 @@ class BSKick : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("KICK", do_kickcmd, NULL, BOT_HELP_KICK, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("KICK BADWORDS", NULL, NULL, BOT_HELP_KICK_BADWORDS, -1, -1, -1, -1); diff --git a/src/core/bs_say.c b/src/core/bs_say.c index 5935f0250..157e10c79 100644 --- a/src/core/bs_say.c +++ b/src/core/bs_say.c @@ -27,7 +27,7 @@ class BSSay : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SAY", do_say, NULL, BOT_HELP_SAY, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_set.c b/src/core/bs_set.c index 03f425a04..ef26e6eee 100644 --- a/src/core/bs_set.c +++ b/src/core/bs_set.c @@ -27,7 +27,7 @@ class BSSet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SET", do_set, NULL, BOT_HELP_SET, -1, -1, BOT_SERVADMIN_HELP_SET, BOT_SERVADMIN_HELP_SET); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c index 1885685a7..d54687fbe 100644 --- a/src/core/bs_unassign.c +++ b/src/core/bs_unassign.c @@ -27,7 +27,7 @@ class BSUnassign : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("UNASSIGN", do_unassign, NULL, BOT_HELP_UNASSIGN, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_access.c b/src/core/cs_access.c index b63f9e9b1..bea907e51 100644 --- a/src/core/cs_access.c +++ b/src/core/cs_access.c @@ -31,7 +31,7 @@ class CSAccess : public Module moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("ACCESS", do_access, NULL, CHAN_HELP_ACCESS, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c index 3659c73af..eba591674 100644 --- a/src/core/cs_akick.c +++ b/src/core/cs_akick.c @@ -29,7 +29,7 @@ class CSAKick : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("AKICK", do_akick, NULL, CHAN_HELP_AKICK, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c index e7d77b23b..ff45639bd 100644 --- a/src/core/cs_ban.c +++ b/src/core/cs_ban.c @@ -28,7 +28,7 @@ class CSBan : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("BAN", do_ban, NULL, CHAN_HELP_BAN, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c index 8bb2b493f..3d3e62802 100644 --- a/src/core/cs_clear.c +++ b/src/core/cs_clear.c @@ -27,7 +27,7 @@ class CSClear : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("CLEAR", do_clear, NULL, CHAN_HELP_CLEAR, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c index f80b17fac..d262a617f 100644 --- a/src/core/cs_drop.c +++ b/src/core/cs_drop.c @@ -27,7 +27,7 @@ class CSDrop : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("DROP", do_drop, NULL, -1, CHAN_HELP_DROP, -1, CHAN_SERVADMIN_HELP_DROP, CHAN_SERVADMIN_HELP_DROP); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c index 344db11b1..f0f32a300 100644 --- a/src/core/cs_forbid.c +++ b/src/core/cs_forbid.c @@ -27,7 +27,7 @@ class CSForbid : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_FORBID, CHAN_SERVADMIN_HELP_FORBID); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c index 2ec7c6e67..d219e2c74 100644 --- a/src/core/cs_getkey.c +++ b/src/core/cs_getkey.c @@ -27,7 +27,7 @@ class CSGetKey : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("GETKEY", do_getkey, NULL, CHAN_HELP_GETKEY, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c index 611ceadbd..111500582 100644 --- a/src/core/cs_getpass.c +++ b/src/core/cs_getpass.c @@ -27,7 +27,7 @@ class CSGetPass : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_GETPASS, CHAN_SERVADMIN_HELP_GETPASS); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_help.c b/src/core/cs_help.c index 3b8c7b873..14b4ebf84 100644 --- a/src/core/cs_help.c +++ b/src/core/cs_help.c @@ -26,7 +26,7 @@ class CSHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c index 9e6bd2ae8..20addcb01 100644 --- a/src/core/cs_identify.c +++ b/src/core/cs_identify.c @@ -27,7 +27,7 @@ class CSIdentify : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("IDENTIFY", do_identify, NULL, CHAN_HELP_IDENTIFY, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_info.c b/src/core/cs_info.c index cc5aebf9b..9fda8d7a7 100644 --- a/src/core/cs_info.c +++ b/src/core/cs_info.c @@ -27,7 +27,7 @@ class CSInfo : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("INFO", do_info, NULL, CHAN_HELP_INFO, -1, CHAN_SERVADMIN_HELP_INFO, CHAN_SERVADMIN_HELP_INFO, CHAN_SERVADMIN_HELP_INFO); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c index 5da9445d5..8575b79f5 100644 --- a/src/core/cs_invite.c +++ b/src/core/cs_invite.c @@ -27,7 +27,7 @@ class CSInvite : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("INVITE", do_invite, NULL, CHAN_HELP_INVITE, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c index 754d7a2e0..b2c7caf50 100644 --- a/src/core/cs_kick.c +++ b/src/core/cs_kick.c @@ -27,7 +27,7 @@ class CSKick : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("KICK", do_cs_kick, NULL, CHAN_HELP_KICK, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_list.c b/src/core/cs_list.c index 89dad7a55..f205a673d 100644 --- a/src/core/cs_list.c +++ b/src/core/cs_list.c @@ -27,7 +27,7 @@ class CSList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("LIST", do_list, NULL, -1, CHAN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST); diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c index 15a2f1823..79716b382 100644 --- a/src/core/cs_logout.c +++ b/src/core/cs_logout.c @@ -28,7 +28,7 @@ class CSLogout : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("LOGOUT", do_logout, NULL, -1, CHAN_HELP_LOGOUT, -1, CHAN_SERVADMIN_HELP_LOGOUT, CHAN_SERVADMIN_HELP_LOGOUT); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c index 44c02bccf..3c658042a 100644 --- a/src/core/cs_modes.c +++ b/src/core/cs_modes.c @@ -37,7 +37,7 @@ class CSModes : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("OP", do_op, NULL, CHAN_HELP_OP, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_register.c b/src/core/cs_register.c index 01a75344f..72be9c21d 100644 --- a/src/core/cs_register.c +++ b/src/core/cs_register.c @@ -27,7 +27,7 @@ class CSRegister : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("REGISTER", do_register, NULL, CHAN_HELP_REGISTER, -1, -1, -1, -1); c->help_param1 = s_NickServ; diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c index 2d08ce3b7..ae2ebb1a6 100644 --- a/src/core/cs_sendpass.c +++ b/src/core/cs_sendpass.c @@ -28,7 +28,7 @@ class CSSendPass : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SENDPASS", do_sendpass, NULL, CHAN_HELP_SENDPASS, -1, -1, -1, -1); diff --git a/src/core/cs_set.c b/src/core/cs_set.c index ca34c11c0..7e0af68c8 100644 --- a/src/core/cs_set.c +++ b/src/core/cs_set.c @@ -49,7 +49,7 @@ class CSSet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SET", do_set, NULL, CHAN_HELP_SET, -1, -1, CHAN_SERVADMIN_HELP_SET, CHAN_SERVADMIN_HELP_SET); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_status.c b/src/core/cs_status.c index 618deb464..0bfece60c 100644 --- a/src/core/cs_status.c +++ b/src/core/cs_status.c @@ -27,7 +27,7 @@ class CSStatus : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("STATUS", do_status, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_STATUS, CHAN_SERVADMIN_HELP_STATUS); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c index b05690ca9..ed0e8ad9b 100644 --- a/src/core/cs_suspend.c +++ b/src/core/cs_suspend.c @@ -28,7 +28,7 @@ class CSSuspend : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1, -1, CHAN_SERVADMIN_HELP_SUSPEND, CHAN_SERVADMIN_HELP_SUSPEND); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c index 85ea36dce..254afa0c3 100644 --- a/src/core/cs_topic.c +++ b/src/core/cs_topic.c @@ -27,7 +27,7 @@ class CSTopic : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("TOPIC", do_cs_topic, NULL, CHAN_HELP_TOPIC, -1, -1,-1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c index 97b0c183e..22e66365a 100644 --- a/src/core/cs_xop.c +++ b/src/core/cs_xop.c @@ -91,7 +91,7 @@ class CSXOP : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("AOP", do_aop, NULL, CHAN_HELP_AOP, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/enc_md5.c b/src/core/enc_md5.c index 090969e2c..bc8df660a 100644 --- a/src/core/enc_md5.c +++ b/src/core/enc_md5.c @@ -390,7 +390,7 @@ class EMD5 : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, ENCRYPTION); + this->SetType(ENCRYPTION); encmodule_encrypt(md5_encrypt); encmodule_encrypt_in_place(md5_encrypt_in_place); diff --git a/src/core/enc_none.c b/src/core/enc_none.c index fbc8c03af..4ad78e24b 100644 --- a/src/core/enc_none.c +++ b/src/core/enc_none.c @@ -22,7 +22,7 @@ class ENone : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, ENCRYPTION); + this->SetType(ENCRYPTION); encmodule_encrypt(plain_encrypt); encmodule_encrypt_in_place(plain_encrypt_in_place); diff --git a/src/core/enc_old.c b/src/core/enc_old.c index 2b08892a9..fbddf94b3 100644 --- a/src/core/enc_old.c +++ b/src/core/enc_old.c @@ -417,7 +417,7 @@ class EOld : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, ENCRYPTION); + this->SetType(ENCRYPTION); encmodule_encrypt(old_encrypt); encmodule_encrypt_in_place(old_encrypt_in_place); diff --git a/src/core/enc_sha1.c b/src/core/enc_sha1.c index ce136d044..94820f0fe 100644 --- a/src/core/enc_sha1.c +++ b/src/core/enc_sha1.c @@ -255,7 +255,7 @@ class ESHA1 : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, ENCRYPTION); + this->SetType(ENCRYPTION); encmodule_encrypt(sha1_encrypt); encmodule_encrypt_in_place(sha1_encrypt_in_place); diff --git a/src/core/he_help.c b/src/core/he_help.c index c3526c396..864f4ced9 100644 --- a/src/core/he_help.c +++ b/src/core/he_help.c @@ -26,7 +26,7 @@ class HEHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(HELPSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_del.c b/src/core/hs_del.c index c85f40f1e..d372b57cd 100644 --- a/src/core/hs_del.c +++ b/src/core/hs_del.c @@ -27,7 +27,7 @@ class HSDel : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("DEL", do_del, is_host_remover, HOST_HELP_DEL, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c index 6cdcd536d..2de0360af 100644 --- a/src/core/hs_delall.c +++ b/src/core/hs_delall.c @@ -27,7 +27,7 @@ class HSDelAll : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("DELALL", do_delall, is_host_remover, HOST_HELP_DELALL, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_group.c b/src/core/hs_group.c index 409386cd0..6f2c740a1 100644 --- a/src/core/hs_group.c +++ b/src/core/hs_group.c @@ -30,7 +30,7 @@ class HSGroup : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("GROUP", do_group, NULL, HOST_HELP_GROUP, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_help.c b/src/core/hs_help.c index 135a2c218..ba082af83 100644 --- a/src/core/hs_help.c +++ b/src/core/hs_help.c @@ -26,7 +26,7 @@ class HSHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_list.c b/src/core/hs_list.c index c39f42403..94b243bbb 100644 --- a/src/core/hs_list.c +++ b/src/core/hs_list.c @@ -27,7 +27,7 @@ class HSList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("LIST", listOut, is_services_oper, -1, -1, HOST_HELP_LIST, HOST_HELP_LIST, HOST_HELP_LIST); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_off.c b/src/core/hs_off.c index c6663ff26..30657d850 100644 --- a/src/core/hs_off.c +++ b/src/core/hs_off.c @@ -27,7 +27,7 @@ class HSOff : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("OFF", do_off, NULL, HOST_HELP_OFF, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_on.c b/src/core/hs_on.c index 20a683ad3..67936b3f2 100644 --- a/src/core/hs_on.c +++ b/src/core/hs_on.c @@ -27,7 +27,7 @@ class HSOn : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("ON", do_on, NULL, HOST_HELP_ON, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_set.c b/src/core/hs_set.c index 5c8bf8af5..509c5ed0c 100644 --- a/src/core/hs_set.c +++ b/src/core/hs_set.c @@ -27,7 +27,7 @@ class HSSet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SET", myDoSet, is_host_setter, HOST_HELP_SET, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c index b15b51870..5fbd16859 100644 --- a/src/core/hs_setall.c +++ b/src/core/hs_setall.c @@ -29,7 +29,7 @@ class HSSetAll : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SETALL", do_setall, is_host_setter, HOST_HELP_SETALL, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c index edaf9a3bd..5dc632019 100644 --- a/src/core/ms_cancel.c +++ b/src/core/ms_cancel.c @@ -27,7 +27,7 @@ class MSCancel : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("CANCEL", do_cancel, NULL, MEMO_HELP_CANCEL, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_check.c b/src/core/ms_check.c index 03ceaa58d..ed7939125 100644 --- a/src/core/ms_check.c +++ b/src/core/ms_check.c @@ -27,7 +27,7 @@ class MSCheck : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("CHECK", do_memocheck, NULL, MEMO_HELP_CHECK, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_del.c b/src/core/ms_del.c index 2467c0a47..a65866c47 100644 --- a/src/core/ms_del.c +++ b/src/core/ms_del.c @@ -28,7 +28,7 @@ class MSDel : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("DEL", do_del, NULL, MEMO_HELP_DEL, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_help.c b/src/core/ms_help.c index 5b937f220..c494db1cf 100644 --- a/src/core/ms_help.c +++ b/src/core/ms_help.c @@ -26,7 +26,7 @@ class MSHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); } diff --git a/src/core/ms_info.c b/src/core/ms_info.c index fda116432..bd4942df5 100644 --- a/src/core/ms_info.c +++ b/src/core/ms_info.c @@ -27,7 +27,7 @@ class MSInfo : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("INFO", do_info, NULL, -1, MEMO_HELP_INFO, -1, MEMO_SERVADMIN_HELP_INFO, MEMO_SERVADMIN_HELP_INFO); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_list.c b/src/core/ms_list.c index 1d504030a..502086370 100644 --- a/src/core/ms_list.c +++ b/src/core/ms_list.c @@ -28,7 +28,7 @@ class MSList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("LIST", do_list, NULL, MEMO_HELP_LIST, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_read.c b/src/core/ms_read.c index 242313d83..e4a61ff79 100644 --- a/src/core/ms_read.c +++ b/src/core/ms_read.c @@ -31,7 +31,7 @@ class MSRead : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("READ", do_read, NULL, MEMO_HELP_READ, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c index ffe41b4cd..f2e9f7e11 100644 --- a/src/core/ms_rsend.c +++ b/src/core/ms_rsend.c @@ -27,7 +27,7 @@ class MSRSend : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("RSEND", do_rsend, NULL, MEMO_HELP_RSEND, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_send.c b/src/core/ms_send.c index e3c1ee6d0..c7262e76b 100644 --- a/src/core/ms_send.c +++ b/src/core/ms_send.c @@ -27,7 +27,7 @@ class MSSend : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SEND", do_send, NULL, MEMO_HELP_SEND, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c index 11ad43647..197e21383 100644 --- a/src/core/ms_sendall.c +++ b/src/core/ms_sendall.c @@ -27,7 +27,7 @@ class MSSendAll : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SENDALL", do_sendall, is_services_admin, -1, -1, -1, MEMO_HELP_SENDALL, MEMO_HELP_SENDALL); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_set.c b/src/core/ms_set.c index 7e0185c2c..af3715bf1 100644 --- a/src/core/ms_set.c +++ b/src/core/ms_set.c @@ -29,7 +29,7 @@ class MSSet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SET", do_set, NULL, MEMO_HELP_SET, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c index f584a5edf..2d21fb439 100644 --- a/src/core/ms_staff.c +++ b/src/core/ms_staff.c @@ -27,7 +27,7 @@ class MSStaff : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("STAFF", do_staff, is_services_oper, -1, -1, MEMO_HELP_STAFF, MEMO_HELP_STAFF, MEMO_HELP_STAFF); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ns_access.c b/src/core/ns_access.c index a7bbe4ddc..886526738 100644 --- a/src/core/ns_access.c +++ b/src/core/ns_access.c @@ -27,7 +27,7 @@ class NSAccess : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("ACCESS", do_access, NULL, NICK_HELP_ACCESS, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c index 58296c2ae..19bc1dcc8 100644 --- a/src/core/ns_alist.c +++ b/src/core/ns_alist.c @@ -27,7 +27,7 @@ class NSAList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("ALIST", do_alist, NULL, -1, NICK_HELP_ALIST, -1, NICK_SERVADMIN_HELP_ALIST, NICK_SERVADMIN_HELP_ALIST); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c index f41929443..0134a2b25 100644 --- a/src/core/ns_drop.c +++ b/src/core/ns_drop.c @@ -28,7 +28,7 @@ class NSDrop : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("DROP", do_drop, NULL, -1, NICK_HELP_DROP, -1, NICK_SERVADMIN_HELP_DROP, NICK_SERVADMIN_HELP_DROP); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c index 6ef085050..6252a4def 100644 --- a/src/core/ns_forbid.c +++ b/src/core/ns_forbid.c @@ -28,7 +28,7 @@ class NSForbid : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_FORBID, NICK_SERVADMIN_HELP_FORBID); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c index 1b3c54f40..089df6d6e 100644 --- a/src/core/ns_getemail.c +++ b/src/core/ns_getemail.c @@ -32,7 +32,7 @@ class NSGetEMail : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("GETEMAIL", do_getemail, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_GETEMAIL, NICK_SERVADMIN_HELP_GETEMAIL); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c index 16e34a2fe..4112551ce 100644 --- a/src/core/ns_getpass.c +++ b/src/core/ns_getpass.c @@ -27,7 +27,7 @@ class NSGetPass : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_GETPASS, NICK_SERVADMIN_HELP_GETPASS); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c index af74641e0..5a69dac2c 100644 --- a/src/core/ns_ghost.c +++ b/src/core/ns_ghost.c @@ -27,7 +27,7 @@ class NSGhost : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("GHOST", do_ghost, NULL, NICK_HELP_GHOST, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_group.c b/src/core/ns_group.c index 150dba560..0cf4856ce 100644 --- a/src/core/ns_group.c +++ b/src/core/ns_group.c @@ -34,7 +34,7 @@ class NSGroup : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("GROUP", do_group, NULL, NICK_HELP_GROUP, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_help.c b/src/core/ns_help.c index 6bb21b021..d363e30a6 100644 --- a/src/core/ns_help.c +++ b/src/core/ns_help.c @@ -26,7 +26,7 @@ class NSHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c index a99fcf24a..0ce50d1c4 100644 --- a/src/core/ns_identify.c +++ b/src/core/ns_identify.c @@ -31,7 +31,7 @@ class NSIdentify : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("ID", do_identify, NULL, NICK_HELP_IDENTIFY, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_info.c b/src/core/ns_info.c index d2528d894..a24758919 100644 --- a/src/core/ns_info.c +++ b/src/core/ns_info.c @@ -28,7 +28,7 @@ class NSInfo : public Module moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("INFO", do_info, NULL, NICK_HELP_INFO, -1, NICK_HELP_INFO, NICK_SERVADMIN_HELP_INFO, NICK_SERVADMIN_HELP_INFO); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_list.c b/src/core/ns_list.c index b20be6386..f0b60b87e 100644 --- a/src/core/ns_list.c +++ b/src/core/ns_list.c @@ -27,7 +27,7 @@ class NSList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("LIST", do_list, NULL, -1, NICK_HELP_LIST, -1, NICK_SERVADMIN_HELP_LIST, NICK_SERVADMIN_HELP_LIST); diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c index cb1c64e06..414727ae2 100644 --- a/src/core/ns_logout.c +++ b/src/core/ns_logout.c @@ -30,7 +30,7 @@ class NSLogout : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("LOGOUT", do_logout, NULL, -1, NICK_HELP_LOGOUT, -1, NICK_SERVADMIN_HELP_LOGOUT, NICK_SERVADMIN_HELP_LOGOUT); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c index da9cfb41a..4750fff95 100644 --- a/src/core/ns_recover.c +++ b/src/core/ns_recover.c @@ -28,7 +28,7 @@ class NSRecover : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("RECOVER", do_recover, NULL, -1, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_register.c b/src/core/ns_register.c index ca919080a..0daf85a0e 100644 --- a/src/core/ns_register.c +++ b/src/core/ns_register.c @@ -34,7 +34,7 @@ class NSRegister : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("REGISTER", do_register, NULL, NICK_HELP_REGISTER, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_release.c b/src/core/ns_release.c index 12e8f9e7e..281d3f0cd 100644 --- a/src/core/ns_release.c +++ b/src/core/ns_release.c @@ -28,7 +28,7 @@ class NSRelease : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("RELEASE", do_release, NULL, -1, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c index 0354fe0cb..4a1f0a043 100644 --- a/src/core/ns_saset.c +++ b/src/core/ns_saset.c @@ -42,7 +42,7 @@ class NSSASet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id: ns_set.c 850 2005-08-07 14:52:04Z geniusdex $"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SASET", do_saset, is_services_oper, -1, -1, -1, NICK_HELP_SASET, NICK_HELP_SASET); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c index 419acb2ae..2df8b3c54 100644 --- a/src/core/ns_sendpass.c +++ b/src/core/ns_sendpass.c @@ -28,7 +28,7 @@ class NSSendPass : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SENDPASS", do_sendpass, NULL, NICK_HELP_SENDPASS, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_set.c b/src/core/ns_set.c index 7be913ae0..48dd44763 100644 --- a/src/core/ns_set.c +++ b/src/core/ns_set.c @@ -41,7 +41,7 @@ class NSSet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SET", do_set, NULL, NICK_HELP_SET, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_status.c b/src/core/ns_status.c index 398f59018..09b11f3e7 100644 --- a/src/core/ns_status.c +++ b/src/core/ns_status.c @@ -27,7 +27,7 @@ class NSStatus : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("STATUS", do_status, NULL, NICK_HELP_STATUS, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c index bf4b93410..46f7850b4 100644 --- a/src/core/ns_suspend.c +++ b/src/core/ns_suspend.c @@ -28,7 +28,7 @@ class NSSuspend : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1, -1, NICK_SERVADMIN_HELP_SUSPEND, NICK_SERVADMIN_HELP_SUSPEND); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_update.c b/src/core/ns_update.c index 49b6c45ef..f5e880611 100644 --- a/src/core/ns_update.c +++ b/src/core/ns_update.c @@ -27,7 +27,7 @@ class NSUpdate : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("UPDATE", do_nickupdate, NULL, NICK_HELP_UPDATE, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/os_admin.c b/src/core/os_admin.c index 0e22968f0..2fee6d780 100644 --- a/src/core/os_admin.c +++ b/src/core/os_admin.c @@ -30,7 +30,7 @@ class OSAdmin : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("ADMIN", do_admin, NULL, OPER_HELP_ADMIN, -1, -1, -1, -1); c->help_param1 = s_NickServ; diff --git a/src/core/os_akill.c b/src/core/os_akill.c index c50bc17f7..ee11de529 100644 --- a/src/core/os_akill.c +++ b/src/core/os_akill.c @@ -33,7 +33,7 @@ class OSAKill : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("AKILL", do_akill, is_services_oper, OPER_HELP_AKILL, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c index 6886c670a..61b76c1b3 100644 --- a/src/core/os_chankill.c +++ b/src/core/os_chankill.c @@ -27,7 +27,7 @@ class OSChanKill : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("CHANKILL", do_chankill, is_services_admin, OPER_HELP_CHANKILL, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c index d5c8e6700..d0f386fc0 100644 --- a/src/core/os_chanlist.c +++ b/src/core/os_chanlist.c @@ -30,7 +30,7 @@ class OSChanList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("CHANLIST", do_chanlist, is_services_oper, OPER_HELP_CHANLIST, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c index 54de301ce..82bfd9af1 100644 --- a/src/core/os_clearmodes.c +++ b/src/core/os_clearmodes.c @@ -28,7 +28,7 @@ class OSClearModes : public Module moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("CLEARMODES", do_clearmodes, is_services_oper, OPER_HELP_CLEARMODES, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c index 7ec0e7b60..2e9df1d9c 100644 --- a/src/core/os_defcon.c +++ b/src/core/os_defcon.c @@ -33,7 +33,7 @@ class OSDEFCON : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("DEFCON", do_defcon, is_services_admin, OPER_HELP_DEFCON, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_global.c b/src/core/os_global.c index 64221dff6..14829f3e8 100644 --- a/src/core/os_global.c +++ b/src/core/os_global.c @@ -27,7 +27,7 @@ class OSGlobal : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("GLOBAL", do_global, is_services_admin, OPER_HELP_GLOBAL, -1, -1, -1, -1); c->help_param1 = s_GlobalNoticer; diff --git a/src/core/os_help.c b/src/core/os_help.c index f551d179f..4b874da4f 100644 --- a/src/core/os_help.c +++ b/src/core/os_help.c @@ -26,7 +26,7 @@ class OSHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); } diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c index abd4a8704..ec0e5f430 100644 --- a/src/core/os_ignore.c +++ b/src/core/os_ignore.c @@ -28,7 +28,7 @@ class OSIgnore : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("IGNORE", do_ignoreuser, is_services_admin, OPER_HELP_IGNORE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c index c7c8da744..436265f08 100644 --- a/src/core/os_jupe.c +++ b/src/core/os_jupe.c @@ -27,7 +27,7 @@ class OSJupe : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("JUPE", do_jupe, is_services_admin, OPER_HELP_JUPE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_kick.c b/src/core/os_kick.c index ec29c0a4d..ea94fe39b 100644 --- a/src/core/os_kick.c +++ b/src/core/os_kick.c @@ -27,7 +27,7 @@ class OSKick : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("KICK", do_os_kick, is_services_oper, OPER_HELP_KICK, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_logonnews.c b/src/core/os_logonnews.c index 43c82a2b9..d7ff18cd3 100644 --- a/src/core/os_logonnews.c +++ b/src/core/os_logonnews.c @@ -31,7 +31,7 @@ class OSLogonNews : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); /** * For some unknown reason, do_logonnews is actaully defined in news.c diff --git a/src/core/os_mode.c b/src/core/os_mode.c index 9a63ac618..1153610bc 100644 --- a/src/core/os_mode.c +++ b/src/core/os_mode.c @@ -27,7 +27,7 @@ class OSMode : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("MODE", do_os_mode, is_services_oper, OPER_HELP_MODE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c index f63caeefb..2a5bcd53b 100644 --- a/src/core/os_modinfo.c +++ b/src/core/os_modinfo.c @@ -29,7 +29,7 @@ class OSModInfo : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("MODINFO", do_modinfo, NULL, -1, -1, -1, -1, OPER_HELP_MODINFO); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c index 282ba8634..e8786a126 100644 --- a/src/core/os_modlist.c +++ b/src/core/os_modlist.c @@ -27,7 +27,7 @@ class OSModList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("MODLIST", do_modlist, NULL, -1, -1, -1, -1, OPER_HELP_MODLIST); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_modload.c b/src/core/os_modload.c index 71fe5ae28..dbf37ed65 100644 --- a/src/core/os_modload.c +++ b/src/core/os_modload.c @@ -27,7 +27,7 @@ class OSModLoad : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("MODLOAD", do_modload, is_services_root, -1, -1, -1, -1, OPER_HELP_MODLOAD); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c index 94f43bab2..295eea0f1 100644 --- a/src/core/os_modunload.c +++ b/src/core/os_modunload.c @@ -28,7 +28,7 @@ class OSModUnLoad : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("MODUNLOAD", do_modunload, is_services_root, -1, -1, -1, -1, OPER_HELP_MODUNLOAD); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_noop.c b/src/core/os_noop.c index 429477b78..e7a03d8cb 100644 --- a/src/core/os_noop.c +++ b/src/core/os_noop.c @@ -27,7 +27,7 @@ class OSNOOP : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("NOOP", do_noop, is_services_admin, OPER_HELP_NOOP, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_oline.c b/src/core/os_oline.c index 7e1fc7f0c..04f06a228 100644 --- a/src/core/os_oline.c +++ b/src/core/os_oline.c @@ -27,7 +27,7 @@ class OSOLine : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("OLINE", do_operoline, is_services_root, OPER_HELP_OLINE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_oper.c b/src/core/os_oper.c index b14e6aed9..3f353d038 100644 --- a/src/core/os_oper.c +++ b/src/core/os_oper.c @@ -30,7 +30,7 @@ class OSOper : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("OPER", do_oper, NULL, OPER_HELP_OPER, -1, -1, -1, -1); c->help_param1 = s_NickServ; moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_opernews.c b/src/core/os_opernews.c index 3a0c55299..0b77c1a81 100644 --- a/src/core/os_opernews.c +++ b/src/core/os_opernews.c @@ -31,7 +31,7 @@ class OSOperNews : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); /** XXX: For some unknown reason, do_opernews is actaully defined in news.c * we can look at moving it here later diff --git a/src/core/os_quit.c b/src/core/os_quit.c index 8bb4d8fc1..111ca19e7 100644 --- a/src/core/os_quit.c +++ b/src/core/os_quit.c @@ -27,7 +27,7 @@ class OSQuit : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("QUIT", do_os_quit, is_services_root, OPER_HELP_QUIT, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_randomnews.c b/src/core/os_randomnews.c index 6b2db1bfa..da64204cd 100644 --- a/src/core/os_randomnews.c +++ b/src/core/os_randomnews.c @@ -27,7 +27,7 @@ class OSRandomNews : public Module moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); /** XXX: For some unknown reason, do_randomnews is actaully defined in news.c * we can look at moving it here later diff --git a/src/core/os_raw.c b/src/core/os_raw.c index c8c95252d..c8ac778aa 100644 --- a/src/core/os_raw.c +++ b/src/core/os_raw.c @@ -26,7 +26,7 @@ class OSRaw : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, THIRD); + this->SetType(THIRD); c = createCommand("RAW", do_raw, is_services_root, OPER_HELP_RAW, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_reload.c b/src/core/os_reload.c index b756ad124..5ef31daca 100644 --- a/src/core/os_reload.c +++ b/src/core/os_reload.c @@ -27,7 +27,7 @@ class OSReload : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("RELOAD", do_reload, is_services_root, OPER_HELP_RELOAD, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_restart.c b/src/core/os_restart.c index df5493916..932bb277d 100644 --- a/src/core/os_restart.c +++ b/src/core/os_restart.c @@ -32,7 +32,7 @@ class OSRestart : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("RESTART", do_restart, is_services_root, OPER_HELP_RESTART, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_session.c b/src/core/os_session.c index 46a410c3a..ebc97b4c0 100644 --- a/src/core/os_session.c +++ b/src/core/os_session.c @@ -26,7 +26,7 @@ class OSSession : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); /** * do_session/do_exception are exported from sessions.c - we just want to provide an interface. diff --git a/src/core/os_set.c b/src/core/os_set.c index 40c45e89c..9664b490e 100644 --- a/src/core/os_set.c +++ b/src/core/os_set.c @@ -27,7 +27,7 @@ class OSSet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SET", do_set, is_services_root, OPER_HELP_SET, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c index 39bc1a700..4de74b815 100644 --- a/src/core/os_sgline.c +++ b/src/core/os_sgline.c @@ -34,7 +34,7 @@ class OSSGLine : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SGLINE", do_sgline, is_services_oper, OPER_HELP_SGLINE, -1, -1, -1, -1); diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c index 21d654bc0..c396c25dd 100644 --- a/src/core/os_shutdown.c +++ b/src/core/os_shutdown.c @@ -27,7 +27,7 @@ class OSShutdown : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SHUTDOWN", do_shutdown, is_services_root, OPER_HELP_SHUTDOWN, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c index b4d6db43e..2746a06a2 100644 --- a/src/core/os_sqline.c +++ b/src/core/os_sqline.c @@ -34,7 +34,7 @@ class OSSQLine : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SQLINE", do_sqline, is_services_oper, OPER_HELP_SQLINE, -1, -1, -1, -1); diff --git a/src/core/os_staff.c b/src/core/os_staff.c index 2215e4fc1..d2fc90931 100644 --- a/src/core/os_staff.c +++ b/src/core/os_staff.c @@ -30,7 +30,7 @@ class OSStaff : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("STAFF", do_staff, NULL, OPER_HELP_STAFF, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_stats.c b/src/core/os_stats.c index c0a2ea601..2d653b202 100644 --- a/src/core/os_stats.c +++ b/src/core/os_stats.c @@ -30,7 +30,7 @@ class OSStats : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("STATS", do_stats, NULL, OPER_HELP_STATS, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c index 5acc54011..9f6a1fa48 100644 --- a/src/core/os_svsnick.c +++ b/src/core/os_svsnick.c @@ -27,7 +27,7 @@ class OSSVSNick : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SVSNICK", do_svsnick, is_services_root, OPER_HELP_SVSNICK, -1, -1, -1, -1); diff --git a/src/core/os_szline.c b/src/core/os_szline.c index 3a34a5380..472d55103 100644 --- a/src/core/os_szline.c +++ b/src/core/os_szline.c @@ -33,7 +33,7 @@ class OSSZLine : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("SZLINE", do_szline, is_services_oper, OPER_HELP_SZLINE, -1, -1, -1, -1); diff --git a/src/core/os_umode.c b/src/core/os_umode.c index 2ae8d1491..1b3d14ea0 100644 --- a/src/core/os_umode.c +++ b/src/core/os_umode.c @@ -27,7 +27,7 @@ class OSUMode : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("UMODE", do_operumodes, is_services_root, OPER_HELP_UMODE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_update.c b/src/core/os_update.c index 7ffd2e713..54fa1cdba 100644 --- a/src/core/os_update.c +++ b/src/core/os_update.c @@ -27,7 +27,7 @@ class OSUpdate : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("UPDATE", do_update, is_services_root, OPER_HELP_UPDATE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c index c0ef3f449..fb6231dc3 100644 --- a/src/core/os_userlist.c +++ b/src/core/os_userlist.c @@ -32,7 +32,7 @@ class OSUserList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); c = createCommand("USERLIST", do_userlist, NULL, OPER_HELP_USERLIST, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/modules.c b/src/modules.c index 2b411e4d5..2988b9f52 100644 --- a/src/modules.c +++ b/src/modules.c @@ -235,7 +235,7 @@ int encryption_module_init(void) { if (ret != MOD_ERR_OK) alog("ERROR: status: [%d][%s]", ret, ModuleGetErrStr(ret)); else - moduleSetType(findModule(EncModule), ENCRYPTION); + findModule(EncModule)->SetType(ENCRYPTION); mod_current_module = NULL; return ret; } @@ -252,7 +252,7 @@ int protocol_module_init(void) if (ret == MOD_ERR_OK) { - moduleSetType(findModule(IRCDModule), PROTOCOL); + findModule(IRCDModule)->SetType(PROTOCOL); /* This is really NOT the correct place to do config checks, but * as we only have the ircd struct filled here, we have to over * here. -GD @@ -404,6 +404,12 @@ Module::~Module() */ } +void Module::SetType(MODType type) +{ + this->type = type; +} + + /** * Add the module to the list of currently loaded modules. * @param m the currently loaded module @@ -781,11 +787,6 @@ int unloadModule(Module * m, User * u) } } -void moduleSetType(Module *m, MODType type) -{ - m->type = type; -} - /** * Prepare a module to be unloaded. * Remove all commands and messages this module is providing, and delete diff --git a/src/modules/bs_fantasy_unban.c b/src/modules/bs_fantasy_unban.c index e1bf22096..a0c342e5c 100644 --- a/src/modules/bs_fantasy_unban.c +++ b/src/modules/bs_fantasy_unban.c @@ -26,7 +26,7 @@ class BSFantasyUnban : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, CORE); + this->SetType(CORE); hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy); moduleAddEventHook(hook); diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c index 7c0144e5b..0e15c9af7 100644 --- a/src/modules/cs_appendtopic.c +++ b/src/modules/cs_appendtopic.c @@ -62,7 +62,7 @@ class CSAppendTopic : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(this, SUPPORTED); + this->SetType(SUPPORTED); c = createCommand("APPENDTOPIC", my_cs_appendtopic, NULL, -1, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_HEAD); diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c index 7a353c57f..9979e0a58 100644 --- a/src/modules/cs_enforce.c +++ b/src/modules/cs_enforce.c @@ -41,7 +41,7 @@ class CSEnforce : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(this, SUPPORTED); + this->SetType(SUPPORTED); c = createCommand("ENFORCE", my_cs_enforce, NULL, -1, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_HEAD); diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c index 03bc2f019..d4204d04f 100644 --- a/src/modules/cs_tban.c +++ b/src/modules/cs_tban.c @@ -55,7 +55,7 @@ class CSTBan : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(this, SUPPORTED); + this->SetType(SUPPORTED); } }; diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c index eee65f2ef..21afda48a 100644 --- a/src/modules/hs_request.c +++ b/src/modules/hs_request.c @@ -122,7 +122,7 @@ class HSRequest : public Module moduleSetHostHelp(hs_help); moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(this, SUPPORTED); + this->SetType(SUPPORTED); my_load_config(); my_add_languages(); diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c index 5e8d621de..99db12ada 100644 --- a/src/modules/ns_maxemail.c +++ b/src/modules/ns_maxemail.c @@ -41,7 +41,7 @@ class NSMaxEmail : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(this, SUPPORTED); + this->SetType(SUPPORTED); c = createCommand("REGISTER", my_ns_register, NULL, -1, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_HEAD); diff --git a/src/modules/ns_noop_convert.c b/src/modules/ns_noop_convert.c index 576d01486..ef71a5be8 100644 --- a/src/modules/ns_noop_convert.c +++ b/src/modules/ns_noop_convert.c @@ -68,7 +68,7 @@ class NSNOOPConvert : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(this, SUPPORTED); + this->SetType(SUPPORTED); if (mLoadConfig(0, NULL)) throw ModuleException("Couldn't load config?"); diff --git a/src/modules/os_ignore_db.c b/src/modules/os_ignore_db.c index e9038292f..4c138701b 100644 --- a/src/modules/os_ignore_db.c +++ b/src/modules/os_ignore_db.c @@ -86,7 +86,7 @@ class OSIgnoreDB : public Module moduleAddAuthor(AUTHOR);
moduleAddVersion(VERSION);
- moduleSetType(this, SUPPORTED);
+ this->SetType(SUPPORTED);
hook = createEventHook(EVENT_RELOAD, reload_config);
if (moduleAddEventHook(hook) != MOD_ERR_OK) diff --git a/src/modules/os_info.c b/src/modules/os_info.c index 15f940e34..2756bf3bf 100644 --- a/src/modules/os_info.c +++ b/src/modules/os_info.c @@ -73,7 +73,7 @@ class OSInfo : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(this, SUPPORTED); + this->SetType(SUPPORTED); if (mLoadConfig()) throw ModuleException("Unable to load config"); diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index 20acdb727..a8c03a2a4 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -1049,7 +1049,7 @@ class ProtoBahamut : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, PROTOCOL); + this->SetType(PROTOCOL); pmodule_ircd_version("BahamutIRCd 1.4.*/1.8.*"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index c7dc34015..ed712faf0 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -1304,7 +1304,7 @@ class ProtoCharybdis : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id: charybdis.c 953 2006-01-14 11:36:29Z certus $"); - moduleSetType(this, PROTOCOL); + this->SetType(PROTOCOL); pmodule_ircd_version("Charybdis 1.0/1.1+"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 1701b00bf..3e9600c9b 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -1323,7 +1323,7 @@ class ProtoInspIRCd : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, PROTOCOL); + this->SetType(PROTOCOL); pmodule_ircd_version("inspircdIRCd 1.1"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index 678a7acbf..a1a6b17b8 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -1316,7 +1316,7 @@ class ProtoInspIRCd : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, PROTOCOL); + this->SetType(PROTOCOL); TS6SID = sstrdup(Numeric); diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c index 80e148d4a..185e68583 100644 --- a/src/protocol/obsolete/hybrid.c +++ b/src/protocol/obsolete/hybrid.c @@ -1535,7 +1535,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, PROTOCOL); + this->SetType(PROTOCOL); pmodule_ircd_version("Hybrid IRCd 7.0"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c index c6fbc4691..1fe8717e3 100644 --- a/src/protocol/obsolete/ptlink.c +++ b/src/protocol/obsolete/ptlink.c @@ -1765,7 +1765,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(this, PROTOCOL); + this->SetType(PROTOCOL); pmodule_ircd_version("PTlink 6.15.*+"); diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c index 0ea23c065..012d2eac9 100644 --- a/src/protocol/obsolete/rageircd.c +++ b/src/protocol/obsolete/rageircd.c @@ -1645,7 +1645,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(this, PROTOCOL); + this->SetType(PROTOCOL); pmodule_ircd_version("RageIRCd 2.0.x"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c index 95c70f201..4f77d13ae 100644 --- a/src/protocol/obsolete/solidircd.c +++ b/src/protocol/obsolete/solidircd.c @@ -1678,7 +1678,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(this, PROTOCOL); + this->SetType(PROTOCOL); pmodule_ircd_version("Solid-IRCd 3.4.*"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c index b8cf0b15f..e502b7d6b 100644 --- a/src/protocol/obsolete/ultimate3.c +++ b/src/protocol/obsolete/ultimate3.c @@ -1786,7 +1786,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(this, PROTOCOL); + this->SetType(PROTOCOL); pmodule_ircd_version("UltimateIRCd 3.0.0.a26+"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/obsolete/viagra.c b/src/protocol/obsolete/viagra.c index 8b6c88f81..6db3598a9 100644 --- a/src/protocol/obsolete/viagra.c +++ b/src/protocol/obsolete/viagra.c @@ -1684,7 +1684,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, PROTOCOL); + this->SetType(PROTOCOL); pmodule_ircd_version("ViagraIRCd 1.3.x"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index e685428a6..f37ce1b92 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -1176,7 +1176,7 @@ class ProtoRatbox : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, PROTOCOL); + this->SetType(PROTOCOL); if (UseTS6) { diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index c3436f45b..0bdfa9d7a 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -1526,7 +1526,7 @@ class ProtoUnreal : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(this, PROTOCOL); + this->SetType(PROTOCOL); pmodule_ircd_version("UnrealIRCd 3.2+"); pmodule_ircd_cap(myIrcdcap); |