diff options
Diffstat (limited to 'include')
36 files changed, 77 insertions, 77 deletions
diff --git a/include/access.h b/include/access.h index 4242509aa..b1587f0c7 100644 --- a/include/access.h +++ b/include/access.h @@ -27,7 +27,7 @@ enum * backing each ChanAccess determines whether that ChanAccess has a given * privilege. */ -struct CoreExport Privilege +struct CoreExport Privilege final { Anope::string name; Anope::string desc; @@ -38,7 +38,7 @@ struct CoreExport Privilege bool operator==(const Privilege &other) const; }; -class CoreExport PrivilegeManager +class CoreExport PrivilegeManager final { static std::vector<Privilege> Privileges; public: @@ -135,7 +135,7 @@ public: /* A group of access entries. This is used commonly, for example with ChannelInfo::AccessFor, * to show what access a user has on a channel because users can match multiple access entries. */ -class CoreExport AccessGroup +class CoreExport AccessGroup final { public: /* access entries + paths */ diff --git a/include/account.h b/include/account.h index 1062b67bf..3d6e0e846 100644 --- a/include/account.h +++ b/include/account.h @@ -28,7 +28,7 @@ extern CoreExport nickcoreid_map NickCoreIdList; /* A registered nickname. * It matters that Base is here before Extensible (it is inherited by Serializable) */ -class CoreExport NickAlias +class CoreExport NickAlias final : public Serializable , public Extensible { @@ -106,7 +106,7 @@ public: * account's display. * It matters that Base is here before Extensible (it is inherited by Serializable) */ -class CoreExport NickCore +class CoreExport NickCore final : public Serializable , public Extensible { diff --git a/include/anope.h b/include/anope.h index 976c69702..ee9797627 100644 --- a/include/anope.h +++ b/include/anope.h @@ -22,7 +22,7 @@ namespace Anope * allow us to only require one type of string everywhere that can be converted * at any time to a specific type of string. */ - class CoreExport string + class CoreExport string final { private: /** @@ -312,7 +312,7 @@ namespace Anope inline const string operator+(const char *_str, const string &str) { string tmp(_str); tmp += str; return tmp; } inline const string operator+(const std::string &_str, const string &str) { string tmp(_str); tmp += str; return tmp; } - struct hash_ci + struct hash_ci final { inline size_t operator()(const string &s) const { @@ -320,7 +320,7 @@ namespace Anope } }; - struct hash_cs + struct hash_cs final { inline size_t operator()(const string &s) const { @@ -328,7 +328,7 @@ namespace Anope } }; - struct compare + struct compare final { inline bool operator()(const string &s1, const string &s2) const { @@ -628,7 +628,7 @@ public: /** A derived form of sepstream, which separates on commas */ -class commasepstream +class commasepstream final : public sepstream { public: @@ -639,7 +639,7 @@ public: /** A derived form of sepstream, which separates on spaces */ -class spacesepstream +class spacesepstream final : public sepstream { public: @@ -712,7 +712,7 @@ public: virtual ~ModuleException() noexcept = default; }; -class CoreExport ConvertException +class CoreExport ConvertException final : public CoreException { public: diff --git a/include/bots.h b/include/bots.h index 35ec7cd50..87a074058 100644 --- a/include/bots.h +++ b/include/bots.h @@ -19,7 +19,7 @@ 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 +class CoreExport BotInfo final : public User , public Serializable { diff --git a/include/channels.h b/include/channels.h index 0230cc566..d918f4a52 100644 --- a/include/channels.h +++ b/include/channels.h @@ -18,7 +18,7 @@ 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 +struct ChanUserContainer final : public Extensible { User *user; @@ -29,7 +29,7 @@ struct ChanUserContainer ChanUserContainer(User *u, Channel *c) : user(u), chan(c) { } }; -class CoreExport Channel +class CoreExport Channel final : public Base , public Extensible { diff --git a/include/commands.h b/include/commands.h index 5f15da345..7c1e62686 100644 --- a/include/commands.h +++ b/include/commands.h @@ -15,13 +15,13 @@ #include "anope.h" #include "channels.h" -struct CommandGroup +struct CommandGroup final { Anope::string name, description; }; /* Used in BotInfo::commands */ -struct CommandInfo +struct CommandInfo final { typedef Anope::map<CommandInfo> map; @@ -47,7 +47,7 @@ struct CoreExport CommandReply }; /* The source for a command */ -class CoreExport CommandSource +class CoreExport CommandSource final { /* The nick executing the command */ Anope::string nick; diff --git a/include/config.h b/include/config.h index cb8de7c55..d172da457 100644 --- a/include/config.h +++ b/include/config.h @@ -78,7 +78,7 @@ namespace Configuration /** Represents a configuration file */ - class File + class File final { Anope::string name; bool executable; @@ -98,7 +98,7 @@ namespace Configuration struct Uplink; - struct CoreExport Conf + struct CoreExport Conf final : Block { /* options:readtimeout */ @@ -153,7 +153,7 @@ namespace Configuration const Block *GetCommand(CommandSource &); }; - struct Uplink + struct Uplink final { Anope::string host; unsigned port; @@ -172,7 +172,7 @@ 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 +class CoreExport ConfigException final : public CoreException { public: diff --git a/include/extensible.h b/include/extensible.h index a83d9e81f..df76be036 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -209,7 +209,7 @@ public: }; template<typename T> -struct ExtensibleRef +struct ExtensibleRef final : ServiceReference<BaseExtensibleItem<T> > { ExtensibleRef(const Anope::string &n) : ServiceReference<BaseExtensibleItem<T> >("Extensible", n) { } diff --git a/include/hashcomp.h b/include/hashcomp.h index 91ccc3391..3b9b7d833 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -50,7 +50,7 @@ namespace Anope /* rfc1459 case insensitive ctype, { = [, } = ], and | = \ */ template<typename char_type> - class rfc1459_ctype + class rfc1459_ctype final : public ascii_ctype<char_type> { public: @@ -80,7 +80,7 @@ namespace ci * This class is used to implement ci::string, a case-insensitive, ASCII- * comparing string class. */ - struct CoreExport ci_char_traits + struct CoreExport ci_char_traits final : std::char_traits<char> { /** Check if two chars match. @@ -126,7 +126,7 @@ namespace ci */ typedef std::basic_string<char, ci_char_traits, std::allocator<char> > string; - struct CoreExport less + struct CoreExport less final { /** Compare two Anope::strings as ci::strings and find which one is less * @param s1 The first string diff --git a/include/lists.h b/include/lists.h index 62578259b..4c4fd8578 100644 --- a/include/lists.h +++ b/include/lists.h @@ -60,7 +60,7 @@ public: /** This class handles formatting LIST/VIEW replies. */ -class CoreExport ListFormatter +class CoreExport ListFormatter final { public: typedef std::map<Anope::string, Anope::string> ListEntry; @@ -78,7 +78,7 @@ public: /** This class handles formatting INFO replies */ -class CoreExport InfoFormatter +class CoreExport InfoFormatter final { NickCore *nc; std::vector<std::pair<Anope::string, Anope::string> > replies; diff --git a/include/logger.h b/include/logger.h index aba306134..89f251a9a 100644 --- a/include/logger.h +++ b/include/logger.h @@ -37,7 +37,7 @@ enum LogType LOG_DEBUG_4 }; -struct LogFile +struct LogFile final { Anope::string filename; std::ofstream stream; @@ -48,7 +48,7 @@ struct LogFile }; /* Represents a single log message */ -class CoreExport Log +class CoreExport Log final { public: /* Bot that should log this message */ @@ -109,7 +109,7 @@ public: }; /* Configured in the configuration file, actually does the message logging */ -class CoreExport LogInfo +class CoreExport LogInfo final { public: BotInfo *bot = nullptr; diff --git a/include/mail.h b/include/mail.h index 1a0ce88cc..eeacd3842 100644 --- a/include/mail.h +++ b/include/mail.h @@ -22,7 +22,7 @@ namespace Mail extern CoreExport bool Validate(const Anope::string &email); /* A email message being sent */ - class Message + class Message final : public Thread { private: diff --git a/include/memo.h b/include/memo.h index 5e7c1a5c9..70d8d63b7 100644 --- a/include/memo.h +++ b/include/memo.h @@ -14,7 +14,7 @@ #include "anope.h" #include "serialize.h" -class CoreExport Memo +class CoreExport Memo final : public Serializable { public: @@ -37,7 +37,7 @@ public: /* Memo info structures. Since both nicknames and channels can have memos, * we encapsulate memo data in a MemoInfo to make it easier to handle. */ -struct CoreExport MemoInfo +struct CoreExport MemoInfo final { int16_t memomax = 0; Serialize::Checker<std::vector<Memo *> > memos; diff --git a/include/modes.h b/include/modes.h index b87d1e5b5..f1c116f1c 100644 --- a/include/modes.h +++ b/include/modes.h @@ -232,7 +232,7 @@ public: }; /* The status a user has on a channel (+v, +h, +o) etc */ -class CoreExport ChannelStatus +class CoreExport ChannelStatus final { Anope::string modes; public: @@ -305,7 +305,7 @@ public: * This also contains a mode stacker that will combine multiple modes and set * them on a channel or user at once */ -class CoreExport ModeManager +class CoreExport ModeManager final { public: @@ -401,7 +401,7 @@ public: /** Represents a mask set on a channel (b/e/I) */ -class CoreExport Entry +class CoreExport Entry final { Anope::string name; Anope::string mask; diff --git a/include/modules.h b/include/modules.h index de8d560fe..3fdcef674 100644 --- a/include/modules.h +++ b/include/modules.h @@ -162,7 +162,7 @@ enum }; typedef unsigned short ModType; -struct ModuleVersionC +struct ModuleVersionC final { int version_major, version_minor, version_patch; }; @@ -170,7 +170,7 @@ struct ModuleVersionC /** Returned by Module::GetVersion, used to see what version of Anope * a module is compiled against. */ -class ModuleVersion +class ModuleVersion final { private: int version_major; @@ -196,7 +196,7 @@ public: int GetPatch() const; }; -class CoreExport NotImplementedException +class CoreExport NotImplementedException final : public CoreException { }; @@ -1113,7 +1113,7 @@ enum Implementation /** Used to manage modules. */ -class CoreExport ModuleManager +class CoreExport ModuleManager final { public: /** Event handler hooks. diff --git a/include/modules/dns.h b/include/modules/dns.h index 25123a504..801b5b2f0 100644 --- a/include/modules/dns.h +++ b/include/modules/dns.h @@ -79,7 +79,7 @@ namespace DNS Question(const Anope::string &n, QueryType t, unsigned short c = 1) : name(n), type(t), qclass(c) { } inline bool operator==(const Question & other) const { return name == other.name && type == other.type && qclass == other.qclass; } - struct hash + struct hash final { size_t operator()(const Question &q) const { @@ -88,7 +88,7 @@ namespace DNS }; }; - struct ResourceRecord + struct ResourceRecord final : Question { unsigned int ttl = 0; diff --git a/include/modules/httpd.h b/include/modules/httpd.h index c755e9dd2..b08ca8bf4 100644 --- a/include/modules/httpd.h +++ b/include/modules/httpd.h @@ -18,7 +18,7 @@ enum HTTPError }; /* A message to someone */ -struct HTTPReply +struct HTTPReply final { HTTPError error = HTTP_ERROR_OK; Anope::string content_type; @@ -46,7 +46,7 @@ struct HTTPReply out.clear(); } - struct Data + struct Data final { char *buf; size_t len; @@ -81,7 +81,7 @@ struct HTTPReply }; /* A message from someone */ -struct HTTPMessage +struct HTTPMessage final { std::map<Anope::string, Anope::string> headers; std::map<Anope::string, Anope::string> cookies; diff --git a/include/modules/ldap.h b/include/modules/ldap.h index 37087198d..2342bd1ba 100644 --- a/include/modules/ldap.h +++ b/include/modules/ldap.h @@ -16,7 +16,7 @@ public: virtual ~LDAPException() noexcept = default; }; -struct LDAPModification +struct LDAPModification final { enum LDAPOperation { @@ -31,7 +31,7 @@ struct LDAPModification }; typedef std::vector<LDAPModification> LDAPMods; -struct LDAPAttributes +struct LDAPAttributes final : public std::map<Anope::string, std::vector<Anope::string>> { size_t size(const Anope::string &attr) const @@ -75,7 +75,7 @@ enum QueryType QUERY_MODIFY }; -struct LDAPResult +struct LDAPResult final { std::vector<LDAPAttributes> messages; Anope::string error; diff --git a/include/modules/os_news.h b/include/modules/os_news.h index af7619e56..03842946c 100644 --- a/include/modules/os_news.h +++ b/include/modules/os_news.h @@ -15,7 +15,7 @@ enum NewsType NEWS_OPER }; -struct NewsMessages +struct NewsMessages final { NewsType type; Anope::string name; diff --git a/include/modules/os_session.h b/include/modules/os_session.h index 5341b4fe0..7077b0985 100644 --- a/include/modules/os_session.h +++ b/include/modules/os_session.h @@ -8,7 +8,7 @@ #pragma once -struct Session +struct Session final { cidr addr; /* A cidr (sockaddrs + len) representing this session */ unsigned count = 1; /* Number of clients with this host */ @@ -17,7 +17,7 @@ struct Session Session(const sockaddrs &ip, int len) : addr(ip, len) { } }; -struct Exception +struct Exception final : Serializable { Anope::string mask; /* Hosts to which this exception applies */ diff --git a/include/modules/redis.h b/include/modules/redis.h index ec990823e..71ccf6ef7 100644 --- a/include/modules/redis.h +++ b/include/modules/redis.h @@ -10,7 +10,7 @@ namespace Redis { - struct Reply + struct Reply final { enum Type { diff --git a/include/modules/sasl.h b/include/modules/sasl.h index 2b1c6a30d..2e4d990c5 100644 --- a/include/modules/sasl.h +++ b/include/modules/sasl.h @@ -10,7 +10,7 @@ namespace SASL { - struct Message + struct Message final { Anope::string source; Anope::string target; diff --git a/include/modules/sql.h b/include/modules/sql.h index 59cc7a24b..8355fe009 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -11,7 +11,7 @@ namespace SQL { - class Data + class Data final : public Serialize::Data { public: @@ -93,13 +93,13 @@ namespace SQL /** A SQL query */ - struct QueryData + struct QueryData final { Anope::string data; bool escape; }; - struct Query + struct Query final { Anope::string query; std::map<Anope::string, QueryData> parameters; diff --git a/include/modules/xmlrpc.h b/include/modules/xmlrpc.h index a12a23c9e..698a8e6ce 100644 --- a/include/modules/xmlrpc.h +++ b/include/modules/xmlrpc.h @@ -10,7 +10,7 @@ #include "httpd.h" -class XMLRPCRequest +class XMLRPCRequest final { std::map<Anope::string, Anope::string> replies; diff --git a/include/opertype.h b/include/opertype.h index d1858f270..855dc8afb 100644 --- a/include/opertype.h +++ b/include/opertype.h @@ -40,7 +40,7 @@ struct CoreExport Oper static Oper *Find(const Anope::string &name); }; -class CoreExport OperType +class CoreExport OperType final { private: /** The name of this opertype, e.g. "sra". diff --git a/include/protocol.h b/include/protocol.h index e2bee5317..c21e4ae84 100644 --- a/include/protocol.h +++ b/include/protocol.h @@ -245,7 +245,7 @@ public: virtual Anope::string NormalizeMask(const Anope::string &mask); }; -class CoreExport MessageSource +class CoreExport MessageSource final { Anope::string source; User *u = nullptr; @@ -285,7 +285,7 @@ public: }; /** MessageTokenizer allows tokens in the IRC wire format to be read from a string */ -class CoreExport MessageTokenizer +class CoreExport MessageTokenizer final { private: /** The message we are parsing tokens from. */ diff --git a/include/regchannel.h b/include/regchannel.h index 29c203cf3..9b6a64971 100644 --- a/include/regchannel.h +++ b/include/regchannel.h @@ -21,7 +21,7 @@ typedef Anope::hash_map<ChannelInfo *> registered_channel_map; extern CoreExport Serialize::Checker<registered_channel_map> RegisteredChannelList; /* AutoKick data. */ -class CoreExport AutoKick +class CoreExport AutoKick final : public Serializable { public: @@ -44,7 +44,7 @@ public: /* It matters that Base is here before Extensible (it is inherited by Serializable) */ -class CoreExport ChannelInfo +class CoreExport ChannelInfo final : public Serializable , public Extensible { diff --git a/include/regexpr.h b/include/regexpr.h index 536c891c1..e48d2582b 100644 --- a/include/regexpr.h +++ b/include/regexpr.h @@ -15,7 +15,7 @@ #include "anope.h" #include "service.h" -class CoreExport RegexException +class CoreExport RegexException final : public CoreException { public: diff --git a/include/serialize.h b/include/serialize.h index b0739e683..91ced7370 100644 --- a/include/serialize.h +++ b/include/serialize.h @@ -108,7 +108,7 @@ public: * of class that inherits from Serializable. Used for unserializing objects * of this type, as it requires a function pointer to a static member function. */ -class CoreExport Serialize::Type +class CoreExport Serialize::Type final : public Base { typedef Serializable* (*unserialize_func)(Serializable *obj, Serialize::Data &); @@ -242,7 +242,7 @@ public: * destructed. */ template<typename T> -class Serialize::Reference +class Serialize::Reference final : public ReferenceBase { protected: diff --git a/include/servers.h b/include/servers.h index a2a0bfdfb..8f491fe01 100644 --- a/include/servers.h +++ b/include/servers.h @@ -37,7 +37,7 @@ namespace Servers /** Class representing a server */ -class CoreExport Server +class CoreExport Server final : public Extensible { private: diff --git a/include/service.h b/include/service.h index 5a59fa303..87a04ece1 100644 --- a/include/service.h +++ b/include/service.h @@ -160,7 +160,7 @@ public: } }; -class ServiceAlias +class ServiceAlias final { Anope::string t, f; public: diff --git a/include/socketengine.h b/include/socketengine.h index 88fa329f2..e9d35cd2e 100644 --- a/include/socketengine.h +++ b/include/socketengine.h @@ -14,7 +14,7 @@ #include "services.h" #include "sockets.h" -class CoreExport SocketEngine +class CoreExport SocketEngine final { static const int DefaultSize = 2; // Uplink, mode stacker public: diff --git a/include/sockets.h b/include/sockets.h index e7311e727..b8aacc7e7 100644 --- a/include/sockets.h +++ b/include/sockets.h @@ -103,7 +103,7 @@ union CoreExport sockaddrs void ntop(int type, const void *src); }; -class CoreExport cidr +class CoreExport cidr final { sockaddrs addr; Anope::string cidr_ip; @@ -120,13 +120,13 @@ public: bool operator==(const cidr &other) const; bool operator!=(const cidr &other) const; - struct CoreExport hash + struct CoreExport hash final { size_t operator()(const cidr &s) const; }; }; -class CoreExport SocketException +class CoreExport SocketException final : public CoreException { public: @@ -339,7 +339,7 @@ class CoreExport BinarySocket : public virtual Socket { protected: - struct DataBlock + struct DataBlock final { char *orig; char *buf; diff --git a/include/timers.h b/include/timers.h index 1e94519b4..456666535 100644 --- a/include/timers.h +++ b/include/timers.h @@ -101,7 +101,7 @@ public: * This will ensure timers are not missed, as well as removing timers that have * expired and allowing the addition of new ones. */ -class CoreExport TimerManager +class CoreExport TimerManager final { /** A list of timers */ diff --git a/include/uplink.h b/include/uplink.h index 6646f58cb..72622de7b 100644 --- a/include/uplink.h +++ b/include/uplink.h @@ -20,7 +20,7 @@ namespace Uplink } /* This is the socket to our uplink */ -class UplinkSocket +class UplinkSocket final : public ConnectionSocket , public BufferedSocket { @@ -33,7 +33,7 @@ public: void OnError(const Anope::string &) override; /* A message sent over the uplink socket */ - class CoreExport Message + class CoreExport Message final { MessageSource source; std::stringstream buffer; diff --git a/include/xline.h b/include/xline.h index 19dd0a5c0..1c269e7ac 100644 --- a/include/xline.h +++ b/include/xline.h @@ -13,7 +13,7 @@ #include "sockets.h" /* An Xline, eg, anything added with operserv/akill, or any of the operserv/sxline commands */ -class CoreExport XLine +class CoreExport XLine final : public Serializable { void Init(); |