Change IS_FAKE and CheckTimeStamp to IS_SERVER and ResolveModeConflict to clarify their use

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11765 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 3 insertions, 3 deletions

diff --git a/include/mode.h b/include/mode.h
index e118a161b..2c0e30be4 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -286,7 +286,7 @@ class CoreExport ModeHandler : public classbase
 	 * @param channel The channel we are checking against
 	 * @return True if the other side wins the merge, false if we win the merge for this mode.
 	 */
-	virtual bool CheckTimeStamp(std::string &their_param, const std::string &our_param, Channel* channel);
+	virtual bool ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel* channel);
 
 	/**
 	 * When a remote server needs to bounce a set of modes, it will call this method for every mode
diff --git a/include/modes/cmode_l.h b/include/modes/cmode_l.h
index 94313ec52..d83c4f1cf 100644
--- a/include/modes/cmode_l.h
+++ b/include/modes/cmode_l.h
@@ -23,5 +23,5 @@ class ModeChannelLimit : public ModeHandler
 	ModeChannelLimit();
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
-	bool CheckTimeStamp(std::string &their_param, const std::string &our_param, Channel* channel);
+	bool ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel* channel);
 };
diff --git a/include/modules.h b/include/modules.h
index d4c549730..63492b885 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -216,7 +216,7 @@ do { \
 /** Is a remote user */
 #define IS_REMOTE(x) (x->GetFd() < 0)
 /** Is a fake user */
-#define IS_FAKE(x) (x->GetFd() == FD_FAKEUSER_NUMBER)
+#define IS_SERVER(x) (x->GetFd() == FD_FAKEUSER_NUMBER)
 /** Is a module created user */
 #define IS_MODULE_CREATED(x) (x->GetFd() == FD_MAGIC_NUMBER)
 /** Is an oper */