From c8707149b2a9a1b9774457c2d1629d37920b9f74 Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Sun, 7 Oct 2012 18:14:22 +0200 Subject: Move simple user and channel mode handlers into a single file --- src/mode.cpp | 18 +++++------------- src/modes/cmode_i.cpp | 30 ------------------------------ src/modes/cmode_m.cpp | 30 ------------------------------ src/modes/cmode_n.cpp | 30 ------------------------------ src/modes/cmode_p.cpp | 30 ------------------------------ src/modes/cmode_s.cpp | 30 ------------------------------ src/modes/cmode_t.cpp | 29 ----------------------------- src/modes/umode_i.cpp | 29 ----------------------------- src/modes/umode_w.cpp | 29 ----------------------------- 9 files changed, 5 insertions(+), 250 deletions(-) delete mode 100644 src/modes/cmode_i.cpp delete mode 100644 src/modes/cmode_m.cpp delete mode 100644 src/modes/cmode_n.cpp delete mode 100644 src/modes/cmode_p.cpp delete mode 100644 src/modes/cmode_s.cpp delete mode 100644 src/modes/cmode_t.cpp delete mode 100644 src/modes/umode_i.cpp delete mode 100644 src/modes/umode_w.cpp (limited to 'src') diff --git a/src/mode.cpp b/src/mode.cpp index 845b23fb0..21c9e7144 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -24,22 +24,18 @@ #include "inspircd.h" -#include "inspstring.h" /* +s (secret) */ -#include "modes/cmode_s.h" /* +p (private) */ -#include "modes/cmode_p.h" -/* +b (bans) */ -#include "modes/cmode_b.h" /* +m (moderated) */ -#include "modes/cmode_m.h" /* +t (only (half) ops can change topic) */ -#include "modes/cmode_t.h" /* +n (no external messages) */ -#include "modes/cmode_n.h" /* +i (invite only) */ -#include "modes/cmode_i.h" +/* +w (see wallops) */ +/* +i (invisible) */ +#include "modes/simplemodes.h" +/* +b (bans) */ +#include "modes/cmode_b.h" /* +k (keyed channel) */ #include "modes/cmode_k.h" /* +l (channel user limit) */ @@ -48,10 +44,6 @@ #include "modes/cmode_o.h" /* +v (channel voice) */ #include "modes/cmode_v.h" -/* +w (see wallops) */ -#include "modes/umode_w.h" -/* +i (invisible) */ -#include "modes/umode_i.h" /* +o (operator) */ #include "modes/umode_o.h" /* +s (server notice masks) */ diff --git a/src/modes/cmode_i.cpp b/src/modes/cmode_i.cpp deleted file mode 100644 index 0013264fe..000000000 --- a/src/modes/cmode_i.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * InspIRCd -- Internet Relay Chat Daemon - * - * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Craig Edwards - * - * This file is part of InspIRCd. InspIRCd is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, version 2. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include "inspircd.h" -#include "mode.h" -#include "channels.h" -#include "users.h" -#include "modes/cmode_i.h" - -ModeChannelInviteOnly::ModeChannelInviteOnly() : SimpleChannelModeHandler(NULL, "inviteonly", 'i') -{ -} - diff --git a/src/modes/cmode_m.cpp b/src/modes/cmode_m.cpp deleted file mode 100644 index 4f7325d1d..000000000 --- a/src/modes/cmode_m.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * InspIRCd -- Internet Relay Chat Daemon - * - * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Craig Edwards - * - * This file is part of InspIRCd. InspIRCd is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, version 2. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include "inspircd.h" -#include "mode.h" -#include "channels.h" -#include "users.h" -#include "modes/cmode_m.h" - -ModeChannelModerated::ModeChannelModerated() : SimpleChannelModeHandler(NULL, "moderated", 'm') -{ -} - diff --git a/src/modes/cmode_n.cpp b/src/modes/cmode_n.cpp deleted file mode 100644 index 6976d6e38..000000000 --- a/src/modes/cmode_n.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * InspIRCd -- Internet Relay Chat Daemon - * - * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Craig Edwards - * - * This file is part of InspIRCd. InspIRCd is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, version 2. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include "inspircd.h" -#include "mode.h" -#include "channels.h" -#include "users.h" -#include "modes/cmode_n.h" - -ModeChannelNoExternal::ModeChannelNoExternal() : SimpleChannelModeHandler(NULL, "noextmsg", 'n') -{ -} - diff --git a/src/modes/cmode_p.cpp b/src/modes/cmode_p.cpp deleted file mode 100644 index 0b73430ed..000000000 --- a/src/modes/cmode_p.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * InspIRCd -- Internet Relay Chat Daemon - * - * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Craig Edwards - * - * This file is part of InspIRCd. InspIRCd is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, version 2. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include "inspircd.h" -#include "mode.h" -#include "channels.h" -#include "users.h" -#include "modes/cmode_p.h" - -ModeChannelPrivate::ModeChannelPrivate() : SimpleChannelModeHandler(NULL, "private", 'p') -{ -} - diff --git a/src/modes/cmode_s.cpp b/src/modes/cmode_s.cpp deleted file mode 100644 index ff10584f3..000000000 --- a/src/modes/cmode_s.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * InspIRCd -- Internet Relay Chat Daemon - * - * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Craig Edwards - * - * This file is part of InspIRCd. InspIRCd is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, version 2. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include "inspircd.h" -#include "mode.h" -#include "channels.h" -#include "users.h" -#include "modes/cmode_s.h" - -ModeChannelSecret::ModeChannelSecret() : SimpleChannelModeHandler(NULL, "secret", 's') -{ -} - diff --git a/src/modes/cmode_t.cpp b/src/modes/cmode_t.cpp deleted file mode 100644 index 8aa3a1a39..000000000 --- a/src/modes/cmode_t.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - * InspIRCd -- Internet Relay Chat Daemon - * - * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Craig Edwards - * - * This file is part of InspIRCd. InspIRCd is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, version 2. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include "inspircd.h" -#include "mode.h" -#include "channels.h" -#include "users.h" -#include "modes/cmode_t.h" - -ModeChannelTopicOps::ModeChannelTopicOps() : SimpleChannelModeHandler(NULL, "topiclock", 't') -{ -} diff --git a/src/modes/umode_i.cpp b/src/modes/umode_i.cpp deleted file mode 100644 index 530bd0fc1..000000000 --- a/src/modes/umode_i.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - * InspIRCd -- Internet Relay Chat Daemon - * - * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Craig Edwards - * - * This file is part of InspIRCd. InspIRCd is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, version 2. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include "inspircd.h" -#include "mode.h" -#include "channels.h" -#include "users.h" -#include "modes/umode_i.h" - -ModeUserInvisible::ModeUserInvisible() : SimpleUserModeHandler(NULL, "invisible", 'i') -{ -} diff --git a/src/modes/umode_w.cpp b/src/modes/umode_w.cpp deleted file mode 100644 index 8bdeba8fb..000000000 --- a/src/modes/umode_w.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - * InspIRCd -- Internet Relay Chat Daemon - * - * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Craig Edwards - * - * This file is part of InspIRCd. InspIRCd is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, version 2. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include "inspircd.h" -#include "mode.h" -#include "channels.h" -#include "users.h" -#include "modes/umode_w.h" - -ModeUserWallops::ModeUserWallops() : SimpleUserModeHandler(NULL, "wallops", 'w') -{ -} -- cgit v1.2.3