Fixes from vtable cross-check

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11977 e03df62e-2008-0410-955e-edbf42e46eb7

11 files changed, 25 insertions, 25 deletions

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index faf2a4200..c9a0e497a 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -52,8 +52,8 @@ class ModuleCensor : public Module
 		OnRehash(NULL);
 		if (!ServerInstance->Modes->AddMode(&cu) || !ServerInstance->Modes->AddMode(&cc))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRunTestSuite };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
 
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 5249a088c..a466978e3 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -18,7 +18,6 @@
 #include "u_listmode.h"
 
 /* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
-/* $ModDep: ../../include/u_listmode.h */
 
 /** Handles channel mode +g
  */
@@ -69,8 +68,8 @@ class ModuleChanFilter : public Module
 			throw ModuleException("Could not add new modes!");
 
 		cf.DoImplements(this);
-		Implementation eventlist[] = { I_OnChannelDelete, I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
+		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
+		ServerInstance->Modules->Attach(eventlist, this, 4);
 
 		OnRehash(NULL);
 		ServerInstance->Modules->PublishInterface("ChannelBanList", this);
diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 22a4ee0aa..1ae36ade1 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -19,12 +19,14 @@ class ModuleModesOnConnect : public Module
 {
  public:
 	ModuleModesOnConnect() 	{
-		Implementation eventlist[] = { I_OnUserConnect, I_OnRehash };
-		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);
+		ServerInstance->Modules->Attach(I_OnUserConnect, this);
 	}
 
+	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()
 	{
diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 54207db55..80fee268f 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -55,11 +55,10 @@ class ModuleHideOper : public Module
 	ModuleHideOper()
 		: hm(this)
 	{
-
 		if (!ServerInstance->Modes->AddMode(&hm))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhoisLine };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 77d02a288..c89b4f511 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -192,8 +192,8 @@ class ModuleJoinFlood : public Module
 		if (!ServerInstance->Modes->AddMode(&jf))
 			throw ModuleException("Could not add new modes!");
 		ServerInstance->Extensions.Register(&jf.ext);
-		Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index e7903acc4..48eafff7a 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -53,7 +53,7 @@ class ModuleNoNickChange : public Module
 		OnRehash(NULL);
 		ServerInstance->Modes->AddMode(&nn);
 		Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
 	virtual ~ModuleNoNickChange()
diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 775dea204..122e1fa30 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -226,8 +226,8 @@ class ModuleOjoin : public Module
 
 		ServerInstance->AddCommand(&mycommand);
 
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick, I_OnUserPart, I_OnUserPreKick, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
+		Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserPreKick, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
 	ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 53004ff79..a9c4c8a72 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -179,8 +179,8 @@ public:
 	{
 		if (!ServerInstance->Modes->AddMode(&p))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 4);
 
 		OnRehash(NULL);
 	}
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 677e930f2..add530ff1 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -226,8 +226,8 @@ class ModuleSASL : public Module
 	ModuleSASL()
 		: authExt("sasl_auth", this), cap(this, "sasl"), auth(this, authExt, cap), sasl(this, authExt)
 	{
-		Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnPostConnect, I_OnUserDisconnect };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		Implementation eventlist[] = { I_OnEvent, I_OnUserRegister };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 
 		ServerInstance->AddCommand(&auth);
 		ServerInstance->AddCommand(&sasl);
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 568fcafb6..77a7377c6 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -117,9 +117,9 @@ class ModuleServicesAccount : public Module
 
 		ServerInstance->Extensions.Register(&accountname);
 		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)
diff --git a/src/modules/u_listmode.h b/src/modules/u_listmode.h
index 0ca44547f..44c220dfb 100644
--- a/src/modules/u_listmode.h
+++ b/src/modules/u_listmode.h
@@ -209,8 +209,8 @@ class ListModeBase : public ModeHandler
 	 */
 	virtual void DoImplements(Module* m)
 	{
-		Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, m, 3);
+		Implementation eventlist[] = { I_OnSyncChannel, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, m, 2);
 	}
 
 	/** Handle the list mode.