From baa9ba88b78cf9de5e37dc78433c4e2f91ee9c79 Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Mon, 2 Jul 2012 19:08:00 +0200 Subject: [PATCH] Remove leftover #ifdefs and #includes from cmd_*.cpp --- src/commands/cmd_away.cpp | 11 ----------- src/commands/cmd_clearcache.cpp | 4 ---- src/commands/cmd_commands.cpp | 11 ----------- src/commands/cmd_eline.cpp | 11 ----------- src/commands/cmd_ison.cpp | 11 ----------- src/commands/cmd_join.cpp | 11 ----------- src/commands/cmd_kick.cpp | 1 - src/commands/cmd_links.cpp | 11 ----------- src/commands/cmd_loadmodule.cpp | 1 - src/commands/cmd_lusers.cpp | 11 ----------- src/commands/cmd_names.cpp | 11 ----------- src/commands/cmd_nick.cpp | 1 - src/commands/cmd_oper.cpp | 1 - src/commands/cmd_rehash.cpp | 2 +- src/commands/cmd_stats.cpp | 2 -- src/commands/cmd_userhost.cpp | 11 ----------- src/commands/cmd_version.cpp | 13 ------------- 17 files changed, 1 insertion(+), 123 deletions(-) diff --git a/src/commands/cmd_away.cpp b/src/commands/cmd_away.cpp index cd47e49ef..fa3f7fae9 100644 --- a/src/commands/cmd_away.cpp +++ b/src/commands/cmd_away.cpp @@ -20,14 +20,6 @@ #include "inspircd.h" -#ifndef CMD_AWAY_H -#define CMD_AWAY_H - -// include the common header files - -#include "users.h" -#include "channels.h" - /** Handle /AWAY. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these @@ -48,9 +40,6 @@ class CommandAway : public Command CmdResult Handle(const std::vector& parameters, User *user); }; -#endif - - /** Handle /AWAY */ CmdResult CommandAway::Handle (const std::vector& parameters, User *user) diff --git a/src/commands/cmd_clearcache.cpp b/src/commands/cmd_clearcache.cpp index b47017c07..5914f9a8f 100644 --- a/src/commands/cmd_clearcache.cpp +++ b/src/commands/cmd_clearcache.cpp @@ -20,10 +20,6 @@ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "ctables.h" - /** Handle /CLEARCACHE. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these diff --git a/src/commands/cmd_commands.cpp b/src/commands/cmd_commands.cpp index 2d4d42a1f..13bd3fab8 100644 --- a/src/commands/cmd_commands.cpp +++ b/src/commands/cmd_commands.cpp @@ -20,14 +20,6 @@ #include "inspircd.h" -#ifndef CMD_COMMANDS_H -#define CMD_COMMANDS_H - -// include the common header files - -#include "users.h" -#include "channels.h" - /** Handle /COMMANDS. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these @@ -48,9 +40,6 @@ class CommandCommands : public Command CmdResult Handle(const std::vector& parameters, User *user); }; -#endif - - /** Handle /COMMANDS */ CmdResult CommandCommands::Handle (const std::vector&, User *user) diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp index 0523d052f..15487bd8e 100644 --- a/src/commands/cmd_eline.cpp +++ b/src/commands/cmd_eline.cpp @@ -21,14 +21,6 @@ #include "inspircd.h" #include "xline.h" -#ifndef CMD_ELINE_H -#define CMD_ELINE_H - -// include the common header files - -#include "users.h" -#include "channels.h" - /** Handle /ELINE. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these @@ -49,9 +41,6 @@ class CommandEline : public Command CmdResult Handle(const std::vector& parameters, User *user); }; -#endif - - /** Handle /ELINE */ CmdResult CommandEline::Handle (const std::vector& parameters, User *user) diff --git a/src/commands/cmd_ison.cpp b/src/commands/cmd_ison.cpp index 978c1ad5b..784328eb5 100644 --- a/src/commands/cmd_ison.cpp +++ b/src/commands/cmd_ison.cpp @@ -20,14 +20,6 @@ #include "inspircd.h" -#ifndef CMD_ISON_H -#define CMD_ISON_H - -// include the common header files - -#include "users.h" -#include "channels.h" - /** Handle /ISON. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these @@ -48,9 +40,6 @@ class CommandIson : public Command CmdResult Handle(const std::vector& parameters, User *user); }; -#endif - - /** Handle /ISON */ CmdResult CommandIson::Handle (const std::vector& parameters, User *user) diff --git a/src/commands/cmd_join.cpp b/src/commands/cmd_join.cpp index 1dc1d7f92..6124fcc1c 100644 --- a/src/commands/cmd_join.cpp +++ b/src/commands/cmd_join.cpp @@ -20,14 +20,6 @@ #include "inspircd.h" -#ifndef CMD_JOIN_H -#define CMD_JOIN_H - -// include the common header files - -#include "users.h" -#include "channels.h" - /** Handle /JOIN. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these @@ -48,9 +40,6 @@ class CommandJoin : public Command CmdResult Handle(const std::vector& parameters, User *user); }; -#endif - - /** Handle /JOIN */ CmdResult CommandJoin::Handle (const std::vector& parameters, User *user) diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp index f4001d7db..3c5fb0052 100644 --- a/src/commands/cmd_kick.cpp +++ b/src/commands/cmd_kick.cpp @@ -40,7 +40,6 @@ class CommandKick : public Command CmdResult Handle(const std::vector& parameters, User *user); }; - /** Handle /KICK */ CmdResult CommandKick::Handle (const std::vector& parameters, User *user) diff --git a/src/commands/cmd_links.cpp b/src/commands/cmd_links.cpp index 80b8d7f56..f4152ebc5 100644 --- a/src/commands/cmd_links.cpp +++ b/src/commands/cmd_links.cpp @@ -20,14 +20,6 @@ #include "inspircd.h" -#ifndef CMD_LINKS_H -#define CMD_LINKS_H - -// include the common header files - -#include "users.h" -#include "channels.h" - /** Handle /LINKS. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these @@ -48,9 +40,6 @@ class CommandLinks : public Command CmdResult Handle(const std::vector& parameters, User *user); }; -#endif - - /** Handle /LINKS */ CmdResult CommandLinks::Handle (const std::vector&, User *user) diff --git a/src/commands/cmd_loadmodule.cpp b/src/commands/cmd_loadmodule.cpp index 74bd74dd3..9d60613a2 100644 --- a/src/commands/cmd_loadmodule.cpp +++ b/src/commands/cmd_loadmodule.cpp @@ -40,7 +40,6 @@ class CommandLoadmodule : public Command CmdResult Handle(const std::vector& parameters, User *user); }; - /** Handle /LOADMODULE */ CmdResult CommandLoadmodule::Handle (const std::vector& parameters, User *user) diff --git a/src/commands/cmd_lusers.cpp b/src/commands/cmd_lusers.cpp index a3892dbce..e9e36b3d1 100644 --- a/src/commands/cmd_lusers.cpp +++ b/src/commands/cmd_lusers.cpp @@ -20,14 +20,6 @@ #include "inspircd.h" -#ifndef CMD_LUSERS_H -#define CMD_LUSERS_H - -// include the common header files - -#include "users.h" -#include "channels.h" - /** Handle /LUSERS. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these @@ -51,9 +43,6 @@ class CommandLusers : public Command CmdResult Handle(const std::vector& parameters, User *user); }; -#endif - - /** Handle /LUSERS */ CmdResult CommandLusers::Handle (const std::vector&, User *user) diff --git a/src/commands/cmd_names.cpp b/src/commands/cmd_names.cpp index f34afb361..0c06b636f 100644 --- a/src/commands/cmd_names.cpp +++ b/src/commands/cmd_names.cpp @@ -20,14 +20,6 @@ #include "inspircd.h" -#ifndef CMD_NAMES_H -#define CMD_NAMES_H - -// include the common header files - -#include "users.h" -#include "channels.h" - /** Handle /NAMES. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these @@ -48,9 +40,6 @@ class CommandNames : public Command CmdResult Handle(const std::vector& parameters, User *user); }; -#endif - - /** Handle /NAMES */ CmdResult CommandNames::Handle (const std::vector& parameters, User *user) diff --git a/src/commands/cmd_nick.cpp b/src/commands/cmd_nick.cpp index 5e600ad1c..a079e59d0 100644 --- a/src/commands/cmd_nick.cpp +++ b/src/commands/cmd_nick.cpp @@ -21,7 +21,6 @@ #include "inspircd.h" -#include "xline.h" /** Handle /NICK. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work diff --git a/src/commands/cmd_oper.cpp b/src/commands/cmd_oper.cpp index 2fd7744ee..e3f79d347 100644 --- a/src/commands/cmd_oper.cpp +++ b/src/commands/cmd_oper.cpp @@ -20,7 +20,6 @@ #include "inspircd.h" -#include "hashcomp.h" bool OneOfMatches(const char* host, const char* ip, const char* hostlist); diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp index ff326faf2..2026e7a00 100644 --- a/src/commands/cmd_rehash.cpp +++ b/src/commands/cmd_rehash.cpp @@ -20,7 +20,7 @@ #include "inspircd.h" -#include "xline.h" + /** Handle /REHASH. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp index 2ed5eedcd..6944a4c44 100644 --- a/src/commands/cmd_stats.cpp +++ b/src/commands/cmd_stats.cpp @@ -32,8 +32,6 @@ #pragma comment(lib, "psapi.lib") #endif -#include "xline.h" - /** Handle /STATS. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these diff --git a/src/commands/cmd_userhost.cpp b/src/commands/cmd_userhost.cpp index c19ad5b6f..726c063b3 100644 --- a/src/commands/cmd_userhost.cpp +++ b/src/commands/cmd_userhost.cpp @@ -20,14 +20,6 @@ #include "inspircd.h" -#ifndef CMD_USERHOST_H -#define CMD_USERHOST_H - -// include the common header files - -#include "users.h" -#include "channels.h" - /** Handle /USERHOST. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these @@ -48,9 +40,6 @@ class CommandUserhost : public Command CmdResult Handle(const std::vector& parameters, User *user); }; -#endif - - CmdResult CommandUserhost::Handle (const std::vector& parameters, User *user) { std::string retbuf = std::string("302 ") + user->nick + " :"; diff --git a/src/commands/cmd_version.cpp b/src/commands/cmd_version.cpp index 9b19c0ee0..6fae329bd 100644 --- a/src/commands/cmd_version.cpp +++ b/src/commands/cmd_version.cpp @@ -20,14 +20,6 @@ #include "inspircd.h" -#ifndef CMD_VERSION_H -#define CMD_VERSION_H - -// include the common header files - -#include "users.h" -#include "channels.h" - /** Handle /VERSION. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these @@ -48,11 +40,6 @@ class CommandVersion : public Command CmdResult Handle(const std::vector& parameters, User *user); }; -#endif - - - - CmdResult CommandVersion::Handle (const std::vector&, User *user) { user->WriteNumeric(RPL_VERSION, "%s :%s",user->nick.c_str(),ServerInstance->GetVersionString(IS_OPER(user)).c_str()); -- 2.39.5