From: Attila Molnar <attilamolnar@hush.com>
Date: Sun, 15 Feb 2015 16:56:01 +0000 (+0100)
Subject: Convert mods calling the old compat wrapper of ModuleManager::SetPriority() to use... 
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=bfc1abbcad598fcbc6921fa72b950144b13e059f;hp=-c;p=user%2Fhenk%2Fcode%2Finspircd.git

Convert mods calling the old compat wrapper of ModuleManager::SetPriority() to use the current method, remove wrapper
---

bfc1abbcad598fcbc6921fa72b950144b13e059f
diff --git a/include/modules.h b/include/modules.h
index 9b45eb3c8..62078bbfa 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1116,12 +1116,6 @@ class CoreExport ModuleManager : public fakederef<ModuleManager>
 	 */
 	bool SetPriority(Module* mod, Implementation i, Priority s, Module* which = NULL);
 
-	/** Backwards compat interface */
-	inline bool SetPriority(Module* mod, Implementation i, Priority s, Module** dptr)
-	{
-		return SetPriority(mod, i, s, *dptr);
-	}
-
 	/** Change the priority of all events in a module.
 	 * @param mod The module to set the priority of
 	 * @param s The priority of all events in the module.
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 5b3979179..6bd59a780 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -351,7 +351,7 @@ class ModuleAlias : public Module
 	{
 		// Prioritise after spanningtree so that channel aliases show the alias before the effects.
 		Module* linkmod = ServerInstance->Modules->Find("m_spanningtree.so");
-		ServerInstance->Modules->SetPriority(this, I_OnUserMessage, PRIORITY_AFTER, &linkmod);
+		ServerInstance->Modules->SetPriority(this, I_OnUserMessage, PRIORITY_AFTER, linkmod);
 	}
 };
 
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 8ac2e8b47..a99628bf1 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -168,7 +168,7 @@ class ModuleNickLock : public Module
 	void Prioritize()
 	{
 		Module *nflood = ServerInstance->Modules->Find("m_nickflood.so");
-		ServerInstance->Modules->SetPriority(this, I_OnUserPreNick, PRIORITY_BEFORE, &nflood);
+		ServerInstance->Modules->SetPriority(this, I_OnUserPreNick, PRIORITY_BEFORE, nflood);
 	}
 };
 
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index b56f7ae95..689189229 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -99,7 +99,7 @@ class ModuleSaMode : public Module
 	void Prioritize()
 	{
 		Module *override = ServerInstance->Modules->Find("m_override.so");
-		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, &override);
+		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override);
 	}
 };
 
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 7ea16b5b0..a3a2909a0 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -191,7 +191,7 @@ class ModuleShun : public Module
 	void Prioritize()
 	{
 		Module* alias = ServerInstance->Modules->Find("m_alias.so");
-		ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, &alias);
+		ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, alias);
 	}
 
 	ModResult OnStats(char symbol, User* user, string_list& out) CXX11_OVERRIDE