Move GetPrefixChar() from Channel to Membership

2 files changed, 9 insertions, 13 deletions

diff --git a/include/channels.h b/include/channels.h
index 5109c0463..daf8be9e2 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -304,19 +304,6 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 	 */
 	void UserList(User *user);
 
-	/** Get a users prefix on this channel in a string.
-	 * @param user The user to look up
-	 * @return A character array containing the prefix string.
-	 * Unlike GetStatus and GetStatusFlags which will only return the
-	 * core specified modes @, % and + (op, halfop and voice), GetPrefixChar
-	 * will also return module-defined prefixes. If the user has to prefix,
-	 * an empty but non-null string is returned. If the user has multiple
-	 * prefixes, the highest is returned. If you do not recognise the prefix
-	 * character you can get, you can deal with it in a 'proprtional' manner
-	 * compared to known prefixes, using GetPrefixValue().
-	 */
-	const char* GetPrefixChar(User *user);
-
 	/** Return all of a users mode prefixes into a char* string.
 	 * @param user The user to look up
 	 * @return A list of all prefix characters. The prefixes will always
diff --git a/include/membership.h b/include/membership.h
index d98b54731..c6b0bf14a 100644
--- a/include/membership.h
+++ b/include/membership.h
@@ -43,6 +43,15 @@ class CoreExport Membership : public Extensible, public intrusive_list_node<Memb
 	 * @return True if a change was made
 	 */
 	bool SetPrefix(PrefixMode* mh, bool adding);
+
+	/** Get the highest prefix this user has on the channel
+	 * @return A character containing the highest prefix.
+	 * If the user has no prefix, 0 is returned. If the user has multiple prefixes,
+	 * the highest is returned. If you do not recognise the prefix character you
+	 * can get, you can deal with it in a 'proportional' manner compared to known
+	 * prefixes, using GetPrefixValue().
+	 */
+	char GetPrefixChar() const;
 };
 
 template <typename T>