Make all User::IsModeSet() methods const, accept const ModeHandler

diff --git a/include/users.h b/include/users.h
index 8cf78a585c890807a12318c0924434932d88a8aa..29c573daaf39faeac0ab512ea6ed78fb510694dd 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -427,10 +427,10 @@ class CoreExport User : public Extensible
         * @param m The user mode
         * @return True if the mode is set
         */
-       bool IsModeSet(unsigned char m);
-       bool IsModeSet(ModeHandler* mh);
-       bool IsModeSet(ModeHandler& mh) { return IsModeSet(&mh); }
-       bool IsModeSet(UserModeReference& moderef);
+       bool IsModeSet(unsigned char m) const;
+       bool IsModeSet(const ModeHandler* mh) const;
+       bool IsModeSet(const ModeHandler& mh) const { return IsModeSet(&mh); }
+       bool IsModeSet(UserModeReference& moderef) const;
 
        /** Set a specific usermode to on or off
         * @param m The user mode
@@ -924,12 +924,12 @@ inline FakeUser* IS_SERVER(User* u)
        return u->usertype == USERTYPE_SERVER ? static_cast<FakeUser*>(u) : NULL;
 }
 
-inline bool User::IsModeSet(ModeHandler* mh)
+inline bool User::IsModeSet(const ModeHandler* mh) const
 {
        return (modes[mh->GetId()]);
 }
 
-inline bool User::IsModeSet(UserModeReference& moderef)
+inline bool User::IsModeSet(UserModeReference& moderef) const
 {
        if (!moderef)
                return false;

diff --git a/src/users.cpp b/src/users.cpp
index 06a1c1149d93e67f3a363c300d0eaa8bddd7fa0f..90978a49683e24cae0e112fe041d6acda3184563 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -33,7 +33,7 @@ bool User::IsNoticeMaskSet(unsigned char sm)
        return (snomasks[sm-65]);
 }
 
-bool User::IsModeSet(unsigned char m)
+bool User::IsModeSet(unsigned char m) const
 {
        ModeHandler* mh = ServerInstance->Modes->FindMode(m, MODETYPE_USER);
        return (mh && modes[mh->GetId()]);