diff options
Diffstat (limited to 'src')
115 files changed, 199 insertions, 199 deletions
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<classbase*> 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 = "<nick>{,<nick>}"; 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<classbase*> 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: <whowas:maxkeep> 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<classbase*> 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 = "<nickname>"; 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 = "<nick>"; 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<std::string> 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 = "<channel> [<duration> :<reason>]"; 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<CGIhost> 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 = "<nickname>|<ip>|<hostmask>|<channel>"; 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 = "<nick> <newhost>"; 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 = "<nick> <newident>"; 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 = "<nick> <newname>"; 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 = "<limit>"; 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 = "<user> <password>"; 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 = "<channel> :[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; 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 = "{[+|-]<nick> <time>|HELP|LIST}"; diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp index f2c47cc9a..3056bdaff 100644 --- a/src/modules/m_devoice.cpp +++ b/src/modules/m_devoice.cpp @@ -22,10 +22,10 @@ /** Handle /DEVOICE */ -class cmd_devoice : public command_t +class cmd_devoice : public Command { public: - cmd_devoice (InspIRCd* Instance) : command_t(Instance,"DEVOICE", 0, 1) + cmd_devoice (InspIRCd* Instance) : Command(Instance,"DEVOICE", 0, 1) { this->source = "m_devoice.so"; syntax = "<channel>"; diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h index 5e74177e5..e0faafc98 100644 --- a/src/modules/m_filter.h +++ b/src/modules/m_filter.h @@ -116,11 +116,11 @@ class FilterBase : public Module bool AppliesToMe(userrec* user, FilterResult* filter, int flags); }; -class cmd_filter : public command_t +class cmd_filter : public Command { FilterBase* Base; public: - cmd_filter(FilterBase* f, InspIRCd* Me, const std::string &source) : command_t(Me, "FILTER", 'o', 1), Base(f) + cmd_filter(FilterBase* f, InspIRCd* Me, const std::string &source) : Command(Me, "FILTER", 'o', 1), Base(f) { this->source = source; this->syntax = "<filter-definition> <type> <flags> [<gline-duration>] :<reason>"; @@ -338,7 +338,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters return 0; /* We cant block a part or quit, so instead we change the reason to 'Reason filtered' */ - command_t* c = ServerInstance->Parser->GetHandler(command); + Command* c = ServerInstance->Parser->GetHandler(command); if (c) { const char* params[MAXPARAMETERS]; diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index faf35d572..0e7ff2e6d 100644 --- a/src/modules/m_globalload.cpp +++ b/src/modules/m_globalload.cpp @@ -17,10 +17,10 @@ /** Handle /GLOADMODULE */ -class cmd_gloadmodule : public command_t +class cmd_gloadmodule : public Command { public: - cmd_gloadmodule (InspIRCd* Instance) : command_t(Instance,"GLOADMODULE", 'o', 1) + cmd_gloadmodule (InspIRCd* Instance) : Command(Instance,"GLOADMODULE", 'o', 1) { this->source = "m_globalload.so"; syntax = "<modulename> [servermask]"; @@ -52,10 +52,10 @@ class cmd_gloadmodule : public command_t /** Handle /GUNLOADMODULE */ -class cmd_gunloadmodule : public command_t +class cmd_gunloadmodule : public Command { public: - cmd_gunloadmodule (InspIRCd* Instance) : command_t(Instance,"GUNLOADMODULE", 'o', 1) + cmd_gunloadmodule (InspIRCd* Instance) : Command(Instance,"GUNLOADMODULE", 'o', 1) { this->source = "m_globalload.so"; syntax = "<modulename> [servermask]"; @@ -86,10 +86,10 @@ class cmd_gunloadmodule : public command_t /** Handle /GRELOADMODULE */ -class cmd_greloadmodule : public command_t +class cmd_greloadmodule : public Command { public: - cmd_greloadmodule (InspIRCd* Instance) : command_t(Instance, "GRELOADMODULE", 'o', 1) + cmd_greloadmodule (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 9908ad053..1d870a7c2 100644 --- a/src/modules/m_globops.cpp +++ b/src/modules/m_globops.cpp @@ -19,10 +19,10 @@ /** Handle /GLOBOPS */ -class cmd_globops : public command_t +class cmd_globops : public Command { public: - cmd_globops (InspIRCd* Instance) : command_t(Instance,"GLOBOPS",'o',1) + cmd_globops (InspIRCd* Instance) : Command(Instance,"GLOBOPS",'o',1) { this->source = "m_globops.so"; syntax = "<any-text>"; diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp index b1028a042..86866f7fb 100644 --- a/src/modules/m_helpop.cpp +++ b/src/modules/m_helpop.cpp @@ -49,10 +49,10 @@ class Helpop : public ModeHandler /** Handles /HELPOP */ -class cmd_helpop : public command_t +class cmd_helpop : public Command { public: - cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 0) + cmd_helpop (InspIRCd* Instance) : Command(Instance, "HELPOP", 0, 0) { this->source = "m_helpop.so"; syntax = "<any-text>"; diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp index a0a2388f0..47e9f595c 100644 --- a/src/modules/m_invisible.cpp +++ b/src/modules/m_invisible.cpp @@ -221,7 +221,7 @@ class ModuleInvisible : public Module { if (user->IsModeSet('Q')) { - command_t* parthandler = ServerInstance->Parser->GetHandler("PART"); + Command* parthandler = ServerInstance->Parser->GetHandler("PART"); std::vector<std::string> to_leave; const char* parameters[2]; if (parthandler) diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp index fb8727e3a..600b8f70f 100644 --- a/src/modules/m_jumpserver.cpp +++ b/src/modules/m_jumpserver.cpp @@ -17,7 +17,7 @@ /** Handle /SAPART */ -class cmd_jumpserver : public command_t +class cmd_jumpserver : public Command { public: bool redirect_all_immediately; @@ -27,7 +27,7 @@ class cmd_jumpserver : public command_t std::string reason; int port; - cmd_jumpserver (InspIRCd* Instance) : command_t(Instance, "JUMPSERVER", 'o', 0) + cmd_jumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", 'o', 0) { this->source = "m_jumpserver.so"; syntax = "[<server> <port> <+/-a> :<reason>]"; diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp index 5ed69273e..fd8256641 100644 --- a/src/modules/m_knock.cpp +++ b/src/modules/m_knock.cpp @@ -17,10 +17,10 @@ /** Handles the /KNOCK command */ -class cmd_knock : public command_t +class cmd_knock : public Command { public: - cmd_knock (InspIRCd* Instance) : command_t(Instance,"KNOCK", 0, 2) + cmd_knock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2) { this->source = "m_knock.so"; syntax = "<channel> <reason>"; diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp index 94ab31421..a4b794050 100644 --- a/src/modules/m_lockserv.cpp +++ b/src/modules/m_lockserv.cpp @@ -21,14 +21,14 @@ */ -class cmd_lockserv : public command_t +class cmd_lockserv : public Command { private: bool& locked; public: cmd_lockserv (InspIRCd* Instance, bool &lock) - : command_t(Instance, "LOCKSERV", 'o', 0), locked(lock) + : Command(Instance, "LOCKSERV", 'o', 0), locked(lock) { this->source = "m_lockserv.so"; syntax.clear(); @@ -44,14 +44,14 @@ public: } }; -class cmd_unlockserv : public command_t +class cmd_unlockserv : public Command { private: bool& locked; public: cmd_unlockserv (InspIRCd* Instance, bool &lock) - : command_t(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 731c0433d..e21ea9b90 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -17,11 +17,11 @@ /** Handle /NICKLOCK */ -class cmd_nicklock : public command_t +class cmd_nicklock : public Command { char* dummy; public: - cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2) + cmd_nicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", 'o', 2) { this->source = "m_nicklock.so"; syntax = "<oldnick> <newnick>"; @@ -72,10 +72,10 @@ class cmd_nicklock : public command_t /** Handle /NICKUNLOCK */ -class cmd_nickunlock : public command_t +class cmd_nickunlock : public Command { public: - cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1) + cmd_nickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", 'o', 1) { this->source = "m_nicklock.so"; syntax = "<locked-nick>"; diff --git a/src/modules/m_oper_hash.cpp b/src/modules/m_oper_hash.cpp index d8acc3ef9..66fa1e61e 100644 --- a/src/modules/m_oper_hash.cpp +++ b/src/modules/m_oper_hash.cpp @@ -21,14 +21,14 @@ typedef std::map<irc::string, Module*> hashymodules; /* Handle /MKPASSWD */ -class cmd_mkpasswd : public command_t +class cmd_mkpasswd : public Command { Module* Sender; hashymodules &hashers; std::deque<std::string> &names; public: cmd_mkpasswd (InspIRCd* Instance, Module* S, hashymodules &h, std::deque<std::string> &n) - : command_t(Instance,"MKPASSWD", 'o', 2), Sender(S), hashers(h), names(n) + : Command(Instance,"MKPASSWD", 'o', 2), Sender(S), hashers(h), names(n) { this->source = "m_oper_hash.so"; syntax = "<hashtype> <any-text>"; diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp index b02689704..09395fccb 100644 --- a/src/modules/m_operlog.cpp +++ b/src/modules/m_operlog.cpp @@ -47,7 +47,7 @@ class ModuleOperLog : public Module if ((IS_OPER(user)) && (IS_LOCAL(user)) && (user->HasPermission(command))) { - command_t* thiscommand = ServerInstance->Parser->GetHandler(command); + Command* thiscommand = ServerInstance->Parser->GetHandler(command); if ((thiscommand) && (thiscommand->flags_needed == 'o')) { std::string plist; diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp index 6de816413..2ae4c30b5 100644 --- a/src/modules/m_opermotd.cpp +++ b/src/modules/m_opermotd.cpp @@ -40,10 +40,10 @@ CmdResult ShowOperMOTD(userrec* user) /** Handle /OPERMOTD */ -class cmd_opermotd : public command_t +class cmd_opermotd : public Command { public: - cmd_opermotd (InspIRCd* Instance) : command_t(Instance,"OPERMOTD", 'o', 0) + cmd_opermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", 'o', 0) { this->source = "m_opermotd.so"; syntax = "[<servername>]"; diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp index 5f8d52714..96ed2758e 100644 --- a/src/modules/m_randquote.cpp +++ b/src/modules/m_randquote.cpp @@ -23,10 +23,10 @@ std::string suffix; /** Handle /RANDQUOTE */ -class cmd_randquote : public command_t +class cmd_randquote : public Command { public: - cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0) + cmd_randquote (InspIRCd* Instance) : Command(Instance,"RANDQUOTE", 0, 0) { this->source = "m_randquote.so"; } diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index c8d661890..9de0942c1 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -203,10 +203,10 @@ class RemoveBase /** Handle /REMOVE */ -class cmd_remove : public command_t, public RemoveBase +class cmd_remove : public Command, public RemoveBase { public: - cmd_remove(InspIRCd* Instance, bool& snk) : command_t(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk) + cmd_remove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk) { this->source = "m_remove.so"; syntax = "<nick> <channel> [<reason>]"; @@ -221,10 +221,10 @@ class cmd_remove : public command_t, public RemoveBase /** Handle /FPART */ -class cmd_fpart : public command_t, public RemoveBase +class cmd_fpart : public Command, public RemoveBase { public: - cmd_fpart(InspIRCd* Instance, bool& snk) : command_t(Instance, "FPART", 0, 2), RemoveBase(Instance, snk) + cmd_fpart(InspIRCd* Instance, bool& snk) : Command(Instance, "FPART", 0, 2), RemoveBase(Instance, snk) { this->source = "m_remove.so"; syntax = "<channel> <nick> [<reason>]"; diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index d0567cb16..03bf7c47c 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -17,10 +17,10 @@ /** Handle /SAJOIN */ -class cmd_sajoin : public command_t +class cmd_sajoin : public Command { public: - cmd_sajoin (InspIRCd* Instance) : command_t(Instance,"SAJOIN", 'o', 2) + cmd_sajoin (InspIRCd* Instance) : Command(Instance,"SAJOIN", 'o', 2) { this->source = "m_sajoin.so"; syntax = "<nick> <channel>"; diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp index bb0394fb0..a083f4305 100644 --- a/src/modules/m_samode.cpp +++ b/src/modules/m_samode.cpp @@ -17,10 +17,10 @@ /** Handle /SAMODE */ -class cmd_samode : public command_t +class cmd_samode : public Command { public: - cmd_samode (InspIRCd* Instance) : command_t(Instance,"SAMODE", 'o', 2) + cmd_samode (InspIRCd* Instance) : Command(Instance,"SAMODE", 'o', 2) { 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 de70579f9..e4f2006c4 100644 --- a/src/modules/m_sanick.cpp +++ b/src/modules/m_sanick.cpp @@ -17,10 +17,10 @@ /** Handle /SANICK */ -class cmd_sanick : public command_t +class cmd_sanick : public Command { public: - cmd_sanick (InspIRCd* Instance) : command_t(Instance,"SANICK", 'o', 2) + cmd_sanick (InspIRCd* Instance) : Command(Instance,"SANICK", 'o', 2) { this->source = "m_sanick.so"; syntax = "<nick> <new-nick>"; diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp index 32cd751b0..0c4d061e1 100644 --- a/src/modules/m_sapart.cpp +++ b/src/modules/m_sapart.cpp @@ -17,10 +17,10 @@ /** Handle /SAPART */ -class cmd_sapart : public command_t +class cmd_sapart : public Command { public: - cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2) + cmd_sapart (InspIRCd* Instance) : Command(Instance,"SAPART", 'o', 2) { this->source = "m_sapart.so"; syntax = "<nick> <channel>"; diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp index 7aafcc193..7f4212d80 100644 --- a/src/modules/m_saquit.cpp +++ b/src/modules/m_saquit.cpp @@ -17,10 +17,10 @@ /** Handle /SAQUIT */ -class cmd_saquit : public command_t +class cmd_saquit : public Command { public: - cmd_saquit (InspIRCd* Instance) : command_t(Instance,"SAQUIT",'o',2) + cmd_saquit (InspIRCd* Instance) : Command(Instance,"SAQUIT",'o',2) { this->source = "m_saquit.so"; syntax = "<nick> <reason>"; diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp index 730909d6c..59b48fbc1 100644 --- a/src/modules/m_sethost.cpp +++ b/src/modules/m_sethost.cpp @@ -17,12 +17,12 @@ /** Handle /SETHOST */ -class cmd_sethost : public command_t +class cmd_sethost : public Command { private: char* hostmap; public: - cmd_sethost (InspIRCd* Instance, char* hmap) : command_t(Instance,"SETHOST",'o',1), hostmap(hmap) + cmd_sethost (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 a353f883c..4a19b8412 100644 --- a/src/modules/m_setident.cpp +++ b/src/modules/m_setident.cpp @@ -17,10 +17,10 @@ /** Handle /SETIDENT */ -class cmd_setident : public command_t +class cmd_setident : public Command { public: - cmd_setident (InspIRCd* Instance) : command_t(Instance,"SETIDENT", 'o', 1) + cmd_setident (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 d95a9bfc1..6dbcae711 100644 --- a/src/modules/m_setidle.cpp +++ b/src/modules/m_setidle.cpp @@ -17,10 +17,10 @@ /** Handle /SETIDLE */ -class cmd_setidle : public command_t +class cmd_setidle : public Command { public: - cmd_setidle (InspIRCd* Instance) : command_t(Instance,"SETIDLE", 'o', 1) + cmd_setidle (InspIRCd* Instance) : Command(Instance,"SETIDLE", 'o', 1) { this->source = "m_setidle.so"; syntax = "<duration>"; diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp index fb439db6f..80179c8cb 100644 --- a/src/modules/m_setname.cpp +++ b/src/modules/m_setname.cpp @@ -17,10 +17,10 @@ -class cmd_setname : public command_t +class cmd_setname : public Command { public: - cmd_setname (InspIRCd* Instance) : command_t(Instance,"SETNAME", 0, 1) + cmd_setname (InspIRCd* Instance) : Command(Instance,"SETNAME", 0, 1) { this->source = "m_setname.so"; syntax = "<new-gecos>"; diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index f809d7d57..1bea10b70 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -21,11 +21,11 @@ // have one of these structures associated with their user record. typedef std::map<irc::string, time_t> silencelist; -class cmd_silence : public command_t +class cmd_silence : public Command { unsigned int& maxsilence; public: - cmd_silence (InspIRCd* Instance, unsigned int &max) : command_t(Instance,"SILENCE", 0, 0), maxsilence(max) + cmd_silence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max) { this->source = "m_silence.so"; syntax = "{[+|-]<mask>}"; diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp index 9a3abe543..e9a4fdc78 100644 --- a/src/modules/m_silence_ext.cpp +++ b/src/modules/m_silence_ext.cpp @@ -51,11 +51,11 @@ static int SILENCE_ALL = 0x0020; /* a all, (pcint) */ static int SILENCE_EXCLUDE = 0x0040; /* x exclude this pattern */ -class cmd_silence : public command_t +class cmd_silence : public Command { unsigned int& maxsilence; public: - cmd_silence (InspIRCd* Instance, unsigned int &max) : command_t(Instance,"SILENCE", 0, 0), maxsilence(max) + cmd_silence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max) { this->source = "m_silence_ext.so"; syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}"; diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp index 029b826bc..f538e2963 100644 --- a/src/modules/m_spanningtree/postcommand.cpp +++ b/src/modules/m_spanningtree/postcommand.cpp @@ -38,7 +38,7 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const char** if ((result == CMD_SUCCESS) && (ServerInstance->IsValidModuleCommand(command, pcnt, user))) { /* Safe, we know its non-null because IsValidModuleCommand returned true */ - command_t* thiscmd = ServerInstance->Parser->GetHandler(command); + Command* thiscmd = ServerInstance->Parser->GetHandler(command); // this bit of code cleverly routes all module commands // to all remote severs *automatically* so that modules // can just handle commands locally, without having diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp index e992554ed..25bf833e1 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_t(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/rconnect.h b/src/modules/m_spanningtree/rconnect.h index 77e271949..080d2aad6 100644 --- a/src/modules/m_spanningtree/rconnect.h +++ b/src/modules/m_spanningtree/rconnect.h @@ -16,7 +16,7 @@ /** Handle /RCONNECT */ -class cmd_rconnect : public command_t +class cmd_rconnect : public Command { Module* Creator; /* Creator */ SpanningTreeUtilities* Utils; /* Utility class */ diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp index 0ea7988ec..8c7e9d7f9 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_t(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_spanningtree/rsquit.h b/src/modules/m_spanningtree/rsquit.h index 81e9bc2b7..d6285b83f 100644 --- a/src/modules/m_spanningtree/rsquit.h +++ b/src/modules/m_spanningtree/rsquit.h @@ -16,7 +16,7 @@ /** Handle /RCONNECT */ -class cmd_rsquit : public command_t +class cmd_rsquit : public Command { Module* Creator; /* Creator */ SpanningTreeUtilities* Utils; /* Utility class */ diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp index 60b893e1d..8e42f9c75 100644 --- a/src/modules/m_spy.cpp +++ b/src/modules/m_spy.cpp @@ -63,10 +63,10 @@ void spy_userlist(userrec *user, chanrec *c) /** Handle /SPYLIST */ -class cmd_spylist : public command_t +class cmd_spylist : public Command { public: - cmd_spylist (InspIRCd* Instance) : command_t(Instance,"SPYLIST", 'o', 0) + cmd_spylist (InspIRCd* Instance) : Command(Instance,"SPYLIST", 'o', 0) { this->source = "m_spy.so"; syntax.clear(); @@ -91,10 +91,10 @@ class cmd_spylist : public command_t /** Handle /SPYNAMES */ -class cmd_spynames : public command_t +class cmd_spynames : public Command { public: - cmd_spynames (InspIRCd* Instance) : command_t(Instance,"SPYNAMES", 'o', 0) + cmd_spynames (InspIRCd* Instance) : Command(Instance,"SPYNAMES", 'o', 0) { this->source = "m_spy.so"; syntax = "{<channel>{,<channel>}}"; diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index 4027dbeb7..f26454d3e 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -47,10 +47,10 @@ SVSHoldMap HoldMap; /** Handle /SVSHold */ -class cmd_svshold : public command_t +class cmd_svshold : public Command { public: - cmd_svshold(InspIRCd* Me) : command_t(Me, "SVSHOLD", 'o', 1) + cmd_svshold(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 09d9d94af..3e8c53ea1 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -17,11 +17,11 @@ /** Handle /SWHOIS */ -class cmd_swhois : public command_t +class cmd_swhois : public Command { public: - cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2) + cmd_swhois (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 a137e8d90..da8ad9749 100644 --- a/src/modules/m_taxonomy.cpp +++ b/src/modules/m_taxonomy.cpp @@ -17,13 +17,13 @@ /** Handle /TAXONOMY */ -class cmd_taxonomy : public command_t +class cmd_taxonomy : public Command { Module* Creator; bool& claimed; public: /* Command 'taxonomy', takes no parameters and needs no special modes */ - cmd_taxonomy (InspIRCd* Instance, Module* maker, bool &claim) : command_t(Instance,"TAXONOMY", 'o', 1), Creator(maker), claimed(claim) + cmd_taxonomy (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_testcommand.cpp b/src/modules/m_testcommand.cpp index f2a0fb5fd..d99a51c7d 100644 --- a/src/modules/m_testcommand.cpp +++ b/src/modules/m_testcommand.cpp @@ -17,11 +17,11 @@ /** Handle /DALINFO */ -class cmd_dalinfo : public command_t +class cmd_dalinfo : public Command { public: /* Command 'dalinfo', takes no parameters and needs no special modes */ - cmd_dalinfo (InspIRCd* Instance) : command_t(Instance,"DALINFO", 0, 0) + cmd_dalinfo (InspIRCd* Instance) : Command(Instance,"DALINFO", 0, 0) { this->source = "m_testcommand.so"; } diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 58dffbbe4..714b8b40a 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -30,10 +30,10 @@ timedbans TimedBanList; /** Handle /TBAN */ -class cmd_tban : public command_t +class cmd_tban : public Command { public: - cmd_tban (InspIRCd* Instance) : command_t(Instance,"TBAN", 0, 3) + cmd_tban (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 3) { this->source = "m_timedbans.so"; syntax = "<channel> <duration> <banmask>"; diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp index 3296a7f15..bfeeb202e 100644 --- a/src/modules/m_tline.cpp +++ b/src/modules/m_tline.cpp @@ -18,10 +18,10 @@ /** Handle /TLINE */ -class cmd_tline : public command_t +class cmd_tline : public Command { public: - cmd_tline (InspIRCd* Instance) : command_t(Instance,"TLINE", 'o', 1) + cmd_tline (InspIRCd* Instance) : Command(Instance,"TLINE", 'o', 1) { this->source = "m_tline.so"; this->syntax = "<mask>"; diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp index cd3296ce6..7e13a63f9 100644 --- a/src/modules/m_uninvite.cpp +++ b/src/modules/m_uninvite.cpp @@ -17,10 +17,10 @@ /** Handle /UNINVITE */ -class cmd_uninvite : public command_t +class cmd_uninvite : public Command { public: - cmd_uninvite (InspIRCd* Instance) : command_t(Instance,"UNINVITE", 0, 2) + cmd_uninvite (InspIRCd* Instance) : Command(Instance,"UNINVITE", 0, 2) { this->source = "m_uninvite.so"; syntax = "<nick> <channel>"; diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp index 81e2cf6c8..949ce758e 100644 --- a/src/modules/m_userip.cpp +++ b/src/modules/m_userip.cpp @@ -17,10 +17,10 @@ /** Handle /USERIP */ -class cmd_userip : public command_t +class cmd_userip : public Command { public: - cmd_userip (InspIRCd* Instance) : command_t(Instance,"USERIP", 'o', 1) + cmd_userip (InspIRCd* Instance) : Command(Instance,"USERIP", 'o', 1) { this->source = "m_userip.so"; syntax = "<nick>{,<nick>}"; diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp index 71f1069a3..92aeb3401 100644 --- a/src/modules/m_vhost.cpp +++ b/src/modules/m_vhost.cpp @@ -17,10 +17,10 @@ /** Handle /VHOST */ -class cmd_vhost : public command_t +class cmd_vhost : public Command { public: - cmd_vhost (InspIRCd* Instance) : command_t(Instance,"VHOST", 0, 2) + cmd_vhost (InspIRCd* Instance) : Command(Instance,"VHOST", 0, 2) { this->source = "m_vhost.so"; syntax = "<username> <password>"; diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp index caad37049..a090487f3 100644 --- a/src/modules/m_watch.cpp +++ b/src/modules/m_watch.cpp @@ -76,7 +76,7 @@ watchentries* whos_watching_me; /** Handle /WATCH */ -class cmd_watch : public command_t +class cmd_watch : public Command { unsigned int& MAX_WATCH; public: @@ -192,7 +192,7 @@ class cmd_watch : public command_t return CMD_FAILURE; } - cmd_watch (InspIRCd* Instance, unsigned int &maxwatch) : command_t(Instance,"WATCH",0,0), MAX_WATCH(maxwatch) + cmd_watch (InspIRCd* Instance, unsigned int &maxwatch) : Command(Instance,"WATCH",0,0), MAX_WATCH(maxwatch) { this->source = "m_watch.so"; syntax = "[C|L|S]|[+|-<nick>]"; diff --git a/src/users.cpp b/src/users.cpp index feadc7b18..d3f6d6075 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -857,7 +857,7 @@ void userrec::QuitUser(InspIRCd* Instance, userrec *user, const std::string &qui /* adds or updates an entry in the whowas list */ void userrec::AddToWhoWas() { - command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS"); + Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS"); if (whowas_command) { std::deque<classbase*> params; @@ -1203,7 +1203,7 @@ bool userrec::ForceNickChange(const char* newnick) if (this->registered == REG_ALL) { std::deque<classbase*> dummy; - command_t* nickhandler = ServerInstance->Parser->GetHandler("NICK"); + Command* nickhandler = ServerInstance->Parser->GetHandler("NICK"); if (nickhandler) { nickhandler->HandleInternal(1, dummy); |