Slight API tweak. Change Command to take char * instead of char in it's constructor, this avoids confusion/generates a compile error if someone mixes up flags with number of params, instead of working but not working as expected in a weird manner.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8918 e03df62e-2008-0410-955e-edbf42e46eb7

50 files changed, 55 insertions, 55 deletions

diff --git a/include/command_parse.h b/include/command_parse.h
index 13b70997b..25d334dbf 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -217,7 +217,7 @@ class cmd_reload : public Command
  public:
 	/** Standard constructor
 	 */
-	cmd_reload (InspIRCd* Instance) : Command(Instance,"RELOAD",'o',1) { syntax = "<core-command>"; }
+	cmd_reload (InspIRCd* Instance) : Command(Instance,"RELOAD","o",1) { syntax = "<core-command>"; }
 	/** Handle RELOAD
 	 */
 	CmdResult Handle(const char** parameters, int pcnt, User *user);
diff --git a/include/commands/cmd_clearcache.h b/include/commands/cmd_clearcache.h
index e88a61822..d3435391a 100644
--- a/include/commands/cmd_clearcache.h
+++ b/include/commands/cmd_clearcache.h
@@ -28,7 +28,7 @@ class CommandClearcache : public Command
  public:
 	/** Constructor for clearcache.
 	 */
-	CommandClearcache (InspIRCd* Instance) : Command(Instance,"CLEARCACHE",'o',0) { }
+	CommandClearcache (InspIRCd* Instance) : Command(Instance,"CLEARCACHE","o",0) { }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_connect.h b/include/commands/cmd_connect.h
index 791b2eebe..907108a13 100644
--- a/include/commands/cmd_connect.h
+++ b/include/commands/cmd_connect.h
@@ -29,7 +29,7 @@ class CommandConnect : public Command
  public:
 	/** Constructor for connect.
 	 */
-	CommandConnect (InspIRCd* Instance) : Command(Instance,"CONNECT",'o',1,false,0) { syntax = "<servername> [<remote-server>]"; }
+	CommandConnect (InspIRCd* Instance) : Command(Instance,"CONNECT","o",1,false,0) { syntax = "<servername> [<remote-server>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_die.h b/include/commands/cmd_die.h
index 3713a9bbf..903fa8a25 100644
--- a/include/commands/cmd_die.h
+++ b/include/commands/cmd_die.h
@@ -29,7 +29,7 @@ class CommandDie : public Command
  public:
 	/** Constructor for die.
 	 */
-	CommandDie (InspIRCd* Instance) : Command(Instance,"DIE",'o',1,false,0) { syntax = "<password>"; }
+	CommandDie (InspIRCd* Instance) : Command(Instance,"DIE","o",1,false,0) { syntax = "<password>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_eline.h b/include/commands/cmd_eline.h
index fe0acc8eb..0bcfbfc96 100644
--- a/include/commands/cmd_eline.h
+++ b/include/commands/cmd_eline.h
@@ -29,7 +29,7 @@ class CommandEline : public Command
  public:
 	/** Constructor for eline.
 	 */
-	CommandEline (InspIRCd* Instance) : Command(Instance,"ELINE",'o',1,false,0) { syntax = "<ident@host> [<duration> :<reason>]"; }
+	CommandEline (InspIRCd* Instance) : Command(Instance,"ELINE","o",1,false,0) { syntax = "<ident@host> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_gline.h b/include/commands/cmd_gline.h
index c342bc28b..11e67448a 100644
--- a/include/commands/cmd_gline.h
+++ b/include/commands/cmd_gline.h
@@ -29,7 +29,7 @@ class CommandGline : public Command
  public:
 	/** Constructor for gline.
 	 */
-	CommandGline (InspIRCd* Instance) : Command(Instance,"GLINE",'o',1,false,0) { syntax = "<ident@host> [<duration> :<reason>]"; }
+	CommandGline (InspIRCd* Instance) : Command(Instance,"GLINE","o",1,false,0) { syntax = "<ident@host> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_kill.h b/include/commands/cmd_kill.h
index 29c93d0bf..16d80bb5e 100644
--- a/include/commands/cmd_kill.h
+++ b/include/commands/cmd_kill.h
@@ -29,7 +29,7 @@ class CommandKill : public Command
  public:
 	/** Constructor for kill.
 	 */
-	CommandKill (InspIRCd* Instance) : Command(Instance,"KILL",'o',2,false,0) { syntax = "<nickname> <reason>"; }
+	CommandKill (InspIRCd* Instance) : Command(Instance,"KILL","o",2,false,0) { syntax = "<nickname> <reason>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_kline.h b/include/commands/cmd_kline.h
index 3e987643f..fda1f39f4 100644
--- a/include/commands/cmd_kline.h
+++ b/include/commands/cmd_kline.h
@@ -29,7 +29,7 @@ class CommandKline : public Command
  public:
 	/** Constructor for kline.
 	 */
-	CommandKline (InspIRCd* Instance) : Command(Instance,"KLINE",'o',1,false,0) { syntax = "<ident@host> [<duration> :<reason>]"; }
+	CommandKline (InspIRCd* Instance) : Command(Instance,"KLINE","o",1,false,0) { syntax = "<ident@host> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_loadmodule.h b/include/commands/cmd_loadmodule.h
index 9d5ad621b..14b843449 100644
--- a/include/commands/cmd_loadmodule.h
+++ b/include/commands/cmd_loadmodule.h
@@ -29,7 +29,7 @@ class CommandLoadmodule : public Command
  public:
 	/** Constructor for loadmodule.
 	 */
-	CommandLoadmodule (InspIRCd* Instance) : Command(Instance,"LOADMODULE",'o',1) { syntax = "<modulename>"; }
+	CommandLoadmodule (InspIRCd* Instance) : Command(Instance,"LOADMODULE","o",1) { syntax = "<modulename>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_qline.h b/include/commands/cmd_qline.h
index 735c270b5..d3c0ae85e 100644
--- a/include/commands/cmd_qline.h
+++ b/include/commands/cmd_qline.h
@@ -29,7 +29,7 @@ class CommandQline : public Command
  public:
 	/** Constructor for qline.
 	 */
-	CommandQline (InspIRCd* Instance) : Command(Instance,"QLINE",'o',1,false,0) { syntax = "<nick> [<duration> :<reason>]"; }
+	CommandQline (InspIRCd* Instance) : Command(Instance,"QLINE","o",1,false,0) { syntax = "<nick> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_rehash.h b/include/commands/cmd_rehash.h
index 7eb843d9a..3d538ea32 100644
--- a/include/commands/cmd_rehash.h
+++ b/include/commands/cmd_rehash.h
@@ -29,7 +29,7 @@ class CommandRehash : public Command
  public:
 	/** Constructor for rehash.
 	 */
-	CommandRehash (InspIRCd* Instance) : Command(Instance,"REHASH",'o',0,false,3) { syntax = "[<servermask>]"; }
+	CommandRehash (InspIRCd* Instance) : Command(Instance,"REHASH","o",0,false,3) { syntax = "[<servermask>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_reloadmodule.h b/include/commands/cmd_reloadmodule.h
index 3ab68ea42..f35caf0f2 100644
--- a/include/commands/cmd_reloadmodule.h
+++ b/include/commands/cmd_reloadmodule.h
@@ -29,7 +29,7 @@ class CommandReloadmodule : public Command
  public:
 	/** Constructor for reloadmodule.
 	 */
-	CommandReloadmodule (InspIRCd* Instance) : Command(Instance,"RELOADMODULE",'o',1) { syntax = "<modulename>"; }
+	CommandReloadmodule (InspIRCd* Instance) : Command(Instance,"RELOADMODULE","o",1) { syntax = "<modulename>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_restart.h b/include/commands/cmd_restart.h
index 886c42b11..ddb14cbbc 100644
--- a/include/commands/cmd_restart.h
+++ b/include/commands/cmd_restart.h
@@ -32,7 +32,7 @@ class CommandRestart : public Command
  public:
 	/** Constructor for restart.
 	 */
-	CommandRestart (InspIRCd* Instance) : Command(Instance,"RESTART",'o',1,false,0) { syntax = "<password>"; }
+	CommandRestart (InspIRCd* Instance) : Command(Instance,"RESTART","o",1,false,0) { syntax = "<password>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_squit.h b/include/commands/cmd_squit.h
index a70b53ce7..9b1a19bf2 100644
--- a/include/commands/cmd_squit.h
+++ b/include/commands/cmd_squit.h
@@ -32,7 +32,7 @@ class CommandSquit : public Command
  public:
 	/** Constructor for squit.
 	 */
-	CommandSquit (InspIRCd* Instance) : Command(Instance,"SQUIT",'o',1) { syntax = "<servername> [<reason>]"; }
+	CommandSquit (InspIRCd* Instance) : Command(Instance,"SQUIT","o",1) { syntax = "<servername> [<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_trace.h b/include/commands/cmd_trace.h
index 24cabf0f8..3c476d1a7 100644
--- a/include/commands/cmd_trace.h
+++ b/include/commands/cmd_trace.h
@@ -29,7 +29,7 @@ class CommandTrace : public Command
  public:
 	/** Constructor for trace.
 	 */
-	CommandTrace (InspIRCd* Instance) : Command(Instance,"TRACE",'o',0) { syntax = "[<object>]"; }
+	CommandTrace (InspIRCd* Instance) : Command(Instance,"TRACE","o",0) { syntax = "[<object>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_unloadmodule.h b/include/commands/cmd_unloadmodule.h
index b102ec07f..bffbe3f24 100644
--- a/include/commands/cmd_unloadmodule.h
+++ b/include/commands/cmd_unloadmodule.h
@@ -29,7 +29,7 @@ class CommandUnloadmodule : public Command
  public:
 	/** Constructor for unloadmodule.
 	 */
-	CommandUnloadmodule (InspIRCd* Instance) : Command(Instance,"UNLOADMODULE",'o',1) { syntax = "<modulename>"; }
+	CommandUnloadmodule (InspIRCd* Instance) : Command(Instance,"UNLOADMODULE","o",1) { syntax = "<modulename>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_wallops.h b/include/commands/cmd_wallops.h
index f56a07f4c..84e8234c5 100644
--- a/include/commands/cmd_wallops.h
+++ b/include/commands/cmd_wallops.h
@@ -29,7 +29,7 @@ class CommandWallops : public Command
  public:
 	/** Constructor for wallops.
 	 */
-	CommandWallops (InspIRCd* Instance) : Command(Instance,"WALLOPS",'o',1) { syntax = "<any-text>"; }
+	CommandWallops (InspIRCd* Instance) : Command(Instance,"WALLOPS","o",1) { syntax = "<any-text>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_zline.h b/include/commands/cmd_zline.h
index cea166c26..b6a3a037a 100644
--- a/include/commands/cmd_zline.h
+++ b/include/commands/cmd_zline.h
@@ -29,7 +29,7 @@ class CommandZline : public Command
  public:
 	/** Constructor for zline.
 	 */
-	CommandZline (InspIRCd* Instance) : Command(Instance,"ZLINE",'o',1,false,0) { syntax = "<ipmask> [<duration> :<reason>]"; }
+	CommandZline (InspIRCd* Instance) : Command(Instance,"ZLINE","o",1,false,0) { syntax = "<ipmask> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/ctables.h b/include/ctables.h
index 8daddf192..1464494a3 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -89,14 +89,14 @@ class CoreExport Command : public Extensible
 	/** Create a new command.
 	 * @param Instance Pointer to creator class
 	 * @param cmd Command name. This must be UPPER CASE.
-	 * @param flags User modes required to execute the command.
+	 * @param flags User mode required to execute the command. May ONLY be one mode - it's a string to give warnings if people mix params up.
 	 * For oper only commands, set this to 'o', otherwise use 0.
 	 * @param minpara Minimum parameters required for the command.
 	 * @param before_reg If this is set to true, the command will
 	 * be allowed before the user is 'registered' (has sent USER,
 	 * NICK, optionally PASS, and been resolved).
 	 */
-	Command(InspIRCd* Instance, const std::string &cmd, char flags, int minpara, int before_reg = false, int penalty = 1) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false), works_before_reg(before_reg), Penalty(penalty)
+	Command(InspIRCd* Instance, const std::string &cmd, char *flags, int minpara, int before_reg = false, int penalty = 1) : ServerInstance(Instance), command(cmd), flags_needed(*flags), min_params(minpara), disabled(false), works_before_reg(before_reg), Penalty(penalty)
 	{
 		use_count = 0;
 		total_bytes = 0;
diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index 602646ebd..b5f4968d0 100644
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -18,7 +18,7 @@
 class CommandAlltime : public Command
 {
  public:
-	CommandAlltime(InspIRCd *Instance) : Command(Instance, "ALLTIME", 'o', 0)
+	CommandAlltime(InspIRCd *Instance) : Command(Instance, "ALLTIME", "o", 0)
 	{
 		this->source = "m_alltime.so";
 		syntax.clear();
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 9c196a9bb..f13a3b97a 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -47,7 +47,7 @@ cbanlist cbans;
 class CommandCban : public Command
 {
  public:
-	CommandCban(InspIRCd* Me) : Command(Me, "CBAN", 'o', 1)
+	CommandCban(InspIRCd* Me) : Command(Me, "CBAN", "o", 1)
 	{
 		this->source = "m_cban.so";
 		this->syntax = "<channel> [<duration> :<reason>]";
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index af8aaa3fc..e678ec1cb 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -21,7 +21,7 @@
 class CommandCheck : public Command
 {
  public:
- 	CommandCheck (InspIRCd* Instance) : Command(Instance,"CHECK", 'o', 1)
+ 	CommandCheck (InspIRCd* Instance) : Command(Instance,"CHECK", "o", 1)
 	{
 		this->source = "m_check.so";
 		syntax = "<nickname>|<ip>|<hostmask>|<channel>";
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 74663e0b7..005e71c8f 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -22,7 +22,7 @@ class CommandChghost : public Command
  private:
 	char* hostmap;
  public:
-	CommandChghost (InspIRCd* Instance, char* hmap) : Command(Instance,"CHGHOST",'o',2), hostmap(hmap)
+	CommandChghost (InspIRCd* Instance, char* hmap) : Command(Instance,"CHGHOST","o",2), hostmap(hmap)
 	{
 		this->source = "m_chghost.so";
 		syntax = "<nick> <newhost>";
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index b8973f722..8e47e87e6 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -20,7 +20,7 @@
 class CommandChgident : public Command
 {
  public:
-	CommandChgident (InspIRCd* Instance) : Command(Instance,"CHGIDENT", 'o', 2)
+	CommandChgident (InspIRCd* Instance) : Command(Instance,"CHGIDENT", "o", 2)
 	{
 		this->source = "m_chgident.so";
 		syntax = "<nick> <newident>";
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index 0a7b5a664..f4d41ab8d 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -20,7 +20,7 @@
 class CommandChgname : public Command
 {
  public:
-	CommandChgname (InspIRCd* Instance) : Command(Instance,"CHGNAME", 'o', 2)
+	CommandChgname (InspIRCd* Instance) : Command(Instance,"CHGNAME", "o", 2)
 	{
 		this->source = "m_chgname.so";
 		syntax = "<nick> <newname>";
diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 0c1cdff2f..eb2c6cd3d 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -21,7 +21,7 @@
 class CommandClones : public Command
 {
  public:
- 	CommandClones (InspIRCd* Instance) : Command(Instance,"CLONES", 'o', 1)
+ 	CommandClones (InspIRCd* Instance) : Command(Instance,"CLONES", "o", 1)
 	{
 		this->source = "m_clones.so";
 		syntax = "<limit>";
diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index 9b868e61e..da3760de1 100644
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -19,7 +19,7 @@ class CommandClose : public Command
 {
  public:
 	/* Command 'close', needs operator */
-	CommandClose (InspIRCd* Instance) : Command(Instance,"CLOSE", 'o', 0)
+	CommandClose (InspIRCd* Instance) : Command(Instance,"CLOSE", "o", 0)
 	{
 		this->source = "m_close.so";
 	}
diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h
index 130509682..02adc7809 100644
--- a/src/modules/m_filter.h
+++ b/src/modules/m_filter.h
@@ -121,7 +121,7 @@ class CommandFilter : public Command
 {
 	FilterBase* Base;
  public:
-	CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &ssource) : Command(Me, "FILTER", 'o', 1), Base(f)
+	CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &ssource) : Command(Me, "FILTER", "o", 1), Base(f)
 	{
 		this->source = ssource;
 		this->syntax = "<filter-definition> <type> <flags> [<gline-duration>] :<reason>";
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 254a73c27..0d834a4bb 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -20,7 +20,7 @@
 class CommandGloadmodule : public Command
 {
  public:
-	CommandGloadmodule (InspIRCd* Instance) : Command(Instance,"GLOADMODULE", 'o', 1)
+	CommandGloadmodule (InspIRCd* Instance) : Command(Instance,"GLOADMODULE", "o", 1)
 	{
 		this->source = "m_globalload.so";
 		syntax = "<modulename> [servermask]";
@@ -55,7 +55,7 @@ class CommandGloadmodule : public Command
 class CommandGunloadmodule : public Command
 {
  public:
-	CommandGunloadmodule (InspIRCd* Instance) : Command(Instance,"GUNLOADMODULE", 'o', 1)
+	CommandGunloadmodule (InspIRCd* Instance) : Command(Instance,"GUNLOADMODULE", "o", 1)
 	{
 		this->source = "m_globalload.so";
 		syntax = "<modulename> [servermask]";
@@ -89,7 +89,7 @@ class CommandGunloadmodule : public Command
 class CommandGreloadmodule : public Command
 {
  public:
-	CommandGreloadmodule (InspIRCd* Instance) : Command(Instance, "GRELOADMODULE", 'o', 1)
+	CommandGreloadmodule (InspIRCd* Instance) : Command(Instance, "GRELOADMODULE", "o", 1)
 	{
 		this->source = "m_globalload.so";
 		syntax = "<modulename> [servermask]";
diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 51e0b7f1e..661ff91dc 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -22,7 +22,7 @@
 class CommandGlobops : public Command
 {
  public:
-	CommandGlobops (InspIRCd* Instance) : Command(Instance,"GLOBOPS",'o',1)
+	CommandGlobops (InspIRCd* Instance) : Command(Instance,"GLOBOPS","o",1)
 	{
 		this->source = "m_globops.so";
 		syntax = "<any-text>";
diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 255d3eac9..327fdc8f1 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -27,7 +27,7 @@ class CommandJumpserver : public Command
 	std::string reason;
 	int port;
 
-	CommandJumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", 'o', 0)
+	CommandJumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", "o", 0)
 	{
 		this->source = "m_jumpserver.so";
 		syntax = "[<server> <port> <+/-a> :<reason>]";
diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index cdb796390..dfda9aaf7 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -28,7 +28,7 @@ private:
 
 public:
 	CommandLockserv (InspIRCd* Instance, bool &lock)
-	: Command(Instance, "LOCKSERV", 'o', 0), locked(lock)
+	: Command(Instance, "LOCKSERV", "o", 0), locked(lock)
 	{
 		this->source = "m_lockserv.so";
 		syntax.clear();
@@ -51,7 +51,7 @@ private:
 
 public:
 	CommandUnlockserv (InspIRCd* Instance, bool &lock)
-	: Command(Instance, "UNLOCKSERV", 'o', 0), locked(lock)
+	: Command(Instance, "UNLOCKSERV", "o", 0), locked(lock)
 	{
 		this->source = "m_lockserv.so";
 		syntax.clear();
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 83b0888da..932a9d05b 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -21,7 +21,7 @@ class CommandNicklock : public Command
 {
 	char* dummy;
  public:
-	CommandNicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", 'o', 2)
+	CommandNicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", "o", 2)
 	{
 		this->source = "m_nicklock.so";
 		syntax = "<oldnick> <newnick>";
@@ -75,7 +75,7 @@ class CommandNicklock : public Command
 class CommandNickunlock : public Command
 {
  public:
-	CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", 'o', 1)
+	CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", "o", 1)
 	{
 		this->source = "m_nicklock.so";
 		syntax = "<locked-nick>";
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index fcd27dff0..59e03a901 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -43,7 +43,7 @@ CmdResult ShowOperMOTD(User* user)
 class CommandOpermotd : public Command
 {
  public:
-	CommandOpermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", 'o', 0)
+	CommandOpermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", "o", 0)
 	{
 		this->source = "m_opermotd.so";
 		syntax = "[<servername>]";
diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index 66b917e18..205df724e 100644
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -28,7 +28,7 @@ class CommandMkpasswd : public Command
 	std::deque<std::string> &names;
  public:
 	CommandMkpasswd (InspIRCd* Instance, Module* S, hashymodules &h, std::deque<std::string> &n)
-		: Command(Instance,"MKPASSWD", 'o', 2), Sender(S), hashers(h), names(n)
+		: Command(Instance,"MKPASSWD", "o", 2), Sender(S), hashers(h), names(n)
 	{
 		this->source = "m_password_hash.so";
 		syntax = "<hashtype> <any-text>";
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 398eca2af..5b7ead9b4 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -20,7 +20,7 @@
 class CommandSajoin : public Command
 {
  public:
-	CommandSajoin (InspIRCd* Instance) : Command(Instance,"SAJOIN", 'o', 2, false, 0)
+	CommandSajoin (InspIRCd* Instance) : Command(Instance,"SAJOIN", "o", 2, false, 0)
 	{
 		this->source = "m_sajoin.so";
 		syntax = "<nick> <channel>";
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 4ee9bb208..7db43661d 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -20,7 +20,7 @@
 class CommandSamode : public Command
 {
  public:
-	CommandSamode (InspIRCd* Instance) : Command(Instance,"SAMODE", 'o', 2, false, 0)
+	CommandSamode (InspIRCd* Instance) : Command(Instance,"SAMODE", "o", 2, false, 0)
 	{
 		this->source = "m_samode.so";
 		syntax = "<target> <modes> {<mode-parameters>}";
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 3f7affa8e..c1115827a 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -20,7 +20,7 @@
 class CommandSanick : public Command
 {
  public:
-	CommandSanick (InspIRCd* Instance) : Command(Instance,"SANICK", 'o', 2, false, 0)
+	CommandSanick (InspIRCd* Instance) : Command(Instance,"SANICK", "o", 2, false, 0)
 	{
 		this->source = "m_sanick.so";
 		syntax = "<nick> <new-nick>";
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 1eeb55dc2..ce21b967a 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -20,7 +20,7 @@
 class CommandSapart : public Command
 {
  public:
-	CommandSapart (InspIRCd* Instance) : Command(Instance,"SAPART", 'o', 2, false, 0)
+	CommandSapart (InspIRCd* Instance) : Command(Instance,"SAPART", "o", 2, false, 0)
 	{
 		this->source = "m_sapart.so";
 		syntax = "<nick> <channel> [reason]";
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 2e10385ca..82b44ede5 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -20,7 +20,7 @@
 class CommandSaquit : public Command
 {
  public:
-	CommandSaquit (InspIRCd* Instance) : Command(Instance, "SAQUIT", 'o', 2, false, 0)
+	CommandSaquit (InspIRCd* Instance) : Command(Instance, "SAQUIT", "o", 2, false, 0)
 	{
 		this->source = "m_saquit.so";
 		syntax = "<nick> <reason>";
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 8e4173567..2410f4140 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -22,7 +22,7 @@ class CommandSethost : public Command
  private:
 	char* hostmap;
  public:
-	CommandSethost (InspIRCd* Instance, char* hmap) : Command(Instance,"SETHOST",'o',1), hostmap(hmap)
+	CommandSethost (InspIRCd* Instance, char* hmap) : Command(Instance,"SETHOST","o",1), hostmap(hmap)
 	{
 		this->source = "m_sethost.so";
 		syntax = "<new-hostname>";
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index d0337d239..eeed92042 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -20,7 +20,7 @@
 class CommandSetident : public Command
 {
  public:
- CommandSetident (InspIRCd* Instance) : Command(Instance,"SETIDENT", 'o', 1)
+ CommandSetident (InspIRCd* Instance) : Command(Instance,"SETIDENT", "o", 1)
 	{
 		this->source = "m_setident.so";
 		syntax = "<new-ident>";
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index f877c62ea..045ac5f4a 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -20,7 +20,7 @@
 class CommandSetidle : public Command
 {
  public:
-	CommandSetidle (InspIRCd* Instance) : Command(Instance,"SETIDLE", 'o', 1)
+	CommandSetidle (InspIRCd* Instance) : Command(Instance,"SETIDLE", "o", 1)
 	{
 		this->source = "m_setidle.so";
 		syntax = "<duration>";
diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp
index 9e77c21fe..5cfb681d0 100644
--- a/src/modules/m_spanningtree/rconnect.cpp
+++ b/src/modules/m_spanningtree/rconnect.cpp
@@ -30,7 +30,7 @@
 
 /* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h */
 
-cmd_rconnect::cmd_rconnect (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : Command(Instance, "RCONNECT", 'o', 2), Creator(Callback), Utils(Util)
+cmd_rconnect::cmd_rconnect (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : Command(Instance, "RCONNECT", "o", 2), Creator(Callback), Utils(Util)
 {
 	this->source = "m_spanningtree.so";
 	syntax = "<remote-server-mask> <target-server-mask>";
diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 9f07d9b98..236702b72 100644
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -30,7 +30,7 @@
 
 /* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rsquit.h */
 
-cmd_rsquit::cmd_rsquit (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : Command(Instance, "RSQUIT", 'o', 1), Creator(Callback), Utils(Util)
+cmd_rsquit::cmd_rsquit (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : Command(Instance, "RSQUIT", "o", 1), Creator(Callback), Utils(Util)
 {
 	this->source = "m_spanningtree.so";
 	syntax = "<remote-server-mask> [target-server-mask]";
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 64eb80f30..10e05ddf2 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -50,7 +50,7 @@ SVSHoldMap HoldMap;
 class CommandSvshold : public Command
 {
  public:
-	CommandSvshold(InspIRCd* Me) : Command(Me, "SVSHOLD", 'o', 1)
+	CommandSvshold(InspIRCd* Me) : Command(Me, "SVSHOLD", "o", 1)
 	{
 		this->source = "m_svshold.so";
 		this->syntax = "<nickname> [<duration> :<reason>]";
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 44acd1487..25a860ae4 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -21,7 +21,7 @@ class CommandSwhois : public Command
 {
 	
  public:
-	CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS",'o',2)
+	CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",2)
 	{
 		this->source = "m_swhois.so";
 		syntax = "<nick> <swhois>";
diff --git a/src/modules/m_taxonomy.cpp b/src/modules/m_taxonomy.cpp
index 104d45cdd..1490d90ef 100644
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.cpp
@@ -23,7 +23,7 @@ class CommandTaxonomy : public Command
 	bool& claimed;
  public:
 	/* Command 'taxonomy', takes no parameters and needs no special modes */
-	CommandTaxonomy (InspIRCd* Instance, Module* maker, bool &claim) : Command(Instance,"TAXONOMY", 'o', 1), Creator(maker), claimed(claim)
+	CommandTaxonomy (InspIRCd* Instance, Module* maker, bool &claim) : Command(Instance,"TAXONOMY", "o", 1), Creator(maker), claimed(claim)
 	{
 		this->source = "m_taxonomy.so";
 		syntax = "<nickname>";
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 28a3d2f69..a38deeb5f 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -21,7 +21,7 @@
 class CommandTline : public Command
 {
  public:
-	CommandTline (InspIRCd* Instance) : Command(Instance,"TLINE", 'o', 1)
+	CommandTline (InspIRCd* Instance) : Command(Instance,"TLINE", "o", 1)
 	{
 		this->source = "m_tline.so";
 		this->syntax = "<mask>";
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 3205b753d..9102fbc93 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -20,7 +20,7 @@
 class CommandUserip : public Command
 {
  public:
-	CommandUserip (InspIRCd* Instance) : Command(Instance,"USERIP", 'o', 1)
+	CommandUserip (InspIRCd* Instance) : Command(Instance,"USERIP", "o", 1)
 	{
 		this->source = "m_userip.so";
 		syntax = "<nick>{,<nick>}";