Merge branch 'insp20' into insp3.

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

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index d66f994501389ccad8e29ab6a3440d55f0047223..dbc0a3b5aa1b6d9481cb9dcda87398f01f30ea21 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -32,9 +32,8 @@ class OperPrefixMode : public PrefixMode
                OperPrefixMode(Module* Creator)
                        : PrefixMode(Creator, "operprefix", 'y', OPERPREFIX_VALUE)
                {
-                       std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!");
-                       prefix = pfx.empty() ? '!' : pfx[0];
-                       levelrequired = INT_MAX;
+                       prefix = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!", 1, 1)[0];
+                       ranktoset = ranktounset = UINT_MAX;
                }
 };
 
@@ -45,7 +44,7 @@ class HideOperWatcher : public ModeWatcher
 
  public:
        HideOperWatcher(ModuleOperPrefixMode* parent);
-       void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding);
+       void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding) CXX11_OVERRIDE;
 };
 
 class ModuleOperPrefixMode : public Module
@@ -72,7 +71,7 @@ class ModuleOperPrefixMode : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnPostJoin(Membership* memb)
+       void OnPostJoin(Membership* memb) CXX11_OVERRIDE
        {
                if ((!IS_LOCAL(memb->user)) || (!memb->user->IsOper()) || (memb->user->IsModeSet(hideopermode)))
                        return;
@@ -102,10 +101,10 @@ class ModuleOperPrefixMode : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
+               return Version("Gives opers channel mode +y which provides a staff prefix", VF_VENDOR);
        }
 
-       void Prioritize()
+       void Prioritize() CXX11_OVERRIDE
        {
                // m_opermodes may set +H on the oper to hide him, we don't want to set the oper prefix in that case
                Module* opermodes = ServerInstance->Modules->Find("m_opermodes.so");