Move host cycle logic into m_hostcycle

2 files changed, 4 insertions, 17 deletions

diff --git a/include/configreader.h b/include/configreader.h
index 51ced2ec7..33456d84b 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -450,11 +450,6 @@ class CoreExport ServerConfig
 	 */
 	bool SyntaxHints;
 
-	/** If set to true, users appear to quit then rejoin when their hosts change.
-	 * This keeps clients synchronized properly.
-	 */
-	bool CycleHosts;
-
 	/** If set to true, the CycleHosts mode change will be sourced from the user,
 	 * rather than the server
 	 */
diff --git a/include/users.h b/include/users.h
index 503357348..478476cdd 100644
--- a/include/users.h
+++ b/include/users.h
@@ -585,28 +585,20 @@ class CoreExport User : public Extensible
 	 */
 	bool SharesChannelWith(User *other);
 
-	/** Send fake quit/join messages for host or ident cycle.
-	 * Run this after the item in question has changed.
-	 * You should not need to use this function, call ChangeDisplayedHost instead
-	 *
-	 * @param quitline The entire QUIT line, including the source using the old value
-	 */
-	void DoHostCycle(const std::string &quitline);
-
 	/** Change the displayed host of a user.
 	 * ALWAYS use this function, rather than writing User::dhost directly,
 	 * as this triggers module events allowing the change to be syncronized to
-	 * remote servers. This will also emulate a QUIT and rejoin (where configured)
-	 * before setting their host field.
+	 * remote servers.
 	 * @param host The new hostname to set
 	 * @return True if the change succeeded, false if it didn't
+	 * (a module vetoed the change).
 	 */
 	bool ChangeDisplayedHost(const char* host);
 
 	/** Change the ident (username) of a user.
 	 * ALWAYS use this function, rather than writing User::ident directly,
-	 * as this correctly causes the user to seem to quit (where configured)
-	 * before setting their ident field.
+	 * as this triggers module events allowing the change to be syncronized to
+	 * remote servers.
 	 * @param newident The new ident to set
 	 * @return True if the change succeeded, false if it didn't
 	 */