diff options
Diffstat (limited to 'src')
126 files changed, 248 insertions, 269 deletions
diff --git a/src/core/bs_act.c b/src/core/bs_act.c index 162d321ad..a5c8864da 100644 --- a/src/core/bs_act.c +++ b/src/core/bs_act.c @@ -29,7 +29,7 @@ class BSAct : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("ACT", do_act, NULL, BOT_HELP_ACT, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); moduleSetBotHelp(myBotServHelp); } diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index b28542141..7cb6e3887 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -29,7 +29,7 @@ class BSAssign : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("ASSIGN", do_assign, NULL, BOT_HELP_ASSIGN, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); moduleSetBotHelp(myBotServHelp); } diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c index c5b13e436..65190c286 100644 --- a/src/core/bs_badwords.c +++ b/src/core/bs_badwords.c @@ -33,7 +33,7 @@ class BSBadwords : public Module this->SetType(CORE); c = createCommand("BADWORDS", do_badwords, NULL, BOT_HELP_BADWORDS, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); moduleSetBotHelp(myBotServHelp); } diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index 3ec37f0a6..93dfc89da 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -30,7 +30,7 @@ class BSBot : public Module 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); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); moduleSetBotHelp(myBotServHelp); } diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c index 51a65866c..7173a7807 100644 --- a/src/core/bs_botlist.c +++ b/src/core/bs_botlist.c @@ -29,7 +29,7 @@ class BSBotList : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("BOTLIST", do_botlist, NULL, BOT_HELP_BOTLIST, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); moduleSetBotHelp(myBotServHelp); } diff --git a/src/core/bs_help.c b/src/core/bs_help.c index 2243cfbe1..3c807275c 100644 --- a/src/core/bs_help.c +++ b/src/core/bs_help.c @@ -28,7 +28,7 @@ class BSHelp : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); } }; diff --git a/src/core/bs_info.c b/src/core/bs_info.c index 3be046b0f..b72e6542e 100644 --- a/src/core/bs_info.c +++ b/src/core/bs_info.c @@ -30,7 +30,7 @@ class BSInfo : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("INFO", do_info, NULL, BOT_HELP_INFO, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); moduleSetBotHelp(myBotServHelp); } diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c index fcb76b4c6..fb48c9413 100644 --- a/src/core/bs_kick.c +++ b/src/core/bs_kick.c @@ -30,23 +30,23 @@ class BSKick : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("KICK", do_kickcmd, NULL, BOT_HELP_KICK, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("KICK BADWORDS", NULL, NULL, BOT_HELP_KICK_BADWORDS, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("KICK BOLDS", NULL, NULL, BOT_HELP_KICK_BOLDS, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("KICK CAPS", NULL, NULL, BOT_HELP_KICK_CAPS, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("KICK COLORS", NULL, NULL, BOT_HELP_KICK_COLORS, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("KICK FLOOD", NULL, NULL, BOT_HELP_KICK_FLOOD, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("KICK REPEAT", NULL, NULL, BOT_HELP_KICK_REPEAT, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("KICK REVERSES", NULL, NULL, BOT_HELP_KICK_REVERSES, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("KICK UNDERLINES", NULL, NULL, BOT_HELP_KICK_UNDERLINES, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); moduleSetBotHelp(myBotServHelp); } diff --git a/src/core/bs_say.c b/src/core/bs_say.c index ae0081365..85ec7d40d 100644 --- a/src/core/bs_say.c +++ b/src/core/bs_say.c @@ -29,7 +29,7 @@ class BSSay : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("SAY", do_say, NULL, BOT_HELP_SAY, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); moduleSetBotHelp(myBotServHelp); } diff --git a/src/core/bs_set.c b/src/core/bs_set.c index 01919b71b..17a141360 100644 --- a/src/core/bs_set.c +++ b/src/core/bs_set.c @@ -30,24 +30,24 @@ class BSSet : public Module 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); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("SET DONTKICKOPS", NULL, NULL, BOT_HELP_SET_DONTKICKOPS, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("SET DONTKICKVOICES", NULL, NULL, BOT_HELP_SET_DONTKICKVOICES, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("SET FANTASY", NULL, NULL, BOT_HELP_SET_FANTASY, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("SET GREET", NULL, NULL, BOT_HELP_SET_GREET, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("SET SYMBIOSIS", NULL, NULL, BOT_HELP_SET_SYMBIOSIS, -1, -1, -1, -1); c->help_param1 = s_ChanServ; - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("SET NOBOT", NULL, NULL, -1, -1, -1, BOT_SERVADMIN_HELP_SET_NOBOT, BOT_SERVADMIN_HELP_SET_NOBOT); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("SET PRIVATE", NULL, NULL, -1, -1, -1, BOT_SERVADMIN_HELP_SET_PRIVATE, BOT_SERVADMIN_HELP_SET_PRIVATE); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); moduleSetBotHelp(myBotServHelp); } diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c index fd2708b93..d7a6fb348 100644 --- a/src/core/bs_unassign.c +++ b/src/core/bs_unassign.c @@ -29,7 +29,7 @@ class BSUnassign : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("UNASSIGN", do_unassign, NULL, BOT_HELP_UNASSIGN, -1, -1, -1, -1); - moduleAddCommand(BOTSERV, c, MOD_UNIQUE); + this->AddCommand(BOTSERV, c, MOD_UNIQUE); moduleSetBotHelp(myBotServHelp); } diff --git a/src/core/cs_access.c b/src/core/cs_access.c index 1852fbdf0..d9adb1825 100644 --- a/src/core/cs_access.c +++ b/src/core/cs_access.c @@ -34,11 +34,11 @@ class CSAccess : public Module this->SetType(CORE); c = createCommand("ACCESS", do_access, NULL, CHAN_HELP_ACCESS, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("ACCESS LEVELS", NULL, NULL, CHAN_HELP_ACCESS_LEVELS, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("LEVELS", do_levels, NULL, CHAN_HELP_LEVELS, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } }; diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c index 6685f8704..88ea39661 100644 --- a/src/core/cs_akick.c +++ b/src/core/cs_akick.c @@ -32,7 +32,7 @@ class CSAKick : public Module this->SetType(CORE); c = createCommand("AKICK", do_akick, NULL, CHAN_HELP_AKICK, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c index 3b09dbe06..b5b921900 100644 --- a/src/core/cs_ban.c +++ b/src/core/cs_ban.c @@ -31,9 +31,9 @@ class CSBan : public Module this->SetType(CORE); c = createCommand("BAN", do_ban, NULL, CHAN_HELP_BAN, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("UNBAN", do_unban, NULL, CHAN_HELP_UNBAN, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c index 87dbd358e..a1b4bc8e7 100644 --- a/src/core/cs_clear.c +++ b/src/core/cs_clear.c @@ -30,7 +30,7 @@ class CSClear : public Module this->SetType(CORE); c = createCommand("CLEAR", do_clear, NULL, CHAN_HELP_CLEAR, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c index 364895814..fdfda2b3d 100644 --- a/src/core/cs_drop.c +++ b/src/core/cs_drop.c @@ -30,7 +30,7 @@ class CSDrop : public Module 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); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c index 0a2791d24..293c25e40 100644 --- a/src/core/cs_forbid.c +++ b/src/core/cs_forbid.c @@ -30,7 +30,7 @@ class CSForbid : public Module 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); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c index 1ded60092..4fa616e2f 100644 --- a/src/core/cs_getkey.c +++ b/src/core/cs_getkey.c @@ -30,7 +30,7 @@ class CSGetKey : public Module this->SetType(CORE); c = createCommand("GETKEY", do_getkey, NULL, CHAN_HELP_GETKEY, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c index b45c9aa1e..f8ebfa0db 100644 --- a/src/core/cs_getpass.c +++ b/src/core/cs_getpass.c @@ -30,7 +30,7 @@ class CSGetPass : public Module 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); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_help.c b/src/core/cs_help.c index abc9ff42b..75271b35a 100644 --- a/src/core/cs_help.c +++ b/src/core/cs_help.c @@ -29,7 +29,7 @@ class CSHelp : public Module this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); } }; diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c index 51ff9568b..8af3d4bd7 100644 --- a/src/core/cs_identify.c +++ b/src/core/cs_identify.c @@ -30,10 +30,10 @@ class CSIdentify : public Module this->SetType(CORE); c = createCommand("IDENTIFY", do_identify, NULL, CHAN_HELP_IDENTIFY, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("ID", do_identify, NULL, CHAN_HELP_IDENTIFY, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_info.c b/src/core/cs_info.c index 1b97e8a61..549859044 100644 --- a/src/core/cs_info.c +++ b/src/core/cs_info.c @@ -30,7 +30,7 @@ class CSInfo : public Module 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); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c index 786360f55..191e7dcee 100644 --- a/src/core/cs_invite.c +++ b/src/core/cs_invite.c @@ -30,7 +30,7 @@ class CSInvite : public Module this->SetType(CORE); c = createCommand("INVITE", do_invite, NULL, CHAN_HELP_INVITE, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c index 7e913ff53..50f21ba37 100644 --- a/src/core/cs_kick.c +++ b/src/core/cs_kick.c @@ -30,7 +30,7 @@ class CSKick : public Module this->SetType(CORE); c = createCommand("KICK", do_cs_kick, NULL, CHAN_HELP_KICK, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_list.c b/src/core/cs_list.c index bacedbe53..d5eb57fa3 100644 --- a/src/core/cs_list.c +++ b/src/core/cs_list.c @@ -31,7 +31,7 @@ class CSList : public Module c = createCommand("LIST", do_list, NULL, -1, CHAN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c index f07e5c0d0..e1d8124ee 100644 --- a/src/core/cs_logout.c +++ b/src/core/cs_logout.c @@ -31,7 +31,7 @@ class CSLogout : public Module 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); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c index 2069dc796..8a33bc6fd 100644 --- a/src/core/cs_modes.c +++ b/src/core/cs_modes.c @@ -40,40 +40,40 @@ class CSModes : public Module this->SetType(CORE); c = createCommand("OP", do_op, NULL, CHAN_HELP_OP, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("DEOP", do_deop, NULL, CHAN_HELP_DEOP, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("VOICE", do_voice, NULL, CHAN_HELP_VOICE, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("DEVOICE", do_devoice, NULL, CHAN_HELP_DEVOICE, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); if (ircd->halfop) { c = createCommand("HALFOP", do_halfop, NULL, CHAN_HELP_HALFOP, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("DEHALFOP", do_dehalfop, NULL, CHAN_HELP_DEHALFOP, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); } if (ircd->protect) { c = createCommand("PROTECT", do_protect, NULL, CHAN_HELP_PROTECT, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("DEPROTECT", do_deprotect, NULL, CHAN_HELP_DEPROTECT, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); } if (ircd->owner) { c = createCommand("OWNER", do_owner, NULL, CHAN_HELP_OWNER, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("DEOWNER", do_deowner, NULL, CHAN_HELP_DEOWNER, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); } if (ircd->admin) { c = createCommand("ADMIN", do_protect, NULL, CHAN_HELP_PROTECT, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("DEADMIN", do_deprotect, NULL, CHAN_HELP_DEPROTECT, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); } moduleSetChanHelp(myChanServHelp); diff --git a/src/core/cs_register.c b/src/core/cs_register.c index 62bd8f572..2fb180b76 100644 --- a/src/core/cs_register.c +++ b/src/core/cs_register.c @@ -31,7 +31,7 @@ class CSRegister : public Module c = createCommand("REGISTER", do_register, NULL, CHAN_HELP_REGISTER, -1, -1, -1, -1); c->help_param1 = s_NickServ; - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c index 241ad9691..2e37f2e33 100644 --- a/src/core/cs_sendpass.c +++ b/src/core/cs_sendpass.c @@ -32,7 +32,7 @@ class CSSendPass : public Module c = createCommand("SENDPASS", do_sendpass, NULL, CHAN_HELP_SENDPASS, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); diff --git a/src/core/cs_set.c b/src/core/cs_set.c index 97550542c..e731f94b4 100644 --- a/src/core/cs_set.c +++ b/src/core/cs_set.c @@ -52,51 +52,51 @@ class CSSet : public Module 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); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET FOUNDER", NULL, NULL, CHAN_HELP_SET_FOUNDER, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET SUCCESSOR", NULL, NULL, CHAN_HELP_SET_SUCCESSOR, -1, -1, -1, -1); c->help_param1 = (char *) (long) CSMaxReg; - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET PASSWORD", NULL, NULL, CHAN_HELP_SET_PASSWORD, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET DESC", NULL, NULL, CHAN_HELP_SET_DESC, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET URL", NULL, NULL, CHAN_HELP_SET_URL, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET EMAIL", NULL, NULL, CHAN_HELP_SET_EMAIL, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET ENTRYMSG", NULL, NULL, CHAN_HELP_SET_ENTRYMSG, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET BANTYPE", NULL, NULL, CHAN_HELP_SET_BANTYPE, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET PRIVATE", NULL, NULL, CHAN_HELP_SET_PRIVATE, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET KEEPTOPIC", NULL, NULL, CHAN_HELP_SET_KEEPTOPIC, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET TOPICLOCK", NULL, NULL, CHAN_HELP_SET_TOPICLOCK, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET MLOCK", NULL, NULL, CHAN_HELP_SET_MLOCK, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET RESTRICTED", NULL, NULL, CHAN_HELP_SET_RESTRICTED, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET SECURE", NULL, NULL, CHAN_HELP_SET_SECURE, -1, -1, -1, -1); c->help_param1 = s_NickServ; - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET SECUREOPS", NULL, NULL, CHAN_HELP_SET_SECUREOPS, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET SECUREFOUNDER", NULL, NULL, CHAN_HELP_SET_SECUREFOUNDER, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET SIGNKICK", NULL, NULL, CHAN_HELP_SET_SIGNKICK, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET OPNOTICE", NULL, NULL, CHAN_HELP_SET_OPNOTICE, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET XOP", NULL, NULL, CHAN_HELP_SET_XOP, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET PEACE", NULL, NULL, CHAN_HELP_SET_PEACE, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SET NOEXPIRE", NULL, NULL, -1, -1, -1, CHAN_SERVADMIN_HELP_SET_NOEXPIRE, CHAN_SERVADMIN_HELP_SET_NOEXPIRE); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_status.c b/src/core/cs_status.c index ec21364a2..3a3a8301a 100644 --- a/src/core/cs_status.c +++ b/src/core/cs_status.c @@ -30,7 +30,7 @@ class CSStatus : public Module 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); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c index b5126d241..21b4a5f1a 100644 --- a/src/core/cs_suspend.c +++ b/src/core/cs_suspend.c @@ -31,9 +31,9 @@ class CSSuspend : public Module 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); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("UNSUSPEND", do_unsuspend, is_services_oper, -1, -1, -1, CHAN_SERVADMIN_HELP_UNSUSPEND, CHAN_SERVADMIN_HELP_UNSUSPEND); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c index ea36d09a3..c73de365c 100644 --- a/src/core/cs_topic.c +++ b/src/core/cs_topic.c @@ -30,7 +30,7 @@ class CSTopic : public Module this->SetType(CORE); c = createCommand("TOPIC", do_cs_topic, NULL, CHAN_HELP_TOPIC, -1, -1,-1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c index 899d9e39b..51bf5e71c 100644 --- a/src/core/cs_xop.c +++ b/src/core/cs_xop.c @@ -94,16 +94,16 @@ class CSXOP : public Module this->SetType(CORE); c = createCommand("AOP", do_aop, NULL, CHAN_HELP_AOP, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); if (ircd->halfop) { c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); } c = createCommand("SOP", do_sop, NULL, CHAN_HELP_SOP, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("VOP", do_vop, NULL, CHAN_HELP_VOP, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + this->AddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); } diff --git a/src/core/he_help.c b/src/core/he_help.c index 064c3424f..afcb4c332 100644 --- a/src/core/he_help.c +++ b/src/core/he_help.c @@ -29,7 +29,7 @@ class HEHelp : public Module this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(HELPSERV, c, MOD_UNIQUE); + this->AddCommand(HELPSERV, c, MOD_UNIQUE); } }; diff --git a/src/core/hs_del.c b/src/core/hs_del.c index 222d355da..d59bb2e2d 100644 --- a/src/core/hs_del.c +++ b/src/core/hs_del.c @@ -30,7 +30,7 @@ class HSDel : public Module this->SetType(CORE); c = createCommand("DEL", do_del, is_host_remover, HOST_HELP_DEL, -1, -1, -1, -1); - moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); + this->AddCommand(HOSTSERV, c, MOD_UNIQUE); moduleSetHostHelp(myHostServHelp); } diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c index 02e6d673f..e9173b746 100644 --- a/src/core/hs_delall.c +++ b/src/core/hs_delall.c @@ -30,7 +30,7 @@ class HSDelAll : public Module this->SetType(CORE); c = createCommand("DELALL", do_delall, is_host_remover, HOST_HELP_DELALL, -1, -1, -1, -1); - moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); + this->AddCommand(HOSTSERV, c, MOD_UNIQUE); moduleSetHostHelp(myHostServHelp); } diff --git a/src/core/hs_group.c b/src/core/hs_group.c index 061b5c3f3..240ee2719 100644 --- a/src/core/hs_group.c +++ b/src/core/hs_group.c @@ -33,7 +33,7 @@ class HSGroup : public Module this->SetType(CORE); c = createCommand("GROUP", do_group, NULL, HOST_HELP_GROUP, -1, -1, -1, -1); - moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); + this->AddCommand(HOSTSERV, c, MOD_UNIQUE); moduleSetHostHelp(myHostServHelp); } diff --git a/src/core/hs_help.c b/src/core/hs_help.c index 1ad004acc..abc009a6e 100644 --- a/src/core/hs_help.c +++ b/src/core/hs_help.c @@ -29,7 +29,7 @@ class HSHelp : public Module this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); + this->AddCommand(HOSTSERV, c, MOD_UNIQUE); } }; diff --git a/src/core/hs_list.c b/src/core/hs_list.c index 967afb203..da1ac5103 100644 --- a/src/core/hs_list.c +++ b/src/core/hs_list.c @@ -30,7 +30,7 @@ class HSList : public Module 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); + this->AddCommand(HOSTSERV, c, MOD_UNIQUE); moduleSetHostHelp(myHostServHelp); } }; diff --git a/src/core/hs_off.c b/src/core/hs_off.c index ab0c01aa9..cd215a426 100644 --- a/src/core/hs_off.c +++ b/src/core/hs_off.c @@ -30,7 +30,7 @@ class HSOff : public Module this->SetType(CORE); c = createCommand("OFF", do_off, NULL, HOST_HELP_OFF, -1, -1, -1, -1); - moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); + this->AddCommand(HOSTSERV, c, MOD_UNIQUE); moduleSetHostHelp(myHostServHelp); } diff --git a/src/core/hs_on.c b/src/core/hs_on.c index b96ef6894..aca596df6 100644 --- a/src/core/hs_on.c +++ b/src/core/hs_on.c @@ -30,7 +30,7 @@ class HSOn : public Module this->SetType(CORE); c = createCommand("ON", do_on, NULL, HOST_HELP_ON, -1, -1, -1, -1); - moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); + this->AddCommand(HOSTSERV, c, MOD_UNIQUE); moduleSetHostHelp(myHostServHelp); } diff --git a/src/core/hs_set.c b/src/core/hs_set.c index 3b988a929..56adda848 100644 --- a/src/core/hs_set.c +++ b/src/core/hs_set.c @@ -30,7 +30,7 @@ class HSSet : public Module this->SetType(CORE); c = createCommand("SET", myDoSet, is_host_setter, HOST_HELP_SET, -1, -1, -1, -1); - moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); + this->AddCommand(HOSTSERV, c, MOD_UNIQUE); moduleSetHostHelp(myHostServHelp); } diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c index 14ae197dd..88b81d6c5 100644 --- a/src/core/hs_setall.c +++ b/src/core/hs_setall.c @@ -32,7 +32,7 @@ class HSSetAll : public Module this->SetType(CORE); c = createCommand("SETALL", do_setall, is_host_setter, HOST_HELP_SETALL, -1, -1, -1, -1); - moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); + this->AddCommand(HOSTSERV, c, MOD_UNIQUE); moduleSetHostHelp(myHostServHelp); } }; diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c index 6d86b7908..b988743d1 100644 --- a/src/core/ms_cancel.c +++ b/src/core/ms_cancel.c @@ -29,7 +29,7 @@ class MSCancel : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("CANCEL", do_cancel, NULL, MEMO_HELP_CANCEL, -1, -1, -1, -1); - moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); } }; diff --git a/src/core/ms_check.c b/src/core/ms_check.c index cab1b7eae..e5410d9b1 100644 --- a/src/core/ms_check.c +++ b/src/core/ms_check.c @@ -29,7 +29,7 @@ class MSCheck : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("CHECK", do_memocheck, NULL, MEMO_HELP_CHECK, -1, -1, -1, -1); - moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); } }; diff --git a/src/core/ms_del.c b/src/core/ms_del.c index b6ac6261f..3cc877b9e 100644 --- a/src/core/ms_del.c +++ b/src/core/ms_del.c @@ -30,7 +30,7 @@ class MSDel : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("DEL", do_del, NULL, MEMO_HELP_DEL, -1, -1, -1, -1); - moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); } }; diff --git a/src/core/ms_help.c b/src/core/ms_help.c index 1fb2847af..7a8961190 100644 --- a/src/core/ms_help.c +++ b/src/core/ms_help.c @@ -28,7 +28,7 @@ class MSHelp : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); } }; diff --git a/src/core/ms_info.c b/src/core/ms_info.c index 8dc4b4a4d..74985cb2e 100644 --- a/src/core/ms_info.c +++ b/src/core/ms_info.c @@ -29,7 +29,7 @@ class MSInfo : public Module this->SetVersion("$Id$"); 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); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); } }; diff --git a/src/core/ms_list.c b/src/core/ms_list.c index d395922c0..4ea74fbfe 100644 --- a/src/core/ms_list.c +++ b/src/core/ms_list.c @@ -30,7 +30,7 @@ class MSList : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("LIST", do_list, NULL, MEMO_HELP_LIST, -1, -1, -1, -1); - moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); } }; diff --git a/src/core/ms_read.c b/src/core/ms_read.c index fc5d52ba4..3877b7458 100644 --- a/src/core/ms_read.c +++ b/src/core/ms_read.c @@ -33,7 +33,7 @@ class MSRead : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("READ", do_read, NULL, MEMO_HELP_READ, -1, -1, -1, -1); - moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); } }; diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c index af61dd436..2ce4f3b7a 100644 --- a/src/core/ms_rsend.c +++ b/src/core/ms_rsend.c @@ -29,7 +29,7 @@ class MSRSend : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("RSEND", do_rsend, NULL, MEMO_HELP_RSEND, -1, -1, -1, -1); - moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); if (!MSMemoReceipt) diff --git a/src/core/ms_send.c b/src/core/ms_send.c index 57b002ed8..0189603b3 100644 --- a/src/core/ms_send.c +++ b/src/core/ms_send.c @@ -29,7 +29,7 @@ class MSSend : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("SEND", do_send, NULL, MEMO_HELP_SEND, -1, -1, -1, -1); - moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); } }; diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c index de0b67f07..9f9d98e37 100644 --- a/src/core/ms_sendall.c +++ b/src/core/ms_sendall.c @@ -29,7 +29,7 @@ class MSSendAll : public Module this->SetVersion("$Id$"); 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); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); } }; diff --git a/src/core/ms_set.c b/src/core/ms_set.c index 863648a02..d9cbaf717 100644 --- a/src/core/ms_set.c +++ b/src/core/ms_set.c @@ -32,14 +32,14 @@ class MSSet : public Module this->SetType(CORE); c = createCommand("SET", do_set, NULL, MEMO_HELP_SET, -1, -1, -1, -1); - moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); c = createCommand("SET NOTIFY", NULL, NULL, MEMO_HELP_SET_NOTIFY, -1, -1, -1, -1); - moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); c = createCommand("SET LIMIT", NULL, NULL, -1, MEMO_HELP_SET_LIMIT, MEMO_SERVADMIN_HELP_SET_LIMIT, MEMO_SERVADMIN_HELP_SET_LIMIT, MEMO_SERVADMIN_HELP_SET_LIMIT); c->help_param1 = (char *) (long) MSMaxMemos; - moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); } diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c index b1fdd4596..d5cfcae4a 100644 --- a/src/core/ms_staff.c +++ b/src/core/ms_staff.c @@ -29,7 +29,7 @@ class MSStaff : public Module this->SetVersion("$Id$"); 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); + this->AddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); } }; diff --git a/src/core/ns_access.c b/src/core/ns_access.c index 19f2c1a86..8e32d9919 100644 --- a/src/core/ns_access.c +++ b/src/core/ns_access.c @@ -30,7 +30,7 @@ class NSAccess : public Module this->SetType(CORE); c = createCommand("ACCESS", do_access, NULL, NICK_HELP_ACCESS, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c index 88d099430..ce0d88546 100644 --- a/src/core/ns_alist.c +++ b/src/core/ns_alist.c @@ -30,7 +30,7 @@ class NSAList : public Module 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); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c index b34803737..fcd2734b6 100644 --- a/src/core/ns_drop.c +++ b/src/core/ns_drop.c @@ -31,9 +31,9 @@ class NSDrop : public Module 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); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("UNLINK", do_unlink, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c index 735a46dd1..6a6fc87af 100644 --- a/src/core/ns_forbid.c +++ b/src/core/ns_forbid.c @@ -31,7 +31,7 @@ class NSForbid : public Module 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); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c index ff940212b..19e51389b 100644 --- a/src/core/ns_getemail.c +++ b/src/core/ns_getemail.c @@ -35,7 +35,7 @@ class NSGetEMail : public Module 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); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c index 1598168ab..c741e76c9 100644 --- a/src/core/ns_getpass.c +++ b/src/core/ns_getpass.c @@ -30,7 +30,7 @@ class NSGetPass : public Module 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); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c index c54555ff1..49f036cc6 100644 --- a/src/core/ns_ghost.c +++ b/src/core/ns_ghost.c @@ -30,7 +30,7 @@ class NSGhost : public Module this->SetType(CORE); c = createCommand("GHOST", do_ghost, NULL, NICK_HELP_GHOST, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_group.c b/src/core/ns_group.c index 5cec02bdf..b420be531 100644 --- a/src/core/ns_group.c +++ b/src/core/ns_group.c @@ -37,16 +37,16 @@ class NSGroup : public Module this->SetType(CORE); c = createCommand("GROUP", do_group, NULL, NICK_HELP_GROUP, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("LINK", do_link, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("GLIST", do_glist, NULL, -1, NICK_HELP_GLIST, -1, NICK_SERVADMIN_HELP_GLIST, NICK_SERVADMIN_HELP_GLIST); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("LISTLINKS", do_listlinks, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_help.c b/src/core/ns_help.c index 1af5c50c4..ace2384f2 100644 --- a/src/core/ns_help.c +++ b/src/core/ns_help.c @@ -29,7 +29,7 @@ class NSHelp : public Module this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); } }; diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c index d42da95c1..89a33a89e 100644 --- a/src/core/ns_identify.c +++ b/src/core/ns_identify.c @@ -34,11 +34,11 @@ class NSIdentify : public Module this->SetType(CORE); c = createCommand("ID", do_identify, NULL, NICK_HELP_IDENTIFY, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("IDENTIFY", do_identify, NULL, NICK_HELP_IDENTIFY, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SIDENTIFY", do_identify, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); diff --git a/src/core/ns_info.c b/src/core/ns_info.c index bc32df65f..9644626ec 100644 --- a/src/core/ns_info.c +++ b/src/core/ns_info.c @@ -31,7 +31,7 @@ class NSInfo : public Module 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); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_list.c b/src/core/ns_list.c index 2e285fab6..ed4ba9ab4 100644 --- a/src/core/ns_list.c +++ b/src/core/ns_list.c @@ -31,7 +31,7 @@ class NSList : public Module c = createCommand("LIST", do_list, NULL, -1, NICK_HELP_LIST, -1, NICK_SERVADMIN_HELP_LIST, NICK_SERVADMIN_HELP_LIST); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c index ac448a740..f523dc072 100644 --- a/src/core/ns_logout.c +++ b/src/core/ns_logout.c @@ -33,7 +33,7 @@ class NSLogout : public Module 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); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c index 4447df152..0180ca222 100644 --- a/src/core/ns_recover.c +++ b/src/core/ns_recover.c @@ -31,7 +31,7 @@ class NSRecover : public Module this->SetType(CORE); c = createCommand("RECOVER", do_recover, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleAddHelp(c, myHelpResonse); moduleSetNickHelp(myNickServHelp); diff --git a/src/core/ns_register.c b/src/core/ns_register.c index 21842bdab..f3f08f6fe 100644 --- a/src/core/ns_register.c +++ b/src/core/ns_register.c @@ -37,13 +37,13 @@ class NSRegister : public Module this->SetType(CORE); c = createCommand("REGISTER", do_register, NULL, NICK_HELP_REGISTER, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("CONFIRM", do_confirm, NULL, NICK_HELP_CONFIRM, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("RESEND", do_resend, NULL, NICK_HELP_RESEND, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); diff --git a/src/core/ns_release.c b/src/core/ns_release.c index 3d2af837e..a13bc310d 100644 --- a/src/core/ns_release.c +++ b/src/core/ns_release.c @@ -31,7 +31,7 @@ class NSRelease : public Module this->SetType(CORE); c = createCommand("RELEASE", do_release, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleAddHelp(c, myHelpResonse); moduleSetNickHelp(myNickServHelp); diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c index 9631025a6..f3e8b8c72 100644 --- a/src/core/ns_saset.c +++ b/src/core/ns_saset.c @@ -45,35 +45,35 @@ class NSSASet : public Module 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); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET DISPLAY", NULL, is_services_oper, NICK_HELP_SASET_DISPLAY, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET PASSWORD", NULL, is_services_oper, NICK_HELP_SASET_PASSWORD, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET URL", NULL, is_services_oper, NICK_HELP_SASET_URL, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET EMAIL", NULL, is_services_oper, NICK_HELP_SASET_EMAIL, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET ICQ", NULL, is_services_oper, NICK_HELP_SASET_ICQ, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET GREET", NULL, is_services_oper, NICK_HELP_SASET_GREET, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET KILL", NULL, is_services_oper, NICK_HELP_SASET_KILL, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET SECURE", NULL, is_services_oper, NICK_HELP_SASET_SECURE, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET PRIVATE", NULL, is_services_oper, NICK_HELP_SASET_PRIVATE, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET MSG", NULL, is_services_oper, NICK_HELP_SASET_MSG, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET HIDE", NULL, is_services_oper, NICK_HELP_SASET_HIDE, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET NOEXPIRE", NULL, is_services_oper, -1, -1, -1, NICK_HELP_SASET_NOEXPIRE, NICK_HELP_SASET_NOEXPIRE); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET AUTOOP", NULL, is_services_oper, -1, -1, -1, NICK_HELP_SASET_AUTOOP, NICK_HELP_SASET_AUTOOP); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SASET LANGUAGE", NULL, is_services_oper, -1, -1, -1, -1, NICK_HELP_SASET_LANGUAGE); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c index 8336e9345..03ac69d38 100644 --- a/src/core/ns_sendpass.c +++ b/src/core/ns_sendpass.c @@ -31,7 +31,7 @@ class NSSendPass : public Module this->SetType(CORE); c = createCommand("SENDPASS", do_sendpass, NULL, NICK_HELP_SENDPASS, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); if (!UseMail) diff --git a/src/core/ns_set.c b/src/core/ns_set.c index d6bd54d76..b8af7ebfb 100644 --- a/src/core/ns_set.c +++ b/src/core/ns_set.c @@ -44,31 +44,31 @@ class NSSet : public Module this->SetType(CORE); c = createCommand("SET", do_set, NULL, NICK_HELP_SET, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SET DISPLAY", NULL, NULL, NICK_HELP_SET_DISPLAY, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SET PASSWORD", NULL, NULL, NICK_HELP_SET_PASSWORD, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SET URL", NULL, NULL, NICK_HELP_SET_URL, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SET EMAIL", NULL, NULL, NICK_HELP_SET_EMAIL, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SET ICQ", NULL, NULL, NICK_HELP_SET_ICQ, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SET GREET", NULL, NULL, NICK_HELP_SET_GREET, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SET KILL", NULL, NULL, NICK_HELP_SET_KILL, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SET SECURE", NULL, NULL, NICK_HELP_SET_SECURE, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SET PRIVATE", NULL, NULL, NICK_HELP_SET_PRIVATE, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SET MSG", NULL, NULL, NICK_HELP_SET_MSG, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SET HIDE", NULL, NULL, NICK_HELP_SET_HIDE, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("SET AUTOOP", NULL, NULL, NICK_HELP_SET_AUTOOP, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_status.c b/src/core/ns_status.c index a297d6ea5..45fb1c3e8 100644 --- a/src/core/ns_status.c +++ b/src/core/ns_status.c @@ -30,7 +30,7 @@ class NSStatus : public Module this->SetType(CORE); c = createCommand("STATUS", do_status, NULL, NICK_HELP_STATUS, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c index 600e362c7..76966b149 100644 --- a/src/core/ns_suspend.c +++ b/src/core/ns_suspend.c @@ -31,9 +31,9 @@ class NSSuspend : public Module 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); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); c = createCommand("UNSUSPEND", do_unsuspend, is_services_oper, -1, -1, -1, NICK_SERVADMIN_HELP_UNSUSPEND, NICK_SERVADMIN_HELP_UNSUSPEND); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/ns_update.c b/src/core/ns_update.c index 0588131f2..851339943 100644 --- a/src/core/ns_update.c +++ b/src/core/ns_update.c @@ -30,7 +30,7 @@ class NSUpdate : public Module this->SetType(CORE); c = createCommand("UPDATE", do_nickupdate, NULL, NICK_HELP_UPDATE, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + this->AddCommand(NICKSERV, c, MOD_UNIQUE); moduleSetNickHelp(myNickServHelp); } diff --git a/src/core/os_admin.c b/src/core/os_admin.c index bf5e982fb..d394b526c 100644 --- a/src/core/os_admin.c +++ b/src/core/os_admin.c @@ -34,7 +34,7 @@ class OSAdmin : public Module c = createCommand("ADMIN", do_admin, NULL, OPER_HELP_ADMIN, -1, -1, -1, -1); c->help_param1 = s_NickServ; - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_akill.c b/src/core/os_akill.c index f17cb8d5a..3762ca286 100644 --- a/src/core/os_akill.c +++ b/src/core/os_akill.c @@ -35,7 +35,7 @@ class OSAKill : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("AKILL", do_akill, is_services_oper, OPER_HELP_AKILL, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c index 2070f2091..ef35e2432 100644 --- a/src/core/os_chankill.c +++ b/src/core/os_chankill.c @@ -30,7 +30,7 @@ class OSChanKill : public Module this->SetType(CORE); c = createCommand("CHANKILL", do_chankill, is_services_admin, OPER_HELP_CHANKILL, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c index cb172fd0c..4725eb4bf 100644 --- a/src/core/os_chanlist.c +++ b/src/core/os_chanlist.c @@ -33,7 +33,7 @@ class OSChanList : public Module this->SetType(CORE); c = createCommand("CHANLIST", do_chanlist, is_services_oper, OPER_HELP_CHANLIST, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c index 343e03fc7..8fb27f5ff 100644 --- a/src/core/os_clearmodes.c +++ b/src/core/os_clearmodes.c @@ -31,7 +31,7 @@ class OSClearModes : public Module this->SetType(CORE); c = createCommand("CLEARMODES", do_clearmodes, is_services_oper, OPER_HELP_CLEARMODES, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c index 610310146..66aefc92a 100644 --- a/src/core/os_defcon.c +++ b/src/core/os_defcon.c @@ -36,7 +36,7 @@ class OSDEFCON : public Module this->SetType(CORE); c = createCommand("DEFCON", do_defcon, is_services_admin, OPER_HELP_DEFCON, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_global.c b/src/core/os_global.c index 77d42362e..d311c8f94 100644 --- a/src/core/os_global.c +++ b/src/core/os_global.c @@ -31,7 +31,7 @@ class OSGlobal : public Module c = createCommand("GLOBAL", do_global, is_services_admin, OPER_HELP_GLOBAL, -1, -1, -1, -1); c->help_param1 = s_GlobalNoticer; - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } }; diff --git a/src/core/os_help.c b/src/core/os_help.c index 27e41db14..7f1155eb1 100644 --- a/src/core/os_help.c +++ b/src/core/os_help.c @@ -28,7 +28,7 @@ class OSHelp : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); } }; diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c index 2289b5afe..4ec37c730 100644 --- a/src/core/os_ignore.c +++ b/src/core/os_ignore.c @@ -30,7 +30,7 @@ class OSIgnore : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("IGNORE", do_ignoreuser, is_services_admin, OPER_HELP_IGNORE, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c index 3a9eb2622..dcf550c4f 100644 --- a/src/core/os_jupe.c +++ b/src/core/os_jupe.c @@ -30,7 +30,7 @@ class OSJupe : public Module this->SetType(CORE); c = createCommand("JUPE", do_jupe, is_services_admin, OPER_HELP_JUPE, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_kick.c b/src/core/os_kick.c index e688d96b8..7fc7f7aa2 100644 --- a/src/core/os_kick.c +++ b/src/core/os_kick.c @@ -30,7 +30,7 @@ class OSKick : public Module this->SetType(CORE); c = createCommand("KICK", do_os_kick, is_services_oper, OPER_HELP_KICK, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_logonnews.c b/src/core/os_logonnews.c index e19047835..035c415db 100644 --- a/src/core/os_logonnews.c +++ b/src/core/os_logonnews.c @@ -41,7 +41,7 @@ class OSLogonNews : public Module NEWS_HELP_LOGON, -1, -1, -1, -1); snprintf(buf, BUFSIZE, "%d", NewsCount), c->help_param1 = sstrdup(buf); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); diff --git a/src/core/os_mode.c b/src/core/os_mode.c index e9d6a0193..00be24c10 100644 --- a/src/core/os_mode.c +++ b/src/core/os_mode.c @@ -30,7 +30,7 @@ class OSMode : public Module this->SetType(CORE); c = createCommand("MODE", do_os_mode, is_services_oper, OPER_HELP_MODE, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c index 946317e47..0f9452978 100644 --- a/src/core/os_modinfo.c +++ b/src/core/os_modinfo.c @@ -31,7 +31,7 @@ class OSModInfo : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("MODINFO", do_modinfo, NULL, -1, -1, -1, -1, OPER_HELP_MODINFO); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c index 5ab560982..deb2beada 100644 --- a/src/core/os_modlist.c +++ b/src/core/os_modlist.c @@ -30,7 +30,7 @@ class OSModList : public Module this->SetType(CORE); c = createCommand("MODLIST", do_modlist, NULL, -1, -1, -1, -1, OPER_HELP_MODLIST); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_modload.c b/src/core/os_modload.c index 41b180d04..eb83cb1c7 100644 --- a/src/core/os_modload.c +++ b/src/core/os_modload.c @@ -30,7 +30,7 @@ class OSModLoad : public Module this->SetType(CORE); c = createCommand("MODLOAD", do_modload, is_services_root, -1, -1, -1, -1, OPER_HELP_MODLOAD); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c index 35910056d..bfdf1b323 100644 --- a/src/core/os_modunload.c +++ b/src/core/os_modunload.c @@ -31,7 +31,7 @@ class OSModUnLoad : public Module this->SetType(CORE); c = createCommand("MODUNLOAD", do_modunload, is_services_root, -1, -1, -1, -1, OPER_HELP_MODUNLOAD); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_noop.c b/src/core/os_noop.c index 0c43d5b8c..e3ba6f190 100644 --- a/src/core/os_noop.c +++ b/src/core/os_noop.c @@ -30,7 +30,7 @@ class OSNOOP : public Module this->SetType(CORE); c = createCommand("NOOP", do_noop, is_services_admin, OPER_HELP_NOOP, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_oline.c b/src/core/os_oline.c index feb2be5b6..3cce00093 100644 --- a/src/core/os_oline.c +++ b/src/core/os_oline.c @@ -30,7 +30,7 @@ class OSOLine : public Module this->SetType(CORE); c = createCommand("OLINE", do_operoline, is_services_root, OPER_HELP_OLINE, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); diff --git a/src/core/os_oper.c b/src/core/os_oper.c index 7cd128719..15a56832b 100644 --- a/src/core/os_oper.c +++ b/src/core/os_oper.c @@ -33,7 +33,7 @@ class OSOper : public Module 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); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_opernews.c b/src/core/os_opernews.c index b1b9f4483..13b71da53 100644 --- a/src/core/os_opernews.c +++ b/src/core/os_opernews.c @@ -39,7 +39,7 @@ class OSOperNews : public Module c = createCommand("OPERNEWS", do_opernews, is_services_admin, NEWS_HELP_OPER, -1, -1, -1, -1); snprintf(buf, BUFSIZE, "%d", NewsCount), c->help_param1 = sstrdup(buf); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); diff --git a/src/core/os_quit.c b/src/core/os_quit.c index 5d2819ac0..42410c780 100644 --- a/src/core/os_quit.c +++ b/src/core/os_quit.c @@ -30,7 +30,7 @@ class OSQuit : public Module this->SetType(CORE); c = createCommand("QUIT", do_os_quit, is_services_root, OPER_HELP_QUIT, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_randomnews.c b/src/core/os_randomnews.c index ed646ac78..3c4db1985 100644 --- a/src/core/os_randomnews.c +++ b/src/core/os_randomnews.c @@ -33,7 +33,7 @@ class OSRandomNews : public Module * we can look at moving it here later **/ c = createCommand("RANDOMNEWS", do_randomnews, is_services_admin, NEWS_HELP_RANDOM, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_raw.c b/src/core/os_raw.c index 15096bf02..be520e305 100644 --- a/src/core/os_raw.c +++ b/src/core/os_raw.c @@ -29,7 +29,7 @@ class OSRaw : public Module this->SetType(THIRD); c = createCommand("RAW", do_raw, is_services_root, OPER_HELP_RAW, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); if (DisableRaw) throw ModuleException("os_raw: Not loading because you probably shouldn't be loading me"); diff --git a/src/core/os_reload.c b/src/core/os_reload.c index e9548c1f4..693838700 100644 --- a/src/core/os_reload.c +++ b/src/core/os_reload.c @@ -30,7 +30,7 @@ class OSReload : public Module this->SetType(CORE); c = createCommand("RELOAD", do_reload, is_services_root, OPER_HELP_RELOAD, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_restart.c b/src/core/os_restart.c index 29968e3d4..5380244a8 100644 --- a/src/core/os_restart.c +++ b/src/core/os_restart.c @@ -34,7 +34,7 @@ class OSRestart : public Module this->SetVersion("$Id$"); this->SetType(CORE); c = createCommand("RESTART", do_restart, is_services_root, OPER_HELP_RESTART, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_session.c b/src/core/os_session.c index 98b734879..ddc8fe9b2 100644 --- a/src/core/os_session.c +++ b/src/core/os_session.c @@ -32,9 +32,9 @@ class OSSession : public Module * do_session/do_exception are exported from sessions.c - we just want to provide an interface. **/ c = createCommand("SESSION", do_session, is_services_oper, OPER_HELP_SESSION, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); c = createCommand("EXCEPTION", do_exception, is_services_oper, OPER_HELP_EXCEPTION, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_set.c b/src/core/os_set.c index eaf2f1339..8472b56df 100644 --- a/src/core/os_set.c +++ b/src/core/os_set.c @@ -30,21 +30,21 @@ class OSSet : public Module this->SetType(CORE); c = createCommand("SET", do_set, is_services_root, OPER_HELP_SET, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); c = createCommand("SET LIST", NULL, NULL, OPER_HELP_SET_LIST, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); c = createCommand("SET READONLY", NULL, NULL, OPER_HELP_SET_READONLY, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); c = createCommand("SET LOGCHAN", NULL, NULL, OPER_HELP_SET_LOGCHAN, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); c = createCommand("SET DEBUG", NULL, NULL, OPER_HELP_SET_DEBUG, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); c = createCommand("SET NOEXPIRE", NULL, NULL, OPER_HELP_SET_NOEXPIRE, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); c = createCommand("SET IGNORE", NULL, NULL, OPER_HELP_SET_IGNORE, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); c = createCommand("SET SUPERADMIN", NULL, NULL, OPER_HELP_SET_SUPERADMIN, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c index e08b91f6e..0cd6c10e9 100644 --- a/src/core/os_sgline.c +++ b/src/core/os_sgline.c @@ -38,7 +38,7 @@ class OSSGLine : public Module c = createCommand("SGLINE", do_sgline, is_services_oper, OPER_HELP_SGLINE, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c index 317965ba0..a981d1555 100644 --- a/src/core/os_shutdown.c +++ b/src/core/os_shutdown.c @@ -30,7 +30,7 @@ class OSShutdown : public Module this->SetType(CORE); c = createCommand("SHUTDOWN", do_shutdown, is_services_root, OPER_HELP_SHUTDOWN, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c index 7d2b7f0fe..f6cad0d78 100644 --- a/src/core/os_sqline.c +++ b/src/core/os_sqline.c @@ -38,7 +38,7 @@ class OSSQLine : public Module c = createCommand("SQLINE", do_sqline, is_services_oper, OPER_HELP_SQLINE, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); if (!ircd->sqline) diff --git a/src/core/os_staff.c b/src/core/os_staff.c index ba94e8d1a..fa29b2b7d 100644 --- a/src/core/os_staff.c +++ b/src/core/os_staff.c @@ -33,7 +33,7 @@ class OSStaff : public Module this->SetType(CORE); c = createCommand("STAFF", do_staff, NULL, OPER_HELP_STAFF, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_stats.c b/src/core/os_stats.c index 23349729a..dea85b770 100644 --- a/src/core/os_stats.c +++ b/src/core/os_stats.c @@ -33,9 +33,9 @@ class OSStats : public Module this->SetType(CORE); c = createCommand("STATS", do_stats, NULL, OPER_HELP_STATS, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); c = createCommand("UPTIME", do_stats, NULL, OPER_HELP_STATS, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c index c5733aa65..fda5d3a58 100644 --- a/src/core/os_svsnick.c +++ b/src/core/os_svsnick.c @@ -31,7 +31,7 @@ class OSSVSNick : public Module c = createCommand("SVSNICK", do_svsnick, is_services_root, OPER_HELP_SVSNICK, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); if (!ircd->svsnick) diff --git a/src/core/os_szline.c b/src/core/os_szline.c index deee225a8..7e06be601 100644 --- a/src/core/os_szline.c +++ b/src/core/os_szline.c @@ -37,7 +37,7 @@ class OSSZLine : public Module c = createCommand("SZLINE", do_szline, is_services_oper, OPER_HELP_SZLINE, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); if (!ircd->szline) diff --git a/src/core/os_umode.c b/src/core/os_umode.c index 100642adc..d860890c0 100644 --- a/src/core/os_umode.c +++ b/src/core/os_umode.c @@ -30,7 +30,7 @@ class OSUMode : public Module this->SetType(CORE); c = createCommand("UMODE", do_operumodes, is_services_root, OPER_HELP_UMODE, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); diff --git a/src/core/os_update.c b/src/core/os_update.c index 570b605c8..88573126f 100644 --- a/src/core/os_update.c +++ b/src/core/os_update.c @@ -30,7 +30,7 @@ class OSUpdate : public Module this->SetType(CORE); c = createCommand("UPDATE", do_update, is_services_root, OPER_HELP_UPDATE, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c index 06d356858..b2ffbb3a8 100644 --- a/src/core/os_userlist.c +++ b/src/core/os_userlist.c @@ -35,7 +35,7 @@ class OSUserList : public Module this->SetType(CORE); c = createCommand("USERLIST", do_userlist, NULL, OPER_HELP_USERLIST, -1, -1, -1, -1); - moduleAddCommand(OPERSERV, c, MOD_UNIQUE); + this->AddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); } diff --git a/src/modules.c b/src/modules.c index 891389739..9e232400a 100644 --- a/src/modules.c +++ b/src/modules.c @@ -837,7 +837,7 @@ int prepForUnload(Module * m) for (current = HS_cmdTable[idx]; current; current = current->next) { for (c = current->c; c; c = c->next) { if ((c->mod_name) && (strcmp(c->mod_name, m->name.c_str()) == 0)) { - moduleDelCommand(HOSTSERV, c->name); + m->DelCommand(HOSTSERV, c->name); } } } @@ -845,7 +845,7 @@ int prepForUnload(Module * m) for (current = BS_cmdTable[idx]; current; current = current->next) { for (c = current->c; c; c = c->next) { if ((c->mod_name) && (strcmp(c->mod_name, m->name.c_str()) == 0)) { - moduleDelCommand(BOTSERV, c->name); + m->DelCommand(BOTSERV, c->name); } } } @@ -853,7 +853,7 @@ int prepForUnload(Module * m) for (current = MS_cmdTable[idx]; current; current = current->next) { for (c = current->c; c; c = c->next) { if ((c->mod_name) && (strcmp(c->mod_name, m->name.c_str()) == 0)) { - moduleDelCommand(MEMOSERV, c->name); + m->DelCommand(MEMOSERV, c->name); } } } @@ -861,7 +861,7 @@ int prepForUnload(Module * m) for (current = NS_cmdTable[idx]; current; current = current->next) { for (c = current->c; c; c = c->next) { if ((c->mod_name) && (strcmp(c->mod_name, m->name.c_str()) == 0)) { - moduleDelCommand(NICKSERV, c->name); + m->DelCommand(NICKSERV, c->name); } } } @@ -869,7 +869,7 @@ int prepForUnload(Module * m) for (current = CS_cmdTable[idx]; current; current = current->next) { for (c = current->c; c; c = c->next) { if ((c->mod_name) && (strcmp(c->mod_name, m->name.c_str()) == 0)) { - moduleDelCommand(CHANSERV, c->name); + m->DelCommand(CHANSERV, c->name); } } } @@ -877,7 +877,7 @@ int prepForUnload(Module * m) for (current = HE_cmdTable[idx]; current; current = current->next) { for (c = current->c; c; c = c->next) { if ((c->mod_name) && (strcmp(c->mod_name, m->name.c_str()) == 0)) { - moduleDelCommand(HELPSERV, c->name); + m->DelCommand(HELPSERV, c->name); } } } @@ -885,7 +885,7 @@ int prepForUnload(Module * m) for (current = OS_cmdTable[idx]; current; current = current->next) { for (c = current->c; c; c = c->next) { if ((c->mod_name) && (stricmp(c->mod_name, m->name.c_str()) == 0)) { - moduleDelCommand(OPERSERV, c->name); + m->DelCommand(OPERSERV, c->name); } } } @@ -1091,33 +1091,16 @@ static int internal_addCommand(CommandHash * cmdTable[], Command * c, int pos) return MOD_ERR_OK; } -/** - * Add a module provided command to the given service. - * e.g. moduleAddCommand(NICKSERV,c,MOD_HEAD); - * @param cmdTable the services to add the command to - * @param c the command to add - * @param pos the position to add to, MOD_HEAD, MOD_TAIL, MOD_UNIQUE - * @see createCommand - * @return MOD_ERR_OK on successfully adding the command - */ -int moduleAddCommand(CommandHash * cmdTable[], Command * c, int pos) +int Module::AddCommand(CommandHash * cmdTable[], Command * c, int pos) { int status; if (!cmdTable || !c) { return MOD_ERR_PARAMS; } - /* ok, this appears to be a module adding a command from outside of AnopeInit, try to look up its module struct for it */ - if ((mod_current_module_name) && (!mod_current_module)) { - mod_current_module = findModule(mod_current_module_name); - } - - if (!mod_current_module) { - return MOD_ERR_UNKNOWN; - } /* shouldnt happen */ c->core = 0; if (!c->mod_name) { - c->mod_name = sstrdup(mod_current_module->name.c_str()); + c->mod_name = sstrdup(this->name.c_str()); } @@ -1253,16 +1236,12 @@ static int internal_delCommand(CommandHash * cmdTable[], Command * c, const char * @param name the name of the command to delete from the service * @return returns MOD_ERR_OK on success */ -int moduleDelCommand(CommandHash * cmdTable[], const char *name) +int Module::DelCommand(CommandHash * cmdTable[], const char *name) { Command *c = NULL; Command *cmd = NULL; int status = 0; - if (!mod_current_module) { - return MOD_ERR_UNKNOWN; - } - c = findCommand(cmdTable, name); if (!c) { return MOD_ERR_NOEXIST; @@ -1271,11 +1250,11 @@ int moduleDelCommand(CommandHash * cmdTable[], const char *name) for (cmd = c; cmd; cmd = cmd->next) { if (cmd->mod_name - && cmd->mod_name == mod_current_module->name) { + && cmd->mod_name == this->name) { if (debug >= 2) { displayCommandFromHash(cmdTable, name); } - status = internal_delCommand(cmdTable, cmd, mod_current_module->name.c_str()); + status = internal_delCommand(cmdTable, cmd, this->name.c_str()); if (debug >= 2) { displayCommandFromHash(cmdTable, name); } diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c index 5737bdb4c..0e4ba12f8 100644 --- a/src/modules/cs_appendtopic.c +++ b/src/modules/cs_appendtopic.c @@ -65,7 +65,7 @@ class CSAppendTopic : public Module this->SetType(SUPPORTED); c = createCommand("APPENDTOPIC", my_cs_appendtopic, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_HEAD); + this->AddCommand(CHANSERV, c, MOD_HEAD); moduleAddHelp(c, my_cs_help_appendtopic); moduleSetChanHelp(my_cs_help); diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c index adc79d2e3..31dd089d0 100644 --- a/src/modules/cs_enforce.c +++ b/src/modules/cs_enforce.c @@ -44,7 +44,7 @@ class CSEnforce : public Module this->SetType(SUPPORTED); c = createCommand("ENFORCE", my_cs_enforce, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_HEAD); + this->AddCommand(CHANSERV, c, MOD_HEAD); moduleAddHelp(c, my_cs_help_enforce); moduleSetChanHelp(my_cs_help); diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c index f8fdb6502..327ec43e6 100644 --- a/src/modules/cs_tban.c +++ b/src/modules/cs_tban.c @@ -49,7 +49,7 @@ class CSTBan : public Module moduleSetChanHelp(myHelp); c = createCommand("TBAN", do_tban, NULL, -1, -1, -1, -1, -1); moduleAddHelp(c, myFullHelp); - moduleAddCommand(CHANSERV, c, MOD_HEAD); + this->AddCommand(CHANSERV, c, MOD_HEAD); this->SetAuthor(AUTHOR); this->SetVersion(VERSION); diff --git a/src/modules/demos/catserv/catserv_messages.c b/src/modules/demos/catserv/catserv_messages.c index e11235b4e..23c1b4ec1 100644 --- a/src/modules/demos/catserv/catserv_messages.c +++ b/src/modules/demos/catserv/catserv_messages.c @@ -7,8 +7,8 @@ void addMessageList(void) { Command *c; c = createCommand("meow", do_meow, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(Catserv_cmdTable, c, MOD_UNIQUE); + this->AddCommand(Catserv_cmdTable, c, MOD_UNIQUE); c = createCommand("purr", do_purr, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(Catserv_cmdTable, c, MOD_UNIQUE); + this->AddCommand(Catserv_cmdTable, c, MOD_UNIQUE); } diff --git a/src/modules/demos/hs_conf.c b/src/modules/demos/hs_conf.c index 85b644501..233aa2ff1 100644 --- a/src/modules/demos/hs_conf.c +++ b/src/modules/demos/hs_conf.c @@ -23,7 +23,7 @@ int AnopeInit(int argc, char **argv) { mReadConfig(0,NULL); c = createCommand("SHOW",mShowSetting,NULL,-1,-1,-1,-1,-1); - status = moduleAddCommand(HOSTSERV, c, MOD_HEAD); + status = this->AddCommand(HOSTSERV, c, MOD_HEAD); hook = createEventHook(EVENT_RELOAD, mReadConfig); status = this->AddEventHook(hook); diff --git a/src/modules/demos/hs_moo.c b/src/modules/demos/hs_moo.c index aa8e41f7c..61210271b 100644 --- a/src/modules/demos/hs_moo.c +++ b/src/modules/demos/hs_moo.c @@ -34,7 +34,7 @@ int AnopeInit(int argc, char **argv) /* This will be executed when the mod moduleSetHostHelp(myHostServHelp); /* add us to the .hs help list */ - status = moduleAddCommand(HOSTSERV, c, MOD_HEAD); /* Add the command to the HOSTSERV cmd table */ + status = this->AddCommand(HOSTSERV, c, MOD_HEAD); /* Add the command to the HOSTSERV cmd table */ /* Check if we have any argv's */ if(argc>0) { diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c index ad8d3b4be..cd9939e96 100644 --- a/src/modules/hs_request.c +++ b/src/modules/hs_request.c @@ -93,25 +93,25 @@ class HSRequest : public Module c = createCommand("request", hs_do_request, nick_identified, -1, -1, -1, -1, -1); moduleAddHelp(c, hs_help_request); - moduleAddCommand(HOSTSERV, c, MOD_HEAD); + this->AddCommand(HOSTSERV, c, MOD_HEAD); c = createCommand("activate", hs_do_activate, is_host_setter, -1, -1, -1, -1, -1); moduleAddHelp(c, hs_help_activate); - moduleAddCommand(HOSTSERV, c, MOD_HEAD); + this->AddCommand(HOSTSERV, c, MOD_HEAD); c = createCommand("reject", hs_do_reject, is_host_setter, -1, -1, -1, -1, -1); moduleAddHelp(c, hs_help_reject); - moduleAddCommand(HOSTSERV, c, MOD_HEAD); + this->AddCommand(HOSTSERV, c, MOD_HEAD); c = createCommand("waiting", hs_do_waiting, is_host_setter, -1, -1, -1, -1, -1); moduleAddHelp(c, hs_help_waiting); - moduleAddCommand(HOSTSERV, c, MOD_HEAD); + this->AddCommand(HOSTSERV, c, MOD_HEAD); c = createCommand("list", hs_do_list_out, is_services_oper, -1, -1, -1, -1, -1); - moduleAddCommand(HOSTSERV, c, MOD_HEAD); + this->AddCommand(HOSTSERV, c, MOD_HEAD); c = createCommand("drop", ns_do_drop, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_HEAD); + this->AddCommand(NICKSERV, c, MOD_HEAD); hook = createEventHook(EVENT_DB_SAVING, hsreqevt_db_saving); this->AddEventHook(hook); diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c index 862bf6ab1..ef5b8b167 100644 --- a/src/modules/ns_maxemail.c +++ b/src/modules/ns_maxemail.c @@ -44,9 +44,9 @@ class NSMaxEmail : public Module this->SetType(SUPPORTED); c = createCommand("REGISTER", my_ns_register, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_HEAD); + this->AddCommand(NICKSERV, c, MOD_HEAD); c = createCommand("SET", my_ns_set, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_HEAD); + this->AddCommand(NICKSERV, c, MOD_HEAD); evt = createEventHook(EVENT_RELOAD, my_event_reload); if ((status = this->AddEventHook(evt))) diff --git a/src/modules/os_info.c b/src/modules/os_info.c index e7f46c55e..2d69267ae 100644 --- a/src/modules/os_info.c +++ b/src/modules/os_info.c @@ -80,17 +80,17 @@ class OSInfo : public Module c = createCommand("oInfo", myAddNickInfo, is_oper, -1, -1, -1, -1, -1); moduleAddHelp(c, mNickHelp); - status = moduleAddCommand(NICKSERV, c, MOD_HEAD); + status = this->AddCommand(NICKSERV, c, MOD_HEAD); c = createCommand("Info", myNickInfo, NULL, -1, -1, -1, -1, -1); - status = moduleAddCommand(NICKSERV, c, MOD_TAIL); + status = this->AddCommand(NICKSERV, c, MOD_TAIL); c = createCommand("oInfo", myAddChanInfo, is_oper, -1, -1, -1, -1, -1); moduleAddHelp(c, mChanHelp); - status = moduleAddCommand(CHANSERV, c, MOD_HEAD); + status = this->AddCommand(CHANSERV, c, MOD_HEAD); c = createCommand("Info", myChanInfo, NULL, -1, -1, -1, -1, -1); - status = moduleAddCommand(CHANSERV, c, MOD_TAIL); + status = this->AddCommand(CHANSERV, c, MOD_TAIL); hook = createEventHook(EVENT_DB_SAVING, mSaveData); status = this->AddEventHook(hook); |