From: Attila Molnar <attilamolnar@hush.com>
Date: Fri, 30 Dec 2016 17:51:56 +0000 (+0100)
Subject: Make all User::IsModeSet() methods const, accept const ModeHandler
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=8db52f66a2ff587457c34889b31e7ef70876c7fa;hp=0c3b041d1b36d1515913da5230399b379a802b81;p=user%2Fhenk%2Fcode%2Finspircd.git

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

diff --git a/include/users.h b/include/users.h
index 8cf78a585..29c573daa 100644
--- 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 06a1c1149..90978a496 100644
--- 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()]);