diff options
Diffstat (limited to 'include')
46 files changed, 249 insertions, 117 deletions
diff --git a/include/access.h b/include/access.h index 4a20a8c90..4242509aa 100644 --- a/include/access.h +++ b/include/access.h @@ -52,7 +52,8 @@ public: /* A provider of access. Only used for creating ChanAccesses, as * they contain pure virtual functions. */ -class CoreExport AccessProvider : public Service +class CoreExport AccessProvider + : public Service { public: AccessProvider(Module *owner, const Anope::string &name); @@ -70,7 +71,8 @@ public: }; /* Represents one entry of an access list on a channel. */ -class CoreExport ChanAccess : public Serializable +class CoreExport ChanAccess + : public Serializable { Anope::string mask; /* account this access entry is for, if any */ diff --git a/include/account.h b/include/account.h index 160b0a260..1062b67bf 100644 --- a/include/account.h +++ b/include/account.h @@ -28,7 +28,9 @@ extern CoreExport nickcoreid_map NickCoreIdList; /* A registered nickname. * It matters that Base is here before Extensible (it is inherited by Serializable) */ -class CoreExport NickAlias : public Serializable, public Extensible +class CoreExport NickAlias + : public Serializable + , public Extensible { Anope::string vhost_ident, vhost_host, vhost_creator; time_t vhost_created; @@ -104,7 +106,9 @@ public: * account's display. * It matters that Base is here before Extensible (it is inherited by Serializable) */ -class CoreExport NickCore : public Serializable, public Extensible +class CoreExport NickCore + : public Serializable + , public Extensible { /* Channels which reference this core in some way (this is on their access list, akick list, is founder, successor, etc) */ Serialize::Checker<std::map<ChannelInfo *, int> > chanaccess; diff --git a/include/anope.h b/include/anope.h index fc8d01fba..976c69702 100644 --- a/include/anope.h +++ b/include/anope.h @@ -628,7 +628,8 @@ public: /** A derived form of sepstream, which separates on commas */ -class commasepstream : public sepstream +class commasepstream + : public sepstream { public: /** Initialize with comma separator @@ -638,7 +639,8 @@ public: /** A derived form of sepstream, which separates on spaces */ -class spacesepstream : public sepstream +class spacesepstream + : public sepstream { public: /** Initialize with space separator @@ -652,7 +654,8 @@ public: * be loaded. If this happens, the error message returned by ModuleException::GetReason will be displayed to the user * attempting to load the module, or dumped to the console if the ircd is currently loading for the first time. */ -class CoreExport CoreException : public std::exception +class CoreExport CoreException + : public std::exception { protected: /** Holds the error message to be displayed @@ -691,7 +694,8 @@ public: } }; -class CoreExport ModuleException : public CoreException +class CoreExport ModuleException + : public CoreException { public: /** Default constructor, just uses the error message 'Module threw an exception'. @@ -708,7 +712,8 @@ public: virtual ~ModuleException() noexcept = default; }; -class CoreExport ConvertException : public CoreException +class CoreExport ConvertException + : public CoreException { public: ConvertException(const Anope::string &reason = "") : CoreException(reason) { } diff --git a/include/base.h b/include/base.h index 99b16fed7..07b3bdf89 100644 --- a/include/base.h +++ b/include/base.h @@ -43,7 +43,8 @@ public: * no longer be valid once the object it refers is destructed. */ template<typename T> -class Reference : public ReferenceBase +class Reference + : public ReferenceBase { protected: T *ref = nullptr; diff --git a/include/bots.h b/include/bots.h index 68bfd9318..35ec7cd50 100644 --- a/include/bots.h +++ b/include/bots.h @@ -19,7 +19,9 @@ typedef Anope::map<BotInfo *> botinfo_map; extern CoreExport Serialize::Checker<botinfo_map> BotListByNick, BotListByUID; /* A service bot (NickServ, ChanServ, a BotServ bot, etc). */ -class CoreExport BotInfo : public User, public Serializable +class CoreExport BotInfo + : public User + , public Serializable { /* Channels this bot is assigned to */ Serialize::Checker<std::set<ChannelInfo *> > channels; diff --git a/include/channels.h b/include/channels.h index 1e7531ab2..0230cc566 100644 --- a/include/channels.h +++ b/include/channels.h @@ -18,7 +18,8 @@ typedef Anope::hash_map<Channel *> channel_map; extern CoreExport channel_map ChannelList; /* A user container, there is one of these per user per channel. */ -struct ChanUserContainer : public Extensible +struct ChanUserContainer + : public Extensible { User *user; Channel *chan; @@ -28,7 +29,9 @@ struct ChanUserContainer : public Extensible ChanUserContainer(User *u, Channel *c) : user(u), chan(c) { } }; -class CoreExport Channel : public Base, public Extensible +class CoreExport Channel + : public Base + , public Extensible { static std::vector<Channel *> deleting; diff --git a/include/commands.h b/include/commands.h index cb53cf017..5f15da345 100644 --- a/include/commands.h +++ b/include/commands.h @@ -88,7 +88,8 @@ public: /** Every services command is a class, inheriting from Command. */ -class CoreExport Command : public Service +class CoreExport Command + : public Service { Anope::string desc; std::vector<Anope::string> syntax; diff --git a/include/config.h b/include/config.h index 7a032d7e9..cb8de7c55 100644 --- a/include/config.h +++ b/include/config.h @@ -98,7 +98,8 @@ namespace Configuration struct Uplink; - struct CoreExport Conf : Block + struct CoreExport Conf + : Block { /* options:readtimeout */ time_t ReadTimeout; @@ -171,7 +172,8 @@ namespace Configuration * be loaded. If this happens, the error message returned by ModuleException::GetReason will be displayed to the user * attempting to load the module, or dumped to the console if the ircd is currently loading for the first time. */ -class CoreExport ConfigException : public CoreException +class CoreExport ConfigException + : public CoreException { public: /** Default constructor, just uses the error message 'Config threw an exception'. diff --git a/include/extensible.h b/include/extensible.h index 7388651d8..a83d9e81f 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -15,7 +15,8 @@ class Extensible; -class CoreExport ExtensibleBase : public Service +class CoreExport ExtensibleBase + : public Service { protected: std::map<Extensible *, void *> items; @@ -53,7 +54,8 @@ public: }; template<typename T> -class BaseExtensibleItem : public ExtensibleBase +class BaseExtensibleItem + : public ExtensibleBase { protected: virtual T *Create(Extensible *) = 0; @@ -124,7 +126,8 @@ public: }; template<typename T> -class ExtensibleItem : public BaseExtensibleItem<T> +class ExtensibleItem + : public BaseExtensibleItem<T> { protected: T* Create(Extensible *obj) override @@ -136,7 +139,8 @@ public: }; template<typename T> -class PrimitiveExtensibleItem : public BaseExtensibleItem<T> +class PrimitiveExtensibleItem + : public BaseExtensibleItem<T> { protected: T* Create(Extensible *obj) override @@ -160,7 +164,8 @@ public: }; template<typename T> -class SerializableExtensibleItem : public PrimitiveExtensibleItem<T> +class SerializableExtensibleItem + : public PrimitiveExtensibleItem<T> { public: SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { } @@ -204,7 +209,8 @@ public: }; template<typename T> -struct ExtensibleRef : ServiceReference<BaseExtensibleItem<T> > +struct ExtensibleRef + : ServiceReference<BaseExtensibleItem<T> > { ExtensibleRef(const Anope::string &n) : ServiceReference<BaseExtensibleItem<T> >("Extensible", n) { } }; diff --git a/include/hashcomp.h b/include/hashcomp.h index 13dc3ca10..91ccc3391 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -27,7 +27,8 @@ namespace Anope /* ASCII case insensitive ctype. */ template<typename char_type> - class ascii_ctype : public std::ctype<char_type> + class ascii_ctype + : public std::ctype<char_type> { public: char_type do_toupper(char_type c) const override @@ -49,7 +50,8 @@ namespace Anope /* rfc1459 case insensitive ctype, { = [, } = ], and | = \ */ template<typename char_type> - class rfc1459_ctype : public ascii_ctype<char_type> + class rfc1459_ctype + : public ascii_ctype<char_type> { public: char_type do_toupper(char_type c) const override @@ -78,7 +80,8 @@ namespace ci * This class is used to implement ci::string, a case-insensitive, ASCII- * comparing string class. */ - struct CoreExport ci_char_traits : std::char_traits<char> + struct CoreExport ci_char_traits + : std::char_traits<char> { /** Check if two chars match. * @param c1st First character diff --git a/include/mail.h b/include/mail.h index f0bb6d10d..1a0ce88cc 100644 --- a/include/mail.h +++ b/include/mail.h @@ -22,7 +22,8 @@ namespace Mail extern CoreExport bool Validate(const Anope::string &email); /* A email message being sent */ - class Message : public Thread + class Message + : public Thread { private: Anope::string sendmail_path; diff --git a/include/memo.h b/include/memo.h index 0eac6859e..5e7c1a5c9 100644 --- a/include/memo.h +++ b/include/memo.h @@ -14,7 +14,8 @@ #include "anope.h" #include "serialize.h" -class CoreExport Memo : public Serializable +class CoreExport Memo + : public Serializable { public: MemoInfo *mi; diff --git a/include/messages.h b/include/messages.h index 7782aa665..206570940 100644 --- a/include/messages.h +++ b/include/messages.h @@ -21,35 +21,40 @@ namespace Message { - struct CoreExport Away : IRCDMessage + struct CoreExport Away + : IRCDMessage { Away(Module *creator, const Anope::string &mname = "AWAY") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Capab : IRCDMessage + struct CoreExport Capab + : IRCDMessage { Capab(Module *creator, const Anope::string &mname = "CAPAB") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Error : IRCDMessage + struct CoreExport Error + : IRCDMessage { Error(Module *creator, const Anope::string &mname = "ERROR") : IRCDMessage(creator, mname, 1) { } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Invite : IRCDMessage + struct CoreExport Invite + : IRCDMessage { Invite(Module *creator, const Anope::string &mname = "INVITE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Join : IRCDMessage + struct CoreExport Join + : IRCDMessage { Join(Module *creator, const Anope::string &mname = "JOIN") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } @@ -67,105 +72,120 @@ namespace Message static void SJoin(MessageSource &source, const Anope::string &chan, time_t ts, const Anope::string &modes, const std::list<SJoinUser> &users); }; - struct CoreExport Kick : IRCDMessage + struct CoreExport Kick + : IRCDMessage { Kick(Module *creator, const Anope::string &mname = "KICK") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Kill : IRCDMessage + struct CoreExport Kill + : IRCDMessage { Kill(Module *creator, const Anope::string &mname = "KILL") : IRCDMessage(creator, mname, 2) { } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Mode : IRCDMessage + struct CoreExport Mode + : IRCDMessage { Mode(Module *creator, const Anope::string &mname = "MODE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport MOTD : IRCDMessage + struct CoreExport MOTD + : IRCDMessage { MOTD(Module *creator, const Anope::string &mname = "MOTD") : IRCDMessage(creator, mname, 1) { } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Notice : IRCDMessage + struct CoreExport Notice + : IRCDMessage { Notice(Module *creator, const Anope::string &mname = "NOTICE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Part : IRCDMessage + struct CoreExport Part + : IRCDMessage { Part(Module *creator, const Anope::string &mname = "PART") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Ping : IRCDMessage + struct CoreExport Ping + : IRCDMessage { Ping(Module *creator, const Anope::string &mname = "PING") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Privmsg : IRCDMessage + struct CoreExport Privmsg + : IRCDMessage { Privmsg(Module *creator, const Anope::string &mname = "PRIVMSG") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Quit : IRCDMessage + struct CoreExport Quit + : IRCDMessage { Quit(Module *creator, const Anope::string &mname = "QUIT") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport SQuit : IRCDMessage + struct CoreExport SQuit + : IRCDMessage { SQuit(Module *creator, const Anope::string &mname = "SQUIT") : IRCDMessage(creator, mname, 2) { } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Stats : IRCDMessage + struct CoreExport Stats + : IRCDMessage { Stats(Module *creator, const Anope::string &mname = "STATS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Time : IRCDMessage + struct CoreExport Time + : IRCDMessage { Time(Module *creator, const Anope::string &mname = "TIME") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Topic : IRCDMessage + struct CoreExport Topic + : IRCDMessage { Topic(Module *creator, const Anope::string &mname = "TOPIC") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Version : IRCDMessage + struct CoreExport Version + : IRCDMessage { Version(Module *creator, const Anope::string &mname = "VERSION") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override; }; - struct CoreExport Whois : IRCDMessage + struct CoreExport Whois + : IRCDMessage { Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } diff --git a/include/modes.h b/include/modes.h index 02aef2ebf..b87d1e5b5 100644 --- a/include/modes.h +++ b/include/modes.h @@ -35,7 +35,8 @@ enum ModeClass /** This class is the basis of all modes in Anope */ -class CoreExport Mode : public Base +class CoreExport Mode + : public Base { public: /* Mode name */ @@ -64,7 +65,8 @@ public: /** This class is a user mode, all user modes use this/inherit from this */ -class CoreExport UserMode : public Mode +class CoreExport UserMode + : public Mode { public: /** constructor @@ -74,7 +76,8 @@ public: UserMode(const Anope::string &name, char mc); }; -class CoreExport UserModeParam : public UserMode +class CoreExport UserModeParam + : public UserMode { public: /** constructor @@ -92,7 +95,8 @@ public: /** This class is a channel mode, all channel modes use this/inherit from this */ -class CoreExport ChannelMode : public Mode +class CoreExport ChannelMode + : public Mode { public: /* channel modes that can possibly unwrap this mode */ @@ -123,7 +127,8 @@ public: /** This is a mode for lists, eg b/e/I. These modes should inherit from this */ -class CoreExport ChannelModeList : public ChannelMode +class CoreExport ChannelModeList + : public ChannelMode { public: /** constructor @@ -161,7 +166,8 @@ public: /** This is a mode with a parameter, eg +k/l. These modes should use/inherit from this */ -class CoreExport ChannelModeParam : public ChannelMode +class CoreExport ChannelModeParam + : public ChannelMode { public: /** constructor @@ -183,7 +189,8 @@ public: /** This is a mode that is a channel status, eg +v/h/o/a/q. */ -class CoreExport ChannelModeStatus : public ChannelMode +class CoreExport ChannelModeStatus + : public ChannelMode { public: /* The symbol, eg @ % + */ @@ -206,7 +213,8 @@ public: * but we still have a representation for it. */ template<typename T> -class CoreExport ChannelModeVirtual : public T +class CoreExport ChannelModeVirtual + : public T { Anope::string base; ChannelMode *basech; @@ -239,7 +247,8 @@ public: Anope::string BuildModePrefixList() const; }; -class CoreExport UserModeOperOnly : public UserMode +class CoreExport UserModeOperOnly + : public UserMode { public: UserModeOperOnly(const Anope::string &mname, char um) : UserMode(mname, um) { } @@ -247,7 +256,8 @@ public: bool CanSet(User *u) const override; }; -class CoreExport UserModeNoone : public UserMode +class CoreExport UserModeNoone + : public UserMode { public: UserModeNoone(const Anope::string &mname, char um) : UserMode(mname, um) { } @@ -257,7 +267,8 @@ public: /** Channel mode +k (key) */ -class CoreExport ChannelModeKey : public ChannelModeParam +class CoreExport ChannelModeKey + : public ChannelModeParam { public: ChannelModeKey(char mc) : ChannelModeParam("KEY", mc) { } @@ -267,7 +278,8 @@ public: /** This class is used for oper only channel modes */ -class CoreExport ChannelModeOperOnly : public ChannelMode +class CoreExport ChannelModeOperOnly + : public ChannelMode { public: ChannelModeOperOnly(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { } @@ -278,7 +290,8 @@ public: /** This class is used for channel modes only servers may set */ -class CoreExport ChannelModeNoone : public ChannelMode +class CoreExport ChannelModeNoone + : public ChannelMode { public: ChannelModeNoone(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { } diff --git a/include/modules.h b/include/modules.h index 94bde45aa..de8d560fe 100644 --- a/include/modules.h +++ b/include/modules.h @@ -196,11 +196,15 @@ public: int GetPatch() const; }; -class CoreExport NotImplementedException : public CoreException { }; +class CoreExport NotImplementedException + : public CoreException +{ +}; /** Every module in Anope is actually a class. */ -class CoreExport Module : public Extensible +class CoreExport Module + : public Extensible { private: bool permanent; diff --git a/include/modules/cs_entrymsg.h b/include/modules/cs_entrymsg.h index 95f571f43..8259adf49 100644 --- a/include/modules/cs_entrymsg.h +++ b/include/modules/cs_entrymsg.h @@ -20,7 +20,8 @@ protected: EntryMsg() = default; }; -struct EntryMessageList : Serialize::Checker<std::vector<EntryMsg *> > +struct EntryMessageList + : Serialize::Checker<std::vector<EntryMsg *> > { protected: EntryMessageList() : Serialize::Checker<std::vector<EntryMsg *> >("EntryMsg") { } diff --git a/include/modules/cs_log.h b/include/modules/cs_log.h index 12bc3fcaf..077ee70ed 100644 --- a/include/modules/cs_log.h +++ b/include/modules/cs_log.h @@ -29,7 +29,8 @@ protected: LogSetting() = default; }; -struct LogSettings : Serialize::Checker<std::vector<LogSetting *> > +struct LogSettings + : Serialize::Checker<std::vector<LogSetting *> > { typedef std::vector<LogSetting *>::iterator iterator; diff --git a/include/modules/dns.h b/include/modules/dns.h index a1e5eb71f..25123a504 100644 --- a/include/modules/dns.h +++ b/include/modules/dns.h @@ -88,7 +88,8 @@ namespace DNS }; }; - struct ResourceRecord : Question + struct ResourceRecord + : Question { unsigned int ttl = 0; Anope::string rdata; @@ -113,7 +114,8 @@ namespace DNS /** DNS manager */ - class Manager : public Service + class Manager + : public Service { public: Manager(Module *creator) : Service(creator, "DNS::Manager", "dns/manager") { } @@ -131,7 +133,9 @@ namespace DNS /** A DNS query. */ - class Request : public Timer, public Ques |