From 77123f4dec9f29105f6c0ceea0262cfe8e9eaa1a Mon Sep 17 00:00:00 2001 From: om Date: Sat, 8 Apr 2006 22:33:46 +0000 Subject: Remove references to inspircd_io from these, stop configure making all the modules depend on it too. And remove some more un-needed includes git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3853 e03df62e-2008-0410-955e-edbf42e46eb7 --- configure | 2 +- include/cmd_admin.h | 9 +-------- include/cmd_connect.h | 9 +-------- include/inspircd.h | 1 - src/channels.cpp | 13 +------------ src/cmd_commands.cpp | 25 ------------------------- src/cmd_connect.cpp | 14 -------------- src/cmd_ison.cpp | 18 +----------------- src/cmd_join.cpp | 25 ------------------------- src/cmd_kick.cpp | 21 --------------------- src/cmd_list.cpp | 21 --------------------- src/cmd_loadmodule.cpp | 18 ------------------ src/cmd_lusers.cpp | 16 ---------------- src/cmd_motd.cpp | 44 -------------------------------------------- src/cmd_names.cpp | 41 ----------------------------------------- src/cmd_part.cpp | 41 ----------------------------------------- src/cmd_pass.cpp | 43 ------------------------------------------- src/cmd_pong.cpp | 45 --------------------------------------------- src/cmd_rules.cpp | 44 -------------------------------------------- src/cmd_server.cpp | 44 -------------------------------------------- src/cmd_squit.cpp | 42 ------------------------------------------ src/cmd_summon.cpp | 32 -------------------------------- src/cmd_trace.cpp | 42 ------------------------------------------ src/cmd_unloadmodule.cpp | 16 ---------------- src/cmd_userhost.cpp | 44 -------------------------------------------- src/cmd_users.cpp | 14 -------------- src/cull_list.cpp | 10 ---------- src/modules/m_operwho.cpp | 22 +--------------------- src/timer.cpp | 1 - src/xline.cpp | 11 ----------- 30 files changed, 6 insertions(+), 722 deletions(-) diff --git a/configure b/configure index 6e49a157f..edb4e3dbd 100755 --- a/configure +++ b/configure @@ -1268,7 +1268,7 @@ EOF $cmflags = getcompilerflags("src/modules/m_".$i.".cpp"); $liflags = getlinkerflags("src/modules/m_".$i.".cpp"); print FILEHANDLE < -#include -#include -#include -#include -#include #include "users.h" #include "channels.h" +#include "ctables.h" class cmd_admin : public command_t { diff --git a/include/cmd_connect.h b/include/cmd_connect.h index 75f32a69d..a65000da4 100644 --- a/include/cmd_connect.h +++ b/include/cmd_connect.h @@ -17,16 +17,9 @@ #ifndef __CMD_CONNECT_H__ #define __CMD_CONNECT_H__ -// include the common header files - -#include -#include -#include -#include -#include -#include #include "users.h" #include "channels.h" +#include "ctables.h" class cmd_connect : public command_t { diff --git a/include/inspircd.h b/include/inspircd.h index a9873ff76..bd180328d 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -39,7 +39,6 @@ #include #include -#include "inspircd_io.h" #include "users.h" #include "channels.h" #include "socket.h" diff --git a/src/channels.cpp b/src/channels.cpp index 4eba586ab..c63ddbb28 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -18,22 +18,17 @@ using namespace std; #include "configreader.h" #include "inspircd.h" -#include "inspircd_io.h" #include #include #include #include #include #include -#ifdef GCC3 -#include -#else -#include -#endif #include #include #include #include +#include "hash_map.h" #include "users.h" #include "ctables.h" #include "globals.h" @@ -48,12 +43,6 @@ using namespace std; #include "helperfuncs.h" #include "typedefs.h" -#ifdef GCC3 -#define nspace __gnu_cxx -#else -#define nspace std -#endif - extern ServerConfig* Config; extern int MODCOUNT; diff --git a/src/cmd_commands.cpp b/src/cmd_commands.cpp index db6efe32f..5fd976734 100644 --- a/src/cmd_commands.cpp +++ b/src/cmd_commands.cpp @@ -14,35 +14,12 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "message.h" #include "commands.h" -#include "inspstring.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_commands.h" -extern ServerConfig* Config; extern InspIRCd* ServerInstance; void cmd_commands::Handle (char **parameters, int pcnt, userrec *user) @@ -53,5 +30,3 @@ void cmd_commands::Handle (char **parameters, int pcnt, userrec *user) } WriteServ(user->fd,"903 %s :End of COMMANDS list",user->nick); } - - diff --git a/src/cmd_connect.cpp b/src/cmd_connect.cpp index 19ff6980d..501017c35 100644 --- a/src/cmd_connect.cpp +++ b/src/cmd_connect.cpp @@ -14,21 +14,9 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "message.h" #include "commands.h" -#include "inspstring.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" #include "cmd_connect.h" /* @@ -38,5 +26,3 @@ void cmd_connect::Handle (char **parameters, int pcnt, userrec *user) { WriteServ(user->fd, "NOTICE %s :You are a nub. Load a linking module.", user->nick); } - - diff --git a/src/cmd_ison.cpp b/src/cmd_ison.cpp index e7256b2a2..540a14ea4 100644 --- a/src/cmd_ison.cpp +++ b/src/cmd_ison.cpp @@ -14,24 +14,11 @@ * --------------------------------------------------- */ -using namespace std; - #include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include "users.h" #include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" +#include "users.h" #include "commands.h" -#include "inspstring.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" #include "cmd_ison.h" void cmd_ison::Handle (char **parameters, int pcnt, userrec *user) @@ -54,6 +41,3 @@ void cmd_ison::Handle (char **parameters, int pcnt, userrec *user) WriteServ(user->fd, retbuf); } - - - diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp index 159e38390..a71e4d81c 100644 --- a/src/cmd_join.cpp +++ b/src/cmd_join.cpp @@ -14,32 +14,10 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "message.h" #include "commands.h" -#include "inspstring.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_join.h" extern InspIRCd* ServerInstance; @@ -58,6 +36,3 @@ void cmd_join::Handle (char **parameters, int pcnt, userrec *user) WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]); } } - - - diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp index 9aaa96d1f..ac96956b1 100644 --- a/src/cmd_kick.cpp +++ b/src/cmd_kick.cpp @@ -14,29 +14,10 @@ * --------------------------------------------------- */ -using namespace std; - #include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "commands.h" -#include "inspstring.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_kick.h" void cmd_kick::Handle (char **parameters, int pcnt, userrec *user) @@ -68,5 +49,3 @@ void cmd_kick::Handle (char **parameters, int pcnt, userrec *user) kick_channel(user, u, c, reason); } - - diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp index 1676a48c0..388aead67 100644 --- a/src/cmd_list.cpp +++ b/src/cmd_list.cpp @@ -14,28 +14,10 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#ifdef GCC3 -#include -#else -#include -#endif #include "users.h" #include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "message.h" #include "commands.h" -#include "inspstring.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" #include "cmd_list.h" extern chan_hash chanlist; @@ -56,6 +38,3 @@ void cmd_list::Handle (char **parameters, int pcnt, userrec *user) } WriteServ(user->fd,"323 %s :End of channel list.",user->nick); } - - - diff --git a/src/cmd_loadmodule.cpp b/src/cmd_loadmodule.cpp index 0906f562e..9ee3ab730 100644 --- a/src/cmd_loadmodule.cpp +++ b/src/cmd_loadmodule.cpp @@ -14,26 +14,10 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "message.h" #include "commands.h" -#include "inspstring.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" #include "cmd_loadmodule.h" extern InspIRCd* ServerInstance; @@ -50,5 +34,3 @@ void cmd_loadmodule::Handle (char **parameters, int pcnt, userrec *user) WriteServ(user->fd,"974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError()); } } - - diff --git a/src/cmd_lusers.cpp b/src/cmd_lusers.cpp index ed4a3d997..8933efa04 100644 --- a/src/cmd_lusers.cpp +++ b/src/cmd_lusers.cpp @@ -14,23 +14,9 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "message.h" #include "commands.h" -#include "inspstring.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_lusers.h" void cmd_lusers::Handle (char **parameters, int pcnt, userrec *user) @@ -43,5 +29,3 @@ void cmd_lusers::Handle (char **parameters, int pcnt, userrec *user) WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount()); WriteServ(user->fd,"254 %s :I have %d clients and 0 servers",user->nick,local_count()); } - - diff --git a/src/cmd_motd.cpp b/src/cmd_motd.cpp index ff9b37e02..7cd8f2c08 100644 --- a/src/cmd_motd.cpp +++ b/src/cmd_motd.cpp @@ -14,56 +14,12 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_motd.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; - void cmd_motd::Handle (char **parameters, int pcnt, userrec *user) { ShowMOTD(user); } - - diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp index bf987e9f2..817c892dc 100644 --- a/src/cmd_names.cpp +++ b/src/cmd_names.cpp @@ -14,52 +14,13 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_names.h" -extern ServerConfig* Config; extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; void cmd_names::Handle (char **parameters, int pcnt, userrec *user) { @@ -89,5 +50,3 @@ void cmd_names::Handle (char **parameters, int pcnt, userrec *user) WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]); } } - - diff --git a/src/cmd_part.cpp b/src/cmd_part.cpp index 668506fc3..da38d6df6 100644 --- a/src/cmd_part.cpp +++ b/src/cmd_part.cpp @@ -14,52 +14,13 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_part.h" -extern ServerConfig* Config; extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; void cmd_part::Handle (char **parameters, int pcnt, userrec *user) { @@ -76,5 +37,3 @@ void cmd_part::Handle (char **parameters, int pcnt, userrec *user) del_channel(user,parameters[0],NULL,false); } } - - diff --git a/src/cmd_pass.cpp b/src/cmd_pass.cpp index 18fc18a99..a11be799a 100644 --- a/src/cmd_pass.cpp +++ b/src/cmd_pass.cpp @@ -14,53 +14,11 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_pass.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; - void cmd_pass::Handle (char **parameters, int pcnt, userrec *user) { // Check to make sure they havnt registered -- Fix by FCS @@ -76,4 +34,3 @@ void cmd_pass::Handle (char **parameters, int pcnt, userrec *user) user->haspassed = true; } } - diff --git a/src/cmd_pong.cpp b/src/cmd_pong.cpp index 0b357562d..f372591e4 100644 --- a/src/cmd_pong.cpp +++ b/src/cmd_pong.cpp @@ -14,57 +14,12 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" -#include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_pong.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; - void cmd_pong::Handle (char **parameters, int pcnt, userrec *user) { // set the user as alive so they survive to next ping user->lastping = 1; } - - diff --git a/src/cmd_rules.cpp b/src/cmd_rules.cpp index f62d0b16b..df972121d 100644 --- a/src/cmd_rules.cpp +++ b/src/cmd_rules.cpp @@ -14,56 +14,12 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_rules.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; - void cmd_rules::Handle (char **parameters, int pcnt, userrec *user) { ShowRULES(user); } - - diff --git a/src/cmd_server.cpp b/src/cmd_server.cpp index 691a6db24..2a6058247 100644 --- a/src/cmd_server.cpp +++ b/src/cmd_server.cpp @@ -14,57 +14,13 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_server.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; - void cmd_server::Handle (char **parameters, int pcnt, userrec *user) { WriteServ(user->fd,"666 %s :You cannot identify as a server, you are a USER. IRC Operators informed.",user->nick); WriteOpers("*** WARNING: %s attempted to issue a SERVER command and is registered as a user!",user->nick); } - - diff --git a/src/cmd_squit.cpp b/src/cmd_squit.cpp index 8cf3c0d56..cdfe23159 100644 --- a/src/cmd_squit.cpp +++ b/src/cmd_squit.cpp @@ -14,53 +14,11 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_squit.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; - /* * This is handled by the server linking module, if necessary. Do not remove this stub. */ diff --git a/src/cmd_summon.cpp b/src/cmd_summon.cpp index 6a422baba..004176b90 100644 --- a/src/cmd_summon.cpp +++ b/src/cmd_summon.cpp @@ -14,44 +14,12 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_summon.h" void cmd_summon::Handle (char **parameters, int pcnt, userrec *user) { WriteServ(user->fd,"445 %s :SUMMON has been disabled (depreciated command)",user->nick); } - - diff --git a/src/cmd_trace.cpp b/src/cmd_trace.cpp index 37b711bf7..7d1aaedb5 100644 --- a/src/cmd_trace.cpp +++ b/src/cmd_trace.cpp @@ -14,52 +14,12 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_trace.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; void cmd_trace::Handle (char **parameters, int pcnt, userrec *user) { @@ -85,5 +45,3 @@ void cmd_trace::Handle (char **parameters, int pcnt, userrec *user) } } } - - diff --git a/src/cmd_unloadmodule.cpp b/src/cmd_unloadmodule.cpp index 4b7648538..f20aa81fb 100644 --- a/src/cmd_unloadmodule.cpp +++ b/src/cmd_unloadmodule.cpp @@ -14,25 +14,10 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "message.h" #include "commands.h" -#include "inspstring.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" #include "cmd_unloadmodule.h" extern InspIRCd* ServerInstance; @@ -49,4 +34,3 @@ void cmd_unloadmodule::Handle (char **parameters, int pcnt, userrec *user) WriteServ(user->fd,"972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError()); } } - diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp index 4fe9eb1b4..e365e6405 100644 --- a/src/cmd_userhost.cpp +++ b/src/cmd_userhost.cpp @@ -14,53 +14,12 @@ * --------------------------------------------------- */ -using namespace std; - #include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" #include "cmd_userhost.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; - void cmd_userhost::Handle (char **parameters, int pcnt, userrec *user) { char Return[MAXBUF],junk[MAXBUF]; @@ -87,6 +46,3 @@ void cmd_userhost::Handle (char **parameters, int pcnt, userrec *user) } WriteServ(user->fd,Return); } - - - diff --git a/src/cmd_users.cpp b/src/cmd_users.cpp index bcac49731..2b2030491 100644 --- a/src/cmd_users.cpp +++ b/src/cmd_users.cpp @@ -14,26 +14,12 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" -#include "message.h" #include "commands.h" #include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" #include "cmd_users.h" void cmd_users::Handle (char **parameters, int pcnt, userrec *user) { WriteServ(user->fd,"445 %s :USERS has been disabled (depreciated command)",user->nick); } - - diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 61324c454..00c916199 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -18,17 +18,7 @@ using namespace std; #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#include -#include #include -#ifdef GCC3 -#include -#else -#include -#endif #include #include #include diff --git a/src/modules/m_operwho.cpp b/src/modules/m_operwho.cpp index 61832cd4b..9370ad765 100644 --- a/src/modules/m_operwho.cpp +++ b/src/modules/m_operwho.cpp @@ -14,38 +14,18 @@ * --------------------------------------------------- */ -using namespace std; - /* $ModDesc: Provides an extended version of /WHO for opers */ -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include #include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include #include -#include +#include "inspircd_config.h" #include "users.h" -#include "globals.h" #include "modules.h" #include "helperfuncs.h" #include "message.h" -#include "hashcomp.h" -#include "typedefs.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; extern user_hash clientlist; -extern chan_hash chanlist; extern std::vector all_opers; -extern std::vector local_users; class ModuleOperWho : public Module { diff --git a/src/timer.cpp b/src/timer.cpp index 56cda27b2..0e7a77ad8 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -27,7 +27,6 @@ using namespace std; #include "globals.h" #include "hashcomp.h" #include "inspircd.h" -#include "inspircd_io.h" #include "inspstring.h" #include "helperfuncs.h" diff --git a/src/xline.cpp b/src/xline.cpp index 602b67835..86a6081f2 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -18,17 +18,7 @@ using namespace std; #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#include -#include #include -#ifdef GCC3 -#include -#else -#include -#endif #include #include #include @@ -763,4 +753,3 @@ void stats_e(userrec* user) for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason); } - -- cgit v1.2.3