From a6a0f6c44780c839b2269f4f29a26ecfdbd95544 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 23 Jan 2024 15:28:23 +0000 Subject: Improve the layout of types that inherit from another type. --- modules/commands/bs_assign.cpp | 12 ++++--- modules/commands/bs_badwords.cpp | 19 ++++++---- modules/commands/bs_bot.cpp | 6 ++-- modules/commands/bs_botlist.cpp | 6 ++-- modules/commands/bs_control.cpp | 9 +++-- modules/commands/bs_info.cpp | 6 ++-- modules/commands/bs_kick.cpp | 54 ++++++++++++++++++---------- modules/commands/bs_set.cpp | 15 +++++--- modules/commands/cs_access.cpp | 21 +++++++---- modules/commands/cs_akick.cpp | 12 ++++--- modules/commands/cs_ban.cpp | 9 +++-- modules/commands/cs_clone.cpp | 6 ++-- modules/commands/cs_drop.cpp | 6 ++-- modules/commands/cs_enforce.cpp | 6 ++-- modules/commands/cs_entrymsg.cpp | 13 ++++--- modules/commands/cs_flags.cpp | 12 ++++--- modules/commands/cs_getkey.cpp | 6 ++-- modules/commands/cs_info.cpp | 6 ++-- modules/commands/cs_invite.cpp | 6 ++-- modules/commands/cs_kick.cpp | 6 ++-- modules/commands/cs_list.cpp | 9 +++-- modules/commands/cs_log.cpp | 13 ++++--- modules/commands/cs_mode.cpp | 16 ++++++--- modules/commands/cs_register.cpp | 6 ++-- modules/commands/cs_seen.cpp | 12 ++++--- modules/commands/cs_set.cpp | 51 +++++++++++++++++--------- modules/commands/cs_set_misc.cpp | 10 ++++-- modules/commands/cs_status.cpp | 6 ++-- modules/commands/cs_suspend.cpp | 13 ++++--- modules/commands/cs_sync.cpp | 6 ++-- modules/commands/cs_topic.cpp | 9 +++-- modules/commands/cs_unban.cpp | 6 ++-- modules/commands/cs_updown.cpp | 9 +++-- modules/commands/cs_xop.cpp | 18 ++++++---- modules/commands/gl_global.cpp | 6 ++-- modules/commands/greet.cpp | 12 ++++--- modules/commands/help.cpp | 6 ++-- modules/commands/hs_del.cpp | 9 +++-- modules/commands/hs_group.cpp | 6 ++-- modules/commands/hs_list.cpp | 6 ++-- modules/commands/hs_off.cpp | 6 ++-- modules/commands/hs_on.cpp | 6 ++-- modules/commands/hs_request.cpp | 18 ++++++---- modules/commands/hs_set.cpp | 9 +++-- modules/commands/ms_cancel.cpp | 6 ++-- modules/commands/ms_check.cpp | 6 ++-- modules/commands/ms_del.cpp | 9 +++-- modules/commands/ms_ignore.cpp | 6 ++-- modules/commands/ms_info.cpp | 6 ++-- modules/commands/ms_list.cpp | 9 +++-- modules/commands/ms_read.cpp | 9 +++-- modules/commands/ms_rsend.cpp | 6 ++-- modules/commands/ms_send.cpp | 6 ++-- modules/commands/ms_sendall.cpp | 6 ++-- modules/commands/ms_set.cpp | 6 ++-- modules/commands/ms_staff.cpp | 6 ++-- modules/commands/ns_access.cpp | 6 ++-- modules/commands/ns_ajoin.cpp | 12 ++++--- modules/commands/ns_alist.cpp | 6 ++-- modules/commands/ns_cert.cpp | 15 +++++--- modules/commands/ns_drop.cpp | 6 ++-- modules/commands/ns_getemail.cpp | 6 ++-- modules/commands/ns_group.cpp | 15 +++++--- modules/commands/ns_identify.cpp | 9 +++-- modules/commands/ns_info.cpp | 12 ++++--- modules/commands/ns_list.cpp | 12 ++++--- modules/commands/ns_logout.cpp | 6 ++-- modules/commands/ns_recover.cpp | 9 +++-- modules/commands/ns_register.cpp | 12 ++++--- modules/commands/ns_resetpass.cpp | 6 ++-- modules/commands/ns_set.cpp | 75 ++++++++++++++++++++++++++------------- modules/commands/ns_set_misc.cpp | 13 ++++--- modules/commands/ns_status.cpp | 6 ++-- modules/commands/ns_suspend.cpp | 13 ++++--- modules/commands/ns_update.cpp | 6 ++-- modules/commands/os_akill.cpp | 12 ++++--- modules/commands/os_chankill.cpp | 6 ++-- modules/commands/os_config.cpp | 6 ++-- modules/commands/os_defcon.cpp | 9 +++-- modules/commands/os_dns.cpp | 12 ++++--- modules/commands/os_forbid.cpp | 13 ++++--- modules/commands/os_ignore.cpp | 13 ++++--- modules/commands/os_info.cpp | 12 ++++--- modules/commands/os_jupe.cpp | 6 ++-- modules/commands/os_kick.cpp | 6 ++-- modules/commands/os_kill.cpp | 6 ++-- modules/commands/os_list.cpp | 9 +++-- modules/commands/os_login.cpp | 9 +++-- modules/commands/os_logsearch.cpp | 6 ++-- modules/commands/os_mode.cpp | 9 +++-- modules/commands/os_modinfo.cpp | 9 +++-- modules/commands/os_module.cpp | 12 ++++--- modules/commands/os_news.cpp | 21 +++++++---- modules/commands/os_noop.cpp | 6 ++-- modules/commands/os_oper.cpp | 10 ++++-- modules/commands/os_reload.cpp | 6 ++-- modules/commands/os_session.cpp | 18 ++++++---- modules/commands/os_set.cpp | 6 ++-- modules/commands/os_shutdown.cpp | 12 ++++--- modules/commands/os_stats.cpp | 9 +++-- modules/commands/os_svs.cpp | 12 ++++--- modules/commands/os_sxline.cpp | 18 ++++++---- modules/commands/os_update.cpp | 6 ++-- 103 files changed, 743 insertions(+), 366 deletions(-) (limited to 'modules/commands') diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp index ccce7571a..e1e744842 100644 --- a/modules/commands/bs_assign.cpp +++ b/modules/commands/bs_assign.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandBSAssign : public Command +class CommandBSAssign + : public Command { public: CommandBSAssign(Module *creator) : Command(creator, "botserv/assign", 2, 2) @@ -82,7 +83,8 @@ public: } }; -class CommandBSUnassign : public Command +class CommandBSUnassign + : public Command { public: CommandBSUnassign(Module *creator) : Command(creator, "botserv/unassign", 1, 1) @@ -145,7 +147,8 @@ public: } }; -class CommandBSSetNoBot : public Command +class CommandBSSetNoBot + : public Command { public: CommandBSSetNoBot(Module *creator, const Anope::string &sname = "botserv/set/nobot") : Command(creator, sname, 2, 2) @@ -202,7 +205,8 @@ public: } }; -class BSAssign : public Module +class BSAssign + : public Module { ExtensibleItem nobot; diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp index 82e4e20b3..cf863e442 100644 --- a/modules/commands/bs_badwords.cpp +++ b/modules/commands/bs_badwords.cpp @@ -12,7 +12,9 @@ #include "module.h" #include "modules/bs_badwords.h" -struct BadWordImpl : BadWord, Serializable +struct BadWordImpl + : BadWord + , Serializable { BadWordImpl() : Serializable("BadWord") { } ~BadWordImpl() override; @@ -27,7 +29,8 @@ struct BadWordImpl : BadWord, Serializable static Serializable* Unserialize(Serializable *obj, Serialize::Data &); }; -struct BadWordsImpl : BadWords +struct BadWordsImpl + : BadWords { Serialize::Reference ci; typedef std::vector list; @@ -144,7 +147,8 @@ Serializable* BadWordImpl::Unserialize(Serializable *obj, Serialize::Data &data) return bw; } -class BadwordsDelCallback : public NumberList +class BadwordsDelCallback + : public NumberList { CommandSource &source; ChannelInfo *ci; @@ -181,7 +185,8 @@ public: } }; -class CommandBSBadwords : public Command +class CommandBSBadwords + : public Command { private: void DoList(CommandSource &source, ChannelInfo *ci, const Anope::string &word) @@ -200,7 +205,8 @@ private: } else if (!word.empty() && word.find_first_not_of("1234567890,-") == Anope::string::npos) { - class BadwordsListCallback : public NumberList + class BadwordsListCallback + : public NumberList { ListFormatter &list; BadWords *bw; @@ -453,7 +459,8 @@ public: } }; -class BSBadwords : public Module +class BSBadwords + : public Module { CommandBSBadwords commandbsbadwords; ExtensibleItem badwords; diff --git a/modules/commands/bs_bot.cpp b/modules/commands/bs_bot.cpp index 6499e3baa..e882d3e04 100644 --- a/modules/commands/bs_bot.cpp +++ b/modules/commands/bs_bot.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandBSBot : public Command +class CommandBSBot + : public Command { private: void DoAdd(CommandSource &source, const std::vector ¶ms) @@ -370,7 +371,8 @@ public: } }; -class BSBot : public Module +class BSBot + : public Module { CommandBSBot commandbsbot; diff --git a/modules/commands/bs_botlist.cpp b/modules/commands/bs_botlist.cpp index a62cfe174..828b5af99 100644 --- a/modules/commands/bs_botlist.cpp +++ b/modules/commands/bs_botlist.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandBSBotList : public Command +class CommandBSBotList + : public Command { public: CommandBSBotList(Module *creator) : Command(creator, "botserv/botlist", 0, 0) @@ -65,7 +66,8 @@ public: } }; -class BSBotList : public Module +class BSBotList + : public Module { CommandBSBotList commandbsbotlist; diff --git a/modules/commands/bs_control.cpp b/modules/commands/bs_control.cpp index 1c7f0ddb4..1230f03e1 100644 --- a/modules/commands/bs_control.cpp +++ b/modules/commands/bs_control.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandBSSay : public Command +class CommandBSSay + : public Command { public: CommandBSSay(Module *creator) : Command(creator, "botserv/say", 2, 2) @@ -71,7 +72,8 @@ public: } }; -class CommandBSAct : public Command +class CommandBSAct + : public Command { public: CommandBSAct(Module *creator) : Command(creator, "botserv/act", 2, 2) @@ -130,7 +132,8 @@ public: } }; -class BSControl : public Module +class BSControl + : public Module { CommandBSSay commandbssay; CommandBSAct commandbsact; diff --git a/modules/commands/bs_info.cpp b/modules/commands/bs_info.cpp index 4c2b1d4e9..f8381836d 100644 --- a/modules/commands/bs_info.cpp +++ b/modules/commands/bs_info.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandBSInfo : public Command +class CommandBSInfo + : public Command { private: void send_bot_channels(std::vector &buffers, const BotInfo *bi) @@ -117,7 +118,8 @@ public: } }; -class BSInfo : public Module +class BSInfo + : public Module { CommandBSInfo commandbsinfo; diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp index e1919e241..e02c6cab8 100644 --- a/modules/commands/bs_kick.cpp +++ b/modules/commands/bs_kick.cpp @@ -15,7 +15,8 @@ static Module *me; -struct KickerDataImpl : KickerData +struct KickerDataImpl + : KickerData { KickerDataImpl(Extensible *obj) { @@ -37,7 +38,8 @@ struct KickerDataImpl : KickerData ci->Shrink("kickerdata"); } - struct ExtensibleItem : ::ExtensibleItem + struct ExtensibleItem + : ::ExtensibleItem { ExtensibleItem(Module *m, const Anope::string &ename) : ::ExtensibleItem(m, ename) { } @@ -115,7 +117,8 @@ struct KickerDataImpl : KickerData }; }; -class CommandBSKick : public Command +class CommandBSKick + : public Command { public: CommandBSKick(Module *creator) : Command(creator, "botserv/kick", 0) @@ -159,7 +162,8 @@ public: } }; -class CommandBSKickBase : public Command +class CommandBSKickBase + : public Command { public: CommandBSKickBase(Module *creator, const Anope::string &cname, int minarg, int maxarg) : Command(creator, cname, minarg, maxarg) @@ -244,7 +248,8 @@ protected: } }; -class CommandBSKickAMSG : public CommandBSKickBase +class CommandBSKickAMSG + : public CommandBSKickBase { public: CommandBSKickAMSG(Module *creator) : CommandBSKickBase(creator, "botserv/kick/amsg", 2, 3) @@ -280,7 +285,8 @@ public: } }; -class CommandBSKickBadwords : public CommandBSKickBase +class CommandBSKickBadwords + : public CommandBSKickBase { public: CommandBSKickBadwords(Module *creator) : CommandBSKickBase(creator, "botserv/kick/badwords", 2, 3) @@ -319,7 +325,8 @@ public: } }; -class CommandBSKickBolds : public CommandBSKickBase +class CommandBSKickBolds + : public CommandBSKickBase { public: CommandBSKickBolds(Module *creator) : CommandBSKickBase(creator, "botserv/kick/bolds", 2, 3) @@ -353,7 +360,8 @@ public: } }; -class CommandBSKickCaps : public CommandBSKickBase +class CommandBSKickCaps + : public CommandBSKickBase { public: CommandBSKickCaps(Module *creator) : CommandBSKickBase(creator, "botserv/kick/caps", 2, 5) @@ -449,7 +457,8 @@ public: } }; -class CommandBSKickColors : public CommandBSKickBase +class CommandBSKickColors + : public CommandBSKickBase { public: CommandBSKickColors(Module *creator) : CommandBSKickBase(creator, "botserv/kick/colors", 2, 3) @@ -483,7 +492,8 @@ public: } }; -class CommandBSKickFlood : public CommandBSKickBase +class CommandBSKickFlood + : public CommandBSKickBase { public: CommandBSKickFlood(Module *creator) : CommandBSKickBase(creator, "botserv/kick/flood", 2, 5) @@ -581,7 +591,8 @@ public: } }; -class CommandBSKickItalics : public CommandBSKickBase +class CommandBSKickItalics + : public CommandBSKickBase { public: CommandBSKickItalics(Module *creator) : CommandBSKickBase(creator, "botserv/kick/italics", 2, 3) @@ -615,7 +626,8 @@ public: } }; -class CommandBSKickRepeat : public CommandBSKickBase +class CommandBSKickRepeat + : public CommandBSKickBase { public: CommandBSKickRepeat(Module *creator) : CommandBSKickBase(creator, "botserv/kick/repeat", 2, 4) @@ -716,7 +728,8 @@ public: } }; -class CommandBSKickReverses : public CommandBSKickBase +class CommandBSKickReverses + : public CommandBSKickBase { public: CommandBSKickReverses(Module *creator) : CommandBSKickBase(creator, "botserv/kick/reverses", 2, 3) @@ -750,7 +763,8 @@ public: } }; -class CommandBSKickUnderlines : public CommandBSKickBase +class CommandBSKickUnderlines + : public CommandBSKickBase { public: CommandBSKickUnderlines(Module *creator) : CommandBSKickBase(creator, "botserv/kick/underlines", 2, 3) @@ -784,7 +798,8 @@ public: } }; -class CommandBSSetDontKickOps : public Command +class CommandBSSetDontKickOps + : public Command { public: CommandBSSetDontKickOps(Module *creator, const Anope::string &sname = "botserv/set/dontkickops") : Command(creator, sname, 2, 2) @@ -849,7 +864,8 @@ public: } }; -class CommandBSSetDontKickVoices : public Command +class CommandBSSetDontKickVoices + : public Command { public: CommandBSSetDontKickVoices(Module *creator, const Anope::string &sname = "botserv/set/dontkickvoices") : Command(creator, sname, 2, 2) @@ -985,7 +1001,8 @@ struct UserData Anope::string lastline; }; -class BanDataPurger : public Timer +class BanDataPurger + : public Timer { public: BanDataPurger(Module *o) : Timer(o, 300, Anope::CurTime, true) { } @@ -1007,7 +1024,8 @@ public: } }; -class BSKick : public Module +class BSKick + : public Module { ExtensibleItem bandata; ExtensibleItem userdata; diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp index 17d3eac1e..b2ffa24cb 100644 --- a/modules/commands/bs_set.cpp +++ b/modules/commands/bs_set.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandBSSet : public Command +class CommandBSSet + : public Command { public: CommandBSSet(Module *creator) : Command(creator, "botserv/set", 3, 3) @@ -64,10 +65,12 @@ public: } }; -class CommandBSSetBanExpire : public Command +class CommandBSSetBanExpire + : public Command { public: - class UnbanTimer : public Timer + class UnbanTimer + : public Timer { Anope::string chname; Anope::string mask; @@ -151,7 +154,8 @@ public: } }; -class CommandBSSetPrivate : public Command +class CommandBSSetPrivate + : public Command { public: CommandBSSetPrivate(Module *creator, const Anope::string &sname = "botserv/set/private") : Command(creator, sname, 2, 2) @@ -201,7 +205,8 @@ public: } }; -class BSSet : public Module +class BSSet + : public Module { CommandBSSet commandbsset; CommandBSSetBanExpire commandbssetbanexpire; diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp index 566d98889..939cc9ad4 100644 --- a/modules/commands/cs_access.cpp +++ b/modules/commands/cs_access.cpp @@ -20,7 +20,8 @@ static inline void reset_levels(ChannelInfo *ci) ci->SetLevel(priv, level); } -class AccessChanAccess : public ChanAccess +class AccessChanAccess + : public ChanAccess { public: int level = 0; @@ -67,7 +68,8 @@ public: } }; -class AccessAccessProvider : public AccessProvider +class AccessAccessProvider + : public AccessProvider { public: static AccessAccessProvider *me; @@ -84,7 +86,8 @@ public: }; AccessAccessProvider* AccessAccessProvider::me; -class CommandCSAccess : public Command +class CommandCSAccess + : public Command { void DoAdd(CommandSource &source, ChannelInfo *ci, const std::vector ¶ms) { @@ -257,7 +260,8 @@ class CommandCSAccess : public Command source.Reply(_("%s access list is empty."), ci->name.c_str()); else if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos) { - class AccessDelCallback : public NumberList + class AccessDelCallback + : public NumberList { CommandSource &source; ChannelInfo *ci; @@ -361,7 +365,8 @@ class CommandCSAccess : public Command source.Reply(_("%s access list is empty."), ci->name.c_str()); else if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos) { - class AccessListCallback : public NumberList + class AccessListCallback + : public NumberList { ListFormatter &list; ChannelInfo *ci; @@ -633,7 +638,8 @@ public: } }; -class CommandCSLevels : public Command +class CommandCSLevels + : public Command { void DoSet(CommandSource &source, ChannelInfo *ci, const std::vector ¶ms) { @@ -857,7 +863,8 @@ public: } }; -class CSAccess : public Module +class CSAccess + : public Module { AccessAccessProvider accessprovider; CommandCSAccess commandcsaccess; diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp index 78666e79b..99c1dd2ee 100644 --- a/modules/commands/cs_akick.cpp +++ b/modules/commands/cs_akick.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandCSAKick : public Command +class CommandCSAKick + : public Command { void Enforce(CommandSource &source, ChannelInfo *ci) { @@ -203,7 +204,8 @@ class CommandCSAKick : public Command /* Special case: is it a number/list? Only do search if it isn't. */ if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos) { - class AkickDelCallback : public NumberList + class AkickDelCallback + : public NumberList { CommandSource &source; ChannelInfo *ci; @@ -280,7 +282,8 @@ class CommandCSAKick : public Command if (!mask.empty() && isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos) { - class AkickListCallback : public NumberList + class AkickListCallback + : public NumberList { ListFormatter &list; ChannelInfo *ci; @@ -525,7 +528,8 @@ public: } }; -class CSAKick : public Module +class CSAKick + : public Module { CommandCSAKick commandcsakick; diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp index 4bf0315bc..5419ac263 100644 --- a/modules/commands/cs_ban.cpp +++ b/modules/commands/cs_ban.cpp @@ -13,7 +13,8 @@ static Module *me; -class TempBan : public Timer +class TempBan + : public Timer { private: Anope::string channel; @@ -31,7 +32,8 @@ public: } }; -class CommandCSBan : public Command +class CommandCSBan + : public Command { public: CommandCSBan(Module *creator) : Command(creator, "chanserv/ban", 2, 4) @@ -237,7 +239,8 @@ public: } }; -class CSBan : public Module +class CSBan + : public Module { CommandCSBan commandcsban; diff --git a/modules/commands/cs_clone.cpp b/modules/commands/cs_clone.cpp index f82bdbe08..5201b332c 100644 --- a/modules/commands/cs_clone.cpp +++ b/modules/commands/cs_clone.cpp @@ -12,7 +12,8 @@ #include "module.h" #include "modules/bs_badwords.h" -class CommandCSClone : public Command +class CommandCSClone + : public Command { void CopySetting(ChannelInfo *ci, ChannelInfo *target_ci, const Anope::string &setting) { @@ -246,7 +247,8 @@ public: } }; -class CSClone : public Module +class CSClone + : public Module { CommandCSClone commandcsclone; diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp index 5fa94137e..4f0b3f776 100644 --- a/modules/commands/cs_drop.cpp +++ b/modules/commands/cs_drop.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandCSDrop : public Command +class CommandCSDrop + : public Command { public: CommandCSDrop(Module *creator) : Command(creator, "chanserv/drop", 1, 2) @@ -81,7 +82,8 @@ public: } }; -class CSDrop : public Module +class CSDrop + : public Module { CommandCSDrop commandcsdrop; diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp index 248275a01..dc60e9c5c 100644 --- a/modules/commands/cs_enforce.cpp +++ b/modules/commands/cs_enforce.cpp @@ -13,7 +13,8 @@ #include "module.h" -class CommandCSEnforce : public Command +class CommandCSEnforce + : public Command { private: void DoSecureOps(CommandSource &source, ChannelInfo *ci) @@ -262,7 +263,8 @@ public: } }; -class CSEnforce : public Module +class CSEnforce + : public Module { CommandCSEnforce commandcsenforce; diff --git a/modules/commands/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp index 2659428a4..43055d5e5 100644 --- a/modules/commands/cs_entrymsg.cpp +++ b/modules/commands/cs_entrymsg.cpp @@ -12,7 +12,9 @@ #include "module.h" #include "modules/cs_entrymsg.h" -struct EntryMsgImpl : EntryMsg, Serializable +struct EntryMsgImpl + : EntryMsg + , Serializable { EntryMsgImpl() : Serializable("EntryMsg") { @@ -39,7 +41,8 @@ struct EntryMsgImpl : EntryMsg, Serializable static Serializable* Unserialize(Serializable *obj, Serialize::Data &data); }; -struct EntryMessageListImpl : EntryMessageList +struct EntryMessageListImpl + : EntryMessageList { EntryMessageListImpl(Extensible *) { } @@ -97,7 +100,8 @@ Serializable* EntryMsgImpl::Unserialize(Serializable *obj, Serialize::Data &data return m; } -class CommandEntryMessage : public Command +class CommandEntryMessage + : public Command { private: void DoList(CommandSource &source, ChannelInfo *ci) @@ -260,7 +264,8 @@ public: } }; -class CSEntryMessage : public Module +class CSEntryMessage + : public Module { CommandEntryMessage commandentrymsg; ExtensibleItem eml; diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp index d35f96d45..795dfa167 100644 --- a/modules/commands/cs_flags.cpp +++ b/modules/commands/cs_flags.cpp @@ -13,7 +13,8 @@ static std::map defaultFlags; -class FlagsChanAccess : public ChanAccess +class FlagsChanAccess + : public ChanAccess { public: std::set flags; @@ -59,7 +60,8 @@ public: } }; -class FlagsAccessProvider : public AccessProvider +class FlagsAccessProvider + : public AccessProvider { public: static FlagsAccessProvider *ap; @@ -76,7 +78,8 @@ public: }; FlagsAccessProvider* FlagsAccessProvider::ap; -class CommandCSFlags : public Command +class CommandCSFlags + : public Command { void DoModify(CommandSource &source, ChannelInfo *ci, Anope::string mask, const Anope::string &flags, const Anope::string &description) { @@ -475,7 +478,8 @@ public: } }; -class CSFlags : public Module +class CSFlags + : public Module { FlagsAccessProvider accessprovider; CommandCSFlags commandcsflags; diff --git a/modules/commands/cs_getkey.cpp b/modules/commands/cs_getkey.cpp index 3c573d3ec..4cec2f87b 100644 --- a/modules/commands/cs_getkey.cpp +++ b/modules/commands/cs_getkey.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandCSGetKey : public Command +class CommandCSGetKey + : public Command { public: CommandCSGetKey(Module *creator) : Command(creator, "chanserv/getkey", 1, 1) @@ -59,7 +60,8 @@ public: } }; -class CSGetKey : public Module +class CSGetKey + : public Module { CommandCSGetKey commandcsgetkey; diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp index 03ee6ec0f..0c5c91091 100644 --- a/modules/commands/cs_info.cpp +++ b/modules/commands/cs_info.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandCSInfo : public Command +class CommandCSInfo + : public Command { public: CommandCSInfo(Module *creator) : Command(creator, "chanserv/info", 1, 2) @@ -83,7 +84,8 @@ public: } }; -class CSInfo : public Module +class CSInfo + : public Module { CommandCSInfo commandcsinfo; diff --git a/modules/commands/cs_invite.cpp b/modules/commands/cs_invite.cpp index 8d4f13192..79e588f1e 100644 --- a/modules/commands/cs_invite.cpp +++ b/modules/commands/cs_invite.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandCSInvite : public Command +class CommandCSInvite + : public Command { public: CommandCSInvite(Module *creator) : Command(creator, "chanserv/invite", 1, 3) @@ -97,7 +98,8 @@ public: } }; -class CSInvite : public Module +class CSInvite + : public Module { CommandCSInvite commandcsinvite; diff --git a/modules/commands/cs_kick.cpp b/modules/commands/cs_kick.cpp index 11b7d624b..2756f3a59 100644 --- a/modules/commands/cs_kick.cpp +++ b/modules/commands/cs_kick.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandCSKick : public Command +class CommandCSKick + : public Command { public: CommandCSKick(Module *creator) : Command(creator, "chanserv/kick", 2, 3) @@ -133,7 +134,8 @@ public: } }; -class CSKick : public Module +class CSKick + : public Module { CommandCSKick commandcskick; diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp index d367f903c..6c07db258 100644 --- a/modules/commands/cs_list.cpp +++ b/modules/commands/cs_list.cpp @@ -12,7 +12,8 @@ #include "module.h" #include "modules/cs_mode.h" -class CommandCSList : public Command +class CommandCSList + : public Command { public: CommandCSList(Module *creator) : Command(creator, "chanserv/list", 1, 2) @@ -170,7 +171,8 @@ public: } }; -class CommandCSSetPrivate : public Command +class CommandCSSetPrivate + : public Command { public: CommandCSSetPrivate(Module *creator, const Anope::string &cname = "chanserv/set/private") : Command(creator, cname, 2, 2) @@ -238,7 +240,8 @@ public: } }; -class CSList : public Module +class CSList + : public Module { CommandCSList commandcslist; CommandCSSetPrivate commandcssetprivate; diff --git a/modules/commands/cs_log.cpp b/modules/commands/cs_log.cpp index b955255f4..ebc64f8c7 100644 --- a/modules/commands/cs_log.cpp +++ b/modules/commands/cs_log.cpp @@ -12,7 +12,9 @@ #include "module.h" #include "modules/cs_log.h" -struct LogSettingImpl : LogSetting, Serializable +struct LogSettingImpl + : LogSetting + , Serializable { LogSettingImpl() : Serializable("LogSetting") { @@ -77,7 +79,8 @@ struct LogSettingImpl : LogSetting, Serializable } }; -struct LogSettingsImpl : LogSettings +struct LogSettingsImpl + : LogSettings { LogSettingsImpl(Extensible *) { } @@ -97,7 +100,8 @@ struct LogSettingsImpl : LogSettings } }; -class CommandCSLog : public Command +class CommandCSLog + : public Command { public: CommandCSLog(Module *creator) : Command(creator, "chanserv/log", 1, 4) @@ -281,7 +285,8 @@ public: } }; -class CSLog : public Module +class CSLog + : public Module { ServiceReference MSService; CommandCSLog commandcslog; diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp index 27cd08fcb..1cdec547a 100644 --- a/modules/commands/cs_mode.cpp +++ b/modules/commands/cs_mode.cpp @@ -12,7 +12,9 @@ #include "module.h" #include "modules/cs_mode.h" -struct ModeLockImpl : ModeLock, Serializable +struct ModeLockImpl + : ModeLock + , Serializable { ModeLockImpl() : Serializable("ModeLock") { @@ -33,7 +35,8 @@ struct ModeLockImpl : ModeLock, Serializable static Serializable* Unserialize(Serializable *obj, Serialize::Data &data); }; -struct ModeLocksImpl : ModeLocks +struct ModeLocksImpl + : ModeLocks { Serialize::Reference ci; Serialize::Checker mlocks; @@ -241,7 +244,8 @@ Serializable* ModeLockImpl::Unserialize(Serializable *obj, Serialize::Data &data return ml; } -class CommandCSMode : public Command +class CommandCSMode + : public Command { bool CanSet(CommandSource &source, ChannelInfo *ci, ChannelMode *cm, bool self) { @@ -789,7 +793,8 @@ public: static Anope::map > modes; -class CommandCSModes : public Command +class CommandCSModes + : public Command { public: CommandCSModes(Module *creator) : Command(creator, "chanserv/modes", 1, 2) @@ -906,7 +911,8 @@ public: } }; -class CSMode : public Module +class CSMode + : public Module { CommandCSMode commandcsmode; CommandCSModes commandcsmodes; diff --git a/modules/commands/cs_register.cpp b/modules/commands/cs_register.cpp index 14d23f1f5..e16413b79 100644 --- a/modules/commands/cs_register.cpp +++ b/modules/commands/cs_register.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandCSRegister : public Command +class CommandCSRegister + : public Command { public: CommandCSRegister(Module *creator) : Command(creator, "chanserv/register", 1, 2) @@ -110,7 +111,8 @@ public: }; -class CSRegister : public Module +class CSRegister + : public Module { CommandCSRegister commandcsregister; diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp index bf7f9f853..378d78105 100644 --- a/modules/commands/cs_seen.cpp +++ b/modules/commands/cs_seen.cpp @@ -22,7 +22,8 @@ static SeenInfo *FindInfo(const Anope::string &nick); typedef Anope::hash_map database_map; database_map database; -struct SeenInfo : Serializable +struct SeenInfo + : Serializable { Anope::string nick; Anope::string vhost; @@ -109,7 +110,8 @@ static bool ShouldHide(const Anope::string &channel, User *u) return false; } -class CommandOSSeen : public Command +class CommandOSSeen + : public Command { public: CommandOSSeen(Module *creator) : Command(creator, "operserv/seen", 1, 2) @@ -180,7 +182,8 @@ public: } }; -class CommandSeen : public Command +class CommandSeen + : public Command { void SimpleSeen(CommandSource &source, const std::vector ¶ms) { @@ -368,7 +371,8 @@ public: } }; -class CSSeen : public Module +class CSSeen + : public Module { Serialize::Type seeninfo_type; CommandSeen commandseen; diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp index 973a01b23..ba44f14e2 100644 --- a/modules/commands/cs_set.cpp +++ b/modules/commands/cs_set.cpp @@ -12,7 +12,8 @@ #include "module.h" #include "modules/cs_mode.h" -class CommandCSSet : public Command +class CommandCSSet + : public Command { public: CommandCSSet(Module *creator) : Command(creator, "chanserv/set", 2, 3) @@ -64,7 +65,8 @@ public: } }; -class CommandCSSetAutoOp : public Command +class CommandCSSetAutoOp + : public Command { public: CommandCSSetAutoOp(Module *creator, const Anope::string &cname = "chanserv/set/autoop") : Command(creator, cname, 2, 2) @@ -127,7 +129,8 @@ public: } }; -class CommandCSSetBanType : public Command +class CommandCSSetBanType + : public Command { public: CommandCSSetBanType(Module *creator, const Anope::string &cname = "chanserv/set/bantype") : Command(creator, cname, 2, 2) @@ -194,7 +197,8 @@ public: } }; -class CommandCSSetDescription : public Command +class CommandCSSetDescription + : public Command { public: CommandCSSetDescription(Module *creator, const Anope::string &cname = "chanserv/set/description") : Command(creator, cname, 1, 2) @@ -256,7 +260,8 @@ public: } }; -class CommandCSSetFounder : public Command +class CommandCSSetFounder + : public Command { public: CommandCSSetFounder(Module *creator, const Anope::string &cname = "chanserv/set/founder") : Command(creator, cname, 2, 2) @@ -325,7 +330,8 @@ public: } }; -class CommandCSSetKeepModes : public Command +class CommandCSSetKeepModes + : public Command { public: CommandCSSetKeepModes(Module *creator, const Anope::string &cname = "chanserv/set/keepmodes") : Command(creator, cname, 2, 2) @@ -390,7 +396,8 @@ public: } }; -class CommandCSSetPeace : public Command +class CommandCSSetPeace + : public Command { public: CommandCSSetPeace(Module *creator, const Anope::string &cname = "chanserv/set/peace") : Command(creator, cname, 2, 2) @@ -462,7 +469,8 @@ inline static Anope::string BotModes() ); } -class CommandCSSetPersist : public Command +class CommandCSSetPersist + : public Command { public: CommandCSSetPersist(Module *creator, const Anope::string &cname = "chanserv/set/persist") : Command(creator, cname, 2, 2) @@ -611,7 +619,8 @@ public: } }; -class CommandCSSetRestricted : public Command +class CommandCSSetRestricted + : public Command { public: CommandCSSetRestricted(Module *creator, const Anope::string &cname = "chanserv/set/restricted") : Command(creator, cname, 2, 2) @@ -673,7 +682,8 @@ public: } }; -class CommandCSSetSecure : public Command +class CommandCSSetSecure + : public Command { public: CommandCSSetSecure(Module *creator, const Anope::string &cname = "chanserv/set/secure") : Command(creator, cname, 2, 2) @@ -736,7 +746,8 @@ public: } }; -class CommandCSSetSecureFounder : public Command +class CommandCSSetSecureFounder + : public Command { public: CommandCSSetSecureFounder(Module *creator, const Anope::string &cname = "chanserv/set/securefounder") : Command(creator, cname, 2, 2) @@ -800,7 +811,8 @@ public: } }; -class CommandCSSetSecureOps : public Command +class CommandCSSetSecureOps + : public Command { public: CommandCSSetSecureOps(Module *creator, const Anope::string &cname = "chanserv/set/secureops") : Command(creator, cname, 2, 2) @@ -862,7 +874,8 @@ public: } }; -class CommandCSSetSignKick : public Command +class CommandCSSetSignKick + : public Command { public: CommandCSSetSignKick(Module *creator, const Anope::string &cname = "chanserv/set/signkick") : Command(creator, cname, 2, 2) @@ -939,7 +952,8 @@ public: } }; -class CommandCSSetSuccessor : public Command +class CommandCSSetSuccessor + : public Command { public: CommandCSSetSuccessor(Module *creator, const Anope::string &cname = "chanserv/set/successor") : Command(creator, cname, 1, 2) @@ -1033,7 +1047,8 @@ public: } }; -class CommandCSSetNoexpire : public Command +class CommandCSSetNoexpire + : public Command { public: CommandCSSetNoexpire(Module *creator) : Command(creator, "chanserv/saset/noexpire", 2, 2) @@ -1091,13 +1106,15 @@ public: } }; -class CSSet : public Module +class CSSet + : public Module { SerializableExtensibleItem noautoop, peace, securefounder, restricted, secure, secureops, signkick, signkick_level, noexpire, persist; - struct KeepModes : SerializableExtensibleItem + struct KeepModes + : SerializableExtensibleItem { KeepModes(Module *m, const Anope::string &n) : SerializableExtensibleItem(m, n) { } diff --git a/modules/commands/cs_set_misc.cpp b/modules/commands/cs_set_misc.cpp index 5bcdd748e..7a8030d57 100644 --- a/modules/commands/cs_set_misc.cpp +++ b/modules/commands/cs_set_misc.cpp @@ -31,7 +31,9 @@ static ExtensibleItem *GetItem(const Anope::string &name) return it; } -struct CSMiscData : MiscData, Serializable +struct CSMiscData + : MiscData + , Serializable { CSMiscData(Extensible *obj) : Serializable("CSMiscData") { } @@ -88,7 +90,8 @@ static Anope::string GetAttribute(const Anope::string &command) return command; } -class CommandCSSetMisc : public Command +class CommandCSSetMisc + : public Command { public: CommandCSSetMisc(Module *creator, const Anope::string &cname = "chanserv/set/misc") : Command(creator, cname, 1, 2) @@ -164,7 +167,8 @@ public: } }; -class CSSetMisc : public Module +class CSSetMisc + : public Module { CommandCSSetMisc commandcssetmisc; Serialize::Type csmiscdata_type; diff --git a/modules/commands/cs_status.cpp b/modules/commands/cs_status.cpp index 1ae0dcc39..492e30a49 100644 --- a/modules/commands/cs_status.cpp +++ b/modules/commands/cs_status.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandCSStatus : public Command +class CommandCSStatus + : public Command { public: CommandCSStatus(Module *creator) : Command(creator, "chanserv/status", 1, 2) @@ -110,7 +111,8 @@ public: } }; -class CSStatus : public Module +class CSStatus + : public Module { CommandCSStatus commandcsstatus; diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp index dccad5a5f..6d5322753 100644 --- a/modules/commands/cs_suspend.cpp +++ b/modules/commands/cs_suspend.cpp @@ -12,7 +12,9 @@ #include "module.h" #include "modules/suspend.h" -struct CSSuspendInfo : SuspendInfo, Serializable +struct CSSuspendInfo + : SuspendInfo + , Serializable { CSSuspendInfo(Extensible *) : Serializable("CSSuspendInfo") { } @@ -50,7 +52,8 @@ struct CSSuspendInfo : SuspendInfo, Serializable } }; -class CommandCSSuspend : public Command +class CommandCSSuspend + : public Command { public: CommandCSSuspend(Module *creator) : Command(creator, "chanserv/suspend", 2, 3) @@ -142,7 +145,8 @@ public: } }; -class CommandCSUnSuspend : public Command +class CommandCSUnSuspend + : public Command { public: CommandCSUnSuspend(Module *creator) : Command(creator, "chanserv/unsuspend", 1, 1) @@ -193,7 +197,8 @@ public: } }; -class CSSuspend : public Module +class CSSuspend + : public Module { CommandCSSuspend commandcssuspend; CommandCSUnSuspend commandcsunsuspend; diff --git a/modules/commands/cs_sync.cpp b/modules/commands/cs_sync.cpp index cafb73406..7a7140944 100644 --- a/modules/commands/cs_sync.cpp +++ b/modules/commands/cs_sync.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandCSSync : public Command +class CommandCSSync + : public Command { public: CommandCSSync(Module *creator) : Command(creator, "chanserv/sync", 1, 1) @@ -52,7 +53,8 @@ public: } }; -class CSSync : public Module +class CSSync + : public Module { CommandCSSync commandcssync; public: diff --git a/modules/commands/cs_topic.cpp b/modules/commands/cs_topic.cpp index 24bf7ce17..582c6a1e7 100644 --- a/modules/commands/cs_topic.cpp +++ b/modules/commands/cs_topic.cpp @@ -12,7 +12,8 @@ #include "module.h" #include "modules/cs_mode.h" -class CommandCSSetKeepTopic : public Command +class CommandCSSetKeepTopic + : public Command { public: CommandCSSetKeepTopic(Module *creator, const Anope::string &cname = "chanserv/set/keeptopic") : Command(creator, cname, 2, 2) @@ -76,7 +77,8 @@ public: } }; -class CommandCSTopic : public Command +class CommandCSTopic + : public Command { ExtensibleRef topiclock; @@ -202,7 +204,8 @@ public: } }; -class CSTopic : public Module +class CSTopic + : public Module { CommandCSTopic commandcstopic; CommandCSSetKeepTopic commandcssetkeeptopic; diff --git a/modules/commands/cs_unban.cpp b/modules/commands/cs_unban.cpp index 402dfe807..763af5533 100644 --- a/modules/commands/cs_unban.cpp +++ b/modules/commands/cs_unban.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandCSUnban : public Command +class CommandCSUnban + : public Command { public: CommandCSUnban(Module *creator) : Command(creator, "chanserv/unban", 0, 2) @@ -115,7 +116,8 @@ public: } }; -class CSUnban : public Module +class CSUnban + : public Module { CommandCSUnban commandcsunban; diff --git a/modules/commands/cs_updown.cpp b/modules/commands/cs_updown.cpp index 3cbd15ed1..90bb882e2 100644 --- a/modules/commands/cs_updown.cpp +++ b/modules/commands/cs_updown.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandCSUp : public Command +class CommandCSUp + : public Command { void SetModes(User *u, Channel *c) { @@ -129,7 +130,8 @@ public: } }; -class CommandCSDown : public Command +class CommandCSDown + : public Command { void RemoveAll(User *u, Channel *c) { @@ -226,7 +228,8 @@ public: } }; -class CSUpDown : public Module +class CSUpDown + : public Module { CommandCSUp commandcsup; CommandCSDown commandcsdown; diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp index 107b86151..7b0b8fd0c 100644 --- a/modules/commands/cs_xop.cpp +++ b/modules/commands/cs_xop.cpp @@ -17,7 +17,8 @@ namespace std::map > permissions; } -class XOPChanAccess : public ChanAccess +class XOPChanAccess + : public ChanAccess { public: Anope::string type; @@ -84,7 +85,8 @@ public: } }; -class XOPAccessProvider : public AccessProvider +class XOPAccessProvider + : public AccessProvider { public: XOPAccessProvider(Module *o) : AccessProvider(o, "access/xop") @@ -97,7 +99,8 @@ public: } }; -class CommandCSXOP : public Command +class CommandCSXOP + : public Command { private: void DoAdd(CommandSource &source, ChannelInfo *ci, const std::vector ¶ms) @@ -291,7 +294,8 @@ private: /* Special case: is it a number/list? Only do search if it isn't. */ if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos) { - class XOPDelCallback : public NumberList + class XOPDelCallback + : public NumberList { CommandSource &source; ChannelInfo *ci; @@ -394,7 +398,8 @@ private: if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos) { - class XOPListCallback : public NumberList + class XOPListCallback + : public NumberList { ListFormatter &list; ChannelInfo *ci; @@ -595,7 +600,8 @@ public: } }; -class CSXOP : public Module +class CSXOP + : public Module { XOPAccessProvider accessprovider; CommandCSXOP commandcsxop; diff --git a/modules/commands/gl_global.cpp b/modules/commands/gl_global.cpp index 18814b738..3bea27e4d 100644 --- a/modules/commands/gl_global.cpp +++ b/modules/commands/gl_global.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandGLGlobal : public Command +class CommandGLGlobal + : public Command { ServiceReference GService; @@ -51,7 +52,8 @@ public: } }; -class GLGlobal : public Module +class GLGlobal + : public Module { CommandGLGlobal commandglglobal; diff --git a/modules/commands/greet.cpp b/modules/commands/greet.cpp index 6cbb24464..81a5e9c6d 100644 --- a/modules/commands/greet.cpp +++ b/modules/commands/greet.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandBSSetGreet : public Command +class CommandBSSetGreet + : public Command { public: CommandBSSetGreet(Module *creator, const Anope::string &sname = "botserv/set/greet") : Command(creator, sname, 2, 2) @@ -75,7 +76,8 @@ public: } }; -class CommandNSSetGreet : public Command +class CommandNSSetGreet + : public Command { public: CommandNSSetGreet(Module *creator, const Anope::string &sname = "nickserv/set/greet", size_t min = 0) : Command(creator, sname, min, min + 1) @@ -136,7 +138,8 @@ public: } }; -class CommandNSSASetGreet : public CommandNSSetGreet +class CommandNSSASetGreet + : public CommandNSSetGreet { public: CommandNSSASetGreet(Module *creator) : CommandNSSetGreet(creator, "nickserv/saset/greet", 1) @@ -162,7 +165,8 @@ public: } }; -class Greet : public Module +class Greet + : public Module { /* channel setting for whether or not greet should be shown */ SerializableExtensibleItem bs_greet; diff --git a/modules/commands/help.cpp b/modules/commands/help.cpp index 3e8b87c0e..3d6dc47c3 100644 --- a/modules/commands/help.cpp +++ b/modules/commands/help.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandHelp : public Command +class CommandHelp + : public Command { static const unsigned help_wrap_len = 40; @@ -182,7 +183,8 @@ public: } }; -class Help : public Module +class Help + : public Module { CommandHelp commandhelp; diff --git a/modules/commands/hs_del.cpp b/modules/commands/hs_del.cpp index 25e5e7d0b..81fcf3e68 100644 --- a/modules/commands/hs_del.cpp +++ b/modules/commands/hs_del.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandHSDel : public Command +class CommandHSDel + : public Command { public: CommandHSDel(Module *creator) : Command(creator, "hostserv/del", 1, 1) @@ -51,7 +52,8 @@ public: } }; -class CommandHSDelAll : public Command +class CommandHSDelAll + : public Command { public: CommandHSDelAll(Module *creator) : Command(creator, "hostserv/delall", 1, 1) @@ -96,7 +98,8 @@ public: } }; -class HSDel : public Module +class HSDel + : public Module { CommandHSDel commandhsdel; CommandHSDelAll commandhsdelall; diff --git a/modules/commands/hs_group.cpp b/modules/commands/hs_group.cpp index 4d6e802dc..c05c467c0 100644 --- a/modules/commands/hs_group.cpp +++ b/modules/commands/hs_group.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandHSGroup : public Command +class CommandHSGroup + : public Command { bool setting = false; @@ -75,7 +76,8 @@ public: } }; -class HSGroup : public Module +class HSGroup + : public Module { CommandHSGroup commandhsgroup; bool syncongroup; diff --git a/modules/commands/hs_list.cpp b/modules/commands/hs_list.cpp index 9b1a168be..bacd4b367 100644 --- a/modules/commands/hs_list.cpp +++ b/modules/commands/hs_list.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandHSList : public Command +class CommandHSList + : public Command { public: CommandHSList(Module *creator) : Command(creator, "hostserv/list", 0, 1) @@ -142,7 +143,8 @@ public: } }; -class HSList : public Module +class HSList + : public Module { CommandHSList commandhslist; diff --git a/modules/commands/hs_off.cpp b/modules/commands/hs_off.cpp index 053a381b1..cb65c7035 100644 --- a/modules/commands/hs_off.cpp +++ b/modules/commands/hs_off.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandHSOff : public Command +class CommandHSOff + : public Command { public: CommandHSOff(Module *creator) : Command(creator, "hostserv/off", 0, 0) @@ -53,7 +54,8 @@ public: } }; -class HSOff : public Module +class HSOff + : public Module { CommandHSOff commandhsoff; diff --git a/modules/commands/hs_on.cpp b/modules/commands/hs_on.cpp index 7c61fe537..7f14e3406 100644 --- a/modules/commands/hs_on.cpp +++ b/modules/commands/hs_on.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandHSOn : public Command +class CommandHSOn + : public Command { public: CommandHSOn(Module *creator) : Command(creator, "hostserv/on", 0, 0) @@ -59,7 +60,8 @@ public: } }; -class HSOn : public Module +class HSOn + : public Module { CommandHSOn commandhson; diff --git a/modules/commands/hs_request.cpp b/modules/commands/hs_request.cpp index 8e63f2b9d..361e4a8f7 100644 --- a/modules/commands/hs_request.cpp +++ b/modules/commands/hs_request.cpp @@ -20,7 +20,8 @@ static ServiceReference memoserv("MemoServService", "MemoServ") static void req_send_memos(Module *me, CommandSource &source, const Anope::string &vIdent, const Anope::string &vHost); -struct HostRequest : Serializable +struct HostRequest + : Serializable { Anope::string nick; Anope::string ident; @@ -63,7 +64,8 @@ struct HostRequest : Serializable } }; -class CommandHSRequest : public Command +class CommandHSRequest + : public Command { bool isvalidchar(char c) { @@ -185,7 +187,8 @@ public: } }; -class CommandHSActivate : public Command +class CommandHSActivate + : public Command { public: CommandHSActivate(Module *creator) : Command(creator, "hostserv/activate", 1, 1) @@ -234,7 +237,8 @@ public: } }; -class CommandHSReject : public Command +class CommandHSReject + : public Command { public: CommandHSReject(Module *creator) : Command(creator, "hostserv/reject", 1, 2) @@ -290,7 +294,8 @@ public: } }; -class CommandHSWaiting : public Command +class CommandHSWaiting + : public Command { public: CommandHSWaiting(Module *creator) : Command(creator, "hostserv/waiting", 0, 0) @@ -348,7 +353,8 @@ public: } }; -class HSRequest : public Module +class HSRequest + : public Module { CommandHSRequest commandhsrequest; CommandHSActivate commandhsactive; diff --git a/modules/commands/hs_set.cpp b/modules/commands/hs_set.cpp index 4e896a964..8c2027305 100644 --- a/modules/commands/hs_set.cpp +++ b/modules/commands/hs_set.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandHSSet : public Command +class CommandHSSet + : public Command { public: CommandHSSet(Module *creator) : Command(creator, "hostserv/set", 2, 2) @@ -104,7 +105,8 @@ public: } }; -class CommandHSSetAll : public Command +class CommandHSSetAll + : public Command { void Sync(const NickAlias *na) { @@ -212,7 +214,8 @@ public: } }; -class HSSet : public Module +class HSSet + : public Module { CommandHSSet commandhsset; CommandHSSetAll commandhssetall; diff --git a/modules/commands/ms_cancel.cpp b/modules/commands/ms_cancel.cpp index b877d0588..b7b6dee2f 100644 --- a/modules/commands/ms_cancel.cpp +++ b/modules/commands/ms_cancel.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandMSCancel : public Command +class CommandMSCancel + : public Command { public: CommandMSCancel(Module *creator) : Command(creator, "memoserv/cancel", 1, 1) @@ -87,7 +88,8 @@ public: } }; -class MSCancel : public Module +class MSCancel + : public Module { CommandMSCancel commandmscancel; diff --git a/modules/commands/ms_check.cpp b/modules/commands/ms_check.cpp index de26adee8..be5e7fc56 100644 --- a/modules/commands/ms_check.cpp +++ b/modules/commands/ms_check.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandMSCheck : public Command +class CommandMSCheck + : public Command { public: CommandMSCheck(Module *creator) : Command(creator, "memoserv/check", 1, 1) @@ -72,7 +73,8 @@ public: } }; -class MSCheck : public Module +class MSCheck + : public Module { CommandMSCheck commandmscheck; diff --git a/modules/commands/ms_del.cpp b/modules/commands/ms_del.cpp index 13f2b53d2..01e882e44 100644 --- a/modules/commands/ms_del.cpp +++ b/modules/commands/ms_del.cpp @@ -11,7 +11,8 @@ #include "module.h" -class MemoDelCallback : public NumberList +class MemoDelCallback + : public NumberList { CommandSource &source; Command *cmd; @@ -36,7 +37,8 @@ public: } }; -class CommandMSDel : public Command +class CommandMSDel + : public Command { public: CommandMSDel(Module *creator) : Command(creator, "memoserv/del", 0, 2) @@ -144,7 +146,8 @@ public: } }; -class MSDel : public Module +class MSDel + : public Module { CommandMSDel commandmsdel; diff --git a/modules/commands/ms_ignore.cpp b/modules/commands/ms_ignore.cpp index b4da89785..a1d2d6dc3 100644 --- a/modules/commands/ms_ignore.cpp +++ b/modules/commands/ms_ignore.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandMSIgnore : public Command +class CommandMSIgnore + : public Command { public: CommandMSIgnore(Module *creator) : Command(creator, "memoserv/ignore", 1, 3) @@ -118,7 +119,8 @@ public: } }; -class MSIgnore : public Module +class MSIgnore + : public Module { CommandMSIgnore commandmsignore; diff --git a/modules/commands/ms_info.cpp b/modules/commands/ms_info.cpp index b8b44085b..adeb5d082 100644 --- a/modules/commands/ms_info.cpp +++ b/modules/commands/ms_info.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandMSInfo : public Command +class CommandMSInfo + : public Command { public: CommandMSInfo(Module *creator) : Command(creator, "memoserv/info", 0, 1) @@ -218,7 +219,8 @@ public: } }; -class MSInfo : public Module +class MSInfo + : public Module { CommandMSInfo commandmsinfo; diff --git a/modules/commands/ms_list.cpp b/modules/commands/ms_list.cpp index e1bf738fa..b527939c6 100644 --- a/modules/commands/ms_list.cpp +++ b/modules/commands/ms_list.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandMSList : public Command +class CommandMSList + : public Command { public: CommandMSList(Module *creator) : Command(creator, "memoserv/list", 0, 2) @@ -65,7 +66,8 @@ public: if (!param.empty() && isdigit(param[0])) { - class MemoListCallback : public NumberList + class MemoListCallback + : public NumberList { ListFormatter &list; CommandSource &source; @@ -149,7 +151,8 @@ public: } }; -class MSList : public Module +class MSList + : public Module { CommandMSList commandmslist; diff --git a/modules/commands/ms_read.cpp b/modules/commands/ms_read.cpp index a8676a8f5..496bf38a7 100644 --- a/modules/commands/ms_read.cpp +++ b/modules/commands/ms_read.cpp @@ -47,7 +47,8 @@ static void rsend_notify(CommandSource &source, MemoInfo *mi, Memo *m, const Ano m->receipt = false; } -class MemoListCallback : public NumberList +class MemoListCallback + : public NumberList { CommandSource &source; MemoInfo *mi; @@ -104,7 +105,8 @@ public: } }; -class CommandMSRead : public Command +class CommandMSRead + : public Command { public: CommandMSRead(Module *creator) : Command(creator, "memoserv/read", 1, 2) @@ -209,7 +211,8 @@ public: } }; -class MSRead : public Module +class MSRead + : public Module { CommandMSRead commandmsread; diff --git a/modules/commands/ms_rsend.cpp b/modules/commands/ms_rsend.cpp index 854b4e2be..092a0ea34 100644 --- a/modules/commands/ms_rsend.cpp +++ b/modules/commands/ms_rsend.cpp @@ -16,7 +16,8 @@ namespace ServiceReference memoserv("MemoServService", "MemoServ"); } -class CommandMSRSend : public Command +class CommandMSRSend + : public Command { public: CommandMSRSend(Module *creator) : Command(creator, "memoserv/rsend", 2, 2) @@ -88,7 +89,8 @@ public: } }; -class MSRSend : public Module +class MSRSend + : public Module { CommandMSRSend commandmsrsend; diff --git a/modules/commands/ms_send.cpp b/modules/commands/ms_send.cpp index 141cca01f..ced13bb6f 100644 --- a/modules/commands/ms_send.cpp +++ b/modules/commands/ms_send.cpp @@ -16,7 +16,8 @@ namespace ServiceReference memoserv("MemoServService", "MemoServ"); } -class CommandMSSend : public Command +class CommandMSSend + : public Command { public: CommandMSSend(Module *creator) : Command(creator, "memoserv/send", 2, 2) @@ -71,7 +72,8 @@ public: } }; -class MSSend : public Module +class MSSend + : public Module { CommandMSSend commandmssend; diff --git a/modules/commands/ms_sendall.cpp b/modules/commands/ms_sendall.cpp index dfbc4c40c..a7bdb5d93 100644 --- a/modules/commands/ms_sendall.cpp +++ b/modules/commands/ms_sendall.cpp @@ -16,7 +16,8 @@ namespace ServiceReference memoserv("MemoServService", "MemoServ"); } -class CommandMSSendAll : public Command +class CommandMSSendAll + : public Command { public: CommandMSSendAll(Module *creator) : Command(creator, "memoserv/sendall", 1, 1) @@ -52,7 +53,8 @@ public: } }; -class MSSendAll : public Module +class MSSendAll + : public Module { CommandMSSendAll commandmssendall; diff --git a/modules/commands/ms_set.cpp b/modules/commands/ms_set.cpp index 946535f64..bd745a5ef 100644 --- a/modules/commands/ms_set.cpp +++ b/modules/commands/ms_set.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandMSSet : public Command +class CommandMSSet + : public Command { private: void DoNotify(CommandSource &source, const std::vector ¶ms, MemoInfo *mi) @@ -298,7 +299,8 @@ public: } }; -class MSSet : public Module +class MSSet + : public Module { CommandMSSet commandmsset; SerializableExtensibleItem memo_signon, memo_receive, memo_mail, memo_hardmax; diff --git a/modules/commands/ms_staff.cpp b/modules/commands/ms_staff.cpp index fb5d9afd8..0930bbecb 100644 --- a/modules/commands/ms_staff.cpp +++ b/modules/commands/ms_staff.cpp @@ -16,7 +16,8 @@ namespace ServiceReference memoserv("MemoServService", "MemoServ"); } -class CommandMSStaff : public Command +class CommandMSStaff + : public Command { public: CommandMSStaff(Module *creator) : Command(creator, "memoserv/staff", 1, 1) @@ -49,7 +50,8 @@ public: } }; -class MSStaff : public Module +class MSStaff + : public Module { CommandMSStaff commandmsstaff; diff --git a/modules/commands/ns_access.cpp b/modules/commands/ns_access.cpp index a66959f32..0b42436e4 100644 --- a/modules/commands/ns_access.cpp +++ b/modules/commands/ns_access.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandNSAccess : public Command +class CommandNSAccess + : public Command { private: void DoAdd(CommandSource &source, NickCore *nc, const Anope::string &mask) @@ -186,7 +187,8 @@ public: } }; -class NSAccess : public Module +class NSAccess + : public Module { CommandNSAccess commandnsaccess; diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp index 9b63d6576..f28b1d0a1 100644 --- a/modules/commands/ns_ajoin.cpp +++ b/modules/commands/ns_ajoin.cpp @@ -13,13 +13,15 @@ struct AJoinEntry; -struct AJoinList : Serialize::Checker > +struct AJoinList + : Serialize::Checker > { AJoinList(Extensible *) : Serialize::Checker >("AJoinEntry") { } ~AJoinList(); }; -struct AJoinEntry : Serializable +struct AJoinEntry + : Serializable { Serialize::Reference owner; Anope::string channel; @@ -86,7 +88,8 @@ AJoinList::~AJoinList() delete ajoin; } -class CommandNSAJoin : public Command +class CommandNSAJoin + : public Command { void DoList(CommandSource &source, NickCore *nc) { @@ -297,7 +300,8 @@ public: } }; -class NSAJoin : public Module +class NSAJoin + : public Module { CommandNSAJoin commandnsajoin; ExtensibleItem ajoinlist; diff --git a/modules/commands/ns_alist.cpp b/modules/commands/ns_alist.cpp index a2ee212b4..dc05360a4 100644 --- a/modules/commands/ns_alist.cpp +++ b/modules/commands/ns_alist.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandNSAList : public Command +class CommandNSAList + : public Command { static bool ChannelSort(ChannelInfo *ci1, ChannelInfo *ci2) { @@ -131,7 +132,8 @@ public: } }; -class NSAList : public Module +class NSAList + : public Module { CommandNSAList commandnsalist; diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp index 12dc2ede9..8c874ad81 100644 --- a/modules/commands/ns_cert.cpp +++ b/modules/commands/ns_cert.cpp @@ -14,7 +14,8 @@ static Anope::hash_map certmap; -struct CertServiceImpl : CertService +struct CertServiceImpl + : CertService { CertServiceImpl(Module *o) : CertService(o) { } @@ -27,7 +28,8 @@ struct CertServiceImpl : CertService } }; -struct NSCertListImpl : NSCertList +struct NSCertListImpl + : NSCertList { Serialize::Reference nc; std::vector certs; @@ -119,7 +121,8 @@ public: nc->Shrink("certificates"); } - struct ExtensibleItem : ::ExtensibleItem + struct ExtensibleItem + : ::ExtensibleItem { ExtensibleItem(Module *m, const Anope::string &ename) : ::ExtensibleItem(m, ename) { } @@ -160,7 +163,8 @@ public: }; }; -class CommandNSCert : public Command +class CommandNSCert + : public Command { private: void DoAdd(CommandSource &source, NickCore *nc, Anope::string certfp) @@ -338,7 +342,8 @@ public: } }; -class NSCert : public Module +class NSCert + : public Module { CommandNSCert commandnscert; NSCertListImpl::ExtensibleItem certs; diff --git a/modules/commands/ns_drop.cpp b/modules/commands/ns_drop.cpp index c088d88fc..d69486e8a 100644 --- a/modules/commands/ns_drop.cpp +++ b/modules/commands/ns_drop.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandNSDrop : public Command +class CommandNSDrop + : public Command { public: CommandNSDrop(Module *creator) : Command(creator, "nickserv/drop", 1, 1) @@ -71,7 +72,8 @@ public: } }; -class NSDrop : public Module +class NSDrop + : public Module { CommandNSDrop commandnsdrop; diff --git a/modules/commands/ns_getemail.cpp b/modules/commands/ns_getemail.cpp index e69b7a2a1..d3c18c0cf 100644 --- a/modules/commands/ns_getemail.cpp +++ b/modules/commands/ns_getemail.cpp @@ -15,7 +15,8 @@ #include "module.h" -class CommandNSGetEMail : public Command +class CommandNSGetEMail + : public Command { public: CommandNSGetEMail(Module *creator) : Command(creator, "nickserv/getemail", 1, 1) @@ -58,7 +59,8 @@ public: } }; -class NSGetEMail : public Module +class NSGetEMail + : public Module { CommandNSGetEMail commandnsgetemail; public: diff --git a/modules/commands/ns_group.cpp b/modules/commands/ns_group.cpp index 6f45d7f49..96a70fdd6 100644 --- a/modules/commands/ns_group.cpp +++ b/modules/commands/ns_group.cpp @@ -12,7 +12,8 @@ #include "module.h" #include "modules/ns_cert.h" -class NSGroupRequest : public IdentifyRequest +class NSGroupRequest + : public IdentifyRequest { CommandSource source; Command *cmd; @@ -83,7 +84,8 @@ public: } }; -class CommandNSGroup : public Command +class CommandNSGroup + : public Command { public: CommandNSGroup(Module *creator) : Command(creator, "nickserv/group", 0, 2) @@ -228,7 +230,8 @@ public: } }; -class CommandNSUngroup : public Command +class CommandNSUngroup + : public Command { public: CommandNSUngroup(Module *creator) : Command(creator, "nickserv/ungroup", 0, 1) @@ -291,7 +294,8 @@ public: } }; -class CommandNSGList : public Command +class CommandNSGList + : public Command { public: CommandNSGList(Module *creator) : Command(creator, "nickserv/glist", 0, 1) @@ -376,7 +380,8 @@ public: } }; -class NSGroup : public Module +class NSGroup + : public Module { CommandNSGroup commandnsgroup; CommandNSUngroup commandnsungroup; diff --git a/modules/commands/ns_identify.cpp b/modules/commands/ns_identify.cpp index ebe8fbfe1..1f9c49eab 100644 --- a/modules/commands/ns_identify.cpp +++ b/modules/commands/ns_identify.cpp @@ -11,7 +11,8 @@ #include "module.h" -class NSIdentifyRequest : public IdentifyRequest +class NSIdentifyRequest + : public IdentifyRequest { CommandSource source; Command *cmd; @@ -57,7 +58,8 @@ public: } }; -class CommandNSIdentify : public Command +class CommandNSIdentify + : public Command { public: CommandNSIdentify(Module *creator) : Command(creator, "nickserv/identify", 1, 2) @@ -113,7 +115,8 @@ public: } }; -class NSIdentify : public Module +class NSIdentify + : public Module { CommandNSIdentify commandnsidentify; diff --git a/modules/commands/ns_info.cpp b/modules/commands/ns_info.cpp index 567d095f2..10bfda6f4 100644 --- a/modules/commands/ns_info.cpp +++ b/modules/commands/ns_info.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandNSInfo : public Command +class CommandNSInfo + : public Command { public: CommandNSInfo(Module *creator) : Command(creator, "nickserv/info", 0, 2) @@ -134,7 +135,8 @@ public: }; -class CommandNSSetHide : public Command +class CommandNSSetHide + : public Command { public: CommandNSSetHide(Module *creator, const Anope::string &sname = "nickserv/set/hide", size_t min = 2) : Command(creator, sname, min, min + 1) @@ -232,7 +234,8 @@ public: } }; -class CommandNSSASetHide : public CommandNSSetHide +class CommandNSSASetHide + : public CommandNSSetHide { public: CommandNSSASetHide(Module *creator) : CommandNSSetHide(creator, "nickserv/saset/hide", 3) @@ -261,7 +264,8 @@ public: } }; -class NSInfo : public Module +class NSInfo + : public Module { CommandNSInfo commandnsinfo; diff --git a/modules/commands/ns_list.cpp b/modules/commands/ns_list.cpp index ed72c27f2..f32cad2f5 100644 --- a/modules/commands/ns_list.cpp +++ b/modules/commands/ns_list.cpp @@ -11,7 +11,8 @@ #include "module.h" -class CommandNSList : public Command +class CommandNSList + : public Command { public: CommandNSList(Module *creator) : Command(creator, "nickserv/list", 1, 2) @@ -176,7 +177,8 @@ public: }; -class CommandNSSetPrivate : public Command +class CommandNSSetPrivate + : public Command { public: CommandNSSetPrivate(Module *creator, const Anope::string &sname = "nickserv/set/private", size_t min = 1) : Command(creator, sname, min, min + 1) @@ -241,7 +243,8 @@ public: } }; -class CommandNSSASetPrivate : public CommandNSSetPrivate +class CommandNSSASetPrivate + : public CommandNSSetPrivate { public: CommandNSSASetPrivate(Module *creator) : CommandNSSetPrivate(creator, "nickserv/saset/private", 2) @@ -270,7 +273,8 @@ public: }; -class NSList : public Module +class NSList + : public Module { CommandNSList commandn