diff options
164 files changed, 164 insertions, 164 deletions
diff --git a/include/inspircd.h b/include/inspircd.h index cf884f915..e93964b0b 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -25,7 +25,7 @@ #include "channels.h" #include "socket.h" #include "mode.h" -#include "helperfuncs.h" + #include "socketengine.h" #include "command_parse.h" diff --git a/include/u_listmode.h b/include/u_listmode.h index b3c623552..6bcbb728a 100644 --- a/include/u_listmode.h +++ b/include/u_listmode.h @@ -8,7 +8,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "wildcard.h" #include "inspircd.h" diff --git a/src/base.cpp b/src/base.cpp index 30df1f0e7..6b680ce1a 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -22,7 +22,7 @@ #include <string> #include "inspircd.h" #include "modules.h" -#include "helperfuncs.h" + const int bitfields[] = {1,2,4,8,16,32,64,128}; const int inverted_bitfields[] = {~1,~2,~4,~8,~16,~32,~64,~128}; diff --git a/src/channels.cpp b/src/channels.cpp index fff276970..29373e906 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -35,7 +35,7 @@ using namespace std; #include "mode.h" #include "xline.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "typedefs.h" chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance) diff --git a/src/cmd_admin.cpp b/src/cmd_admin.cpp index 98dd13f7e..d87b2de2c 100644 --- a/src/cmd_admin.cpp +++ b/src/cmd_admin.cpp @@ -17,7 +17,7 @@ #include "configreader.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_admin.h" diff --git a/src/cmd_away.cpp b/src/cmd_away.cpp index 60833562d..6843ed4e1 100644 --- a/src/cmd_away.cpp +++ b/src/cmd_away.cpp @@ -20,7 +20,7 @@ #include "users.h" #include "modules.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_away.h" diff --git a/src/cmd_commands.cpp b/src/cmd_commands.cpp index 107ae1e31..d61c5d8ee 100644 --- a/src/cmd_commands.cpp +++ b/src/cmd_commands.cpp @@ -17,7 +17,7 @@ #include "inspircd.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_commands.h" diff --git a/src/cmd_connect.cpp b/src/cmd_connect.cpp index 8f96e7b55..b8383d93c 100644 --- a/src/cmd_connect.cpp +++ b/src/cmd_connect.cpp @@ -16,7 +16,7 @@ #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_connect.h" /* diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp index 2371ca947..e3ee48296 100644 --- a/src/cmd_die.cpp +++ b/src/cmd_die.cpp @@ -20,7 +20,7 @@ #include "configreader.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_die.h" diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp index 9e9274de7..6ee43d16f 100644 --- a/src/cmd_eline.cpp +++ b/src/cmd_eline.cpp @@ -21,7 +21,7 @@ #include "modules.h" #include "commands.h" #include "xline.h" -#include "helperfuncs.h" + #include "commands/cmd_eline.h" diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp index 03725a898..eda52095b 100644 --- a/src/cmd_gline.cpp +++ b/src/cmd_gline.cpp @@ -21,7 +21,7 @@ #include "modules.h" #include "commands.h" #include "xline.h" -#include "helperfuncs.h" + #include "commands/cmd_eline.h" diff --git a/src/cmd_info.cpp b/src/cmd_info.cpp index 6c89ff59e..ca9a4f765 100644 --- a/src/cmd_info.cpp +++ b/src/cmd_info.cpp @@ -18,7 +18,7 @@ #include "users.h" #include "modules.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_info.h" diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp index 423624a01..781bcad28 100644 --- a/src/cmd_invite.cpp +++ b/src/cmd_invite.cpp @@ -19,7 +19,7 @@ #include "users.h" #include "modules.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_invite.h" diff --git a/src/cmd_ison.cpp b/src/cmd_ison.cpp index fd6e92df2..5500334ce 100644 --- a/src/cmd_ison.cpp +++ b/src/cmd_ison.cpp @@ -18,7 +18,7 @@ #include "ctables.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "commands/cmd_ison.h" diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp index 5f214b3aa..3e3801432 100644 --- a/src/cmd_join.cpp +++ b/src/cmd_join.cpp @@ -17,7 +17,7 @@ #include "inspircd.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_join.h" diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp index 9838995d2..07b389689 100644 --- a/src/cmd_kick.cpp +++ b/src/cmd_kick.cpp @@ -17,7 +17,7 @@ #include "inspircd_config.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "commands/cmd_kick.h" diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp index bf596ee2b..01b49ae6b 100644 --- a/src/cmd_kill.cpp +++ b/src/cmd_kill.cpp @@ -21,7 +21,7 @@ #include "users.h" #include "modules.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_kill.h" diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp index 4baeefb8f..02a928f11 100644 --- a/src/cmd_kline.cpp +++ b/src/cmd_kline.cpp @@ -28,7 +28,7 @@ #include "modules.h" #include "commands.h" #include "xline.h" -#include "helperfuncs.h" + #include "commands/cmd_kline.h" void cmd_kline::Handle (const char** parameters, int pcnt, userrec *user) diff --git a/src/cmd_links.cpp b/src/cmd_links.cpp index 3b2fc9a21..1c61b0e70 100644 --- a/src/cmd_links.cpp +++ b/src/cmd_links.cpp @@ -19,7 +19,7 @@ #include "users.h" #include "modules.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_links.h" diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp index 9b6fbfd05..7aa9319ba 100644 --- a/src/cmd_list.cpp +++ b/src/cmd_list.cpp @@ -17,7 +17,7 @@ #include "users.h" #include "ctables.h" #include "commands.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "commands/cmd_list.h" diff --git a/src/cmd_loadmodule.cpp b/src/cmd_loadmodule.cpp index 835a5b170..9b3a85f1d 100644 --- a/src/cmd_loadmodule.cpp +++ b/src/cmd_loadmodule.cpp @@ -17,7 +17,7 @@ #include "inspircd.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_loadmodule.h" diff --git a/src/cmd_lusers.cpp b/src/cmd_lusers.cpp index 39f093072..416dd2924 100644 --- a/src/cmd_lusers.cpp +++ b/src/cmd_lusers.cpp @@ -16,7 +16,7 @@ #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "commands/cmd_lusers.h" diff --git a/src/cmd_map.cpp b/src/cmd_map.cpp index 8463addc5..19e963e63 100644 --- a/src/cmd_map.cpp +++ b/src/cmd_map.cpp @@ -18,7 +18,7 @@ #include "configreader.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_map.h" diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp index 73a226bf1..af8c3e9ab 100644 --- a/src/cmd_modules.cpp +++ b/src/cmd_modules.cpp @@ -27,7 +27,7 @@ #include "users.h" #include "modules.h" #include "commands.h" -#include "helperfuncs.h" + #include "wildcard.h" #include "commands/cmd_modules.h" diff --git a/src/cmd_motd.cpp b/src/cmd_motd.cpp index ab89bfd19..c57da2e9f 100644 --- a/src/cmd_motd.cpp +++ b/src/cmd_motd.cpp @@ -16,7 +16,7 @@ #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_motd.h" void cmd_motd::Handle (const char** parameters, int pcnt, userrec *user) diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp index 70b1876a1..0012a132f 100644 --- a/src/cmd_names.cpp +++ b/src/cmd_names.cpp @@ -17,7 +17,7 @@ #include "inspircd.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_names.h" diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp index d96298ca2..04d204d7b 100644 --- a/src/cmd_nick.cpp +++ b/src/cmd_nick.cpp @@ -24,7 +24,7 @@ #include "commands.h" #include "xline.h" #include "dns.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "hashcomp.h" #include "commands/cmd_nick.h" diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp index 53d6e0d9e..209972400 100644 --- a/src/cmd_notice.cpp +++ b/src/cmd_notice.cpp @@ -24,7 +24,7 @@ #include "modules.h" #include "wildcard.h" #include "commands.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "commands/cmd_notice.h" diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp index e8b22d14d..6fd610322 100644 --- a/src/cmd_oper.cpp +++ b/src/cmd_oper.cpp @@ -29,7 +29,7 @@ #include "mode.h" #include "xline.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "socketengine.h" diff --git a/src/cmd_part.cpp b/src/cmd_part.cpp index 10c95661b..afa59580c 100644 --- a/src/cmd_part.cpp +++ b/src/cmd_part.cpp @@ -17,7 +17,7 @@ #include "inspircd.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_part.h" diff --git a/src/cmd_pass.cpp b/src/cmd_pass.cpp index 35a65b3c5..080cd6517 100644 --- a/src/cmd_pass.cpp +++ b/src/cmd_pass.cpp @@ -16,7 +16,7 @@ #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_pass.h" void cmd_pass::Handle (const char** parameters, int pcnt, userrec *user) diff --git a/src/cmd_ping.cpp b/src/cmd_ping.cpp index 5ece8b941..515312670 100644 --- a/src/cmd_ping.cpp +++ b/src/cmd_ping.cpp @@ -17,7 +17,7 @@ #include "configreader.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_ping.h" diff --git a/src/cmd_pong.cpp b/src/cmd_pong.cpp index cf86b5b53..11973a729 100644 --- a/src/cmd_pong.cpp +++ b/src/cmd_pong.cpp @@ -17,7 +17,7 @@ #include "users.h" #include "commands.h" #include "commands/cmd_pong.h" -#include "helperfuncs.h" + void cmd_pong::Handle (const char** parameters, int pcnt, userrec *user) { diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp index 557289bbd..3f9e33652 100644 --- a/src/cmd_privmsg.cpp +++ b/src/cmd_privmsg.cpp @@ -22,7 +22,7 @@ #include "modules.h" #include "wildcard.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_privmsg.h" void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user) diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp index 5be818ff4..0dc36032d 100644 --- a/src/cmd_qline.cpp +++ b/src/cmd_qline.cpp @@ -20,7 +20,7 @@ #include "modules.h" #include "commands.h" #include "xline.h" -#include "helperfuncs.h" + #include "commands/cmd_qline.h" void cmd_qline::Handle (const char** parameters, int pcnt, userrec *user) diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp index f90778995..7430e0fd2 100644 --- a/src/cmd_quit.cpp +++ b/src/cmd_quit.cpp @@ -29,7 +29,7 @@ #include "mode.h" #include "xline.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "socketengine.h" #include "commands/cmd_quit.h" diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp index ff3d641ff..5704b3416 100644 --- a/src/cmd_restart.cpp +++ b/src/cmd_restart.cpp @@ -17,7 +17,7 @@ #include "configreader.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_restart.h" diff --git a/src/cmd_rules.cpp b/src/cmd_rules.cpp index 4ba1a0ded..f1788772e 100644 --- a/src/cmd_rules.cpp +++ b/src/cmd_rules.cpp @@ -16,7 +16,7 @@ #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_rules.h" void cmd_rules::Handle (const char** parameters, int pcnt, userrec *user) diff --git a/src/cmd_server.cpp b/src/cmd_server.cpp index b932a2089..e179f9305 100644 --- a/src/cmd_server.cpp +++ b/src/cmd_server.cpp @@ -16,7 +16,7 @@ #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "commands/cmd_server.h" diff --git a/src/cmd_squit.cpp b/src/cmd_squit.cpp index cc496d4bc..e583d4fa3 100644 --- a/src/cmd_squit.cpp +++ b/src/cmd_squit.cpp @@ -16,7 +16,7 @@ #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_squit.h" /* diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp index 8187f8812..201f9c0e2 100644 --- a/src/cmd_stats.cpp +++ b/src/cmd_stats.cpp @@ -35,7 +35,7 @@ #include "mode.h" #include "xline.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "socketengine.h" #include "command_parse.h" diff --git a/src/cmd_summon.cpp b/src/cmd_summon.cpp index e85981a50..c14f9af5d 100644 --- a/src/cmd_summon.cpp +++ b/src/cmd_summon.cpp @@ -16,7 +16,7 @@ #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_summon.h" void cmd_summon::Handle (const char** parameters, int pcnt, userrec *user) diff --git a/src/cmd_time.cpp b/src/cmd_time.cpp index e5ed1c183..a4ae310d1 100644 --- a/src/cmd_time.cpp +++ b/src/cmd_time.cpp @@ -18,7 +18,7 @@ #include "configreader.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_time.h" void cmd_time::Handle (const char** parameters, int pcnt, userrec *user) diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp index fd9f192ae..1939af7b2 100644 --- a/src/cmd_topic.cpp +++ b/src/cmd_topic.cpp @@ -20,7 +20,7 @@ #include "modules.h" #include "commands.h" #include "commands/cmd_topic.h" -#include "helperfuncs.h" + void cmd_topic::Handle (const char** parameters, int pcnt, userrec *user) { diff --git a/src/cmd_trace.cpp b/src/cmd_trace.cpp index 675681e3a..6f4fecc75 100644 --- a/src/cmd_trace.cpp +++ b/src/cmd_trace.cpp @@ -16,7 +16,7 @@ #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "commands/cmd_trace.h" diff --git a/src/cmd_unloadmodule.cpp b/src/cmd_unloadmodule.cpp index 2b0d8dbf3..df84603a6 100644 --- a/src/cmd_unloadmodule.cpp +++ b/src/cmd_unloadmodule.cpp @@ -17,7 +17,7 @@ #include "inspircd.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_unloadmodule.h" diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp index 22cfbfab1..66a275c72 100644 --- a/src/cmd_user.cpp +++ b/src/cmd_user.cpp @@ -18,7 +18,7 @@ #include "configreader.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_user.h" diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp index cf7000b5d..aaa25c986 100644 --- a/src/cmd_userhost.cpp +++ b/src/cmd_userhost.cpp @@ -17,7 +17,7 @@ #include "inspircd_config.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "commands/cmd_userhost.h" diff --git a/src/cmd_users.cpp b/src/cmd_users.cpp index 963f392c1..ff8877df4 100644 --- a/src/cmd_users.cpp +++ b/src/cmd_users.cpp @@ -16,7 +16,7 @@ #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_users.h" void cmd_users::Handle (const char** parameters, int pcnt, userrec *user) diff --git a/src/cmd_version.cpp b/src/cmd_version.cpp index 884e533e6..eab4aec01 100644 --- a/src/cmd_version.cpp +++ b/src/cmd_version.cpp @@ -18,7 +18,7 @@ #include "configreader.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_version.h" diff --git a/src/cmd_wallops.cpp b/src/cmd_wallops.cpp index 9e278ca6c..11a4664e8 100644 --- a/src/cmd_wallops.cpp +++ b/src/cmd_wallops.cpp @@ -17,7 +17,7 @@ #include "configreader.h" #include "modules.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_wallops.h" diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp index 16e746ee3..2fcefa22d 100644 --- a/src/cmd_who.cpp +++ b/src/cmd_who.cpp @@ -18,7 +18,7 @@ #include "users.h" #include "modules.h" #include "commands.h" -#include "helperfuncs.h" + #include "wildcard.h" #include "commands/cmd_who.h" diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp index c863d7998..703faad3f 100644 --- a/src/cmd_whois.cpp +++ b/src/cmd_whois.cpp @@ -19,7 +19,7 @@ #include "users.h" #include "modules.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_whois.h" const char* Spacify(char* n) diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp index f147336fd..fe0d8c90d 100644 --- a/src/cmd_whowas.cpp +++ b/src/cmd_whowas.cpp @@ -18,7 +18,7 @@ #include "configreader.h" #include "users.h" #include "commands.h" -#include "helperfuncs.h" + #include "commands/cmd_whowas.h" void cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user) diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp index cdb296d16..17fdeed16 100644 --- a/src/cmd_zline.cpp +++ b/src/cmd_zline.cpp @@ -21,7 +21,7 @@ #include "modules.h" #include "commands.h" #include "xline.h" -#include "helperfuncs.h" + #include "commands/cmd_zline.h" diff --git a/src/command_parse.cpp b/src/command_parse.cpp index e3d47e9b7..d7c8aefe5 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -36,7 +36,7 @@ #include "commands.h" #include "xline.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "socketengine.h" #include "userprocess.h" diff --git a/src/commands.cpp b/src/commands.cpp index b9f6d2cec..7e2878497 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -43,7 +43,7 @@ #include "mode.h" #include "xline.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "socketengine.h" #include "typedefs.h" diff --git a/src/configreader.cpp b/src/configreader.cpp index e983bbc90..a9e34a716 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -22,7 +22,7 @@ #include <fstream> #include "inspircd.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "userprocess.h" #include "xline.h" diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 50ecfe518..74e16e64e 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -33,7 +33,7 @@ using namespace std; #include "xline.h" #include "inspstring.h" #include "inspircd.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "typedefs.h" #include "cull_list.h" diff --git a/src/dns.cpp b/src/dns.cpp index b5bab8edd..50aae9c82 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -38,7 +38,7 @@ using namespace std; #include <map> #include "dns.h" #include "inspircd.h" -#include "helperfuncs.h" + #include "inspircd_config.h" #include "socketengine.h" #include "configreader.h" diff --git a/src/dynamic.cpp b/src/dynamic.cpp index f42d1fec9..3a6c0897c 100644 --- a/src/dynamic.cpp +++ b/src/dynamic.cpp @@ -28,7 +28,7 @@ using namespace std; #endif #include "inspstring.h" -#include "helperfuncs.h" + #include "inspircd.h" #include <unistd.h> #include <sys/types.h> diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index 953997e5b..d4f9e53d6 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -20,7 +20,7 @@ using namespace std; #include "inspircd.h" #include <string> #include "hashcomp.h" -#include "helperfuncs.h" + #include <ext/hash_map> #define nspace __gnu_cxx diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 51246199a..cc4b8355f 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -38,7 +38,7 @@ #include "xline.h" #include "commands.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "typedefs.h" #include "inspircd.h" diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 831ac80a1..9084f8277 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -55,7 +55,7 @@ #include "commands.h" #include "xline.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "socketengine.h" #include "inspircd_se_config.h" diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 1bf58c91c..75f8dc250 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -23,7 +23,7 @@ #include "socket.h" #include "configreader.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "socketengine.h" #include "inspircd.h" diff --git a/src/mode.cpp b/src/mode.cpp index b3886eefe..c865ebe2f 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -25,7 +25,7 @@ using namespace std; #include "users.h" #include "modules.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "commands.h" #include "mode.h" diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp index 82e57ea7b..546bcb30f 100644 --- a/src/modes/cmode_b.cpp +++ b/src/modes/cmode_b.cpp @@ -7,7 +7,7 @@ #include "mode.h" #include "channels.h" #include "users.h" -#include "helperfuncs.h" + #include "modules.h" #include "inspstring.h" #include "hashcomp.h" diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp index cb7c631db..21c97cabc 100644 --- a/src/modes/cmode_h.cpp +++ b/src/modes/cmode_h.cpp @@ -7,7 +7,7 @@ #include "mode.h" #include "channels.h" #include "users.h" -#include "helperfuncs.h" + #include "commands.h" #include "modules.h" #include "inspstring.h" diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp index 864923506..0ab3d9d95 100644 --- a/src/modes/cmode_o.cpp +++ b/src/modes/cmode_o.cpp @@ -7,7 +7,7 @@ #include "mode.h" #include "channels.h" #include "users.h" -#include "helperfuncs.h" + #include "commands.h" #include "modules.h" #include "inspstring.h" diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp index 171e845fd..af1fbe22a 100644 --- a/src/modes/cmode_v.cpp +++ b/src/modes/cmode_v.cpp @@ -7,7 +7,7 @@ #include "mode.h" #include "channels.h" #include "users.h" -#include "helperfuncs.h" + #include "commands.h" #include "modules.h" #include "inspstring.h" diff --git a/src/modules.cpp b/src/modules.cpp index fc49d622f..b78b84d12 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -35,7 +35,7 @@ #include "xline.h" #include "commands.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "socket.h" #include "socketengine.h" diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp index 819d77843..d435600b4 100644 --- a/src/modules/extra/m_filter_pcre.cpp +++ b/src/modules/extra/m_filter_pcre.cpp @@ -24,7 +24,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" class FilterPCREException : public ModuleException diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index d43203ac4..db68e17cd 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -23,7 +23,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "m_sqlv2.h" diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index a60fcb5f6..c4bf1da99 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -25,7 +25,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "configreader.h" diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp index 12bad82fc..acdd5da51 100644 --- a/src/modules/extra/m_sqlauth.cpp +++ b/src/modules/extra/m_sqlauth.cpp @@ -21,7 +21,7 @@ #include "channels.h" #include "modules.h" #include "inspircd.h" -#include "helperfuncs.h" + #include "m_sqlv2.h" #include "m_sqlutils.h" diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp index 4ae07b3de..22535e163 100644 --- a/src/modules/extra/m_sqloper.cpp +++ b/src/modules/extra/m_sqloper.cpp @@ -21,7 +21,7 @@ #include "modules.h" #include "inspircd.h" #include "configreader.h" -#include "helperfuncs.h" + #include "m_sqlv2.h" #include "m_sqlutils.h" #include "commands/cmd_oper.h" diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp index 8cddacd42..700f69e7d 100644 --- a/src/modules/extra/m_sqlutils.cpp +++ b/src/modules/extra/m_sqlutils.cpp @@ -23,7 +23,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "configreader.h" diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index b33213c14..fdde010dc 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -8,7 +8,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "socket.h" #include "hashcomp.h" #include "inspircd.h" diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index a1cb6c4c4..280796b4b 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -9,7 +9,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "socket.h" #include "hashcomp.h" #include "inspircd.h" diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp index e9696ed95..cff09ba41 100644 --- a/src/modules/extra/m_testclient.cpp +++ b/src/modules/extra/m_testclient.cpp @@ -3,7 +3,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "configreader.h" #include "m_sqlv2.h" diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 5eb7c9908..09cf15947 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -19,7 +19,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "commands.h" #include "inspircd.h" #include <vector> diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp index 7a8437935..557d2ca0c 100644 --- a/src/modules/m_antibear.cpp +++ b/src/modules/m_antibear.cpp @@ -19,7 +19,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + /* $ModDesc: Sends a numeric on connect which cripples a common type of trojan/spambot */ diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index cc3bf0730..82939231f 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -5,7 +5,7 @@ #include "channels.h" #include "modules.h" #include "mode.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "u_listmode.h" diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index 59c03e1e3..7dc2f2f2f 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -23,7 +23,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "inspircd.h" diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index 1e9095a83..b105e1dc5 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -18,7 +18,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "mode.h" diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp index 04d9d1e54..978c72e52 100644 --- a/src/modules/m_blockcolor.cpp +++ b/src/modules/m_blockcolor.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for unreal-style channel mode +c */ diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp index eabe8a0b4..0cde92bec 100644 --- a/src/modules/m_botmode.cpp +++ b/src/modules/m_botmode.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "configreader.h" #include "inspircd.h" diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 19d6e8502..a774968bb 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -22,7 +22,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "commands.h" #include "configreader.h" diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index e68886a34..a1aba037d 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" typedef std::map<irc::string,irc::string> censor_t; diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 32ac5726f..496162877 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -23,7 +23,7 @@ #include <arpa/inet.h> #include "users.h" #include "modules.h" -#include "helperfuncs.h" + #include "dns.h" #include "inspircd.h" diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index c835da180..693b1788d 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -22,7 +22,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "u_listmode.h" #include "inspircd.h" diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 13a9957cb..981f14f2e 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -17,7 +17,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "commands.h" diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 54abe0940..b3a9dbb1f 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -21,7 +21,7 @@ using namespace std; #include "modules.h" #include "commands.h" #include "inspircd.h" -#include "helperfuncs.h" + #include "wildcard.h" /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */ diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index d3c3dc84f..fdb438c91 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for the CHGHOST command */ diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index 5bc70e3d7..e5b19bfca 100644 --- a/src/modules/m_chgident.cpp +++ b/src/modules/m_chgident.cpp @@ -1,7 +1,7 @@ #include <string> #include "users.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for the CHGIDENT command */ diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp index e04563218..937577c5e 100644 --- a/src/modules/m_conn_waitpong.cpp +++ b/src/modules/m_conn_waitpong.cpp @@ -4,7 +4,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */ diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp index ffa2fba83..6a0ee948a 100644 --- a/src/modules/m_connflood.cpp +++ b/src/modules/m_connflood.cpp @@ -20,7 +20,7 @@ using namespace std; #include "users.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Connection throttle */ diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp index 67a7aaca6..04d0a3033 100644 --- a/src/modules/m_denychans.cpp +++ b/src/modules/m_denychans.cpp @@ -18,7 +18,7 @@ #include "channels.h" #include "modules.h" #include "hashcomp.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Implements config tags which allow blocking of joins to channels */ diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index a1511c3f2..775130f35 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -25,7 +25,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: An enhanced version of the unreal m_filter.so used by chatspike.net */ diff --git a/src/modules/m_foobar.cpp b/src/modules/m_foobar.cpp index a5b0553b0..13c3477de 100644 --- a/src/modules/m_foobar.cpp +++ b/src/modules/m_foobar.cpp @@ -19,7 +19,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: A dummy module for testing */ diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index 842b03a27..dfd518cf2 100644 --- a/src/modules/m_globalload.cpp +++ b/src/modules/m_globalload.cpp @@ -23,7 +23,7 @@ using namespace std; #include "channels.h" #include "modules.h" #include "inspircd.h" -#include "helperfuncs.h" + class cmd_gloadmodule : public command_t { diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp index 46b82b234..2bce7097d 100644 --- a/src/modules/m_helpop.cpp +++ b/src/modules/m_helpop.cpp @@ -19,7 +19,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" // Global Vars diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 19367e1fe..feddae001 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -21,7 +21,7 @@ using namespace std; #include "channels.h" #include "modules.h" #include "inspsocket.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "httpd.h" diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 677beed22..29b9b190d 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -22,7 +22,7 @@ using namespace std; #include "configreader.h" #include "modules.h" #include "inspsocket.h" -#include "helperfuncs.h" + #include "httpd.h" #include "inspircd.h" diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp index 0f2748b0a..ba582555d 100644 --- a/src/modules/m_inviteexception.cpp +++ b/src/modules/m_inviteexception.cpp @@ -5,7 +5,7 @@ #include "channels.h" #include "modules.h" #include "mode.h" -#include "helperfuncs.h" + #include "u_listmode.h" /* $ModDesc: Provides support for the +I channel mode */ diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index e4d528159..7f12d5cce 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "configreader.h" #include "inspircd.h" diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 86f53fae7..35aecc894 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -5,7 +5,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */ diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp index 25286f4c5..092ce999f 100644 --- a/src/modules/m_knock.cpp +++ b/src/modules/m_knock.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "configreader.h" #include "inspircd.h" diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index ce10daed2..5a4f03340 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides channel mode +f (message flood protection) */ diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 16f6aafa6..1a7e8c5a7 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "inspircd.h" diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp index 666143a04..885f2dd54 100644 --- a/src/modules/m_noctcp.cpp +++ b/src/modules/m_noctcp.cpp @@ -20,7 +20,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for unreal-style channel mode +c */ diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp index b2878830e..9e4d37ff1 100644 --- a/src/modules/m_noinvite.cpp +++ b/src/modules/m_noinvite.cpp @@ -20,7 +20,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for unreal-style channel mode +V */ diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp index 1606ca026..abf4f8034 100644 --- a/src/modules/m_nokicks.cpp +++ b/src/modules/m_nokicks.cpp @@ -20,7 +20,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for unreal-style channel mode +Q */ diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp index d8f974c9f..9d2a3d9eb 100644 --- a/src/modules/m_nonicks.cpp +++ b/src/modules/m_nonicks.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "configreader.h" #include "inspircd.h" diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp index 1c0948f12..c6de6dbdf 100644 --- a/src/modules/m_nonotice.cpp +++ b/src/modules/m_nonotice.cpp @@ -20,7 +20,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for unreal-style channel mode +T */ diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp index def8452b4..2bb1299c9 100644 --- a/src/modules/m_operchans.cpp +++ b/src/modules/m_operchans.cpp @@ -20,7 +20,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for oper-only chans via the +O channel mode */ diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp index 45c5e3959..67512815d 100644 --- a/src/modules/m_operjoin.cpp +++ b/src/modules/m_operjoin.cpp @@ -5,7 +5,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */ diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp index ba0235f6a..ab4fee21f 100644 --- a/src/modules/m_operlevels.cpp +++ b/src/modules/m_operlevels.cpp @@ -4,7 +4,7 @@ using namespace std; #include "channels.h" #include "modules.h" #include <string> -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */ diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp index 088410baa..cf5b80a38 100644 --- a/src/modules/m_operlog.cpp +++ b/src/modules/m_operlog.cpp @@ -19,7 +19,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" #include <vector> diff --git a/src/modules/m_opermd5.cpp b/src/modules/m_opermd5.cpp index 3cfb74961..9ac896e81 100644 --- a/src/modules/m_opermd5.cpp +++ b/src/modules/m_opermd5.cpp @@ -26,7 +26,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* The four core functions - F1 is optimized somewhat */ diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp index f0457904a..5d50d4192 100644 --- a/src/modules/m_opermotd.cpp +++ b/src/modules/m_opermotd.cpp @@ -6,7 +6,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */ diff --git a/src/modules/m_opersha256.cpp b/src/modules/m_opersha256.cpp index 6ab8f6d16..92579cdaf 100644 --- a/src/modules/m_opersha256.cpp +++ b/src/modules/m_opersha256.cpp @@ -44,7 +44,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index c65a992e7..e13481ab1 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -17,7 +17,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "configreader.h" #include "inspircd.h" diff --git a/src/modules/m_park.cpp b/src/modules/m_park.cpp index e27a47d04..c1c8a055b 100644 --- a/src/modules/m_park.cpp +++ b/src/modules/m_park.cpp @@ -21,7 +21,7 @@ using namespace std; #include <vector> #include "users.h" #include "channels.h" -#include "helperfuncs.h" + #include "modules.h" #include "inspircd.h" diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp index 035b39a0c..0bb0be1db 100644 --- a/src/modules/m_randquote.cpp +++ b/src/modules/m_randquote.cpp @@ -19,7 +19,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index 4f9aa0c2a..e51d1f20f 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -20,7 +20,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides channel mode +L (limit redirection) */ diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index 8e26f6ead..1ee4742a3 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -6,7 +6,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "configreader.h" #include "commands.h" #include "inspircd.h" diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp index 50d83617c..1b7d4104a 100644 --- a/src/modules/m_restrictchans.cpp +++ b/src/modules/m_restrictchans.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Only opers may create new channels if this module is loaded */ diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp index 4b9a838b7..8e10e2457 100644 --- a/src/modules/m_restrictmsg.cpp +++ b/src/modules/m_restrictmsg.cpp @@ -22,7 +22,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */ diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index 89e72f652..1f7f2742f 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -19,7 +19,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include <vector> #include "configreader.h" #include "inspircd.h" diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index 3dfbc7efe..01a335f80 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for unreal-style SAJOIN command */ diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp index 3120783cf..98178c46a 100644 --- a/src/modules/m_sapart.cpp +++ b/src/modules/m_sapart.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for unreal-style SAPART command */ diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp index 92049497f..14eb2aecf 100644 --- a/src/modules/m_securelist.cpp +++ b/src/modules/m_securelist.cpp @@ -19,7 +19,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include <vector> #include "inspircd.h" diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp index 21ab31f6b..0a7e3adff 100644 --- a/src/modules/m_services.cpp +++ b/src/modules/m_services.cpp @@ -21,7 +21,7 @@ using namespace std; #include "channels.h" #include "modules.h" #include <string> -#include "helperfuncs.h" + #include "commands.h" #include "hashcomp.h" #include "inspircd.h" diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index d3a16fa05..5ddbbb979 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -21,7 +21,7 @@ using namespace std; #include "channels.h" #include "modules.h" #include <string> -#include "helperfuncs.h" + #include "hashcomp.h" #include "inspircd.h" diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp index 75d758f38..b7496a4ba 100644 --- a/src/modules/m_sethost.cpp +++ b/src/modules/m_sethost.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for the SETHOST command */ diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp index e9795cc7e..94ab3ff51 100644 --- a/src/modules/m_setident.cpp +++ b/src/modules/m_setident.cpp @@ -1,6 +1,6 @@ #include "users.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for the SETIDENT command */ diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp index 8bc790fca..f6584aef6 100644 --- a/src/modules/m_setidle.cpp +++ b/src/modules/m_setidle.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Allows opers to set their idle time */ diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp index e088b7963..25269d1c4 100644 --- a/src/modules/m_setname.cpp +++ b/src/modules/m_setname.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for the SETNAME command */ diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp index 728b07fc5..0719a93f8 100644 --- a/src/modules/m_showwhois.cpp +++ b/src/modules/m_showwhois.cpp @@ -6,7 +6,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */ diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index e39c0a7ea..d3a5ca44a 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -22,7 +22,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "inspircd.h" diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index 8aa3e2b65..b3cc874bd 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -32,7 +32,7 @@ using namespace std; #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "wildcard.h" #include "inspstring.h" diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp index df52b4fee..55b3a650c 100644 --- a/src/modules/m_spy.cpp +++ b/src/modules/m_spy.cpp @@ -34,7 +34,7 @@ using namespace std; #include "modules.h" #include "commands.h" #include "socket.h" -#include "helperfuncs.h" + #include "inspircd.h" #include "inspstring.h" #include "hashcomp.h" diff --git a/src/modules/m_ssl_dummy.cpp b/src/modules/m_ssl_dummy.cpp index 284d1d6cb..4b3390c8d 100644 --- a/src/modules/m_ssl_dummy.cpp +++ b/src/modules/m_ssl_dummy.cpp @@ -17,7 +17,7 @@ #include "users.h" #include "modules.h" -#include "helperfuncs.h" + /* $ModDesc: Makes remote /whoises to SSL servers work on a non-ssl server */ diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp index 55cfd7a16..9cc3f2872 100644 --- a/src/modules/m_sslmodes.cpp +++ b/src/modules/m_sslmodes.cpp @@ -1,7 +1,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for unreal-style channel mode +z */ diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index 46e577779..293b5ee13 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides channel +S mode (strip ansi colour) */ diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index f885a6145..e98f87ffb 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -17,7 +17,7 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */ diff --git a/src/modules/m_testcommand.cpp b/src/modules/m_testcommand.cpp index 61effc3de..a615f9cb5 100644 --- a/src/modules/m_testcommand.cpp +++ b/src/modules/m_testcommand.cpp @@ -20,7 +20,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "dns.h" #include "inspircd.h" diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index ac993e0a9..faeb3e6ba 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -23,7 +23,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "configreader.h" #include "inspircd.h" diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp index 37574ea02..2616448e6 100644 --- a/src/modules/m_tline.cpp +++ b/src/modules/m_tline.cpp @@ -20,7 +20,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "wildcard.h" #include "inspircd.h" #include "dns.h" diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp index 3af5a7e6f..044907b69 100644 --- a/src/modules/m_uninvite.cpp +++ b/src/modules/m_uninvite.cpp @@ -22,7 +22,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "configreader.h" #include "inspircd.h" diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp index 7389038ea..9fea5837b 100644 --- a/src/modules/m_userip.cpp +++ b/src/modules/m_userip.cpp @@ -21,7 +21,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Provides support for USERIP command */ diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp index 521ddde56..d01bc045a 100644 --- a/src/modules/m_watch.cpp +++ b/src/modules/m_watch.cpp @@ -22,7 +22,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "inspircd.h" diff --git a/src/snomasks.cpp b/src/snomasks.cpp index 7aac60330..3b52e2f0e 100644 --- a/src/snomasks.cpp +++ b/src/snomasks.cpp @@ -21,6 +21,6 @@ #include "modules.h" #include "commands.h" #include "xline.h" -#include "helperfuncs.h" + #include "snomasks.h" diff --git a/src/socket.cpp b/src/socket.cpp index 39b0feeb0..d28107f7f 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -19,7 +19,7 @@ #include "socket.h" #include "inspircd.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "socketengine.h" #include "wildcard.h" diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 834fe9e0b..65571caf5 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -28,7 +28,7 @@ #include <vector> #include <string> #include "socketengine.h" -#include "helperfuncs.h" + #include "inspircd.h" SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance) diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp index f25d41939..64b1be63d 100644 --- a/src/socketengine_epoll.cpp +++ b/src/socketengine_epoll.cpp @@ -21,7 +21,7 @@ #include <vector> #include <string> #include "socketengine_epoll.h" -#include "helperfuncs.h" + #include "inspircd.h" EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance) diff --git a/src/socketengine_kqueue.cpp b/src/socketengine_kqueue.cpp index ea054f96c..0c3226113 100644 --- a/src/socketengine_kqueue.cpp +++ b/src/socketengine_kqueue.cpp @@ -23,7 +23,7 @@ #include <vector> #include <string> #include "socketengine_kqueue.h" -#include "helperfuncs.h" + KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance) { diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp index f8a403d05..4e79dc19b 100644 --- a/src/socketengine_select.cpp +++ b/src/socketengine_select.cpp @@ -21,7 +21,7 @@ #include <string> #include <sys/select.h> #include "socketengine_select.h" -#include "helperfuncs.h" + SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance) { diff --git a/src/timer.cpp b/src/timer.cpp index 2b30b478c..148dafc68 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -19,7 +19,7 @@ #include "inspircd_config.h" #include "inspircd.h" #include "typedefs.h" -#include "helperfuncs.h" + #include "timer.h" void TimerManager::TickTimers(time_t TIME) diff --git a/src/userprocess.cpp b/src/userprocess.cpp index 5cf116978..49a4e9089 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -42,7 +42,7 @@ using namespace std; #include "commands.h" #include "xline.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "socketengine.h" #include "userprocess.h" diff --git a/src/users.cpp b/src/users.cpp index 41d25cf53..84bdbb9d6 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -23,7 +23,7 @@ #include <stdarg.h> #include "inspstring.h" #include "commands.h" -#include "helperfuncs.h" + #include "typedefs.h" #include "socketengine.h" #include "hashcomp.h" diff --git a/src/wildcard.cpp b/src/wildcard.cpp index 403280996..502dc89c3 100644 --- a/src/wildcard.cpp +++ b/src/wildcard.cpp @@ -19,7 +19,7 @@ using namespace std; #include <string> #include "inspircd_config.h" #include "inspircd.h" -#include "helperfuncs.h" + #include "inspstring.h" using irc::sockets::MatchCIDR; diff --git a/src/xline.cpp b/src/xline.cpp index 2ad58d093..0a1150aa8 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -32,7 +32,7 @@ using namespace std; #include "commands.h" #include "xline.h" #include "inspstring.h" -#include "helperfuncs.h" + #include "hashcomp.h" #include "typedefs.h" #include "configreader.h" |