Convert mods calling the old compat wrapper of ModuleManager::SetPriority() to use...

diff --git a/include/modules.h b/include/modules.h
index 9b45eb3c8a865b135d79d27624d7dacedd080b45..62078bbfa893bb3179f12274d2871c99b18043ab 100644 (file)
--- 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 5b3979179bc0d39e665ea710693cbea277bc1a60..6bd59a78070a788eaf66b951fd84ea12dad841df 100644 (file)
--- 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 8ac2e8b4703baf39dd5300a21fb5c13d94c5d9ac..a99628bf1258396e1bb5d82f21935f4755a9a155 100644 (file)
--- 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 b56f7ae95f76dcb4dfd7c1c50175ccbc0931c53b..689189229c8ed80b7d542199607aa9ede2037cd5 100644 (file)
--- 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 7ea16b5b038e8c8fbabe6eb349ed49cba37f84c7..a3a2909a08bb9427704d3b2eb3498da6070eb943 100644 (file)
--- 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