From: w00t Date: Mon, 15 Oct 2007 20:55:55 +0000 (+0000) Subject: class command_t -> class Command. Whey :D X-Git-Tag: v2.0.23~4467 X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=694e307c09334c21aaf1a6c3f0b7b6d95440dd3e;p=user%2Fhenk%2Fcode%2Finspircd.git class command_t -> class Command. Whey :D git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8203 e03df62e-2008-0410-955e-edbf42e46eb7 --- diff --git a/include/command_parse.h b/include/command_parse.h index 4e25d1004..be3ea89ff 100644 --- a/include/command_parse.h +++ b/include/command_parse.h @@ -77,13 +77,13 @@ class CoreExport CommandParser : public classbase /** Removes a command if the sources match. Used as a helper for * safe hash_map delete while iter in RemoveCommands(const char* source). */ - void RemoveCommand(nspace::hash_map::iterator safei, const char* source); + void RemoveCommand(nspace::hash_map::iterator safei, const char* source); public: - /** Command list, a hash_map of command names to command_t* + /** Command list, a hash_map of command names to Command* */ - command_table cmdlist; + Commandable cmdlist; /** Reload a core command. * This will only reload commands implemented by the core, @@ -117,7 +117,7 @@ class CoreExport CommandParser : public classbase * @param commandname The command required. Always use uppercase for this parameter. * @return a pointer to the command handler, or NULL */ - command_t* GetHandler(const std::string &commandname); + Command* GetHandler(const std::string &commandname); /** This function returns true if a command is valid with the given number of parameters and user. * @param commandname The command name to check @@ -150,7 +150,7 @@ class CoreExport CommandParser : public classbase * @return This function will return 1 when there are no more parameters to process. When this occurs, its * caller should return without doing anything, otherwise it should continue into its main section of code. */ - int LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra); + int LoopCall(userrec* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra); /** LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list. * There are two overriden versions of this method, one of which takes two potential lists and the other takes one. @@ -173,7 +173,7 @@ class CoreExport CommandParser : public classbase * @return This function will return 1 when there are no more parameters to process. When this occurs, its * caller should return without doing anything, otherwise it should continue into its main section of code. */ - int LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere); + int LoopCall(userrec* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere); /** Take a raw input buffer from a recvq, and process it on behalf of a user. * @param buffer The buffer line to process @@ -188,13 +188,13 @@ class CoreExport CommandParser : public classbase bool RemoveCommands(const char* source); /** Add a new command to the commands hash - * @param f The new command_t to add to the list + * @param f The new Command to add to the list * @param so_handle The handle to the shared object where the command can be found. * Only core commands loaded via cmd_*.so files should set this parameter to anything * meaningful. Module authors should leave this parameter at its default of NULL. * @return True if the command was added */ - bool CreateCommand(command_t *f, void* so_handle = NULL); + bool CreateCommand(Command *f, void* so_handle = NULL); /** Insert the default RFC1459 commands into the command hash. * Ignore any already loaded commands. @@ -215,12 +215,12 @@ class CoreExport CommandParser : public classbase /** Command handler class for the RELOAD command. * A command cant really reload itself, so this has to be in here. */ -class cmd_reload : public command_t +class cmd_reload : public Command { public: /** Standard constructor */ - cmd_reload (InspIRCd* Instance) : command_t(Instance,"RELOAD",'o',1) { syntax = ""; } + cmd_reload (InspIRCd* Instance) : Command(Instance,"RELOAD",'o',1) { syntax = ""; } /** Handle RELOAD */ CmdResult Handle(const char** parameters, int pcnt, userrec *user); diff --git a/include/commands/cmd_admin.h b/include/commands/cmd_admin.h index c1f90312b..049d230b0 100644 --- a/include/commands/cmd_admin.h +++ b/include/commands/cmd_admin.h @@ -22,12 +22,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_admin : public command_t +class cmd_admin : public Command { public: /** Constructor for admin. */ - cmd_admin (InspIRCd* Instance) : command_t(Instance,"ADMIN",0,0) { syntax = "[]"; } + cmd_admin (InspIRCd* Instance) : Command(Instance,"ADMIN",0,0) { syntax = "[]"; } /** 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_away.h b/include/commands/cmd_away.h index 73b75fd28..269c548aa 100644 --- a/include/commands/cmd_away.h +++ b/include/commands/cmd_away.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_away : public command_t +class cmd_away : public Command { public: /** Constructor for away. */ - cmd_away (InspIRCd* Instance) : command_t(Instance,"AWAY",0,0) { syntax = "[]"; } + cmd_away (InspIRCd* Instance) : Command(Instance,"AWAY",0,0) { syntax = "[]"; } /** 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_clearcache.h b/include/commands/cmd_clearcache.h index 10cd20994..b89029a30 100644 --- a/include/commands/cmd_clearcache.h +++ b/include/commands/cmd_clearcache.h @@ -23,12 +23,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_clearcache : public command_t +class cmd_clearcache : public Command { public: /** Constructor for clearcache. */ - cmd_clearcache (InspIRCd* Instance) : command_t(Instance,"CLEARCACHE",'o',0) { } + cmd_clearcache (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_commands.h b/include/commands/cmd_commands.h index c7206b657..a796d4ebd 100644 --- a/include/commands/cmd_commands.h +++ b/include/commands/cmd_commands.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_commands : public command_t +class cmd_commands : public Command { public: /** Constructor for commands. */ - cmd_commands (InspIRCd* Instance) : command_t(Instance,"COMMANDS",0,0) { } + cmd_commands (InspIRCd* Instance) : Command(Instance,"COMMANDS",0,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 4cb3d7992..b621cab77 100644 --- a/include/commands/cmd_connect.h +++ b/include/commands/cmd_connect.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_connect : public command_t +class cmd_connect : public Command { public: /** Constructor for connect. */ - cmd_connect (InspIRCd* Instance) : command_t(Instance,"CONNECT",'o',1) { syntax = " []"; } + cmd_connect (InspIRCd* Instance) : Command(Instance,"CONNECT",'o',1) { syntax = " []"; } /** 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 f74ea1585..cae2637e9 100644 --- a/include/commands/cmd_die.h +++ b/include/commands/cmd_die.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_die : public command_t +class cmd_die : public Command { public: /** Constructor for die. */ - cmd_die (InspIRCd* Instance) : command_t(Instance,"DIE",'o',1) { syntax = ""; } + cmd_die (InspIRCd* Instance) : Command(Instance,"DIE",'o',1) { syntax = ""; } /** 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 1b31431e3..36b22ce79 100644 --- a/include/commands/cmd_eline.h +++ b/include/commands/cmd_eline.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_eline : public command_t +class cmd_eline : public Command { public: /** Constructor for eline. */ - cmd_eline (InspIRCd* Instance) : command_t(Instance,"ELINE",'o',1) { syntax = " [ :]"; } + cmd_eline (InspIRCd* Instance) : Command(Instance,"ELINE",'o',1) { syntax = " [ :]"; } /** 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 906b1c784..caf703009 100644 --- a/include/commands/cmd_gline.h +++ b/include/commands/cmd_gline.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_gline : public command_t +class cmd_gline : public Command { public: /** Constructor for gline. */ - cmd_gline (InspIRCd* Instance) : command_t(Instance,"GLINE",'o',1) { syntax = " [ :]"; } + cmd_gline (InspIRCd* Instance) : Command(Instance,"GLINE",'o',1) { syntax = " [ :]"; } /** 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_info.h b/include/commands/cmd_info.h index 9627112d6..c84a03adf 100644 --- a/include/commands/cmd_info.h +++ b/include/commands/cmd_info.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_info : public command_t +class cmd_info : public Command { public: /** Constructor for info. */ - cmd_info (InspIRCd* Instance) : command_t(Instance,"INFO",0,0) { syntax = "[]"; } + cmd_info (InspIRCd* Instance) : Command(Instance,"INFO",0,0) { syntax = "[]"; } /** 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_invite.h b/include/commands/cmd_invite.h index 3be048ea2..95391e829 100644 --- a/include/commands/cmd_invite.h +++ b/include/commands/cmd_invite.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_invite : public command_t +class cmd_invite : public Command { public: /** Constructor for invite. */ - cmd_invite (InspIRCd* Instance) : command_t(Instance,"INVITE",0,0) { syntax = "[ ]"; } + cmd_invite (InspIRCd* Instance) : Command(Instance,"INVITE",0,0) { syntax = "[ ]"; } /** 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_ison.h b/include/commands/cmd_ison.h index 4e64ec91b..3b914d62e 100644 --- a/include/commands/cmd_ison.h +++ b/include/commands/cmd_ison.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_ison : public command_t +class cmd_ison : public Command { public: /** Constructor for ison. */ - cmd_ison (InspIRCd* Instance) : command_t(Instance,"ISON",0,0) { syntax = " {nick}"; } + cmd_ison (InspIRCd* Instance) : Command(Instance,"ISON",0,0) { syntax = " {nick}"; } /** 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_join.h b/include/commands/cmd_join.h index 6981d458b..cf678e4ea 100644 --- a/include/commands/cmd_join.h +++ b/include/commands/cmd_join.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_join : public command_t +class cmd_join : public Command { public: /** Constructor for join. */ - cmd_join (InspIRCd* Instance) : command_t(Instance,"JOIN",0,1) { syntax = "{,} {{,}}"; } + cmd_join (InspIRCd* Instance) : Command(Instance,"JOIN",0,1) { syntax = "{,} {{,}}"; } /** 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_kick.h b/include/commands/cmd_kick.h index acd177b44..3a58d4203 100644 --- a/include/commands/cmd_kick.h +++ b/include/commands/cmd_kick.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_kick : public command_t +class cmd_kick : public Command { public: /** Constructor for kick. */ - cmd_kick (InspIRCd* Instance) : command_t(Instance,"KICK",0,2) { syntax = " {,} []"; } + cmd_kick (InspIRCd* Instance) : Command(Instance,"KICK",0,2) { syntax = " {,} []"; } /** 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 7a3ae5304..1e1835f00 100644 --- a/include/commands/cmd_kill.h +++ b/include/commands/cmd_kill.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_kill : public command_t +class cmd_kill : public Command { public: /** Constructor for kill. */ - cmd_kill (InspIRCd* Instance) : command_t(Instance,"KILL",'o',2) { syntax = " "; } + cmd_kill (InspIRCd* Instance) : Command(Instance,"KILL",'o',2) { syntax = " "; } /** 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 3ce7d34e5..edaa8a8bc 100644 --- a/include/commands/cmd_kline.h +++ b/include/commands/cmd_kline.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_kline : public command_t +class cmd_kline : public Command { public: /** Constructor for kline. */ - cmd_kline (InspIRCd* Instance) : command_t(Instance,"KLINE",'o',1) { syntax = " [ :]"; } + cmd_kline (InspIRCd* Instance) : Command(Instance,"KLINE",'o',1) { syntax = " [ :]"; } /** 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_links.h b/include/commands/cmd_links.h index 260ba60fb..74b616401 100644 --- a/include/commands/cmd_links.h +++ b/include/commands/cmd_links.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_links : public command_t +class cmd_links : public Command { public: /** Constructor for links. */ - cmd_links (InspIRCd* Instance) : command_t(Instance,"LINKS",0,0) { } + cmd_links (InspIRCd* Instance) : Command(Instance,"LINKS",0,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_list.h b/include/commands/cmd_list.h index 5395b3180..f99111fa0 100644 --- a/include/commands/cmd_list.h +++ b/include/commands/cmd_list.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_list : public command_t +class cmd_list : public Command { public: /** Constructor for list. */ - cmd_list (InspIRCd* Instance) : command_t(Instance,"LIST",0,0) { } + cmd_list (InspIRCd* Instance) : Command(Instance,"LIST",0,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_loadmodule.h b/include/commands/cmd_loadmodule.h index 19de8b988..4288eb4c6 100644 --- a/include/commands/cmd_loadmodule.h +++ b/include/commands/cmd_loadmodule.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_loadmodule : public command_t +class cmd_loadmodule : public Command { public: /** Constructor for loadmodule. */ - cmd_loadmodule (InspIRCd* Instance) : command_t(Instance,"LOADMODULE",'o',1) { syntax = ""; } + cmd_loadmodule (InspIRCd* Instance) : Command(Instance,"LOADMODULE",'o',1) { syntax = ""; } /** 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_lusers.h b/include/commands/cmd_lusers.h index e257899c0..76ebf5674 100644 --- a/include/commands/cmd_lusers.h +++ b/include/commands/cmd_lusers.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_lusers : public command_t +class cmd_lusers : public Command { public: /** Constructor for lusers. */ - cmd_lusers (InspIRCd* Instance) : command_t(Instance,"LUSERS",0,0) { } + cmd_lusers (InspIRCd* Instance) : Command(Instance,"LUSERS",0,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_map.h b/include/commands/cmd_map.h index 961e91753..1ae324309 100644 --- a/include/commands/cmd_map.h +++ b/include/commands/cmd_map.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_map : public command_t +class cmd_map : public Command { public: /** Constructor for map. */ - cmd_map (InspIRCd* Instance) : command_t(Instance,"MAP",0,0) { } + cmd_map (InspIRCd* Instance) : Command(Instance,"MAP",0,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_mode.h b/include/commands/cmd_mode.h index 3d6c72840..9231f2c61 100644 --- a/include/commands/cmd_mode.h +++ b/include/commands/cmd_mode.h @@ -23,12 +23,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_mode : public command_t +class cmd_mode : public Command { public: /** Constructor for mode. */ - cmd_mode (InspIRCd* Instance) : command_t(Instance,"MODE",0,1) { syntax = " {}"; } + cmd_mode (InspIRCd* Instance) : Command(Instance,"MODE",0,1) { syntax = " {}"; } /** 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_modules.h b/include/commands/cmd_modules.h index 7d2657416..73a6074d1 100644 --- a/include/commands/cmd_modules.h +++ b/include/commands/cmd_modules.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_modules : public command_t +class cmd_modules : public Command { public: /** Constructor for modules. */ - cmd_modules (InspIRCd* Instance) : command_t(Instance,"MODULES",0,0) { syntax = "[debug]"; } + cmd_modules (InspIRCd* Instance) : Command(Instance,"MODULES",0,0) { syntax = "[debug]"; } /** 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_motd.h b/include/commands/cmd_motd.h index c58599938..e6f5092b2 100644 --- a/include/commands/cmd_motd.h +++ b/include/commands/cmd_motd.h @@ -27,12 +27,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_motd : public command_t +class cmd_motd : public Command { public: /** Constructor for motd. */ - cmd_motd (InspIRCd* Instance) : command_t(Instance,"MOTD",0,0) { syntax = "[]"; } + cmd_motd (InspIRCd* Instance) : Command(Instance,"MOTD",0,0) { syntax = "[]"; } /** 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_names.h b/include/commands/cmd_names.h index 577e49e34..b65fdeda8 100644 --- a/include/commands/cmd_names.h +++ b/include/commands/cmd_names.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_names : public command_t +class cmd_names : public Command { public: /** Constructor for names. */ - cmd_names (InspIRCd* Instance) : command_t(Instance,"NAMES",0,0) { syntax = "{{,}}"; } + cmd_names (InspIRCd* Instance) : Command(Instance,"NAMES",0,0) { syntax = "{{,}}"; } /** 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_nick.h b/include/commands/cmd_nick.h index 6b361c9c0..849b59c22 100644 --- a/include/commands/cmd_nick.h +++ b/include/commands/cmd_nick.h @@ -24,13 +24,13 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_nick : public command_t +class cmd_nick : public Command { bool allowinvalid; public: /** Constructor for nick. */ - cmd_nick (InspIRCd* Instance) : command_t(Instance,"NICK",0,1,true), allowinvalid(false) { syntax = ""; } + cmd_nick (InspIRCd* Instance) : Command(Instance,"NICK",0,1,true), allowinvalid(false) { syntax = ""; } /** 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_notice.h b/include/commands/cmd_notice.h index 8ae576ee2..20c34b6bf 100644 --- a/include/commands/cmd_notice.h +++ b/include/commands/cmd_notice.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_notice : public command_t +class cmd_notice : public Command { public: /** Constructor for notice. */ - cmd_notice (InspIRCd* Instance) : command_t(Instance,"NOTICE",0,2) { syntax = "{,} "; } + cmd_notice (InspIRCd* Instance) : Command(Instance,"NOTICE",0,2) { syntax = "{,} "; } /** 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_oper.h b/include/commands/cmd_oper.h index 3a61c8a80..17d71dbe3 100644 --- a/include/commands/cmd_oper.h +++ b/include/commands/cmd_oper.h @@ -26,12 +26,12 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist); * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_oper : public command_t +class cmd_oper : public Command { public: /** Constructor for oper. */ - cmd_oper (InspIRCd* Instance) : command_t(Instance,"OPER",0,2) { syntax = " "; } + cmd_oper (InspIRCd* Instance) : Command(Instance,"OPER",0,2) { syntax = " "; } /** 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_part.h b/include/commands/cmd_part.h index c4c9668a3..c419fb798 100644 --- a/include/commands/cmd_part.h +++ b/include/commands/cmd_part.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_part : public command_t +class cmd_part : public Command { public: /** Constructor for part. */ - cmd_part (InspIRCd* Instance) : command_t(Instance,"PART",0,1) { syntax = "{,} []"; } + cmd_part (InspIRCd* Instance) : Command(Instance,"PART",0,1) { syntax = "{,} []"; } /** 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_pass.h b/include/commands/cmd_pass.h index 609c1e72f..0edd17a97 100644 --- a/include/commands/cmd_pass.h +++ b/include/commands/cmd_pass.h @@ -27,12 +27,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_pass : public command_t +class cmd_pass : public Command { public: /** Constructor for pass. */ - cmd_pass (InspIRCd* Instance) : command_t(Instance,"PASS",0,1,true) { syntax = ""; } + cmd_pass (InspIRCd* Instance) : Command(Instance,"PASS",0,1,true) { syntax = ""; } /** 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_ping.h b/include/commands/cmd_ping.h index 83bbd06ad..6e856fa3a 100644 --- a/include/commands/cmd_ping.h +++ b/include/commands/cmd_ping.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_ping : public command_t +class cmd_ping : public Command { public: /** Constructor for ping. */ - cmd_ping (InspIRCd* Instance) : command_t(Instance,"PING",0,1) { syntax = " [:]"; } + cmd_ping (InspIRCd* Instance) : Command(Instance,"PING",0,1) { syntax = " [:]"; } /** 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_pong.h b/include/commands/cmd_pong.h index 26e7444d1..f050a4ee8 100644 --- a/include/commands/cmd_pong.h +++ b/include/commands/cmd_pong.h @@ -25,12 +25,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_pong : public command_t +class cmd_pong : public Command { public: /** Constructor for pong. */ - cmd_pong (InspIRCd* Instance) : command_t(Instance,"PONG",0,1) { syntax = ""; } + cmd_pong (InspIRCd* Instance) : Command(Instance,"PONG",0,1) { syntax = ""; } /** 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_privmsg.h b/include/commands/cmd_privmsg.h index 276580fbe..604093851 100644 --- a/include/commands/cmd_privmsg.h +++ b/include/commands/cmd_privmsg.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_privmsg : public command_t +class cmd_privmsg : public Command { public: /** Constructor for privmsg. */ - cmd_privmsg (InspIRCd* Instance) : command_t(Instance,"PRIVMSG",0,2) { syntax = "{,} "; } + cmd_privmsg (InspIRCd* Instance) : Command(Instance,"PRIVMSG",0,2) { syntax = "{,} "; } /** 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 4221f78b7..fb9e88048 100644 --- a/include/commands/cmd_qline.h +++ b/include/commands/cmd_qline.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_qline : public command_t +class cmd_qline : public Command { public: /** Constructor for qline. */ - cmd_qline (InspIRCd* Instance) : command_t(Instance,"QLINE",'o',1) { syntax = " [ :]"; } + cmd_qline (InspIRCd* Instance) : Command(Instance,"QLINE",'o',1) { syntax = " [ :]"; } /** 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_quit.h b/include/commands/cmd_quit.h index c0a27744a..06c564ac0 100644 --- a/include/commands/cmd_quit.h +++ b/include/commands/cmd_quit.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_quit : public command_t +class cmd_quit : public Command { public: /** Constructor for quit. */ - cmd_quit (InspIRCd* Instance) : command_t(Instance,"QUIT",0,0,true) { syntax = "[]"; } + cmd_quit (InspIRCd* Instance) : Command(Instance,"QUIT",0,0,true) { syntax = "[]"; } /** 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 818a038c8..684ffee9c 100644 --- a/include/commands/cmd_rehash.h +++ b/include/commands/cmd_rehash.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_rehash : public command_t +class cmd_rehash : public Command { public: /** Constructor for rehash. */ - cmd_rehash (InspIRCd* Instance) : command_t(Instance,"REHASH",'o',0) { syntax = "[]"; } + cmd_rehash (InspIRCd* Instance) : Command(Instance,"REHASH",'o',0) { syntax = "[]"; } /** 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 6e21e0dfa..672816289 100644 --- a/include/commands/cmd_reloadmodule.h +++ b/include/commands/cmd_reloadmodule.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_reloadmodule : public command_t +class cmd_reloadmodule : public Command { public: /** Constructor for reloadmodule. */ - cmd_reloadmodule (InspIRCd* Instance) : command_t(Instance,"RELOADMODULE",'o',1) { syntax = ""; } + cmd_reloadmodule (InspIRCd* Instance) : Command(Instance,"RELOADMODULE",'o',1) { syntax = ""; } /** 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 e66873ebb..0834bf61b 100644 --- a/include/commands/cmd_restart.h +++ b/include/commands/cmd_restart.h @@ -27,12 +27,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_restart : public command_t +class cmd_restart : public Command { public: /** Constructor for restart. */ - cmd_restart (InspIRCd* Instance) : command_t(Instance,"RESTART",'o',1) { syntax = ""; } + cmd_restart (InspIRCd* Instance) : Command(Instance,"RESTART",'o',1) { syntax = ""; } /** 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_rules.h b/include/commands/cmd_rules.h index a57080eaa..5313dae32 100644 --- a/include/commands/cmd_rules.h +++ b/include/commands/cmd_rules.h @@ -27,12 +27,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_rules : public command_t +class cmd_rules : public Command { public: /** Constructor for rules. */ - cmd_rules (InspIRCd* Instance) : command_t(Instance,"RULES",0,0) { syntax = "[]"; } + cmd_rules (InspIRCd* Instance) : Command(Instance,"RULES",0,0) { syntax = "[]"; } /** 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_server.h b/include/commands/cmd_server.h index 20d8ca8a3..e3383e5c7 100644 --- a/include/commands/cmd_server.h +++ b/include/commands/cmd_server.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_server : public command_t +class cmd_server : public Command { public: /** Constructor for server. */ - cmd_server (InspIRCd* Instance) : command_t(Instance,"SERVER",0,0) { } + cmd_server (InspIRCd* Instance) : Command(Instance,"SERVER",0,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_squit.h b/include/commands/cmd_squit.h index fd09ca437..faef49dff 100644 --- a/include/commands/cmd_squit.h +++ b/include/commands/cmd_squit.h @@ -27,12 +27,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_squit : public command_t +class cmd_squit : public Command { public: /** Constructor for squit. */ - cmd_squit (InspIRCd* Instance) : command_t(Instance,"SQUIT",'o',1) { syntax = " []"; } + cmd_squit (InspIRCd* Instance) : Command(Instance,"SQUIT",'o',1) { syntax = " []"; } /** 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_stats.h b/include/commands/cmd_stats.h index ce4755fec..2931a27e0 100644 --- a/include/commands/cmd_stats.h +++ b/include/commands/cmd_stats.h @@ -27,12 +27,12 @@ DllExport void DoStats(InspIRCd* Instance, char statschar, userrec* user, string * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_stats : public command_t +class cmd_stats : public Command { public: /** Constructor for stats. */ - cmd_stats (InspIRCd* Instance) : command_t(Instance,"STATS",0,1) { syntax = " []"; } + cmd_stats (InspIRCd* Instance) : Command(Instance,"STATS",0,1) { syntax = " []"; } /** 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_time.h b/include/commands/cmd_time.h index d0206b84b..24423c46e 100644 --- a/include/commands/cmd_time.h +++ b/include/commands/cmd_time.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_time : public command_t +class cmd_time : public Command { public: /** Constructor for time. */ - cmd_time (InspIRCd* Instance) : command_t(Instance,"TIME",0,0) { syntax = "[]"; } + cmd_time (InspIRCd* Instance) : Command(Instance,"TIME",0,0) { syntax = "[]"; } /** 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_topic.h b/include/commands/cmd_topic.h index ce82ad119..0e75df750 100644 --- a/include/commands/cmd_topic.h +++ b/include/commands/cmd_topic.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_topic : public command_t +class cmd_topic : public Command { public: /** Constructor for topic. */ - cmd_topic (InspIRCd* Instance) : command_t(Instance,"TOPIC",0,1) { syntax = " []"; } + cmd_topic (InspIRCd* Instance) : Command(Instance,"TOPIC",0,1) { syntax = " []"; } /** 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 69ee31df1..6f5aecf00 100644 --- a/include/commands/cmd_trace.h +++ b/include/commands/cmd_trace.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_trace : public command_t +class cmd_trace : public Command { public: /** Constructor for trace. */ - cmd_trace (InspIRCd* Instance) : command_t(Instance,"TRACE",'o',0) { syntax = "[]"; } + cmd_trace (InspIRCd* Instance) : Command(Instance,"TRACE",'o',0) { syntax = "[]"; } /** 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 25515114d..962c7dcb6 100644 --- a/include/commands/cmd_unloadmodule.h +++ b/include/commands/cmd_unloadmodule.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_unloadmodule : public command_t +class cmd_unloadmodule : public Command { public: /** Constructor for unloadmodule. */ - cmd_unloadmodule (InspIRCd* Instance) : command_t(Instance,"UNLOADMODULE",'o',1) { syntax = ""; } + cmd_unloadmodule (InspIRCd* Instance) : Command(Instance,"UNLOADMODULE",'o',1) { syntax = ""; } /** 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_user.h b/include/commands/cmd_user.h index 29a859131..dc4e0e3aa 100644 --- a/include/commands/cmd_user.h +++ b/include/commands/cmd_user.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_user : public command_t +class cmd_user : public Command { public: /** Constructor for user. */ - cmd_user (InspIRCd* Instance) : command_t(Instance,"USER",0,4,true) { syntax = " "; } + cmd_user (InspIRCd* Instance) : Command(Instance,"USER",0,4,true) { syntax = " "; } /** 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_userhost.h b/include/commands/cmd_userhost.h index 85ad55550..bd19219de 100644 --- a/include/commands/cmd_userhost.h +++ b/include/commands/cmd_userhost.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_userhost : public command_t +class cmd_userhost : public Command { public: /** Constructor for userhost. */ - cmd_userhost (InspIRCd* Instance) : command_t(Instance,"USERHOST",0,1) { syntax = "{,}"; } + cmd_userhost (InspIRCd* Instance) : Command(Instance,"USERHOST",0,1) { syntax = "{,}"; } /** 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_version.h b/include/commands/cmd_version.h index 825e9fdbc..2163bc1cf 100644 --- a/include/commands/cmd_version.h +++ b/include/commands/cmd_version.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_version : public command_t +class cmd_version : public Command { public: /** Constructor for version. */ - cmd_version (InspIRCd* Instance) : command_t(Instance,"VERSION",0,0) { syntax = "[]"; } + cmd_version (InspIRCd* Instance) : Command(Instance,"VERSION",0,0) { syntax = "[]"; } /** 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 a65bced0d..6c09989fe 100644 --- a/include/commands/cmd_wallops.h +++ b/include/commands/cmd_wallops.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_wallops : public command_t +class cmd_wallops : public Command { public: /** Constructor for wallops. */ - cmd_wallops (InspIRCd* Instance) : command_t(Instance,"WALLOPS",'o',1) { syntax = ""; } + cmd_wallops (InspIRCd* Instance) : Command(Instance,"WALLOPS",'o',1) { syntax = ""; } /** 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_who.h b/include/commands/cmd_who.h index cf6849d7d..f89137c0a 100644 --- a/include/commands/cmd_who.h +++ b/include/commands/cmd_who.h @@ -24,7 +24,7 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_who : public command_t +class cmd_who : public Command { bool CanView(chanrec* chan, userrec* user); bool opt_viewopersonly; @@ -41,7 +41,7 @@ class cmd_who : public command_t public: /** Constructor for who. */ - cmd_who (InspIRCd* Instance) : command_t(Instance,"WHO",0,1) { syntax = "|||||0 [ohurmMiaplf]"; } + cmd_who (InspIRCd* Instance) : Command(Instance,"WHO",0,1) { syntax = "|||||0 [ohurmMiaplf]"; } void SendWhoLine(userrec* user, const std::string &initial, chanrec* ch, userrec* u, std::vector &whoresults); /** Handle command. * @param parameters The parameters to the comamnd diff --git a/include/commands/cmd_whois.h b/include/commands/cmd_whois.h index 545b0c8c4..6aec85e0a 100644 --- a/include/commands/cmd_whois.h +++ b/include/commands/cmd_whois.h @@ -27,12 +27,12 @@ DllExport void do_whois(InspIRCd* Instance, userrec* user, userrec* dest,unsigne * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_whois : public command_t +class cmd_whois : public Command { public: /** Constructor for whois. */ - cmd_whois (InspIRCd* Instance) : command_t(Instance,"WHOIS",0,1) { syntax = "{,}"; } + cmd_whois (InspIRCd* Instance) : Command(Instance,"WHOIS",0,1) { syntax = "{,}"; } /** 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_whowas.h b/include/commands/cmd_whowas.h index 28ded7ca2..50f5ffd0f 100644 --- a/include/commands/cmd_whowas.h +++ b/include/commands/cmd_whowas.h @@ -56,7 +56,7 @@ typedef std::deque > whowas_users_fifo; * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_whowas : public command_t +class cmd_whowas : public Command { private: /** Whowas container, contains a map of vectors of users tracked by WHOWAS diff --git a/include/commands/cmd_zline.h b/include/commands/cmd_zline.h index 1a89dcf82..114de31b1 100644 --- a/include/commands/cmd_zline.h +++ b/include/commands/cmd_zline.h @@ -24,12 +24,12 @@ * the same way, however, they can be fully unloaded, where these * may not. */ -class cmd_zline : public command_t +class cmd_zline : public Command { public: /** Constructor for zline. */ - cmd_zline (InspIRCd* Instance) : command_t(Instance,"ZLINE",'o',1) { syntax = " [ :]"; } + cmd_zline (InspIRCd* Instance) : Command(Instance,"ZLINE",'o',1) { syntax = " [ :]"; } /** 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 d112e885c..abfc740da 100644 --- a/include/ctables.h +++ b/include/ctables.h @@ -52,9 +52,9 @@ enum TranslateType /** A structure that defines a command. Every command available - * in InspIRCd must be defined as derived from command_t. + * in InspIRCd must be defined as derived from Command. */ -class CoreExport command_t : public Extensible +class CoreExport Command : public Extensible { protected: /** Owner/Creator object @@ -102,7 +102,7 @@ class CoreExport command_t : public Extensible * be allowed before the user is 'registered' (has sent USER, * NICK, optionally PASS, and been resolved). */ - command_t(InspIRCd* Instance, const std::string &cmd, char flags, int minpara, int before_reg = false) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false), works_before_reg(before_reg) + Command(InspIRCd* Instance, const std::string &cmd, char flags, int minpara, int before_reg = false) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false), works_before_reg(before_reg) { use_count = 0; total_bytes = 0; @@ -173,12 +173,12 @@ class CoreExport command_t : public Extensible /** Standard constructor gubbins */ - virtual ~command_t() {} + virtual ~Command() {} }; /** A hash of commands used by the core */ -typedef nspace::hash_map command_table; +typedef nspace::hash_map Commandable; #define TRANSLATE1(x1) translation.push_back(x1); #define TRANSLATE2(x1,x2) translation.push_back(x1);translation.push_back(x2); diff --git a/include/inspircd.h b/include/inspircd.h index c44325a02..7aa5a5ec3 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -773,10 +773,10 @@ class CoreExport InspIRCd : public classbase bool AddResolver(Resolver* r, bool cached); /** Add a command to this server's command parser - * @param f A command_t command handler object to add + * @param f A Command command handler object to add * @throw ModuleException Will throw ModuleExcption if the command already exists */ - void AddCommand(command_t *f); + void AddCommand(Command *f); /** Send a modechange. * The parameters provided are identical to that sent to the diff --git a/src/cmd_admin.cpp b/src/cmd_admin.cpp index df984a10f..a7a72c0f8 100644 --- a/src/cmd_admin.cpp +++ b/src/cmd_admin.cpp @@ -15,7 +15,7 @@ #include "commands/cmd_admin.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_admin(Instance); } diff --git a/src/cmd_away.cpp b/src/cmd_away.cpp index 98209217f..c27ce222a 100644 --- a/src/cmd_away.cpp +++ b/src/cmd_away.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_away.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_away(Instance); } diff --git a/src/cmd_clearcache.cpp b/src/cmd_clearcache.cpp index 333593425..0a08498e8 100644 --- a/src/cmd_clearcache.cpp +++ b/src/cmd_clearcache.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_clearcache.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_clearcache(Instance); } diff --git a/src/cmd_commands.cpp b/src/cmd_commands.cpp index 85437c2b0..41f68690e 100644 --- a/src/cmd_commands.cpp +++ b/src/cmd_commands.cpp @@ -16,14 +16,14 @@ /** Handle /COMMANDS */ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_commands(Instance); } CmdResult cmd_commands::Handle (const char** parameters, int pcnt, userrec *user) { - for (command_table::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++) + for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++) { user->WriteServ("902 %s :%s %s %d",user->nick,i->second->command.c_str(),i->second->source.c_str(),i->second->min_params); } diff --git a/src/cmd_connect.cpp b/src/cmd_connect.cpp index 0f1e10695..63afa02a2 100644 --- a/src/cmd_connect.cpp +++ b/src/cmd_connect.cpp @@ -18,7 +18,7 @@ * This is handled by the server linking module, if necessary. Do not remove this stub. */ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_connect(Instance); } diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp index 6025ea2b5..4772c9d17 100644 --- a/src/cmd_die.cpp +++ b/src/cmd_die.cpp @@ -15,7 +15,7 @@ #include "commands/cmd_die.h" #include "exitcodes.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_die(Instance); } diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp index 96e04da71..d28f72418 100644 --- a/src/cmd_eline.cpp +++ b/src/cmd_eline.cpp @@ -15,7 +15,7 @@ #include "xline.h" #include "commands/cmd_eline.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_eline(Instance); } diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp index bed81c984..2dff4902e 100644 --- a/src/cmd_gline.cpp +++ b/src/cmd_gline.cpp @@ -15,7 +15,7 @@ #include "xline.h" #include "commands/cmd_gline.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_gline(Instance); } diff --git a/src/cmd_info.cpp b/src/cmd_info.cpp index ce2b471db..29085afb7 100644 --- a/src/cmd_info.cpp +++ b/src/cmd_info.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_info.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_info(Instance); } diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp index 74ac7ea2c..a1e3fb24b 100644 --- a/src/cmd_invite.cpp +++ b/src/cmd_invite.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_invite.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_invite(Instance); } diff --git a/src/cmd_ison.cpp b/src/cmd_ison.cpp index 4ca319afc..4c5542cd8 100644 --- a/src/cmd_ison.cpp +++ b/src/cmd_ison.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_ison.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_ison(Instance); } diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp index 4e69cbb4e..171f90bba 100644 --- a/src/cmd_join.cpp +++ b/src/cmd_join.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_join.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_join(Instance); } diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp index bd700113f..78edb177d 100644 --- a/src/cmd_kick.cpp +++ b/src/cmd_kick.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_kick.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_kick(Instance); } diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp index 43cf1d5ab..a2e76ce45 100644 --- a/src/cmd_kill.cpp +++ b/src/cmd_kill.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_kill.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_kill(Instance); } diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp index ec31228ed..75a868577 100644 --- a/src/cmd_kline.cpp +++ b/src/cmd_kline.cpp @@ -15,7 +15,7 @@ #include "xline.h" #include "commands/cmd_kline.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_kline(Instance); } diff --git a/src/cmd_links.cpp b/src/cmd_links.cpp index 45011d3e8..2576b63e9 100644 --- a/src/cmd_links.cpp +++ b/src/cmd_links.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_links.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_links(Instance); } diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp index 1e994965b..e77feeb66 100644 --- a/src/cmd_list.cpp +++ b/src/cmd_list.cpp @@ -17,7 +17,7 @@ /** Handle /LIST */ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_list(Instance); } diff --git a/src/cmd_loadmodule.cpp b/src/cmd_loadmodule.cpp index e9f6cf39c..0c5cb139b 100644 --- a/src/cmd_loadmodule.cpp +++ b/src/cmd_loadmodule.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_loadmodule.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_loadmodule(Instance); } diff --git a/src/cmd_lusers.cpp b/src/cmd_lusers.cpp index 0d70fa788..cc66ba435 100644 --- a/src/cmd_lusers.cpp +++ b/src/cmd_lusers.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_lusers.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_lusers(Instance); } diff --git a/src/cmd_map.cpp b/src/cmd_map.cpp index 70918e392..471f53a1a 100644 --- a/src/cmd_map.cpp +++ b/src/cmd_map.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_map.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_map(Instance); } diff --git a/src/cmd_mode.cpp b/src/cmd_mode.cpp index 4e4466d36..5680e1b05 100644 --- a/src/cmd_mode.cpp +++ b/src/cmd_mode.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_mode.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_mode(Instance); } diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp index dc3eea15d..12697a68f 100644 --- a/src/cmd_modules.cpp +++ b/src/cmd_modules.cpp @@ -31,7 +31,7 @@ char* itab[] = { "OnPostCommand", "OnPostJoin", "OnWhoisLine", "OnBuildExemptList", "OnRawSocketConnect", "OnGarbageCollect", NULL }; -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_modules(Instance); } diff --git a/src/cmd_motd.cpp b/src/cmd_motd.cpp index 38117be6b..53d140a9d 100644 --- a/src/cmd_motd.cpp +++ b/src/cmd_motd.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_motd.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_motd(Instance); } diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp index 2b3a421a2..21ab2f3ed 100644 --- a/src/cmd_names.cpp +++ b/src/cmd_names.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_names.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_names(Instance); } diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp index 4eb439895..6eb72349b 100644 --- a/src/cmd_nick.cpp +++ b/src/cmd_nick.cpp @@ -15,7 +15,7 @@ #include "xline.h" #include "commands/cmd_nick.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_nick(Instance); } diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp index f66341846..7c0f06b40 100644 --- a/src/cmd_notice.cpp +++ b/src/cmd_notice.cpp @@ -15,7 +15,7 @@ #include "wildcard.h" #include "commands/cmd_notice.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_notice(Instance); } diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp index 4d70f29eb..cc2ae6e65 100644 --- a/src/cmd_oper.cpp +++ b/src/cmd_oper.cpp @@ -30,7 +30,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist) return false; } -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_oper(Instance); } diff --git a/src/cmd_part.cpp b/src/cmd_part.cpp index 9887d844e..9088ec21d 100644 --- a/src/cmd_part.cpp +++ b/src/cmd_part.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_part.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_part(Instance); } diff --git a/src/cmd_pass.cpp b/src/cmd_pass.cpp index 9b57c375d..78bf1a2cf 100644 --- a/src/cmd_pass.cpp +++ b/src/cmd_pass.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_pass.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_pass(Instance); } diff --git a/src/cmd_ping.cpp b/src/cmd_ping.cpp index 2ffd7850b..ff16f2e44 100644 --- a/src/cmd_ping.cpp +++ b/src/cmd_ping.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_ping.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_ping(Instance); } diff --git a/src/cmd_pong.cpp b/src/cmd_pong.cpp index 08d47eca7..dab4de720 100644 --- a/src/cmd_pong.cpp +++ b/src/cmd_pong.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_pong.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_pong(Instance); } diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp index 5c3020b5b..2c54a770a 100644 --- a/src/cmd_privmsg.cpp +++ b/src/cmd_privmsg.cpp @@ -15,7 +15,7 @@ #include "wildcard.h" #include "commands/cmd_privmsg.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_privmsg(Instance); } diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp index 41643c5d6..1d4f8d089 100644 --- a/src/cmd_qline.cpp +++ b/src/cmd_qline.cpp @@ -17,7 +17,7 @@ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_qline(Instance); } diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp index 671e1ccef..8626db1ef 100644 --- a/src/cmd_quit.cpp +++ b/src/cmd_quit.cpp @@ -16,7 +16,7 @@ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_quit(Instance); } diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp index ed972007d..a1292f19f 100644 --- a/src/cmd_rehash.cpp +++ b/src/cmd_rehash.cpp @@ -16,7 +16,7 @@ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_rehash(Instance); } diff --git a/src/cmd_reloadmodule.cpp b/src/cmd_reloadmodule.cpp index df198d662..b1201ef6e 100644 --- a/src/cmd_reloadmodule.cpp +++ b/src/cmd_reloadmodule.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_reloadmodule.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_reloadmodule(Instance); } diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp index b9afd7c9d..8da98f77e 100644 --- a/src/cmd_restart.cpp +++ b/src/cmd_restart.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_restart.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_restart(Instance); } diff --git a/src/cmd_rules.cpp b/src/cmd_rules.cpp index ef63d58fd..7c47607db 100644 --- a/src/cmd_rules.cpp +++ b/src/cmd_rules.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_rules.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_rules(Instance); } diff --git a/src/cmd_server.cpp b/src/cmd_server.cpp index 0b71ba005..837c94067 100644 --- a/src/cmd_server.cpp +++ b/src/cmd_server.cpp @@ -16,7 +16,7 @@ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_server(Instance); } diff --git a/src/cmd_squit.cpp b/src/cmd_squit.cpp index 94e7c148b..a29ddbaef 100644 --- a/src/cmd_squit.cpp +++ b/src/cmd_squit.cpp @@ -19,7 +19,7 @@ */ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_squit(Instance); } diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp index f8d5eba27..4b93d5f5f 100644 --- a/src/cmd_stats.cpp +++ b/src/cmd_stats.cpp @@ -26,7 +26,7 @@ #include "commands/cmd_whowas.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_stats(Instance); } @@ -159,7 +159,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, /* stats m (list number of times each command has been used, plus bytecount) */ case 'm': - for (command_table::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++) + for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++) { if (i->second->use_count) { @@ -175,11 +175,11 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, results.push_back(sn+" 240 "+user->nick+" :InspIRCd(CLASS) "+ConvToStr(sizeof(InspIRCd))+" bytes"); results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->clientlist->size())+" ("+ConvToStr(ServerInstance->clientlist->size()*sizeof(userrec))+" bytes)"); results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(ServerInstance->chanlist->size())+" ("+ConvToStr(ServerInstance->chanlist->size()*sizeof(chanrec))+" bytes)"); - results.push_back(sn+" 249 "+user->nick+" :Commands(VECTOR) "+ConvToStr(ServerInstance->Parser->cmdlist.size())+" ("+ConvToStr(ServerInstance->Parser->cmdlist.size()*sizeof(command_t))+" bytes)"); + results.push_back(sn+" 249 "+user->nick+" :Commands(VECTOR) "+ConvToStr(ServerInstance->Parser->cmdlist.size())+" ("+ConvToStr(ServerInstance->Parser->cmdlist.size()*sizeof(Command))+" bytes)"); if (!ServerInstance->Config->WhoWasGroupSize == 0 && !ServerInstance->Config->WhoWasMaxGroups == 0) { - command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS"); + Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS"); if (whowas_command) { std::deque params; diff --git a/src/cmd_time.cpp b/src/cmd_time.cpp index d34a1eed5..926d69204 100644 --- a/src/cmd_time.cpp +++ b/src/cmd_time.cpp @@ -16,7 +16,7 @@ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_time(Instance); } diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp index d30383024..3318972fb 100644 --- a/src/cmd_topic.cpp +++ b/src/cmd_topic.cpp @@ -15,7 +15,7 @@ #include "commands/cmd_topic.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_topic(Instance); } diff --git a/src/cmd_trace.cpp b/src/cmd_trace.cpp index d4e0b9254..a71bb42bf 100644 --- a/src/cmd_trace.cpp +++ b/src/cmd_trace.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_trace.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_trace(Instance); } diff --git a/src/cmd_unloadmodule.cpp b/src/cmd_unloadmodule.cpp index 932142049..5cb410950 100644 --- a/src/cmd_unloadmodule.cpp +++ b/src/cmd_unloadmodule.cpp @@ -16,7 +16,7 @@ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_unloadmodule(Instance); } diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp index 42e70c1df..f2240bb92 100644 --- a/src/cmd_user.cpp +++ b/src/cmd_user.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_user.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_user(Instance); } diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp index 8a0e187fb..dd1a2d819 100644 --- a/src/cmd_userhost.cpp +++ b/src/cmd_userhost.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "commands/cmd_userhost.h" -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_userhost(Instance); } diff --git a/src/cmd_version.cpp b/src/cmd_version.cpp index 2b6522d81..c355717f7 100644 --- a/src/cmd_version.cpp +++ b/src/cmd_version.cpp @@ -16,7 +16,7 @@ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_version(Instance); } diff --git a/src/cmd_wallops.cpp b/src/cmd_wallops.cpp index a66ceddf5..90a7d8bde 100644 --- a/src/cmd_wallops.cpp +++ b/src/cmd_wallops.cpp @@ -16,7 +16,7 @@ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_wallops(Instance); } diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp index 93855dce2..91c651bcc 100644 --- a/src/cmd_who.cpp +++ b/src/cmd_who.cpp @@ -107,7 +107,7 @@ bool cmd_who::whomatch(userrec* user, const char* matchtext) -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_who(Instance); } diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp index b6f85e01c..508200cb6 100644 --- a/src/cmd_whois.cpp +++ b/src/cmd_whois.cpp @@ -86,7 +86,7 @@ void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned lo -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_whois(Instance); } diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp index 1531f6239..f982d4873 100644 --- a/src/cmd_whowas.cpp +++ b/src/cmd_whowas.cpp @@ -16,13 +16,13 @@ WhoWasMaintainTimer * timer; -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_whowas(Instance); } cmd_whowas::cmd_whowas(InspIRCd* Instance) -: command_t(Instance, "WHOWAS", 0, 1) +: Command(Instance, "WHOWAS", 0, 1) { syntax = "{,}"; timer = new WhoWasMaintainTimer(Instance, 3600); @@ -340,7 +340,7 @@ WhoWasGroup::~WhoWasGroup() /* every hour, run this function which removes all entries older than Config->WhoWasMaxKeep */ void WhoWasMaintainTimer::Tick(time_t t) { - command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS"); + Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS"); if (whowas_command) { std::deque params; diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp index 4a70069ab..cb0167f4e 100644 --- a/src/cmd_zline.cpp +++ b/src/cmd_zline.cpp @@ -17,7 +17,7 @@ -extern "C" DllExport command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_zline(Instance); } diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 30865f414..68555ec8b 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -112,7 +112,7 @@ long InspIRCd::Duration(const std::string &str) * The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc. * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam. */ -int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra) +int CommandParser::LoopCall(userrec* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra) { /* First check if we have more than one item in the list, if we don't we return zero here and the handler * which called us just carries on as it was. @@ -161,7 +161,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p return 1; } -int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere) +int CommandParser::LoopCall(userrec* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere) { /* First check if we have more than one item in the list, if we don't we return zero here and the handler * which called us just carries on as it was. @@ -211,7 +211,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user) { - command_table::iterator n = cmdlist.find(commandname); + Commandable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { @@ -233,9 +233,9 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use return false; } -command_t* CommandParser::GetHandler(const std::string &commandname) +Command* CommandParser::GetHandler(const std::string &commandname) { - command_table::iterator n = cmdlist.find(commandname); + Commandable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) return n->second; @@ -246,7 +246,7 @@ command_t* CommandParser::GetHandler(const std::string &commandname) CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user) { - command_table::iterator n = cmdlist.find(commandname); + Commandable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { @@ -310,7 +310,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd) return; } - command_table::iterator cm = cmdlist.find(command); + Commandable::iterator cm = cmdlist.find(command); if (cm != cmdlist.end()) { @@ -381,7 +381,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd) bool CommandParser::RemoveCommands(const char* source) { - command_table::iterator i,safei; + Commandable::iterator i,safei; for (i = cmdlist.begin(); i != cmdlist.end(); i++) { safei = i; @@ -399,9 +399,9 @@ bool CommandParser::RemoveCommands(const char* source) return true; } -void CommandParser::RemoveCommand(command_table::iterator safei, const char* source) +void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source) { - command_t* x = safei->second; + Command* x = safei->second; if (x->source == std::string(source)) { cmdlist.erase(safei); @@ -431,7 +431,7 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) } } -bool CommandParser::CreateCommand(command_t *f, void* so_handle) +bool CommandParser::CreateCommand(Command *f, void* so_handle) { if (so_handle) { @@ -485,7 +485,7 @@ bool CommandParser::ReloadCommand(const char* cmd, userrec* user) if (command != RFCCommands.end()) { - command_t* cmdptr = cmdlist.find(commandname)->second; + Command* cmdptr = cmdlist.find(commandname)->second; cmdlist.erase(cmdlist.find(commandname)); for (char* x = commandname; *x; x++) @@ -531,7 +531,7 @@ const char* CommandParser::LoadCommand(const char* name) { char filename[MAXBUF]; void* h; - command_t* (*cmd_factory_func)(InspIRCd*); + Command* (*cmd_factory_func)(InspIRCd*); /* Command already exists? Succeed silently - this is needed for REHASH */ if (RFCCommands.find(name) != RFCCommands.end()) @@ -552,7 +552,7 @@ const char* CommandParser::LoadCommand(const char* name) if (this->FindSym((void **)&cmd_factory_func, h, name)) { - command_t* newcommand = cmd_factory_func(ServerInstance); + Command* newcommand = cmd_factory_func(ServerInstance); this->CreateCommand(newcommand, h); } return NULL; diff --git a/src/configreader.cpp b/src/configreader.cpp index 3767fbda9..daf1b04de 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -204,13 +204,13 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance) std::string thiscmd; /* Enable everything first */ - for (command_table::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++) + for (Commandable::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++) x->second->Disable(false); /* Now disable all the ones which the user wants disabled */ while (dcmds >> thiscmd) { - command_table::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd); + Commandable::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd); if (cm != ServerInstance->Parser->cmdlist.end()) { cm->second->Disable(true); @@ -395,7 +395,7 @@ bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, Valu conf->GetInstance()->Log(DEFAULT,"WARNING: value less than 3600, setting to default 3600"); } - command_t* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS"); + Command* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS"); if (whowas_command) { std::deque params; diff --git a/src/modules.cpp b/src/modules.cpp index b844bc56b..b95dcd59d 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -785,7 +785,7 @@ bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, us return this->Parser->IsValidCommand(commandname, pcnt, user); } -void InspIRCd::AddCommand(command_t *f) +void InspIRCd::AddCommand(Command *f) { if (!this->Parser->CreateCommand(f)) { diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp index a0d96fc88..d1bece343 100644 --- a/src/modules/extra/m_sqloper.cpp +++ b/src/modules/extra/m_sqloper.cpp @@ -227,7 +227,7 @@ public: void LoginFail(userrec* user, const std::string &username, const std::string &pass) { - command_t* oper_command = ServerInstance->Parser->GetHandler("OPER"); + Command* oper_command = ServerInstance->Parser->GetHandler("OPER"); if (oper_command) { diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp index c67b50c8c..e95447b6d 100644 --- a/src/modules/extra/m_ssl_oper_cert.cpp +++ b/src/modules/extra/m_ssl_oper_cert.cpp @@ -24,10 +24,10 @@ /** Handle /FINGERPRINT */ -class cmd_fingerprint : public command_t +class cmd_fingerprint : public Command { public: - cmd_fingerprint (InspIRCd* Instance) : command_t(Instance,"FINGERPRINT", 0, 1) + cmd_fingerprint (InspIRCd* Instance) : Command(Instance,"FINGERPRINT", 0, 1) { this->source = "m_ssl_oper_cert.so"; syntax = ""; diff --git a/src/modules/extra/m_sslinfo.cpp b/src/modules/extra/m_sslinfo.cpp index dc9274f1e..008608f03 100644 --- a/src/modules/extra/m_sslinfo.cpp +++ b/src/modules/extra/m_sslinfo.cpp @@ -24,10 +24,10 @@ /** Handle /SSLINFO */ -class cmd_sslinfo : public command_t +class cmd_sslinfo : public Command { public: - cmd_sslinfo (InspIRCd* Instance) : command_t(Instance,"SSLINFO", 0, 1) + cmd_sslinfo (InspIRCd* Instance) : Command(Instance,"SSLINFO", 0, 1) { this->source = "m_sslinfo.so"; this->syntax = ""; diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp index 37dbf38a0..7afa71803 100644 --- a/src/modules/m_alltime.cpp +++ b/src/modules/m_alltime.cpp @@ -15,10 +15,10 @@ /* $ModDesc: Display timestamps from all servers connected to the network */ -class cmd_alltime : public command_t +class cmd_alltime : public Command { public: - cmd_alltime(InspIRCd *Instance) : command_t(Instance, "ALLTIME", 'o', 0) + cmd_alltime(InspIRCd *Instance) : Command(Instance, "ALLTIME", 'o', 0) { this->source = "m_alltime.so"; syntax.clear(); diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index a054a00ef..aa5e18438 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -164,7 +164,7 @@ class ModuleAuditorium : public Module void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) { - command_t* parthandler = ServerInstance->Parser->GetHandler("PART"); + Command* parthandler = ServerInstance->Parser->GetHandler("PART"); std::vector to_leave; const char* parameters[2]; if (parthandler) diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 7c88b03da..6d56b62bc 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -44,10 +44,10 @@ cbanlist cbans; /** Handle /CBAN */ -class cmd_cban : public command_t +class cmd_cban : public Command { public: - cmd_cban(InspIRCd* Me) : command_t(Me, "CBAN", 'o', 1) + cmd_cban(InspIRCd* Me) : Command(Me, "CBAN", 'o', 1) { this->source = "m_cban.so"; this->syntax = " [ :]"; diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 49a6fdabb..eb497dea4 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -40,13 +40,13 @@ public: }; typedef std::vector CGIHostlist; -class cmd_webirc : public command_t +class cmd_webirc : public Command { InspIRCd* Me; CGIHostlist Hosts; bool notify; public: - cmd_webirc(InspIRCd* Me, CGIHostlist &Hosts, bool notify) : command_t(Me, "WEBIRC", 0, 4, true), Hosts(Hosts), notify(notify) + cmd_webirc(InspIRCd* Me, CGIHostlist &Hosts, bool notify) : Command(Me, "WEBIRC", 0, 4, true), Hosts(Hosts), notify(notify) { this->source = "m_cgiirc.so"; this->syntax = "password client hostname ip"; diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index c4ec91988..7a48a3d45 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -18,10 +18,10 @@ /** Handle /CHECK */ -class cmd_check : public command_t +class cmd_check : public Command { public: - cmd_check (InspIRCd* Instance) : command_t(Instance,"CHECK", 'o', 1) + cmd_check (InspIRCd* Instance) : Command(Instance,"CHECK", 'o', 1) { this->source = "m_check.so"; syntax = "|||"; diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index 5f5623682..db8094aa2 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -17,12 +17,12 @@ /** Handle /CHGHOST */ -class cmd_chghost : public command_t +class cmd_chghost : public Command { private: char* hostmap; public: - cmd_chghost (InspIRCd* Instance, char* hmap) : command_t(Instance,"CHGHOST",'o',2), hostmap(hmap) + cmd_chghost (InspIRCd* Instance, char* hmap) : Command(Instance,"CHGHOST",'o',2), hostmap(hmap) { this->source = "m_chghost.so"; syntax = " "; diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index d79088cf9..0561c5156 100644 --- a/src/modules/m_chgident.cpp +++ b/src/modules/m_chgident.cpp @@ -17,10 +17,10 @@ /** Handle /CHGIDENT */ -class cmd_chgident : public command_t +class cmd_chgident : public Command { public: - cmd_chgident (InspIRCd* Instance) : command_t(Instance,"CHGIDENT", 'o', 2) + cmd_chgident (InspIRCd* Instance) : Command(Instance,"CHGIDENT", 'o', 2) { this->source = "m_chgident.so"; syntax = " "; diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index ddb38567f..31467459c 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -17,10 +17,10 @@ /** Handle /CHGNAME */ -class cmd_chgname : public command_t +class cmd_chgname : public Command { public: - cmd_chgname (InspIRCd* Instance) : command_t(Instance,"CHGNAME", 'o', 2) + cmd_chgname (InspIRCd* Instance) : Command(Instance,"CHGNAME", 'o', 2) { this->source = "m_chgname.so"; syntax = " "; diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp index 85613f4ef..a8644f6ed 100644 --- a/src/modules/m_clones.cpp +++ b/src/modules/m_clones.cpp @@ -18,10 +18,10 @@ /** Handle /CHECK */ -class cmd_clones : public command_t +class cmd_clones : public Command { public: - cmd_clones (InspIRCd* Instance) : command_t(Instance,"CLONES", 'o', 1) + cmd_clones (InspIRCd* Instance) : Command(Instance,"CLONES", 'o', 1) { this->source = "m_clones.so"; syntax = ""; diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp index e395b427f..da52dd7d9 100644 --- a/src/modules/m_close.cpp +++ b/src/modules/m_close.cpp @@ -15,11 +15,11 @@ /** Handle /CLOSE */ -class cmd_close : public command_t +class cmd_close : public Command { public: /* Command 'close', needs operator */ - cmd_close (InspIRCd* Instance) : command_t(Instance,"CLOSE", 'o', 0) + cmd_close (InspIRCd* Instance) : Command(Instance,"CLOSE", 'o', 0) { this->source = "m_close.so"; } diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 73f2cda87..ca277c3ae 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -18,11 +18,11 @@ /** Handle /TITLE */ -class cmd_title : public command_t +class cmd_title : public Command { public: - cmd_title (InspIRCd* Instance) : command_t(Instance,"TITLE",0,2) + cmd_title (InspIRCd* Instance) : Command(Instance,"TITLE",0,2) { this->source = "m_customtitle.so"; syntax = " "; diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp index fa55f44d8..06361c692 100644 --- a/src/modules/m_cycle.cpp +++ b/src/modules/m_cycle.cpp @@ -17,10 +17,10 @@ /** Handle /CYCLE */ -class cmd_cycle : public command_t +class cmd_cycle : public Command { public: - cmd_cycle (InspIRCd* Instance) : command_t(Instance,"CYCLE", 0, 1) + cmd_cycle (InspIRCd* Instance) : Command(Instance,"CYCLE", 0, 1) { this->source = "m_cycle.so"; syntax = " :[reason]"; diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index fd9e329cd..7ddce8ab0 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -44,10 +44,10 @@ dccallowlist* dl; typedef std::vector bannedfilelist; bannedfilelist bfl; -class cmd_dccallow : public command_t +class cmd_dccallow : public Command { public: - cmd_dccallow(InspIRCd* Me) : command_t(Me, "DCCALLOW", 0, 0) + cmd_dccallow(InspIRCd* Me) : Command(Me, "DCCALLOW", 0, 0) { this->source = "m_dccallow.so"; syntax = "{[+|-]