Fixes from vtable cross-check

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11977 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
danieldg 2009-10-25 15:31:33 +00:00
parent bd61dc65c1
commit 5c05313b6e
11 changed files with 25 additions and 25 deletions

View File

@ -52,8 +52,8 @@ class ModuleCensor : public Module
OnRehash(NULL); OnRehash(NULL);
if (!ServerInstance->Modes->AddMode(&cu) || !ServerInstance->Modes->AddMode(&cc)) if (!ServerInstance->Modes->AddMode(&cu) || !ServerInstance->Modes->AddMode(&cc))
throw ModuleException("Could not add new modes!"); throw ModuleException("Could not add new modes!");
Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRunTestSuite }; Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice };
ServerInstance->Modules->Attach(eventlist, this, 4); ServerInstance->Modules->Attach(eventlist, this, 3);
} }

View File

@ -18,7 +18,6 @@
#include "u_listmode.h" #include "u_listmode.h"
/* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */ /* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
/* $ModDep: ../../include/u_listmode.h */
/** Handles channel mode +g /** Handles channel mode +g
*/ */
@ -69,8 +68,8 @@ class ModuleChanFilter : public Module
throw ModuleException("Could not add new modes!"); throw ModuleException("Could not add new modes!");
cf.DoImplements(this); cf.DoImplements(this);
Implementation eventlist[] = { I_OnChannelDelete, I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel }; Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
ServerInstance->Modules->Attach(eventlist, this, 5); ServerInstance->Modules->Attach(eventlist, this, 4);
OnRehash(NULL); OnRehash(NULL);
ServerInstance->Modules->PublishInterface("ChannelBanList", this); ServerInstance->Modules->PublishInterface("ChannelBanList", this);

View File

@ -19,12 +19,14 @@ class ModuleModesOnConnect : public Module
{ {
public: public:
ModuleModesOnConnect() { ModuleModesOnConnect() {
Implementation eventlist[] = { I_OnUserConnect, I_OnRehash }; ServerInstance->Modules->Attach(I_OnUserConnect, this);
ServerInstance->Modules->Attach(eventlist, this, 2);
// for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t
ServerInstance->Modules->SetPriority(this, PRIORITY_FIRST);
} }
void Prioritize()
{
// for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t
ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
}
virtual ~ModuleModesOnConnect() virtual ~ModuleModesOnConnect()
{ {

View File

@ -55,11 +55,10 @@ class ModuleHideOper : public Module
ModuleHideOper() ModuleHideOper()
: hm(this) : hm(this)
{ {
if (!ServerInstance->Modes->AddMode(&hm)) if (!ServerInstance->Modes->AddMode(&hm))
throw ModuleException("Could not add new modes!"); throw ModuleException("Could not add new modes!");
Implementation eventlist[] = { I_OnWhoisLine }; Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine };
ServerInstance->Modules->Attach(eventlist, this, 1); ServerInstance->Modules->Attach(eventlist, this, 2);
} }

View File

@ -192,8 +192,8 @@ class ModuleJoinFlood : public Module
if (!ServerInstance->Modes->AddMode(&jf)) if (!ServerInstance->Modes->AddMode(&jf))
throw ModuleException("Could not add new modes!"); throw ModuleException("Could not add new modes!");
ServerInstance->Extensions.Register(&jf.ext); ServerInstance->Extensions.Register(&jf.ext);
Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin }; Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
ServerInstance->Modules->Attach(eventlist, this, 3); ServerInstance->Modules->Attach(eventlist, this, 2);
} }
ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)

View File

@ -53,7 +53,7 @@ class ModuleNoNickChange : public Module
OnRehash(NULL); OnRehash(NULL);
ServerInstance->Modes->AddMode(&nn); ServerInstance->Modes->AddMode(&nn);
Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash }; Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
ServerInstance->Modules->Attach(eventlist, this, 2); ServerInstance->Modules->Attach(eventlist, this, 3);
} }
virtual ~ModuleNoNickChange() virtual ~ModuleNoNickChange()

View File

@ -226,8 +226,8 @@ class ModuleOjoin : public Module
ServerInstance->AddCommand(&mycommand); ServerInstance->AddCommand(&mycommand);
Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick, I_OnUserPart, I_OnUserPreKick, I_OnRehash }; Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserPreKick, I_OnRehash };
ServerInstance->Modules->Attach(eventlist, this, 5); ServerInstance->Modules->Attach(eventlist, this, 3);
} }
ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven) ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)

View File

@ -179,8 +179,8 @@ public:
{ {
if (!ServerInstance->Modes->AddMode(&p)) if (!ServerInstance->Modes->AddMode(&p))
throw ModuleException("Could not add new modes!"); throw ModuleException("Could not add new modes!");
Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode }; Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode, I_OnRehash };
ServerInstance->Modules->Attach(eventlist, this, 3); ServerInstance->Modules->Attach(eventlist, this, 4);
OnRehash(NULL); OnRehash(NULL);
} }

View File

@ -226,8 +226,8 @@ class ModuleSASL : public Module
ModuleSASL() ModuleSASL()
: authExt("sasl_auth", this), cap(this, "sasl"), auth(this, authExt, cap), sasl(this, authExt) : authExt("sasl_auth", this), cap(this, "sasl"), auth(this, authExt, cap), sasl(this, authExt)
{ {
Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnPostConnect, I_OnUserDisconnect }; Implementation eventlist[] = { I_OnEvent, I_OnUserRegister };
ServerInstance->Modules->Attach(eventlist, this, 4); ServerInstance->Modules->Attach(eventlist, this, 2);
ServerInstance->AddCommand(&auth); ServerInstance->AddCommand(&auth);
ServerInstance->AddCommand(&sasl); ServerInstance->AddCommand(&sasl);

View File

@ -117,9 +117,9 @@ class ModuleServicesAccount : public Module
ServerInstance->Extensions.Register(&accountname); ServerInstance->Extensions.Register(&accountname);
Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan, Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan,
I_OnSyncUser, I_OnUserQuit, I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick }; I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick };
ServerInstance->Modules->Attach(eventlist, this, 10); ServerInstance->Modules->Attach(eventlist, this, 8);
} }
void On005Numeric(std::string &t) void On005Numeric(std::string &t)

View File

@ -209,8 +209,8 @@ class ListModeBase : public ModeHandler
*/ */
virtual void DoImplements(Module* m) virtual void DoImplements(Module* m)
{ {
Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnRehash }; Implementation eventlist[] = { I_OnSyncChannel, I_OnRehash };
ServerInstance->Modules->Attach(eventlist, m, 3); ServerInstance->Modules->Attach(eventlist, m, 2);
} }
/** Handle the list mode. /** Handle the list mode.