Fix modules to use the right type (CommandReturn, not CommandResult)

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1977 5417fbe8-f217-4b02-8779-1006273d7864

src/core/cs_status.c

@@ -24,7 +24,7 @@ class CommandCSStatus : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		ChannelInfo *ci;
 		User *u2;

src/core/cs_suspend.c

@@ -24,7 +24,7 @@ class CommandCSSuspend : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		ChannelInfo *ci;
 		char *chan = params[0].c_str();
@@ -126,7 +126,7 @@ class CommandCSUnSuspend : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		ChannelInfo *ci;
 		const char *chan = params[0].c_str();

src/core/cs_topic.c

@@ -24,7 +24,7 @@ class CommandCSTopic : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		char *chan = params[0].c_str();
 		char *topic = params.size() > 1 ? params[1].c_str() : NULL;

src/core/cs_xop.c

@@ -102,7 +102,7 @@ int xop_msgs[XOP_TYPES][XOP_MESSAGES] = {
 class XOPBase : public Command
 {
  private:
-	CommandResult DoAdd(User *u, std::vector<std::string> &params, ChannelInfo *ci, int level, int *messages)
+	CommandReturn DoAdd(User *u, std::vector<std::string> &params, ChannelInfo *ci, int level, int *messages)
 	{
 		const char *nick = params.size() > 2 ? params[2].c_str() : NULL;
 		ChanAccess *access;
@@ -198,7 +198,7 @@ class XOPBase : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoDel(User *u, std::vector<std::string> &params, ChannelInfo *ci, int level, int *messages)
+	CommandReturn DoDel(User *u, std::vector<std::string> &params, ChannelInfo *ci, int level, int *messages)
 	{
 		const char *nick = params.size() > 2 ? params[2].c_str() : NULL;
 		ChanAccess *access;
@@ -329,7 +329,7 @@ class XOPBase : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoList(User *u, std::vector<std::string> &params, ChannelInfo *ci, int level, int *messages)
+	CommandReturn DoList(User *u, std::vector<std::string> &params, ChannelInfo *ci, int level, int *messages)
 	{
 		int sent_header = 0;
 		const char *nick = params.size() > 2 ? params[2].c_str() : NULL;
@@ -365,7 +365,7 @@ class XOPBase : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoClear(User *u, std::vector<std::string> &params, ChannelInfo *ci, int level, int *messages)
+	CommandReturn DoClear(User *u, std::vector<std::string> &params, ChannelInfo *ci, int level, int *messages)
 	{
 		if (readonly)
 		{
@@ -400,7 +400,7 @@ class XOPBase : public Command
 
 		return MOD_CONT;
 	}
-	CommandResult DoXop(User *u, std::vector<std::string> &params, int level, int *messages)
+	CommandReturn DoXop(User *u, std::vector<std::string> &params, int level, int *messages)
 	{
 		const char *chan = params[0].c_str();
 		const char *cmd = params[1].c_str();
@@ -434,7 +434,7 @@ class XOPBase : public Command
 	{
 	}
 
-	virtual CommandResult Execute(User *u, std::vector<std::string> &params) = 0;
+	virtual CommandReturn Execute(User *u, std::vector<std::string> &params) = 0;
 
 	virtual bool OnHelp(User *u, const std::string &subcommand) = 0;
 
@@ -448,7 +448,7 @@ class CommandCSAOP : public XOPBase
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		return this->DoXop(u, params, ACCESS_AOP, xop_msgs[XOP_AOP]);
 	}
@@ -472,7 +472,7 @@ class CommandCSHOP : public XOPBase
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		return this->DoXop(u, params, ACCESS_HOP, xop_msgs[XOP_HOP]);
 	}
@@ -496,7 +496,7 @@ class CommandCSSOP : public XOPBase
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		return this->DoXop(u, params, ACCESS_SOP, xop_msgs[XOP_SOP]);
 	}
@@ -520,7 +520,7 @@ class CommandCSVOP : public XOPBase
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		return this->DoXop(u, params, ACCESS_VOP, xop_msgs[XOP_VOP]);
 	}

src/core/he_help.c

@@ -22,7 +22,7 @@ class CommandHEHelp : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		mod_help_cmd(s_HelpServ, u, HELPSERV, params[0].c_str());
 		return MOD_CONT;

src/core/hs_del.c

@@ -24,7 +24,7 @@ class CommandHSDel : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		NickAlias *na;
 		const char *nick = params[0].c_str();

src/core/hs_delall.c

@@ -24,7 +24,7 @@ class CommandHSDelAll : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		int i;
 		const char *nick = params[0].c_str();

src/core/hs_group.c

@@ -25,7 +25,7 @@ class CommandHSGroup : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		NickAlias *na;
 		HostCore *tmp;

src/core/hs_help.c

@@ -22,7 +22,7 @@ class CommandHSHelp : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		mod_help_cmd(s_HostServ, u, HOSTSERV, params[0].c_str());
 		return MOD_CONT;

src/core/hs_list.c

@@ -24,7 +24,7 @@ class CommandHSList : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *key = params.size() ? params[0].c_str() : NULL;
 		struct tm *tm;

src/core/hs_off.c

@@ -24,7 +24,7 @@ class CommandHSOff : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		NickAlias *na;
 		char *vhost;

src/core/hs_on.c

@@ -24,7 +24,7 @@ class CommandHSOn : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		NickAlias *na;
 		char *vHost;

src/core/hs_set.c

@@ -24,7 +24,7 @@ class CommandHSSet : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		const char *rawhostmask = params[1].c_str();

src/core/hs_setall.c

@@ -25,7 +25,7 @@ class CommandHSSetAll : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		const char *rawhostmask = params[1].c_str();

src/core/ms_cancel.c

@@ -24,7 +24,7 @@ class CommandMSCancel : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		int ischan;
 		int isforbid;

src/core/ms_check.c

@@ -24,7 +24,7 @@ class CommandMSCheck : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		NickAlias *na = NULL;
 		MemoInfo *mi = NULL;

src/core/ms_del.c

@@ -25,7 +25,7 @@ class CommandMSDel : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		MemoInfo *mi;
 		ChannelInfo *ci;

src/core/ms_help.c

@@ -22,7 +22,7 @@ class CommandMSHelp : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		mod_help_cmd(s_MemoServ, u, MEMOSERV, params[0].c_str());
 		return MOD_CONT;

src/core/ms_info.c

@@ -24,7 +24,7 @@ class CommandMSInfo : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		MemoInfo *mi;
 		NickAlias *na = NULL;

src/core/ms_list.c

@@ -26,7 +26,7 @@ class CommandMSList : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *param = params.size() ? params[0].c_str() : NULL, *chan = NULL;
 		ChannelInfo *ci;

src/core/ms_read.c

@@ -27,7 +27,7 @@ class CommandMSRead : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		MemoInfo *mi;
 		ChannelInfo *ci;

src/core/ms_rsend.c

@@ -24,7 +24,7 @@ class CommandMSRSend : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *name = params[0].c_str();
 		const char *text = params[1].c_str();

src/core/ms_send.c

@@ -24,7 +24,7 @@ class CommandMSSend : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *name = params[0].c_str();
 		const char *text = params[1].c_str();

src/core/ms_sendall.c

@@ -24,7 +24,7 @@ class CommandMSSendAll : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		int i, z = 1;
 		NickCore *nc;

src/core/ms_set.c

@@ -20,7 +20,7 @@ void myMemoServHelp(User *u);
 class CommandMSSet : public Command
 {
  private:
-	CommandResult DoNotify(User *u, std::vector<std::string> &params, MemoInfo &mi)
+	CommandReturn DoNotify(User *u, std::vector<std::string> &params, MemoInfo &mi)
 	{
 		const char *params = params[1].c_str();
 
@@ -66,7 +66,7 @@ class CommandMSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoLimit(User *u, std::vector<std::string> &params)
+	CommandReturn DoLimit(User *u, std::vector<std::string> &params)
 	{
 		const char *p1 = params[1].c_str();
 		const char *p2 = params.size() > 2 ? params[2].c_str() : NULL;
@@ -209,7 +209,7 @@ class CommandMSSet : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 		MemoInfo *mi = &u->na->nc->memos;

src/core/ms_staff.c

@@ -24,7 +24,7 @@ class CommandMSStaff : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vecyor<std::string> &params)
+	CommandReturn Execute(User *u, std::vecyor<std::string> &params)
 	{
 		NickCore *nc;
 		int i, z = 0;

src/core/ns_access.c

@@ -20,7 +20,7 @@ void myNickServHelp(User *u);
 class CommandNSAccess : public Command
 {
  private:
-	CommandResult DoServAdminList(User *u, std::vector<std::string> &params)
+	CommandReturn DoServAdminList(User *u, std::vector<std::string> &params)
 	{
 		const char *mask = params.size() > 2 ? params[2].c_str() : NULL;
 		char **access;
@@ -55,7 +55,7 @@ class CommandNSAccess : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoAdd(User *u, std::vector<std::string> &params, const char *mask)
+	CommandReturn DoAdd(User *u, std::vector<std::string> &params, const char *mask)
 	{
 		char **access;
 		int i;
@@ -89,7 +89,7 @@ class CommandNSAccess : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoDel(User *u, std::vector<std::string> &params, const char *mask)
+	CommandReturn DoDel(User *u, std::vector<std::string> &params, const char *mask)
 	{
 		char **access;
 		int i;
@@ -127,7 +127,7 @@ class CommandNSAccess : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoList(User *u, std::vector<std::string> *params, const char *mask)
+	CommandReturn DoList(User *u, std::vector<std::string> *params, const char *mask)
 	{
 		char **access;
 		int i;
@@ -153,7 +153,7 @@ class CommandNSAccess : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 		const char *mask = params.size() > 1 ? params[1].c_str() : NULL;

src/core/ns_alist.c

@@ -24,7 +24,7 @@ class CommandNSAList : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		/*
 		 * List the channels that the given nickname has access on

src/core/ns_drop.c

@@ -24,7 +24,7 @@ class CommandNSDrop : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params.size() ? params[0].c_str() : NULL;
 		NickAlias *na;

src/core/ns_forbid.c

@@ -25,7 +25,7 @@ class CommandNSForbid : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		NickAlias *na;
 		const char *nick = params[0].c_str();

src/core/ns_getemail.c

@@ -29,7 +29,7 @@ class CommandNSGetEMail : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *email = params[0].c_str();
 		int i, j = 0;

src/core/ns_getpass.c

@@ -24,7 +24,7 @@ class CommandNSGetPass : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		char tmp_pass[PASSMAX];

src/core/ns_ghost.c

@@ -24,7 +24,7 @@ class CommandNSGhost : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		const char *pass = params.size() > 1 ? params[1].c_str() : NULL;

src/core/ns_group.c

@@ -26,7 +26,7 @@ class CommandNSGroup : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		NickAlias *na, *target;
 		NickCore *nc;
@@ -218,7 +218,7 @@ class CommandNSGList : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params.size() ? params[0].c_str() : NULL;
 

src/core/ns_help.c

@@ -22,7 +22,7 @@ class CommandNSHelp : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str()
 		if (!stricmp(cmd, "SET LANGUAGE"))

src/core/ns_identify.c

@@ -27,7 +27,7 @@ class CommandNSIdentify : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		char *pass = params[0].c_str();
 		NickAlias *na;

src/core/ns_info.c

@@ -37,7 +37,7 @@ class CommandNSInfo : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		/* Show hidden info to nick owners and sadmins when the "ALL" parameter is
 		 * supplied. If a nick is online, the "Last seen address" changes to "Is

src/core/ns_list.c

@@ -24,7 +24,7 @@ class CommandNSList : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		/* SADMINS can search for nicks based on their NS_FORBIDDEN and NS_NO_EXPIRE
 		 * status. The keywords FORBIDDEN and NOEXPIRE represent these two states

src/core/ns_logout.c

@@ -27,7 +27,7 @@ class CommandNSLogout : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		char *nick = params.size() ? params[0].c_str() : NULL;
 		char *param = params.size() > 1 ? params[1].c_str() : NULL;

src/core/ns_recover.c

@@ -24,7 +24,7 @@ class CommandNSRecover : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		char *nick = params[0].c_str();
 		char *pass = params.size() > 1 ? params[1].c_str() : NULL;

src/core/ns_register.c

@@ -24,7 +24,7 @@ int do_sendregmail(User *u, NickRequest *nr);
 class CommandNSConfirm : public Command
 {
  private:
-	CommandResult DoConfirm(User *u, std::vector<std::string> &params)
+	CommandReturn DoConfirm(User *u, std::vector<std::string> &params)
 	{
 		NickRequest *nr = NULL;
 		NickAlias *na = NULL;
@@ -212,7 +212,7 @@ class CommandNSConfirm : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		return this->DoConfirm(u, params);
 	}
@@ -231,7 +231,7 @@ class CommandNSRegister : public CommandNSConfirm
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		NickRequest *nr = NULL, *anr = NULL;
 		NickCore *nc = NULL;
@@ -400,7 +400,7 @@ class CommandNSResend : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		NickRequest *nr = NULL;
 		if (NSEmailReg)

src/core/ns_release.c

@@ -24,7 +24,7 @@ class CommandNSRelease : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		const char *pass = params.size() > 1 ? params[1].c_str() : NULL;

src/core/ns_saset.c

@@ -21,7 +21,7 @@ void myNickServHelp(User *u);
 class CommandNSSASet : public Command
 {
  private:
-	CommandResult DoSetDisplay(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetDisplay(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 		int i;
@@ -60,7 +60,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetPassword(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetPassword(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -109,7 +109,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetUrl(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetUrl(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -129,7 +129,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetEmail(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetEmail(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -167,7 +167,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetICQ(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetICQ(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -191,7 +191,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetGreet(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetGreet(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -216,7 +216,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetKill(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetKill(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -259,7 +259,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetSecure(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetSecure(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -284,7 +284,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetPrivate(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetPrivate(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -309,7 +309,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetMsg(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetMsg(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -340,7 +340,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetHide(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetHide(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -400,7 +400,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetNoExpire(User *u, std::vector<std::string> &params, NickAlias *na)
+	CommandReturn DoSetNoExpire(User *u, std::vector<std::string> &params, NickAlias *na)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -425,7 +425,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetAutoOP(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetAutoOP(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -451,7 +451,7 @@ class CommandNSSASet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetLanguage(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetLanguage(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 2 ? params[2].c_str() : NULL;
 
@@ -484,7 +484,7 @@ class CommandNSSASet : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		const char *cmd = params[1].c_str();

src/core/ns_sendpass.c

@@ -24,7 +24,7 @@ class CommandNSSendPass : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		NickAlias *na;

src/core/ns_set.c

@@ -21,7 +21,7 @@ void myNickServHelp(User *u);
 class CommandNSSet : public Command
 {
  private:
-	CommandResult DoSetDisplay(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetDisplay(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -61,7 +61,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetPassword(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetPassword(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -104,7 +104,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetLanguage(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetLanguage(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -132,7 +132,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetUrl(User *u, std::vector<std::string> &params)
+	CommandReturn DoSetUrl(User *u, std::vector<std::string> &params)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -152,7 +152,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetEmail(User *u, std::vector<std::string> &params)
+	CommandReturn DoSetEmail(User *u, std::vector<std::string> &params)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -185,7 +185,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetICQ(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetICQ(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -208,7 +208,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetGreet(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetGreet(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -233,7 +233,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetKill(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetKill(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -276,7 +276,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetSecure(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetSecure(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -301,7 +301,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetPrivate(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetPrivate(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -326,7 +326,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetMsg(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetMsg(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -357,7 +357,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetHide(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetHide(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -417,7 +417,7 @@ class CommandNSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetAutoOP(User *u, std::vector<std::string> &params, NickCore *nc)
+	CommandReturn DoSetAutoOP(User *u, std::vector<std::string> &params, NickCore *nc)
 	{
 		const char *param = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -452,7 +452,7 @@ class CommandNSSet : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 		NickAlias *na = u->na;

src/core/ns_status.c

@@ -24,7 +24,7 @@ class CommandNSStatus : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		User *u2;
 		NickAlias *na = NULL;

src/core/ns_suspend.c

@@ -24,7 +24,7 @@ class CommandNSSuspend : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		NickAlias *na, *na2;
 		const char *nick = params[0].c_str();
@@ -108,7 +108,7 @@ class CommandNSUnSuspend : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		NickAlias *na;
 		const char *nick = params[0].c_str();

src/core/os_admin.c

@@ -22,7 +22,7 @@ void myOperServHelp(User *u);
 class CommandOSAdmin : public Command
 {
  private:
-	CommandResult DoAdd(User *u, std::vector<std::string> &params)
+	CommandReturn DoAdd(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params.size() > 1 ? params[1].c_str() : NULL;
 		int res = 0;
@@ -84,7 +84,7 @@ class CommandOSAdmin : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoDel(User *u, std::vector<std::string> &params)
+	CommandReturn DoDel(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params.size() > 1 ? params[1].c_str() : NULL;
 		int res = 0;
@@ -151,7 +151,7 @@ class CommandOSAdmin : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoList(User *u, std::vector<std::string> &params)
+	CommandReturn DoList(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params.size() > 1 ? params[1].c_str() : NULL;
 		int sent_header = 0, res = 0;
@@ -191,7 +191,7 @@ class CommandOSAdmin : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoClear(User *u, std::vector<std::string> &params)
+	CommandReturn DoClear(User *u, std::vector<std::string> &params)
 	{
 		if (!is_services_root(u))
 		{
@@ -216,7 +216,7 @@ class CommandOSAdmin : public Command
 		this->help_param1 = s_NickServ;
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 

src/core/os_akill.c

@@ -24,7 +24,7 @@ int akill_list(int number, Akill *ak, User *u, int *sent_header);
 class CommandOSAKill : public Command
 {
  private:
-	CommandResult DoAdd(User *u, std::vector<std::string> &params)
+	CommandReturn DoAdd(User *u, std::vector<std::string> &params)
 	{
 		int deleted = 0, last_param = 2;
 		const char *expiry, *mask;
@@ -139,7 +139,7 @@ class CommandOSAKill : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoDel(User *u, std::vector<std::string> &params)
+	CommandReturn DoDel(User *u, std::vector<std::string> &params)
 	{
 		const char *mask;
 		int res = 0;
@@ -190,7 +190,7 @@ class CommandOSAKill : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoList(User *u, std::vector<std::string> &params)
+	CommandReturn DoList(User *u, std::vector<std::string> &params)
 	{
 		const char *mask;
 		int res, sent_header = 0;
@@ -235,7 +235,7 @@ class CommandOSAKill : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoView(User *u, std::vector<std::string> &params)
+	CommandReturn DoView(User *u, std::vector<std::string> &params)
 	{
 		const char *mask;
 		int res, sent_header = 0;
@@ -276,7 +276,7 @@ class CommandOSAKill : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoClear(User *u, std::vector<std::string> &params)
+	CommandReturn DoClear(User *u, std::vector<std::string> &params)
 	{
 		slist_clear(&akills, 1);
 		notice_lang(s_OperServ, u, OPER_AKILL_CLEAR);
@@ -288,7 +288,7 @@ class CommandOSAKill : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 		char breason[BUFSIZE];

src/core/os_chankill.c

@@ -24,7 +24,7 @@ class CommandOSChanKill : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *expiry, *channel;
 		char reason[BUFSIZE];

src/core/os_chanlist.c

@@ -24,7 +24,7 @@ class CommandOSChanList : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		char *pattern = params.size() > 0 ? params[0].c_str() : NULL;
 		char *opt = params.size() > 1 ? params[1].c_str() : NULL;

src/core/os_clearmodes.c

@@ -24,7 +24,7 @@ class CommandOSClearModes : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *s;
 		const char *argv[2];

src/core/os_defcon.c

@@ -26,7 +26,7 @@ class CommandOSDEFCON : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		char *lvl = params[0].c_str();
 		int newLevel = 0;

src/core/os_global.c

@@ -25,7 +25,7 @@ class CommandOSGlobal : public Command
 		this->help_param1 = s_GlobalNoticer;
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *msg = params[1].c_str();
 

src/core/os_help.c

@@ -22,7 +22,7 @@ class CommandOSHelp : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		mod_help_cmd(s_OperServ, u, OPERSERV, params[0].c_str());
 		return MOD_CONT;

src/core/os_ignore.c

@@ -20,7 +20,7 @@ void myOperServHelp(User *u);
 class CommandOSIgnore : public Command
 {
  private:
-	CommandResult DoAdd(User *u, std::vector<std::string> &params)
+	CommandReturn DoAdd(User *u, std::vector<std::string> &params)
 	{
 		char *time = params.size() > 1 ? params[1].c_str() : NULL;
 		char *nick = params.size() > 2 ? params[2].c_str() : NULL;
@@ -55,7 +55,7 @@ class CommandOSIgnore : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoList(User *u, std::vector<std::string> &params)
+	CommandReturn DoList(User *u, std::vector<std::string> &params)
 	{
 		IgnoreData *id;
 
@@ -72,7 +72,7 @@ class CommandOSIgnore : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoDel(User *u, std::vector<std::string> &params)
+	CommandReturn DoDel(User *u, std::vector<std::string> &params)
 	{
 		char *nick = params.size() > 1 ? params[1].c_str() : NULL;
 		if (!nick)
@@ -90,7 +90,7 @@ class CommandOSIgnore : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoClear(User *u, std::vector<std::string> &params)
+	CommandReturn DoClear(User *u, std::vector<std::string> &params)
 	{
 		clear_ignores();
 		notice_lang(s_OperServ, u, OPER_IGNORE_LIST_CLEARED);
@@ -102,7 +102,7 @@ class CommandOSIgnore : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 		int t;

src/core/os_jupe.c

@@ -24,7 +24,7 @@ class CommandOSJupe : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *jserver = params[0].c_str();
 		const char *reason = params.size() > 1 ? params[1].c_str() : NULL;

src/core/os_kick.c

@@ -24,7 +24,7 @@ class CommandOSKick : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *argv[3];
 		const char *chan = params[0].c_str(), *nick = params[1].c_str(), *s = params[2].c_str();

src/core/os_mode.c

@@ -24,7 +24,7 @@ class CommandOSMode : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		int ac;
 		const char **av;

src/core/os_modinfo.c

@@ -25,7 +25,7 @@ class CommandOSModInfo : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *file = params[0].c_str();
 		struct tm tm;

src/core/os_modlist.c

@@ -24,7 +24,7 @@ class CommandOSModList : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		int idx;
 		int count = 0;

src/core/os_modload.c

@@ -24,7 +24,7 @@ class CommandOSModLoad : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		char *name;
 

src/core/os_modunload.c

@@ -24,7 +24,7 @@ class CommandOSModUnLoad : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *name = params[0].c_str();
 		int status;

src/core/os_news.c

@@ -21,7 +21,7 @@ int reload_config(int argc, char **argv);
 class NewsBase : public Command
 {
  private:
-	CommandResult DoList(User *u, std::vector<std::string> &params, short type, int *msgs)
+	CommandReturn DoList(User *u, std::vector<std::string> &params, short type, int *msgs)
 	{
 		int i, count = 0;
 		char timebuf[64];
@@ -47,7 +47,7 @@ class NewsBase : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoAdd(User *u, std::vector<std::string> &params, short type, int *msgs)
+	CommandReturn DoAdd(User *u, std::vector<std::string> &params, short type, int *msgs)
 	{
 		const char *text = params.size() > 1 ? params[1].c_str() : NULL;
 		int n;
@@ -71,7 +71,7 @@ class NewsBase : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoDel(User *u, std::vector<std::string> &params, short type, int *msgs)
+	CommandReturn DoDel(User *u, std::vector<std::string> &params, short type, int *msgs)
 	{
 		const char *text = params.size() > 1 ? params[1].c_str() : NULL;
 		int i, num;
@@ -113,7 +113,7 @@ class NewsBase : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoNews(User *u, std::vector<std::string> &params, short type)
+	CommandReturn DoNews(User *u, std::vector<std::string> &params, short type)
 	{
 		int is_servadmin = is_services_admin(u);
 		const char *cmd = params[0].c_str();
@@ -155,7 +155,7 @@ class NewsBase : public Command
 	{
 	}
 
-	virtual CommandResult Execute(User *u, std::vector<std::string> &params) = 0;
+	virtual CommandReturn Execute(User *u, std::vector<std::string> &params) = 0;
 
 	virtual bool OnHelp(User *u, const std::string &subcommand) = 0;
 
@@ -177,7 +177,7 @@ class CommandOSLogonNews : public NewsBase
 		delete [] this->help_param1;
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		return this->DoNews(u, params, NEWS_LOGON);
 	}
@@ -223,7 +223,7 @@ class CommandOSOperNews : public NewsBase
 		delete [] this->help_param1;
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		return this->DoNews(u, params, NEWS_OPER);
 	}
@@ -261,7 +261,7 @@ class CommandOSRandomNews : public NewsBase
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		return this->DoNews(u, params, NEWS_RANDOM);
 	}

src/core/os_noop.c

@@ -24,7 +24,7 @@ class CommandOSNOOP : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 		const char *server = params[1].c_str();

src/core/os_oline.c

@@ -24,7 +24,7 @@ class CommandOSOLine : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		const char *flags = params[1].c_str();

src/core/os_oper.c

@@ -22,7 +22,7 @@ void myOperServHelp(User *u);
 class CommandOSOper : public Command
 {
  private:
-	CommandResult DoAdd(User *u, std::vector<std::string> &params)
+	CommandReturn DoAdd(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = param.size() > 1 ? params[1].c_str() : NULL;
 		NickAlias *na;
@@ -90,7 +90,7 @@ class CommandOSOper : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoDel(User *u, std::vector<std::string> &params)
+	CommandReturn DoDel(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params.size() > 1 ? params[1].c_str() : NULL;
 		NickAlias *na;
@@ -152,7 +152,7 @@ class CommandOSOper : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoList(User *u, std::vector<std::string> &params)
+	CommandReturn DoList(User *u, std::vector<std::string> &params)
 	{
 		int sent_header = 0;
 		const char *nick = params.size() > 1 ? params[1].c_str() : NULL;
@@ -199,7 +199,7 @@ class CommandOSOper : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoClear(User *u, std::vector<std::string> &params)
+	CommandReturn DoClear(User *u, std::vector<std::string> &params)
 	{
 		if (!is_services_root(u))
 		{
@@ -224,7 +224,7 @@ class CommandOSOper : public Command
 		this->help_param1 = s_NickServ;
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 

src/core/os_quit.c

@@ -24,7 +24,7 @@ class CommandOSQuit : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		quitmsg = new char[28 + strlen(u->nick)];
 		if (!quitmsg)

src/core/os_raw.c

@@ -22,7 +22,7 @@ class CommandOSRaw : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *text = params[0].c_str();
 		send_cmd(NULL, "%s", text);

src/core/os_reload.c

@@ -24,7 +24,7 @@ class CommandOSReload : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		if (!read_config(1))
 		{

src/core/os_restart.c

@@ -24,7 +24,7 @@ class CommandOSRestart : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 #ifdef SERVICES_BIN
 		quitmsg = new char[31 + strlen(u->nick)];

src/core/os_session.c

@@ -20,7 +20,7 @@ void myOperServHelp(User *u);
 class CommandOSSession : public Command
 {
  private:
-	CommandResult DoList(User *u, std::vector<std::string> &params)
+	CommandReturn DoList(User *u, std::vector<std::string> &params)
 	{
 		Session *session;
 		int mincount;
@@ -45,7 +45,7 @@ class CommandOSSession : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoView(User *u, std::vector<std::string> &params)
+	CommandReturn DoView(User *u, std::vector<std::string> &params)
 	{
 		const char *param = params[1].c_str();
 		Session *session = findsession(param);
@@ -64,7 +64,7 @@ class CommandOSSession : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 
@@ -101,7 +101,7 @@ class CommandOSSession : public Command
 class CommandOSException : public Command
 {
  private:
-	CommandResult DoAdd(User *u, std::vector<std::string> &params)
+	CommandReturn DoAdd(User *u, std::vector<std::string> &params)
 	{
 		const char *mask, *expiry, *limitstr;
 		char reason[BUFSIZE];
@@ -174,7 +174,7 @@ class CommandOSException : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoDel(User *u, std::vector<std::string> &params)
+	CommandReturn DoDel(User *u, std::vector<std::string> &params)
 	{
 		const char *mask = params.size() > 1 ? params[1].c_str() : NULL;
 		int i;
@@ -233,7 +233,7 @@ class CommandOSException : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoMove(User *u, std::vector<std::string> &params)
+	CommandReturn DoMove(User *u, std::vector<std::string> &params)
 	{
 		Exception *exception;
 		const char *n1str = params.size() > 1 ? params[1].c_str() : NULL; /* From position */
@@ -284,7 +284,7 @@ class CommandOSException : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoList(User *u, std::vector<std::string> &params)
+	CommandReturn DoList(User *u, std::vector<std::string> &params)
 	{
 		int sent_header = 0;
 		expire_exceptions();
@@ -306,7 +306,7 @@ class CommandOSException : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoView(User *u, std::vector<std::string> &params)
+	CommandReturn DoView(User *u, std::vector<std::string> &params)
 	{
 		int sent_header = 0;
 		expire_exceptions();
@@ -333,7 +333,7 @@ class CommandOSException : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 		char *mask, *reason, *expiry, *limitstr;

src/core/os_set.c

@@ -20,7 +20,7 @@ void myOperServHelp(User *u);
 class CommandOSSet : public Command
 {
  private:
-	CommandResult DoList(User *u, std::vector<std::string> &params)
+	CommandReturn DoList(User *u, std::vector<std::string> &params)
 	{
 		int index;
 
@@ -38,7 +38,7 @@ class CommandOSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetIgnore(User *u, std::vector<std::string> &params)
+	CommandReturn DoSetIgnore(User *u, std::vector<std::string> &params)
 	{
 		const char *setting = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -64,7 +64,7 @@ class CommandOSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetReadOnly(User *u, std::vector<std::string> &params)
+	CommandReturn DoSetReadOnly(User *u, std::vector<std::string> &params)
 	{
 		const char *setting = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -94,7 +94,7 @@ class CommandOSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetLogChan(User *u, std::vector<std::string> &params)
+	CommandReturn DoSetLogChan(User *u, std::vector<std::string> &params)
 	{
 		const char *setting = params.size() > 1 ? params[1].c_str() : NULL;
 		Channel *c;
@@ -136,7 +136,7 @@ class CommandOSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetSuperAdmin(User *u, std::vector<std::string> &params)
+	CommandReturn DoSetSuperAdmin(User *u, std::vector<std::string> &params)
 	{
 		const char *setting = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -173,7 +173,7 @@ class CommandOSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetDebug(User *u, std::vector<std::string> &params)
+	CommandReturn DoSetDebug(User *u, std::vector<std::string> &params)
 	{
 		const char *setting = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -207,7 +207,7 @@ class CommandOSSet : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoSetNoExpire(User *u, std::vector<std::string> &params)
+	CommandReturn DoSetNoExpire(User *u, std::vector<std::string> &params)
 	{
 		const char *setting = params.size() > 1 ? params[1].c_str() : NULL;
 
@@ -239,7 +239,7 @@ class CommandOSSet : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		char *option = params[0].c_str();
 		char *setting = strtok(NULL, " ");

src/core/os_sgline.c

@@ -24,7 +24,7 @@ int sgline_list(int number, SXLine *sx, User *u, int *sent_header);
 class CommandOSSGLine : public Command
 {
  private:
-	CommandResult OnAdd(User *u, std::vector<std::string> &params)
+	CommandReturn OnAdd(User *u, std::vector<std::string> &params)
 	{
 		int deleted = 0, last_param = 2;
 		const char *param;
@@ -135,7 +135,7 @@ class CommandOSSGLine : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult OnDel(User *u, std::vector<std::string> &params)
+	CommandReturn OnDel(User *u, std::vector<std::string> &params)
 	{
 		const char *mask;
 		int res = 0;
@@ -185,7 +185,7 @@ class CommandOSSGLine : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult OnList(User *u, std::vector<std::string> &params)
+	CommandReturn OnList(User *u, std::vector<std::string> &params)
 	{
 		const char *mask;
 		int res, sent_header = 0;
@@ -227,7 +227,7 @@ class CommandOSSGLine : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult OnView(User *u, std::vector<std::string> &params)
+	CommandReturn OnView(User *u, std::vector<std::string> &params)
 	{
 		const char *mask;
 		int res, sent_header = 0;
@@ -268,7 +268,7 @@ class CommandOSSGLine : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult OnClear(User *u, std::vector<std::string> &params)
+	CommandReturn OnClear(User *u, std::vector<std::string> &params)
 	{
 		slist_clear(&sglines, 1);
 		notice_lang(s_OperServ, u, OPER_SGLINE_CLEAR);
@@ -278,7 +278,7 @@ class CommandOSSGLine : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 

src/core/os_shutdown.c

@@ -24,7 +24,7 @@ class CommandOSShutdown : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		quitmsg = new char[32 + strlen(u->nick)];
 		if (!quitmsg)

src/core/os_sqline.c

@@ -24,7 +24,7 @@ int sqline_list(int number, SXLine *sx, User *u, int *sent_header);
 class CommandOSSQLine : public Command
 {
  private:
-	CommandResult DoAdd(User *u, std::vector<std::string> &params)
+	CommandReturn DoAdd(User *u, std::vector<std::string> &params)
 	{
 		int deleted = 0, last_param = 2;
 		const char *expiry, *mask;
@@ -128,7 +128,7 @@ class CommandOSSQLine : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoDel(User *u, std::vector<std::string> &params)
+	CommandReturn DoDel(User *u, std::vector<std::string> &params)
 	{
 		const char *mask;
 		int res = 0;
@@ -178,7 +178,7 @@ class CommandOSSQLine : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoList(User *u, std::vector<std::string> &params)
+	CommandReturn DoList(User *u, std::vector<std::string> &params)
 	{
 		const char *mask;
 		int res, sent_header = 0;
@@ -221,7 +221,7 @@ class CommandOSSQLine : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoView(User *u, std::vector<std::string> &params)
+	CommandReturn DoView(User *u, std::vector<std::string> &params)
 	{
 		const char *mask;
 		int res, sent_header = 0;
@@ -262,7 +262,7 @@ class CommandOSSQLine : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoClear(User *u, std::vector<std::string> &params)
+	CommandReturn DoClear(User *u, std::vector<std::string> &params)
 	{
 		slist_clear(&sqlines, 1);
 		notice_lang(s_OperServ, u, OPER_SQLINE_CLEAR);
@@ -274,7 +274,7 @@ class CommandOSSQLine : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 

src/core/os_staff.c

@@ -26,7 +26,7 @@ class CommandOSStaff : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		int idx = 0;
 		User *au = NULL;

src/core/os_stats.c

@@ -21,7 +21,7 @@ void myOperServHelp(User *u);
 class CommandOSStats : public Command
 {
  private:
-	CommandResult DoStatsAkill(User *u, std::vector<std::string> &params)
+	CommandReturn DoStatsAkill(User *u, std::vector<std::string> &params)
 	{
 		int timeout;
 		/* AKILLs */
@@ -104,7 +104,7 @@ class CommandOSStats : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoStatsReset(User *u, std::vector<std::string> &params)
+	CommandReturn DoStatsReset(User *u, std::vector<std::string> &params)
 	{
 		if (is_services_admin(u))
 		{
@@ -116,7 +116,7 @@ class CommandOSStats : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoStatsUptime(User *u, std::vector<std::string> &params)
+	CommandReturn DoStatsUptime(User *u, std::vector<std::string> &params)
 	{
 		notice_lang(s_OperServ, u, OPER_STATS_CURRENT_USERS, usercnt, opcnt);
 		tm = localtime(&maxusertime);
@@ -181,7 +181,7 @@ class CommandOSStats : public Command
 		}
 	}
 
-	CommandResult DoStatsUplink(User *u, std::vector<std::string> &params)
+	CommandReturn DoStatsUplink(User *u, std::vector<std::string> &params)
 	{
 		buf[0] = '\0';
 		buflen = 511; /* How confusing, this is the amount of space left! */
@@ -219,7 +219,7 @@ class CommandOSStats : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoStatsMemory(User *u, std::vector<std::string> &params)
+	CommandReturn DoStatsMemory(User *u, std::vector<std::string> &params)
 	{
 		long count, mem;
 
@@ -256,7 +256,7 @@ class CommandOSStats : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		time_t uptime = time(NULL) - start_time;
 		const char *extra = params.size() ? params[0].c_str() : NULL;

src/core/os_svsnick.c

@@ -24,7 +24,7 @@ class CommandOSSVSNick : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		const char *newnick = params[1].c_str();

src/core/os_szline.c

@@ -24,7 +24,7 @@ int szline_list(int number, SXLine *sx, User *u, int *sent_header);
 class CommandOSSZLine : public Command
 {
  private:
-	CommandResult DoAdd(User *u, std::vector<std::string> &params)
+	CommandReturn DoAdd(User *u, std::vector<std::string> &params)
 	{
 		int deleted = 0, last_param = 2;
 		const char *expiry, *mask;
@@ -128,7 +128,7 @@ class CommandOSSZLine : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoDel(User *u, std::vector<std::string> &params)
+	CommandReturn DoDel(User *u, std::vector<std::string> &params)
 	{
 		char *mask;
 		int res = 0;
@@ -179,7 +179,7 @@ class CommandOSSZLine : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoList(User *u, std::vector<std::string> &params)
+	CommandReturn DoList(User *u, std::vector<std::string> &params)
 	{
 		char *mask;
 		int res, sent_header = 0;
@@ -220,7 +220,7 @@ class CommandOSSZLine : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoView(User *u, std::vector<std::string> &params)
+	CommandReturn DoView(User *u, std::vector<std::string> &params)
 	{
 		char *mask;
 		int res, sent_header = 0;
@@ -261,7 +261,7 @@ class CommandOSSZLine : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoClear(User *u, std::vector<std::string> &params)
+	CommandReturn DoClear(User *u, std::vector<std::string> &params)
 	{
 		slist_clear(&szlines, 1);
 		notice_lang(s_OperServ, u, OPER_SZLINE_CLEAR);
@@ -273,7 +273,7 @@ class CommandOSSZLine : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 

src/core/os_umode.c

@@ -24,7 +24,7 @@ class CommandOSUMode : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		const char *modes = params[1].c_str();

src/core/os_update.c

@@ -24,7 +24,7 @@ class CommandOSUpdate : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		notice_lang(s_OperServ, u, OPER_UPDATING);
 		save_data = 1;

src/core/ss_main.c

@@ -26,7 +26,7 @@ class CommandSSHelp : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		ircdproto->SendMessage(statserv, u->nick, "This is a test of the emergency StatServ system.");
 		return MOD_CONT;

src/modules/cs_appendtopic.c

@@ -59,7 +59,7 @@ class CommandCSAppendTopic : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *chan = params[0].c_str();
 		const char *newtopic = params[1].c_str();

src/modules/cs_enforce.c

@@ -172,7 +172,7 @@ class CommandCSEnforce : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *chan = params[0].c_str();
 		const char *what = params.size() > 1 ? params[1].c_str() : NULL;

src/modules/cs_tban.c

@@ -45,7 +45,7 @@ class CommandCSTBan : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		char mask[BUFSIZE];
 		Channel *c;

src/modules/hs_request.c

@@ -79,7 +79,7 @@ class CommandHSRequest : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		char *nick;
 		const char *rawhostmask = params[1].c_str();
@@ -211,7 +211,7 @@ class CommandHSActivate : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		NickAlias *na;
@@ -273,7 +273,7 @@ class CommandHSReject : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		const char *reason = params.size() > 1 ? params[1].c_str() : NULL;
@@ -329,7 +329,7 @@ class CommandHSReject : public Command
 class CommandHSList : public Command
 {
  private:
-	CommandResult DoList(User *u, std::vector<std::string> &params)
+	CommandReturn DoList(User *u, std::vector<std::string> &params)
 	{
 		struct tm *tm;
 		char buf[BUFSIZE];
@@ -363,7 +363,7 @@ class CommandHSList : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *key = params[0].c_str();
 
@@ -386,7 +386,7 @@ class CommandHSWaiting : public CommandHSList
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		return this->DoList(u, params);
 	}
@@ -411,7 +411,7 @@ class CommandNSDrop : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		HostCore *tmp;
 		bool found = false;

src/modules/ns_maxemail.c

@@ -37,7 +37,7 @@ class CommandNSRegister : public Command
 	{
 	}
 
-	CommandResult(User *u, std::vector<std::string> &params)
+	CommandReturn(User *u, std::vector<std::string> &params)
 	{
 		return check_email_limit_reached(params[1].c_str(), u);
 	}
@@ -55,7 +55,7 @@ class CommandNSSet : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *set = params[0].c_str();
 		const char *email = params[1].c_str();

src/modules/os_info.c

@@ -58,7 +58,7 @@ static Module *me;
 class CommandNSOInfo : public Command
 {
  private:
-	CommandResult DoAdd(User *u, std::vector<std::string> &params)
+	CommandReturn DoAdd(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[1].c_str();
 		const char *info = params.size() > 2 ? params[2].c_str() : NULL;
@@ -83,7 +83,7 @@ class CommandNSOInfo : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoDel(User *u, std::vector<std::string> &params)
+	CommandReturn DoDel(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[1].c_str();
 		NickAlias *na = NULL;
@@ -110,7 +110,7 @@ class CommandNSOInfo : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 
@@ -145,7 +145,7 @@ class CommandNSInfo : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *nick = params[0].c_str();
 		NickAlias *na = NULL;
@@ -174,7 +174,7 @@ class CommandNSInfo : public Command
 class CommandCSOInfo : public Command
 {
  private:
-	CommandResult DoAdd(User *u, std::vector<std::string> &params)
+	CommandReturn DoAdd(User *u, std::vector<std::string> &params)
 	{
 		const char *chan = params[1].c_str();
 		const char *info = params.size() > 2 ? params[2].c_str() : NULL;
@@ -198,7 +198,7 @@ class CommandCSOInfo : public Command
 		return MOD_CONT;
 	}
 
-	CommandResult DoDel(User *u, std::vector<std::string> &params)
+	CommandReturn DoDel(User *u, std::vector<std::string> &params)
 	{
 		const char *chan = params[1].c_str();
 		ChannelInfo *ci = NULL;
@@ -224,7 +224,7 @@ class CommandCSOInfo : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		const char *cmd = params[0].c_str();
 
@@ -259,7 +259,7 @@ class CommandCSInfo : public Command
 	{
 	}
 
-	CommandResult Execute(User *u, std::vector<std::string> &params)
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		char *chan = params[0].c_str();
 		ChannelInfo *ci = NULL;