X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=a7acb24d08b3ca90c3ae8aab3ffd73633daf1cd0;hb=c0ae500d03a30f71c654d5bdf1a835ba6e020d12;hp=1c33785b019b809c07f1a4cc8b2103409999e789;hpb=0204f2254dd44db8b68fd0e658fda130e84aa9cf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 1c33785b0..a7acb24d0 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -83,7 +83,6 @@ void		Module::OnMode(User*, User*, Channel*, const Modes::ChangeList&, ModeParse
 void		Module::OnOper(User*, const std::string&) { DetachEvent(I_OnOper); }
 void		Module::OnPostOper(User*, const std::string&, const std::string &) { DetachEvent(I_OnPostOper); }
 void		Module::OnInfo(User*) { DetachEvent(I_OnInfo); }
-void		Module::OnWhois(User*, User*) { DetachEvent(I_OnWhois); }
 ModResult	Module::OnUserPreInvite(User*, User*, Channel*, time_t) { DetachEvent(I_OnUserPreInvite); return MOD_RES_PASSTHRU; }
 ModResult	Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList&, MessageType) { DetachEvent(I_OnUserPreMessage); return MOD_RES_PASSTHRU; }
 ModResult	Module::OnUserPreNick(LocalUser*, const std::string&) { DetachEvent(I_OnUserPreNick); return MOD_RES_PASSTHRU; }
@@ -131,7 +130,6 @@ void 		Module::OnCleanup(int, void*) { }
 ModResult	Module::OnChannelPreDelete(Channel*) { DetachEvent(I_OnChannelPreDelete); return MOD_RES_PASSTHRU; }
 void		Module::OnChannelDelete(Channel*) { DetachEvent(I_OnChannelDelete); }
 ModResult	Module::OnSetAway(User*, const std::string &) { DetachEvent(I_OnSetAway); return MOD_RES_PASSTHRU; }
-ModResult	Module::OnWhoisLine(User*, User*, int&, std::string&) { DetachEvent(I_OnWhoisLine); return MOD_RES_PASSTHRU; }
 void		Module::OnBuildNeighborList(User*, IncludeChanList&, std::map<User*,bool>&) { DetachEvent(I_OnBuildNeighborList); }
 void		Module::OnGarbageCollect() { DetachEvent(I_OnGarbageCollect); }
 ModResult	Module::OnSetConnectClass(LocalUser* user, ConnectClass* myclass) { DetachEvent(I_OnSetConnectClass); return MOD_RES_PASSTHRU; }
@@ -189,22 +187,20 @@ void ModuleManager::Attach(Implementation* i, Module* mod, size_t sz)
 
 void ModuleManager::AttachAll(Module* mod)
 {
-	for (size_t i = I_BEGIN + 1; i != I_END; ++i)
+	for (size_t i = 0; i != I_END; ++i)
 		Attach((Implementation)i, mod);
 }
 
 void ModuleManager::DetachAll(Module* mod)
 {
-	for (size_t n = I_BEGIN + 1; n != I_END; ++n)
+	for (size_t n = 0; n != I_END; ++n)
 		Detach((Implementation)n, mod);
 }
 
-bool ModuleManager::SetPriority(Module* mod, Priority s)
+void ModuleManager::SetPriority(Module* mod, Priority s)
 {
-	for (size_t n = I_BEGIN + 1; n != I_END; ++n)
+	for (size_t n = 0; n != I_END; ++n)
 		SetPriority(mod, (Implementation)n, s);
-
-	return true;
 }
 
 bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Module* which)