Include explicit parameter list in ProtocolInterface::SendMode

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index b9f5de63cd33a5a16eb056f06022f42e2e6161cf..7bce6161b81e3a20da0dff8b35f04818cb0feb07 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -25,6 +25,7 @@
        #include <dirent.h>
 #endif
 
+
 // version is a simple class for holding a modules version number
 Version::Version(const std::string &sversion, int flags, int api_ver)
 : version(sversion), Flags(flags), API(api_ver)
@@ -115,7 +116,7 @@ void                Module::OnPostJoin(User*, Channel*) { }
 void           Module::OnUserPart(User*, Channel*, std::string&, bool&) { }
 void           Module::OnRehash(User*, const std::string&) { }
 int            Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; }
-void           Module::OnMode(User*, void*, int, const std::string&) { }
+void           Module::OnMode(User*, void*, int, const std::deque<std::string>&, const std::deque<TranslateType>&) { }
 Version                Module::GetVersion() { return Version("Misconfigured", VF_VENDOR, -1); }
 void           Module::OnOper(User*, const std::string&) { }
 void           Module::OnPostOper(User*, const std::string&, const std::string &) { }
@@ -169,7 +170,7 @@ void                Module::OnPostLocalTopicChange(User*, Channel*, const std::string&) { }
 void           Module::OnGetServerDescription(const std::string&, std::string&) { }
 void           Module::OnSyncUser(User*, Module*, void*) { }
 void           Module::OnSyncChannel(Channel*, Module*, void*) { }
-void           Module::ProtoSendMode(void*, TargetTypeFlags, void*, const std::string&) { }
+void           Module::ProtoSendMode(void*, TargetTypeFlags, void*, const std::deque<std::string>&, const std::deque<TranslateType>&) { }
 void           Module::OnSyncChannelMetaData(Channel*, Module*, void*, const std::string&, bool) { }
 void           Module::OnSyncUserMetaData(User*, Module*, void*, const std::string&, bool) { }
 void           Module::OnSyncOtherMetaData(Module*, void*, bool) { }
@@ -237,7 +238,7 @@ void ModuleManager::DetachAll(Module* mod)
                Detach((Implementation)n, mod);
 }
 
-bool ModuleManager::SetPriority(Module* mod, PriorityState s)
+bool ModuleManager::SetPriority(Module* mod, Priority s)
 {
        for (size_t n = I_BEGIN + 1; n != I_END; ++n)
                SetPriority(mod, (Implementation)n, s);
@@ -245,7 +246,7 @@ bool ModuleManager::SetPriority(Module* mod, PriorityState s)
        return true;
 }
 
-bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, Module** modules, size_t sz)
+bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Module** modules, size_t sz)
 {
        /** To change the priority of a module, we first find its position in the vector,
         * then we find the position of the other modules in the vector that this module
@@ -280,22 +281,22 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
        switch (s)
        {
                /* Dummy value */
-               case PRIO_DONTCARE:
+               case PRIORITY_DONTCARE:
                        swap = false;
                break;
                /* Module wants to be first, sod everything else */
-               case PRIO_FIRST:
+               case PRIORITY_FIRST:
                        swap_pos = 0;
                break;
                /* Module is submissive and wants to be last... awww. */
-               case PRIO_LAST:
+               case PRIORITY_LAST:
                        if (EventHandlers[i].empty())
                                swap_pos = 0;
                        else
                                swap_pos = EventHandlers[i].size() - 1;
                break;
                /* Place this module after a set of other modules */
-               case PRIO_AFTER:
+               case PRIORITY_AFTER:
                {
                        /* Find the latest possible position */
                        swap_pos = 0;
@@ -314,7 +315,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
                }
                break;
                /* Place this module before a set of other modules */
-               case PRIO_BEFORE:
+               case PRIORITY_BEFORE:
                {
                        swap_pos = EventHandlers[i].size() - 1;
                        swap = false;
@@ -387,7 +388,7 @@ bool ModuleManager::Load(const char* filename)
                 * to load (but wont abort when it encounters a bad one) and when 1 or
                 * more modules were actually loaded.
                 */
-               return (n_match > 0);
+               return (n_match > 0 ? false : true);
        }
 
        char modfile[MAXBUF];
@@ -400,21 +401,21 @@ bool ModuleManager::Load(const char* filename)
                Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                return false;
        }
-       
+
        if (!ServerConfig::FileExists(modfile))
        {
                LastModuleError = "Module file could not be found: " + filename_str;
                Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                return false;
        }
-       
+
        if (Modules.find(filename_str) != Modules.end())
-       {       
+       {
                LastModuleError = "Module " + filename_str + " is already loaded, cannot load a module twice!";
                Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                return false;
        }
-               
+
        Module* newmod = NULL;
        ircd_module* newhandle = NULL;
 
@@ -569,8 +570,8 @@ void ModuleManager::LoadAll()
        {
                Instance->Config->ConfValue(Instance->Config->config_data, "module", "name", count, configToken, MAXBUF);
                printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
-               
-               if (!this->Load(configToken))           
+
+               if (!this->Load(configToken))
                {
                        Instance->Logs->Log("MODULE", DEFAULT, this->LastError());
                        printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str());
@@ -592,7 +593,7 @@ bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod)
 bool ModuleManager::UnpublishFeature(const std::string &FeatureName)
 {
        featurelist::iterator iter = Features.find(FeatureName);
-       
+
        if (iter == Features.end())
                return false;
 
@@ -843,9 +844,9 @@ ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : Se
 
 std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds)
 {
-       /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */ 
+       /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
        std::string result;
-       
+
        if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds))
        {
                this->error = CONF_VALUE_NOT_FOUND;
@@ -872,19 +873,19 @@ bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int
 int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool need_positive)
 {
        int result;
-       
+
        if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, default_value, index, result))
        {
                this->error = CONF_VALUE_NOT_FOUND;
                return 0;
        }
-       
+
        if ((need_positive) && (result < 0))
        {
                this->error = CONF_INT_NEGATIVE;
                return 0;
        }
-       
+
        return result;
 }