Remove now needless User::ForceNickChange()

Change call sites to call ChangeNick()

1 files changed, 1 insertions, 11 deletions

diff --git a/include/users.h b/include/users.h
index 0f8154bef..4029daa53 100644
--- a/include/users.h
+++ b/include/users.h
@@ -462,15 +462,6 @@ class CoreExport User : public Extensible
 	 */
 	void Oper(OperInfo* info);
 
-	/** Force a nickname change.
-	 * If the nickname change fails (for example, because the nick in question
-	 * already exists) this function will return false, and you must then either
-	 * output an error message, or quit the user for nickname collision.
-	 * @param newnick The nickname to change to
-	 * @return True if the nickchange was successful.
-	 */
-	bool ForceNickChange(const std::string& newnick, time_t newts = 0) { return ChangeNick(newnick, true, newts); }
-
 	/** Oper down.
 	 * This will clear the +o usermode and unset the user's oper type
 	 */
@@ -598,10 +589,9 @@ class CoreExport User : public Extensible
 
 	/** Change a user's nick
 	 * @param newnick The new nick
-	 * @param force True if the change is being forced (should not be blocked by modes like +N)
 	 * @return True if the change succeeded
 	 */
-	bool ChangeNick(const std::string& newnick, bool force = false, time_t newts = 0);
+	bool ChangeNick(const std::string& newnick, time_t newts = 0);
 
 	/** Remove this user from all channels they are on, and delete any that are now empty.
 	 * This is used by QUIT, and will not send part messages!