Get rid of ModePair

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

7 files changed, 0 insertions, 40 deletions

diff --git a/include/mode.h b/include/mode.h
index 2fca1204d..091d11c3d 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -80,13 +80,6 @@ enum ParamSpec
 	PARAM_ALWAYS
 };
 
-/**
- * Used by ModeHandler::ModeSet() to return the state of a mode upon a channel or user.
- * The pair contains an activity flag, true if the mode is set with the given parameter,
- * and the parameter of the mode (or the parameter provided) in the std::string.
- */
-typedef std::pair<bool,std::string> ModePair;
-
 /** Each mode is implemented by ONE ModeHandler class.
  * You must derive ModeHandler and add the child class to
  * the list of modes handled by the ircd, using
@@ -286,21 +279,6 @@ class CoreExport ModeHandler : public classbase
 	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
-	 * in the mode string to determine if the mode is set or not.
-	 * @param source of the mode change, this will be NULL for a server mode
-	 * @param dest Target user of the mode change, if this is a user mode
-	 * @param channel Target channel of the mode change, if this is a channel mode
-	 * @param parameter The parameter given for the mode change, or an empty string
-	 * @returns The first value of the pair should be true if the mode is set with the given parameter.
-	 * In the case of permissions modes such as channelmode +o, this should return true if the user given
-	 * as the parameter has the given privilage on the given channel. The string value of the pair will hold
-	 * the current setting for this mode set locally, when the bool is true, or, the parameter given.
-	 * This allows the local server to enforce our locally set parameters back to a remote server.
-	 */
-	virtual ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
-
-	/**
 	 * When a MODETYPE_USER mode handler is being removed, the server will call this method for every user on the server.
 	 * Your mode handler should remove its user mode from the user by sending the appropriate server modes using
 	 * InspIRCd::SendMode(). The default implementation of this method can remove simple modes which have no parameters,
@@ -578,18 +556,6 @@ class CoreExport ModeParser
 	/** This returns the PREFIX=(ohv)@%+ section of the 005 numeric.
 	 */
 	std::string BuildPrefixes();
-
-	/** This returns the privilages of a user upon a channel, in the format of a mode change.
-	 * For example, if a user has privilages +avh, this will return the string "avh nick nick nick".
-	 * This is used by the core when cycling a user to refresh their hostname. You may use it for
-	 * similar purposes.
-	 * @param user The username to look up
-	 * @param channel The channel name to look up the privilages of the user for
-	 * @param nick_suffix true (the default) if you want nicknames in the mode string, for easy
-	 * use with the mode stacker, false if you just want the "avh" part of "avh nick nick nick".
-	 * @return The mode string.
-	 */
-	std::string ModeString(User* user, Channel* channel, bool nick_suffix = true);
 };
 
 #endif
diff --git a/include/modes/cmode_b.h b/include/modes/cmode_b.h
index 0fdbaee3b..7e6139417 100644
--- a/include/modes/cmode_b.h
+++ b/include/modes/cmode_b.h
@@ -29,7 +29,6 @@ class ModeChannelBan : public ModeHandler
 	std::string& DelBan(User *user,std::string& dest,Channel *chan,int status);
 	void DisplayList(User* user, Channel* channel);
 	void DisplayEmptyList(User* user, Channel* channel);
-	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
 	void RemoveMode(User* user, irc::modestacker* stack = NULL);
 	void RemoveMode(Channel* channel, irc::modestacker* stack = NULL);
 };
diff --git a/include/modes/cmode_h.h b/include/modes/cmode_h.h
index aea56ba32..a93e8bf6a 100644
--- a/include/modes/cmode_h.h
+++ b/include/modes/cmode_h.h
@@ -24,7 +24,6 @@ class ModeChannelHalfOp : public ModeHandler
  public:
 	ModeChannelHalfOp();
 	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);
 	unsigned int GetPrefixRank();
 	void RemoveMode(Channel* channel, irc::modestacker* stack = NULL);
 	void RemoveMode(User* user, irc::modestacker* stack = NULL);
diff --git a/include/modes/cmode_k.h b/include/modes/cmode_k.h
index bb3597923..e26d7e5a6 100644
--- a/include/modes/cmode_k.h
+++ b/include/modes/cmode_k.h
@@ -22,7 +22,6 @@ class ModeChannelKey : public ModeHandler
  public:
 	ModeChannelKey();
 	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);
 	void RemoveMode(Channel* channel, irc::modestacker* stack = NULL);
 	void RemoveMode(User* user, irc::modestacker* stack = NULL);
 };
diff --git a/include/modes/cmode_l.h b/include/modes/cmode_l.h
index d83c4f1cf..dc93396d7 100644
--- a/include/modes/cmode_l.h
+++ b/include/modes/cmode_l.h
@@ -22,6 +22,5 @@ class ModeChannelLimit : public ModeHandler
  public:
 	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 ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel* channel);
 };
diff --git a/include/modes/cmode_o.h b/include/modes/cmode_o.h
index 524d254ee..06c7862c4 100644
--- a/include/modes/cmode_o.h
+++ b/include/modes/cmode_o.h
@@ -24,7 +24,6 @@ class ModeChannelOp : public ModeHandler
  public:
 	ModeChannelOp();
 	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);
 	unsigned int GetPrefixRank();
 	void RemoveMode(Channel* channel, irc::modestacker* stack = NULL);
 	void RemoveMode(User* user, irc::modestacker* stack = NULL);
diff --git a/include/modes/cmode_v.h b/include/modes/cmode_v.h
index 77e8562f2..30a1650ad 100644
--- a/include/modes/cmode_v.h
+++ b/include/modes/cmode_v.h
@@ -24,7 +24,6 @@ class ModeChannelVoice : public ModeHandler
  public:
 	ModeChannelVoice();
 	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);
 	unsigned int GetPrefixRank();
 	void RemoveMode(User* user, irc::modestacker* stack = NULL);
 	void RemoveMode(Channel* channel, irc::modestacker* stack = NULL);