From 6cd88494662c5c4af2da891926dcc82367596cb9 Mon Sep 17 00:00:00 2001
From: Adam <Adam@drink-coca-cola.info>
Date: Sun, 30 May 2010 17:21:44 -0400
Subject: Moved the *Serv help functions to Command, will come in use later
 with subcommands

---
 include/commands.h |  5 +++++
 include/modules.h  | 42 ++++++------------------------------------
 2 files changed, 11 insertions(+), 36 deletions(-)

(limited to 'include')

diff --git a/include/commands.h b/include/commands.h
index 5d381084e..9e597204e 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -78,6 +78,11 @@ class CoreExport Command : public Flags<CommandFlag>
 	 */
 	virtual CommandReturn Execute(User *u, const std::vector<ci::string> &);
 
+	/** Called when HELP is requsted for the client this command is on.
+	 * @param u The user requesting help
+	 */
+	virtual void OnServHelp(User *u);
+
 	/** Requested when the user is requesting help on this command. Help on this command should be sent to the user.
 	 * @param u The user requesting help
 	 * @param subcommand The subcommand the user is requesting help on, or an empty string. (e.g. /ns help set foo bar lol gives a subcommand of 
diff --git a/include/modules.h b/include/modules.h
index 0acd041f9..8e6711b3b 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -334,36 +334,6 @@ class CoreExport Module
 	 */
 	int DelCommand(BotInfo *bi, Command *c);
 
-	/** Called on NickServ HELP
-	 * @param u The user requesting help
-	 */
-	virtual void OnNickServHelp(User *u) { }
-
-	/** Called on ChanServ HELP
-	 * @param u The user requesting help
-	 */
-	virtual void OnChanServHelp(User *u) { }
-
-	/** Called on Botserv HELP
-	 * @param u The user requesting help
-	 */
-	virtual void OnBotServHelp(User *u) { }
-
-	/** Called on HostServ HELP
-	 * @param u The user requesting help
-	 */
-	virtual void OnHostServHelp(User *u) { }
-
-	/** Called on OperServ HELP
-	 * @param u The user requesting help
-	 */
-	virtual void OnOperServHelp(User *u) { }
-
-	/** Called on MemoServ HELP
-	 * @param u The user requesting help
-	 */
-	virtual void OnMemoServHelp(User *u) { }
-
 	/** Called when the ircd notifies that a user has been kicked from a channel.
 	 * @param c The channel the user has been kicked from.
 	 * @param target The user that has been kicked.
@@ -1091,34 +1061,34 @@ enum Implementation
 {
 	I_BEGIN,
 		/* NickServ */
-		I_OnNickServHelp, I_OnPreNickExpire, I_OnNickExpire, I_OnNickForbidden, I_OnNickGroup, I_OnNickLogout, I_OnNickIdentify, I_OnNickDrop,
+		I_OnPreNickExpire, I_OnNickExpire, I_OnNickForbidden, I_OnNickGroup, I_OnNickLogout, I_OnNickIdentify, I_OnNickDrop,
 		I_OnNickRegister, I_OnNickSuspended, I_OnNickUnsuspended,
 		I_OnDelNick, I_OnDelCore, I_OnChangeCoreDisplay,
 		I_OnDelNickRequest, I_OnMakeNickRequest, I_OnNickClearAccess, I_OnNickAddAccess, I_OnNickEraseAccess,
 		I_OnNickInfo,
 
 		/* ChanServ */
-		I_OnChanServHelp, I_OnChanForbidden, I_OnChanSuspend, I_OnChanDrop, I_OnPreChanExpire, I_OnChanExpire, I_OnAccessAdd, I_OnAccessChange,
+		I_OnChanForbidden, I_OnChanSuspend, I_OnChanDrop, I_OnPreChanExpire, I_OnChanExpire, I_OnAccessAdd, I_OnAccessChange,
 		I_OnAccessDel, I_OnAccessClear, I_OnLevelChange, I_OnChanRegistered, I_OnChanUnsuspend, I_OnDelChan, I_OnChannelCreate,
 		I_OnChannelDelete, I_OnAkickAdd, I_OnAkickDel,
 		I_OnChanInfo,
 
 		/* BotServ */
-		I_OnBotServHelp, I_OnBotJoin, I_OnBotKick, I_OnBotCreate, I_OnBotChange, I_OnBotDelete, I_OnBotAssign, I_OnBotUnAssign,
+		I_OnBotJoin, I_OnBotKick, I_OnBotCreate, I_OnBotChange, I_OnBotDelete, I_OnBotAssign, I_OnBotUnAssign,
 		I_OnUserKicked, I_OnBotFantasy, I_OnBotNoFantasyAccess, I_OnBotBan, I_OnBadWordAdd, I_OnBadWordDel,
 
 		/* HostServ */
-		I_OnHostServHelp, I_OnSetVhost, I_OnDeleteVhost,
+		I_OnSetVhost, I_OnDeleteVhost,
 
 		/* MemoServ */
-		I_OnMemoServHelp, I_OnMemoSend, I_OnMemoDel,
+		I_OnMemoSend, I_OnMemoDel,
 
 		/* Users */
 		I_OnPreUserConnect, I_OnUserConnect, I_OnUserNickChange, I_OnUserQuit, I_OnUserLogoff, I_OnPreJoinChannel,
 		I_OnJoinChannel, I_OnPrePartChannel, I_OnPartChannel,
 
 		/* OperServ */
-		I_OnOperServHelp, I_OnDefconLevel, I_OnAddAkill, I_OnDelAkill, I_OnExceptionAdd, I_OnExceptionDel,
+		I_OnDefconLevel, I_OnAddAkill, I_OnDelAkill, I_OnExceptionAdd, I_OnExceptionDel,
 		I_OnAddXLine, I_OnDelXLine,
 
 		/* Database */
-- 
cgit