From 6538641e8703084460df70d04196ac271eff1266 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 17 Dec 2023 13:59:49 +0000 Subject: Remove some unnecessary spaces that break editor indentation. --- include/access.h | 12 ++++++------ include/account.h | 8 ++++---- include/anope.h | 20 ++++++++++---------- include/base.h | 10 +++++----- include/bots.h | 2 +- include/channels.h | 10 +++++----- include/commands.h | 12 ++++++------ include/config.h | 10 +++++----- include/extensible.h | 26 +++++++++++++------------- include/hashcomp.h | 4 ++-- include/lists.h | 12 ++++++------ include/logger.h | 8 ++++---- include/mail.h | 4 ++-- include/memo.h | 2 +- include/modes.h | 32 ++++++++++++++++---------------- include/modules.h | 12 ++++++------ include/modules/bs_badwords.h | 2 +- include/modules/bs_kick.h | 4 ++-- include/modules/cs_entrymsg.h | 6 +++--- include/modules/cs_log.h | 6 +++--- include/modules/cs_mode.h | 2 +- include/modules/dns.h | 4 ++-- include/modules/encryption.h | 4 ++-- include/modules/httpd.h | 8 ++++---- include/modules/ldap.h | 6 +++--- include/modules/ns_cert.h | 6 +++--- include/modules/os_forbid.h | 4 ++-- include/modules/os_ignore.h | 6 +++--- include/modules/os_news.h | 2 +- include/modules/os_session.h | 2 +- include/modules/pseudoclients/chanserv.h | 2 +- include/modules/pseudoclients/global.h | 2 +- include/modules/pseudoclients/memoserv.h | 2 +- include/modules/pseudoclients/nickserv.h | 2 +- include/modules/redis.h | 4 ++-- include/modules/sasl.h | 6 +++--- include/modules/set_misc.h | 2 +- include/modules/sql.h | 12 ++++++------ include/modules/ssl.h | 2 +- include/modules/xmlrpc.h | 6 +++--- include/opertype.h | 4 ++-- include/protocol.h | 10 +++++----- include/regchannel.h | 6 +++--- include/regexpr.h | 8 ++++---- include/serialize.h | 16 ++++++++-------- include/servers.h | 8 ++++---- include/service.h | 6 +++--- include/socketengine.h | 2 +- include/sockets.h | 30 +++++++++++++++--------------- include/threadengine.h | 12 ++++++------ include/timers.h | 6 +++--- include/uplink.h | 4 ++-- include/users.h | 10 +++++----- include/xline.h | 4 ++-- 54 files changed, 206 insertions(+), 206 deletions(-) (limited to 'include') diff --git a/include/access.h b/include/access.h index f22e098bf..3ee6e7896 100644 --- a/include/access.h +++ b/include/access.h @@ -41,7 +41,7 @@ struct CoreExport Privilege class CoreExport PrivilegeManager { static std::vector Privileges; - public: +public: static void AddPrivilege(Privilege p); static void RemovePrivilege(Privilege &p); static Privilege *FindPrivilege(const Anope::string &name); @@ -54,7 +54,7 @@ class CoreExport PrivilegeManager */ class CoreExport AccessProvider : public Service { - public: +public: AccessProvider(Module *owner, const Anope::string &name); virtual ~AccessProvider(); @@ -63,9 +63,9 @@ class CoreExport AccessProvider : public Service */ virtual ChanAccess *Create() = 0; - private: +private: static std::list Providers; - public: +public: static const std::list& GetProviders(); }; @@ -76,7 +76,7 @@ class CoreExport ChanAccess : public Serializable /* account this access entry is for, if any */ Serialize::Reference nc; - public: +public: typedef std::vector Path; /* The provider that created this access entry */ @@ -135,7 +135,7 @@ class CoreExport ChanAccess : public Serializable */ class CoreExport AccessGroup { - public: +public: /* access entries + paths */ std::vector paths; /* Channel these access entries are on */ diff --git a/include/account.h b/include/account.h index d48b25872..08761e7cc 100644 --- a/include/account.h +++ b/include/account.h @@ -33,7 +33,7 @@ class CoreExport NickAlias : public Serializable, public Extensible Anope::string vhost_ident, vhost_host, vhost_creator; time_t vhost_created; - public: +public: Anope::string nick; Anope::string last_quit; Anope::string last_realname; @@ -110,7 +110,7 @@ class CoreExport NickCore : public Serializable, public Extensible Serialize::Checker > chanaccess; /* Unique identifier for the account. */ uint64_t id; - public: +public: /* Name of the account. Find(display)->nc == this. */ Anope::string display; /* User password in form of hashm:data */ @@ -244,11 +244,11 @@ class CoreExport IdentifyRequest static std::set Requests; - protected: +protected: IdentifyRequest(Module *o, const Anope::string &acc, const Anope::string &pass); virtual ~IdentifyRequest(); - public: +public: /* One of these is called when the request goes through */ virtual void OnSuccess() = 0; virtual void OnFail() = 0; diff --git a/include/anope.h b/include/anope.h index 4a2c1074e..a3b17a593 100644 --- a/include/anope.h +++ b/include/anope.h @@ -24,13 +24,13 @@ namespace Anope */ class CoreExport string { - private: + private: /** * The actual string is stored in an std::string as it can be converted to * ci::string, or a C-style string at any time. */ std::string _string; - public: + public: /** * Extras. */ @@ -557,7 +557,7 @@ namespace Anope */ class CoreExport sepstream { - private: +private: /** Original string. */ Anope::string tokens; @@ -570,7 +570,7 @@ class CoreExport sepstream /** If set then GetToken() can return an empty string */ bool allow_empty; - public: +public: /** Create a sepstream and fill it with the provided data */ sepstream(const Anope::string &source, char separator, bool allowempty = false); @@ -626,7 +626,7 @@ class CoreExport sepstream */ class commasepstream : public sepstream { - public: +public: /** Initialize with comma separator */ commasepstream(const Anope::string &source, bool allowempty = false) : sepstream(source, ',', allowempty) { } @@ -636,7 +636,7 @@ class commasepstream : public sepstream */ class spacesepstream : public sepstream { - public: +public: /** Initialize with space separator */ spacesepstream(const Anope::string &source) : sepstream(source, ' ') { } @@ -650,14 +650,14 @@ class spacesepstream : public sepstream */ class CoreException : public std::exception { - protected: +protected: /** Holds the error message to be displayed */ Anope::string err; /** Source of the exception */ Anope::string source; - public: +public: /** Default constructor, just uses the error message 'Core threw an exception'. */ CoreException() : err("Core threw an exception"), source("The core") { } @@ -689,7 +689,7 @@ class CoreException : public std::exception class ModuleException : public CoreException { - public: +public: /** Default constructor, just uses the error message 'Module threw an exception'. */ ModuleException() : CoreException("Module threw an exception", "A Module") { } @@ -706,7 +706,7 @@ class ModuleException : public CoreException class ConvertException : public CoreException { - public: +public: ConvertException(const Anope::string &reason = "") : CoreException(reason) { } virtual ~ConvertException() noexcept = default; diff --git a/include/base.h b/include/base.h index a88877bc5..405595cd5 100644 --- a/include/base.h +++ b/include/base.h @@ -16,7 +16,7 @@ class CoreExport Base { /* References to this base class */ std::set *references = nullptr; - public: +public: virtual ~Base(); /** Adds a reference to this object. Eg, when a Reference @@ -30,9 +30,9 @@ class CoreExport Base class ReferenceBase { - protected: +protected: bool invalid = false; - public: +public: ReferenceBase() = default; ReferenceBase(const ReferenceBase &other) : invalid(other.invalid) { } virtual ~ReferenceBase() = default; @@ -45,9 +45,9 @@ class ReferenceBase template class Reference : public ReferenceBase { - protected: +protected: T *ref = nullptr; - public: +public: Reference() = default; Reference(T *obj) : ref(obj) diff --git a/include/bots.h b/include/bots.h index 4b2f40ddf..36402c0d3 100644 --- a/include/bots.h +++ b/include/bots.h @@ -23,7 +23,7 @@ class CoreExport BotInfo : public User, public Serializable { /* Channels this bot is assigned to */ Serialize::Checker > channels; - public: +public: time_t created; /* Last time this bot said something (via privmsg) */ time_t lastmsg; diff --git a/include/channels.h b/include/channels.h index da4ab33a4..a44633204 100644 --- a/include/channels.h +++ b/include/channels.h @@ -32,14 +32,14 @@ class CoreExport Channel : public Base, public Extensible { static std::vector deleting; - public: +public: typedef std::multimap ModeList; - private: +private: /** A map of channel modes with their parameters set on this channel */ ModeList modes; - public: +public: /* Channel name */ Anope::string name; /* Set if this channel is registered. ci->c == this. Contains information relevant to the registered channel */ @@ -73,14 +73,14 @@ class CoreExport Channel : public Base, public Extensible int16_t chanserv_modecount; /* Number of check_mode()'s this sec */ int16_t bouncy_modes; /* Did we fail to set modes here? */ - private: +private: /** Constructor * @param name The channel name * @param ts The time the channel was created */ Channel(const Anope::string &nname, time_t ts = Anope::CurTime); - public: +public: /** Destructor */ ~Channel(); diff --git a/include/commands.h b/include/commands.h index 451727500..4fe116e1b 100644 --- a/include/commands.h +++ b/include/commands.h @@ -53,7 +53,7 @@ class CoreExport CommandSource Anope::string nick; /* User executing the command, may be NULL */ Reference u; - public: +public: /* The account executing the command */ Reference nc; /* for web clients */ @@ -97,7 +97,7 @@ class CoreExport Command : public Service /* Command requires that a user is executing it */ bool require_user; - public: +public: /* Maximum parameters accepted by this command */ size_t max_params; /* Minimum parameters required to use this command */ @@ -106,7 +106,7 @@ class CoreExport Command : public Service /* Module which owns us */ Module *module; - protected: +protected: /** Create a new command. * @param owner The owner of the command * @param sname The command name @@ -116,10 +116,10 @@ class CoreExport Command : public Service */ Command(Module *owner, const Anope::string &sname, size_t min_params, size_t max_params = 0); - public: +public: virtual ~Command() = default; - protected: +protected: void SetDesc(const Anope::string &d); void ClearSyntax(); @@ -129,7 +129,7 @@ class CoreExport Command : public Service void AllowUnregistered(bool b); void RequireUser(bool b); - public: +public: bool AllowUnregistered() const; bool RequireUser() const; diff --git a/include/config.h b/include/config.h index bcd792adb..b920490d2 100644 --- a/include/config.h +++ b/include/config.h @@ -25,11 +25,11 @@ namespace Configuration { friend struct Configuration::Conf; - public: + public: typedef Anope::map item_map; typedef Anope::multimap block_map; - private: + private: Anope::string name; item_map items; block_map blocks; @@ -38,7 +38,7 @@ namespace Configuration /* Represents a missing tag. */ static Block EmptyBlock; - public: + public: Block(const Anope::string &); const Anope::string &GetName() const; int CountBlock(const Anope::string &name) const; @@ -83,7 +83,7 @@ namespace Configuration Anope::string name; bool executable; FILE *fp = nullptr; - public: + public: File(const Anope::string &, bool); ~File(); const Anope::string &GetName() const; @@ -173,7 +173,7 @@ namespace Configuration */ class ConfigException : public CoreException { - public: +public: /** Default constructor, just uses the error message 'Config threw an exception'. */ ConfigException() : CoreException("Config threw an exception", "Config Parser") { } diff --git a/include/extensible.h b/include/extensible.h index 317ea9f64..93fbd9524 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -17,13 +17,13 @@ class Extensible; class CoreExport ExtensibleBase : public Service { - protected: +protected: std::map items; ExtensibleBase(Module *m, const Anope::string &n); ~ExtensibleBase(); - public: +public: virtual void Unset(Extensible *obj) = 0; /* called when an object we are keep track of is serializing */ @@ -33,7 +33,7 @@ class CoreExport ExtensibleBase : public Service class CoreExport Extensible { - public: +public: std::set extension_items; virtual ~Extensible(); @@ -55,10 +55,10 @@ class CoreExport Extensible template class BaseExtensibleItem : public ExtensibleBase { - protected: +protected: virtual T *Create(Extensible *) = 0; - public: +public: BaseExtensibleItem(Module *m, const Anope::string &n) : ExtensibleBase(m, n) { } ~BaseExtensibleItem() @@ -126,43 +126,43 @@ class BaseExtensibleItem : public ExtensibleBase template class ExtensibleItem : public BaseExtensibleItem { - protected: +protected: T* Create(Extensible *obj) override { return new T(obj); } - public: +public: ExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem(m, n) { } }; template class PrimitiveExtensibleItem : public BaseExtensibleItem { - protected: +protected: T* Create(Extensible *obj) override { return new T(); } - public: +public: PrimitiveExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem(m, n) { } }; template<> class PrimitiveExtensibleItem : public BaseExtensibleItem { - protected: +protected: bool* Create(Extensible *) override { return NULL; } - public: +public: PrimitiveExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem(m, n) { } }; template class SerializableExtensibleItem : public PrimitiveExtensibleItem { - public: +public: SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem(m, n) { } void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override @@ -184,7 +184,7 @@ class SerializableExtensibleItem : public PrimitiveExtensibleItem template<> class SerializableExtensibleItem : public PrimitiveExtensibleItem { - public: +public: SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem(m, n) { } void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override diff --git a/include/hashcomp.h b/include/hashcomp.h index 930717444..6ceb46a55 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -29,7 +29,7 @@ namespace Anope template class ascii_ctype : public std::ctype { - public: + public: char_type do_toupper(char_type c) const override { if (c >= 'a' && c <= 'z') @@ -51,7 +51,7 @@ namespace Anope template class rfc1459_ctype : public ascii_ctype { - public: + public: char_type do_toupper(char_type c) const override { if (c == '{' || c == '}' || c == '|') diff --git a/include/lists.h b/include/lists.h index 6e134d7ca..759706f1d 100644 --- a/include/lists.h +++ b/include/lists.h @@ -23,13 +23,13 @@ */ class CoreExport NumberList { - private: +private: bool is_valid = true; std::set numbers; bool desc; - public: +public: /** Processes a numbered list * @param list The list * @param descending True to make HandleNumber get called with numbers in descending order @@ -62,13 +62,13 @@ class CoreExport NumberList */ class CoreExport ListFormatter { - public: +public: typedef std::map ListEntry; - private: +private: NickCore *nc; std::vector columns; std::vector entries; - public: +public: ListFormatter(NickCore *nc); ListFormatter &AddColumn(const Anope::string &name); void AddEntry(const ListEntry &entry); @@ -83,7 +83,7 @@ class CoreExport InfoFormatter NickCore *nc; std::vector > replies; unsigned longest = 0; - public: +public: InfoFormatter(NickCore *nc); void Process(std::vector &); Anope::string &operator[](const Anope::string &key); diff --git a/include/logger.h b/include/logger.h index c23b00666..6c524d487 100644 --- a/include/logger.h +++ b/include/logger.h @@ -50,7 +50,7 @@ struct LogFile /* Represents a single log message */ class CoreExport Log { - public: +public: /* Bot that should log this message */ BotInfo *bi = nullptr; /* For commands, the user executing the command, but might not always exist */ @@ -94,11 +94,11 @@ class CoreExport Log ~Log(); - private: +private: Anope::string FormatSource() const; Anope::string FormatCommand() const; - public: +public: Anope::string BuildPrefix() const; template Log &operator<<(T val) @@ -111,7 +111,7 @@ class CoreExport Log /* Configured in the configuration file, actually does the message logging */ class CoreExport LogInfo { - public: +public: BotInfo *bot = nullptr; std::vector targets; std::vector logfiles; diff --git a/include/mail.h b/include/mail.h index e06357825..9c6a32136 100644 --- a/include/mail.h +++ b/include/mail.h @@ -24,7 +24,7 @@ namespace Mail /* A email message being sent */ class Message : public Thread { - private: + private: Anope::string sendmail_path; Anope::string send_from; Anope::string mail_to; @@ -35,7 +35,7 @@ namespace Mail bool dont_quote_addresses; bool success = false; - public: + public: /** Construct this message. Once constructed call Thread::Start to launch the mail sending. * @param sf Config->SendFrom * @param mailto Name of person being mailed (u->nick, nc->display, etc) diff --git a/include/memo.h b/include/memo.h index e97cc9da0..9a3571e2c 100644 --- a/include/memo.h +++ b/include/memo.h @@ -16,7 +16,7 @@ class CoreExport Memo : public Serializable { - public: +public: MemoInfo *mi; bool unread; bool receipt; diff --git a/include/modes.h b/include/modes.h index 3c34a6b31..cd42efcdd 100644 --- a/include/modes.h +++ b/include/modes.h @@ -37,7 +37,7 @@ enum ModeClass */ class CoreExport Mode : public Base { - public: +public: /* Mode name */ Anope::string name; /* Class of mode this is (user/channel) */ @@ -66,7 +66,7 @@ class CoreExport Mode : public Base */ class CoreExport UserMode : public Mode { - public: +public: /** constructor * @param name The mode name * @param mc The mode char @@ -76,7 +76,7 @@ class CoreExport UserMode : public Mode class CoreExport UserModeParam : public UserMode { - public: +public: /** constructor * @param name The mode name * @param mc The mode char @@ -94,7 +94,7 @@ class CoreExport UserModeParam : public UserMode */ class CoreExport ChannelMode : public Mode { - public: +public: /* channel modes that can possibly unwrap this mode */ std::vector listeners; @@ -125,7 +125,7 @@ class CoreExport ChannelMode : public Mode */ class CoreExport ChannelModeList : public ChannelMode { - public: +public: /** constructor * @param name The mode name * @param mc The mode char @@ -163,7 +163,7 @@ class CoreExport ChannelModeList : public ChannelMode */ class CoreExport ChannelModeParam : public ChannelMode { - public: +public: /** constructor * @param name The mode name * @param mc The mode char @@ -185,7 +185,7 @@ class CoreExport ChannelModeParam : public ChannelMode */ class CoreExport ChannelModeStatus : public ChannelMode { - public: +public: /* The symbol, eg @ % + */ char symbol; /* The "level" of the mode, used to compare with other modes. @@ -211,7 +211,7 @@ class CoreExport ChannelModeVirtual : public T Anope::string base; ChannelMode *basech; - public: +public: ChannelModeVirtual(const Anope::string &mname, const Anope::string &basename); ~ChannelModeVirtual(); @@ -227,7 +227,7 @@ class CoreExport ChannelModeVirtual : public T class CoreExport ChannelStatus { Anope::string modes; - public: +public: ChannelStatus() = default; ChannelStatus(const Anope::string &modes); void AddMode(char c); @@ -241,7 +241,7 @@ class CoreExport ChannelStatus class CoreExport UserModeOperOnly : public UserMode { - public: +public: UserModeOperOnly(const Anope::string &mname, char um) : UserMode(mname, um) { } bool CanSet(User *u) const override; @@ -249,7 +249,7 @@ class CoreExport UserModeOperOnly : public UserMode class CoreExport UserModeNoone : public UserMode { - public: +public: UserModeNoone(const Anope::string &mname, char um) : UserMode(mname, um) { } bool CanSet(User *u) const override; @@ -259,7 +259,7 @@ class CoreExport UserModeNoone : public UserMode */ class CoreExport ChannelModeKey : public ChannelModeParam { - public: +public: ChannelModeKey(char mc) : ChannelModeParam("KEY", mc) { } bool IsValid(Anope::string &value) const override; @@ -269,7 +269,7 @@ class CoreExport ChannelModeKey : public ChannelModeParam */ class CoreExport ChannelModeOperOnly : public ChannelMode { - public: +public: ChannelModeOperOnly(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { } /* Opers only */ @@ -280,7 +280,7 @@ class CoreExport ChannelModeOperOnly : public ChannelMode */ class CoreExport ChannelModeNoone : public ChannelMode { - public: +public: ChannelModeNoone(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { } bool CanSet(User *u) const override; @@ -294,7 +294,7 @@ class CoreExport ChannelModeNoone : public ChannelMode */ class CoreExport ModeManager { - public: +public: /* Number of generic channel and user modes we are tracking */ static unsigned GenericChannelModes; @@ -392,7 +392,7 @@ class CoreExport Entry { Anope::string name; Anope::string mask; - public: +public: unsigned short cidr_len = 0; int family = 0; Anope::string nick, user, host, real; diff --git a/include/modules.h b/include/modules.h index 13030bca2..56c29434d 100644 --- a/include/modules.h +++ b/include/modules.h @@ -172,12 +172,12 @@ struct ModuleVersionC */ class ModuleVersion { - private: +private: int version_major; int version_minor; int version_patch; - public: +public: ModuleVersion(const ModuleVersionC &); /** Get the major version of Anope this was built against @@ -202,9 +202,9 @@ class NotImplementedException : public CoreException { }; */ class CoreExport Module : public Extensible { - private: +private: bool permanent; - public: +public: /** The module name (e.g. os_modload) */ Anope::string name; @@ -1112,7 +1112,7 @@ enum Implementation */ class CoreExport ModuleManager { - public: +public: /** Event handler hooks. */ static std::vector EventHandlers[I_SIZE]; @@ -1195,7 +1195,7 @@ class CoreExport ModuleManager */ static void UnloadAll(); - private: +private: /** Call the module_delete function to safely delete the module * @param m the module to delete * @return MOD_ERR_OK on success, anything else on fail diff --git a/include/modules/bs_badwords.h b/include/modules/bs_badwords.h index ef773269f..86840600d 100644 --- a/include/modules/bs_badwords.h +++ b/include/modules/bs_badwords.h @@ -33,7 +33,7 @@ struct BadWord BadWordType type; virtual ~BadWord() = default; - protected: +protected: BadWord() = default; }; diff --git a/include/modules/bs_kick.h b/include/modules/bs_kick.h index c296e9221..6d0f4e085 100644 --- a/include/modules/bs_kick.h +++ b/include/modules/bs_kick.h @@ -37,10 +37,10 @@ struct KickerData bool dontkickops, dontkickvoices; - protected: +protected: KickerData() = default; - public: +public: virtual ~KickerData() = default; virtual void Check(ChannelInfo *ci) = 0; }; diff --git a/include/modules/cs_entrymsg.h b/include/modules/cs_entrymsg.h index e3586d5e9..a99ce6dd9 100644 --- a/include/modules/cs_entrymsg.h +++ b/include/modules/cs_entrymsg.h @@ -16,16 +16,16 @@ struct EntryMsg time_t when; virtual ~EntryMsg() = default; - protected: +protected: EntryMsg() = default; }; struct EntryMessageList : Serialize::Checker > { - protected: +protected: EntryMessageList() : Serialize::Checker >("EntryMsg") { } - public: +public: virtual ~EntryMessageList() { for (unsigned i = (*this)->size(); i > 0; --i) diff --git a/include/modules/cs_log.h b/include/modules/cs_log.h index e283beabb..d88bd30c6 100644 --- a/include/modules/cs_log.h +++ b/include/modules/cs_log.h @@ -25,7 +25,7 @@ struct LogSetting time_t created; virtual ~LogSetting() = default; - protected: +protected: LogSetting() = default; }; @@ -33,12 +33,12 @@ struct LogSettings : Serialize::Checker > { typedef std::vector::iterator iterator; - protected: +protected: LogSettings() : Serialize::Checker >("LogSetting") { } - public: +public: virtual ~LogSettings() = default; virtual LogSetting *Create() = 0; }; diff --git a/include/modules/cs_mode.h b/include/modules/cs_mode.h index e62042d04..a4fed83f5 100644 --- a/include/modules/cs_mode.h +++ b/include/modules/cs_mode.h @@ -21,7 +21,7 @@ struct ModeLock time_t created; virtual ~ModeLock() = default; - protected: +protected: ModeLock() = default; }; diff --git a/include/modules/dns.h b/include/modules/dns.h index 1c5941588..4d733d3fc 100644 --- a/include/modules/dns.h +++ b/include/modules/dns.h @@ -115,7 +115,7 @@ namespace DNS */ class Manager : public Service { - public: + public: Manager(Module *creator) : Service(creator, "DNS::Manager", "dns/manager") { } virtual ~Manager() = default; @@ -134,7 +134,7 @@ namespace DNS class Request : public Timer, public Question { Manager *manager; - public: + public: /* Use result cache if available */ bool use_cache; /* Request id */ diff --git a/include/modules/encryption.h b/include/modules/encryption.h index 70bf6fb08..1475e8ab4 100644 --- a/include/modules/encryption.h +++ b/include/modules/encryption.h @@ -18,7 +18,7 @@ namespace Encryption class Context { - public: + public: virtual ~Context() = default; virtual void Update(const unsigned char *data, size_t len) = 0; virtual void Finalize() = 0; @@ -27,7 +27,7 @@ namespace Encryption class Provider : public Service { - public: + public: Provider(Module *creator, const Anope::string &sname) : Service(creator, "Encryption::Provider", sname) { } virtual ~Provider() = default; diff --git a/include/modules/httpd.h b/include/modules/httpd.h index 207499d3b..b84cb728f 100644 --- a/include/modules/httpd.h +++ b/include/modules/httpd.h @@ -98,7 +98,7 @@ class HTTPPage : public virtual Base Anope::string url; Anope::string content_type; - public: +public: HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { } const Anope::string &GetURL() const { return this->url; } @@ -117,13 +117,13 @@ class HTTPPage : public virtual Base class HTTPClient : public ClientSocket, public BinarySocket, public Base { - protected: +protected: void WriteClient(const Anope::string &message) { BinarySocket::Write(message + "\r\n"); } - public: +public: HTTPClient(ListenSocket *l, int f, const sockaddrs &a) : ClientSocket(l, a), BinarySocket() { } virtual const Anope::string GetIP() @@ -140,7 +140,7 @@ class HTTPProvider : public ListenSocket, public Service Anope::string ip; unsigned short port; bool ssl; - public: +public: std::vector ext_ips; std::vector ext_headers; diff --git a/include/modules/ldap.h b/include/modules/ldap.h index 34f73f65b..3769b0ccb 100644 --- a/include/modules/ldap.h +++ b/include/modules/ldap.h @@ -10,7 +10,7 @@ class LDAPException : public ModuleException { - public: +public: LDAPException(const Anope::string &reason) : ModuleException(reason) { } virtual ~LDAPException() noexcept = default; @@ -111,7 +111,7 @@ struct LDAPResult class LDAPInterface { - public: +public: Module *owner; LDAPInterface(Module *m) : owner(m) { } @@ -124,7 +124,7 @@ class LDAPInterface class LDAPProvider : public Service { - public: +public: LDAPProvider(Module *c, const Anope::string &n) : Service(c, "LDAPProvider", n) { } /** Attempt to bind to the LDAP server as an admin diff --git a/include/modules/ns_cert.h b/include/modules/ns_cert.h index 824964ba8..b22d22a7c 100644 --- a/include/modules/ns_cert.h +++ b/include/modules/ns_cert.h @@ -13,9 +13,9 @@ struct NSCertList { - protected: +protected: NSCertList() = default; - public: +public: virtual ~NSCertList() = default; /** Add an entry to the nick's certificate list @@ -65,7 +65,7 @@ struct NSCertList class CertService : public Service { - public: +public: CertService(Module *c) : Service(c, "CertService", "certs") { } virtual NickCore* FindAccountFromCert(const Anope::string &cert) = 0; diff --git a/include/modules/os_forbid.h b/include/modules/os_forbid.h index 35dfc5c7f..354e54453 100644 --- a/include/modules/os_forbid.h +++ b/include/modules/os_forbid.h @@ -27,13 +27,13 @@ struct ForbidData ForbidType type; virtual ~ForbidData() = default; - protected: +protected: ForbidData() = default; }; class ForbidService : public Service { - public: +public: ForbidService(Module *m) : Service(m, "ForbidService", "forbid") { } virtual void AddForbid(ForbidData *d) = 0; diff --git a/include/modules/os_ignore.h b/include/modules/os_ignore.h index 14b71f9ac..fdc89ff7b 100644 --- a/include/modules/os_ignore.h +++ b/include/modules/os_ignore.h @@ -19,16 +19,16 @@ struct IgnoreData time_t time = 0; /* When do we stop ignoring them? */ virtual ~IgnoreData() = default; - protected: +protected: IgnoreData() = default; }; class IgnoreService : public Service { - protected: +protected: IgnoreService(Module *c) : Service(c, "IgnoreService", "ignore") { } - public: +public: virtual void AddIgnore(IgnoreData *) = 0; virtual void DelIgnore(IgnoreData *) = 0; diff --git a/include/modules/os_news.h b/include/modules/os_news.h index 10228e82a..9add8b210 100644 --- a/include/modules/os_news.h +++ b/include/modules/os_news.h @@ -34,7 +34,7 @@ struct NewsItem : Serializable class NewsService : public Service { - public: +public: NewsService(Module *m) : Service(m, "NewsService", "news") { } virtual NewsItem *CreateNewsItem() = 0; diff --git a/include/modules/os_session.h b/include/modules/os_session.h index eb8c2aaca..48799e574 100644 --- a/include/modules/os_session.h +++ b/include/modules/os_session.h @@ -33,7 +33,7 @@ struct Exception : Serializable class SessionService : public Service { - public: +public: typedef std::unordered_map SessionMap; typedef std::vector ExceptionVector; diff --git a/include/modules/pseudoclients/chanserv.h b/include/modules/pseudoclients/chanserv.h index 013596ed9..0cc327155 100644 --- a/include/modules/pseudoclients/chanserv.h +++ b/include/modules/pseudoclients/chanserv.h @@ -10,7 +10,7 @@ class ChanServService : public Service { - public: +public: ChanServService(Module *m) : Service(m, "ChanServService", "ChanServ") { } diff --git a/include/modules/pseudoclients/global.h b/include/modules/pseudoclients/global.h index b27ad3562..f88218769 100644 --- a/include/modules/pseudoclients/global.h +++ b/include/modules/pseudoclients/global.h @@ -10,7 +10,7 @@ class GlobalService : public Service { - public: +public: GlobalService(Module *m) : Service(m, "GlobalService", "Global") { } diff --git a/include/modules/pseudoclients/memoserv.h b/include/modules/pseudoclients/memoserv.h index ea3fc964e..e5119d54a 100644 --- a/include/modules/pseudoclients/memoserv.h +++ b/include/modules/pseudoclients/memoserv.h @@ -10,7 +10,7 @@ class MemoServService : public Service { - public: +public: enum MemoResult { MEMO_SUCCESS, diff --git a/include/modules/pseudoclients/nickserv.h b/include/modules/pseudoclients/nickserv.h index 5207d7021..e037db167 100644 --- a/include/modules/pseudoclients/nickserv.h +++ b/include/modules/pseudoclients/nickserv.h @@ -10,7 +10,7 @@ class NickServService : public Service { - public: +public: NickServService(Module *m) : Service(m, "NickServService", "NickServ") { } diff --git a/include/modules/redis.h b/include/modules/redis.h index f30311f34..517d12701 100644 --- a/include/modules/redis.h +++ b/include/modules/redis.h @@ -45,7 +45,7 @@ namespace Redis class Interface { - public: + public: Module *owner; Interface(Module *m) : owner(m) { } @@ -57,7 +57,7 @@ namespace Redis class Provider : public Service { - public: + public: Provider(Module *c, const Anope::string &n) : Service(c, "Redis::Provider", n) { } virtual bool IsSocketDead() = 0; diff --git a/include/modules/sasl.h b/include/modules/sasl.h index f5482d31b..b8d3c07cb 100644 --- a/include/modules/sasl.h +++ b/include/modules/sasl.h @@ -24,7 +24,7 @@ namespace SASL class Service : public ::Service { - public: + public: Service(Module *o) : ::Service(o, "SASL::Service", "sasl") { } virtual void ProcessMessage(const Message &) = 0; @@ -62,7 +62,7 @@ namespace SASL /* PLAIN, EXTERNAL, etc */ class Mechanism : public ::Service { - public: + public: Mechanism(Module *o, const Anope::string &sname) : Service(o, "SASL::Mechanism", sname) { } virtual Session* CreateSession(const Anope::string &uid) { return new Session(this, uid); } @@ -81,7 +81,7 @@ namespace SASL Anope::string uid; Anope::string hostname, ip; - public: + public: IdentifyRequest(Module *m, const Anope::string &id, const Anope::string &acc, const Anope::string &pass, const Anope::string &h, const Anope::string &i) : ::IdentifyRequest(m, acc, pass), uid(id), hostname(h), ip(i) { } void OnSuccess() override diff --git a/include/modules/set_misc.h b/include/modules/set_misc.h index 892972d6d..43a06237d 100644 --- a/include/modules/set_misc.h +++ b/include/modules/set_misc.h @@ -15,6 +15,6 @@ struct MiscData Anope::string data; virtual ~MiscData() = default; - protected: +protected: MiscData() = default; }; diff --git a/include/modules/sql.h b/include/modules/sql.h index 607f8bcd9..ec21c7b9f 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -13,7 +13,7 @@ namespace SQL class Data : public Serialize::Data { - public: + public: typedef std::map Map; Map data; std::map types; @@ -83,7 +83,7 @@ namespace SQL */ class Exception : public ModuleException { - public: + public: Exception(const Anope::string &reason) : ModuleException(reason) { } virtual ~Exception() noexcept = default; @@ -139,12 +139,12 @@ namespace SQL */ class Result { - protected: + protected: /* Rows, column, item */ std::vector > entries; Query query; Anope::string error; - public: + public: unsigned int id = 0; Anope::string finished_query; @@ -187,7 +187,7 @@ namespace SQL */ class Interface { - public: + public: Module *owner; Interface(Module *m) : owner(m) { } @@ -201,7 +201,7 @@ namespace SQL */ class Provider : public Service { - public: + public: Provider(Module *c, const Anope::string &n) : Service(c, "SQL::Provider", n) { } virtual void Run(Interface *i, const Query &query) = 0; diff --git a/include/modules/ssl.h b/include/modules/ssl.h index 4d1fa63e4..ba391178a 100644 --- a/include/modules/ssl.h +++ b/include/modules/ssl.h @@ -10,7 +10,7 @@ class SSLService : public Service { - public: +public: SSLService(Module *o, const Anope::string &n) : Service(o, "SSLService", n) { } virtual void Init(Socket *s) = 0; diff --git a/include/modules/xmlrpc.h b/include/modules/xmlrpc.h index 81d8b3f7e..92ac1fb7e 100644 --- a/include/modules/xmlrpc.h +++ b/include/modules/xmlrpc.h @@ -14,7 +14,7 @@ class XMLRPCRequest { std::map replies; - public: +public: Anope::string name; Anope::string id; std::deque data; @@ -29,14 +29,14 @@ class XMLRPCServiceInterface; class XMLRPCEvent { - public: +public: virtual ~XMLRPCEvent() = default; virtual bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) = 0; }; class XMLRPCServiceInterface : public Service { - public: +public: XMLRPCServiceInterface(Module *creator, const Anope::string &sname) : Service(creator, "XMLRPCServiceInterface", sname) { } virtual void Register(XMLRPCEvent *event) = 0; diff --git a/include/opertype.h b/include/opertype.h index 628180cbb..12052815d 100644 --- a/include/opertype.h +++ b/include/opertype.h @@ -42,7 +42,7 @@ struct CoreExport Oper class CoreExport OperType { - private: +private: /** The name of this opertype, e.g. "sra". */ Anope::string name; @@ -65,7 +65,7 @@ class CoreExport OperType /** Set of opertypes we inherit from */ std::set inheritances; - public: +public: /** Modes to set when someone identifies using this opertype */ Anope::string modes; diff --git a/include/protocol.h b/include/protocol.h index 9967012c0..58f3d90e1 100644 --- a/include/protocol.h +++ b/include/protocol.h @@ -21,9 +21,9 @@ class CoreExport IRCDProto : public Service { Anope::string proto_name; - protected: +protected: IRCDProto(Module *creator, const Anope::string &proto_name); - public: +public: virtual ~IRCDProto(); virtual void SendSVSKillInternal(const MessageSource &, User *, const Anope::string &); @@ -250,7 +250,7 @@ class CoreExport MessageSource User *u = nullptr; Server *s = nullptr; - public: +public: MessageSource(const Anope::string &); MessageSource(User *u); MessageSource(Server *s); @@ -273,7 +273,7 @@ class CoreExport IRCDMessage : public Service Anope::string name; unsigned param_count; std::set flags; - public: +public: IRCDMessage(Module *owner, const Anope::string &n, unsigned p = 0); unsigned GetParamCount() const; virtual void Run(MessageSource &, const std::vector ¶ms, const Anope::map &tags) = 0; @@ -292,7 +292,7 @@ private: /** The current position within the message. */ Anope::string::size_type position = 0; - public: +public: /** Create a tokenstream and fill it with the provided data. */ MessageTokenizer(const Anope::string &msg); diff --git a/include/regchannel.h b/include/regchannel.h index ef49d0913..74dcd2e65 100644 --- a/include/regchannel.h +++ b/include/regchannel.h @@ -23,7 +23,7 @@ extern CoreExport Serialize::Checker RegisteredChannelLi /* AutoKick data. */ class CoreExport AutoKick : public Serializable { - public: +public: /* Channel this autokick is on */ Serialize::Reference ci; @@ -47,14 +47,14 @@ class CoreExport ChannelInfo : public Serializable, public Extensible { /* channels who reference this one */ Anope::map references; - private: +private: Serialize::Reference founder; /* Channel founder */ Serialize::Reference successor; /* Who gets the channel if the founder nick is dropped or expires */ Serialize::Checker > access; /* List of authorized users */ Serialize::Checker > akick; /* List of users to kickban */ Anope::map levels; - public: +public: friend class ChanAccess; friend class AutoKick; diff --git a/include/regexpr.h b/include/regexpr.h index 7ddfa9a55..9000e5119 100644 --- a/include/regexpr.h +++ b/include/regexpr.h @@ -17,7 +17,7 @@ class RegexException : public CoreException { - public: +public: RegexException(const Anope::string &reason = "") : CoreException(reason) { } virtual ~RegexException() noexcept = default; @@ -26,9 +26,9 @@ class RegexException : public CoreException class CoreExport Regex { Anope::string expression; - protected: +protected: Regex(const Anope::string &expr) : expression(expr) { } - public: +public: virtual ~Regex() = default; const Anope::string &GetExpression() { return expression; } virtual bool Matches(const Anope::string &str) = 0; @@ -36,7 +36,7 @@ class CoreExport Regex class CoreExport RegexProvider : public Service { - public: +public: RegexProvider(Module *o, const Anope::string &n) : Service(o, "Regex", n) { } virtual Regex *Compile(const Anope::string &) = 0; }; diff --git a/include/serialize.h b/include/serialize.h index 1cb4bdce5..3510858f0 100644 --- a/include/serialize.h +++ b/include/serialize.h @@ -20,7 +20,7 @@ namespace Serialize { class Data { - public: + public: enum Type { DT_TEXT, @@ -51,7 +51,7 @@ namespace Serialize */ class CoreExport Serializable : public virtual Base { - private: +private: /* A list of every serializable item in Anope. * Some of these are static and constructed at runtime, * so this list must be on the heap, as it is not always @@ -68,13 +68,13 @@ class CoreExport Serializable : public virtual Base /* The last time this object was committed to the database */ time_t last_commit_time = 0; - protected: +protected: Serializable(const Anope::string &serialize_type); Serializable(const Serializable &); Serializable &operator=(const Serializable &); - public: +public: virtual ~Serializable(); /* Unique ID (per type, not globally) for this object */ @@ -128,7 +128,7 @@ class CoreExport Serialize::Type : public Base */ time_t timestamp = 0; - public: +public: /* Map of Serializable::id to Serializable objects */ std::map objects; @@ -196,7 +196,7 @@ class Serialize::Checker type->Check(); } - public: +public: Checker(const Anope::string &n) : name(n) { } inline const T* operator->() const @@ -242,10 +242,10 @@ class Serialize::Checker template class Serialize::Reference : public ReferenceBase { - protected: +protected: T *ref = nullptr; - public: +public: Reference() = default; Reference(T *obj) : ref(obj) diff --git a/include/servers.h b/include/servers.h index 442b54f25..b7ce2c7c6 100644 --- a/include/servers.h +++ b/include/servers.h @@ -39,7 +39,7 @@ namespace Servers */ class CoreExport Server : public Extensible { - private: +private: /* Server name */ Anope::string name; /* Hops between services and server */ @@ -61,7 +61,7 @@ class CoreExport Server : public Extensible /* Reason this server was quit */ Anope::string quit_reason; - public: +public: /** Constructor * @param uplink The uplink this server is from, is only NULL when creating Me * @param name The server name @@ -72,12 +72,12 @@ class CoreExport Server : public Extensible */ Server(Server *uplink, const Anope::string &name, unsigned hops, const Anope::string &description, const Anope::string &sid = "", bool jupe = false); - private: +private: /** Destructor */ ~Server(); - public: +public: /* Number of users on the server */ unsigned users = 0; diff --git a/include/service.h b/include/service.h index fd4163675..a0552ecf3 100644 --- a/include/service.h +++ b/include/service.h @@ -41,7 +41,7 @@ class CoreExport Service : public virtual Base return NULL; } - public: +public: static Service *FindService(const Anope::string &t, const Anope::string &n) { std::map >::const_iterator it = Services.find(t); @@ -120,7 +120,7 @@ class ServiceReference : public Reference Anope::string type; Anope::string name; - public: +public: ServiceReference() = default; ServiceReference(const Anope::string &t, const Anope::string &n) : type(t), name(n) @@ -161,7 +161,7 @@ class ServiceReference : public Reference class ServiceAlias { Anope::string t, f; - public: +public: ServiceAlias(const Anope::string &type, const Anope::string &from, const Anope::string &to) : t(type), f(from) { Service::AddAlias(type, from, to); diff --git a/include/socketengine.h b/include/socketengine.h index 6084aa522..4c9ad608e 100644 --- a/include/socketengine.h +++ b/include/socketengine.h @@ -17,7 +17,7 @@ class CoreExport SocketEngine { static const int DefaultSize = 2; // Uplink, mode stacker - public: +public: /* Map of sockets */ static std::map Sockets; diff --git a/include/sockets.h b/include/sockets.h index 63df8c7b3..a10e7addd 100644 --- a/include/sockets.h +++ b/include/sockets.h @@ -108,7 +108,7 @@ class CoreExport cidr sockaddrs addr; Anope::string cidr_ip; unsigned short cidr_len; - public: +public: cidr(const Anope::string &ip); cidr(const Anope::string &ip, unsigned char len); cidr(const sockaddrs &ip, unsigned char len); @@ -128,7 +128,7 @@ class CoreExport cidr class SocketException : public CoreException { - public: +public: /** Constructor for socket exceptions * @param message Error message */ @@ -154,7 +154,7 @@ enum SocketFlag class CoreExport SocketIO { - public: +public: virtual ~SocketIO() = default; /** Receive something from the buffer @@ -212,14 +212,14 @@ class CoreExport SocketIO class CoreExport Socket { - protected: +protected: /* Socket FD */ int sock; /* The family of this socket FD */ int family; - public: +public: std::bitset flags; /* Sockaddrs for bind() (if it's bound) */ @@ -288,7 +288,7 @@ class CoreExport Socket class CoreExport BufferedSocket : public virtual Socket { - protected: +protected: /* Things read from the socket */ Anope::string read_buffer; /* Things to be written to the socket */ @@ -296,7 +296,7 @@ class CoreExport BufferedSocket : public virtual Socket /* How much data was received from this socket on this recv() */ int recv_len; - public: +public: virtual ~BufferedSocket() = default; /** Called when there is something to be received for this socket @@ -316,9 +316,9 @@ class CoreExport BufferedSocket : public virtual Socket /** Write to the socket * @param message The message */ - protected: +protected: virtual void Write(const char *buffer, size_t l); - public: +public: void Write(const char *message, ...); void Write(const Anope::string &message); @@ -335,7 +335,7 @@ class CoreExport BufferedSocket : public virtual Socket class CoreExport BinarySocket : public virtual Socket { - protected: +protected: struct DataBlock { char *orig; @@ -349,7 +349,7 @@ class CoreExport BinarySocket : public virtual Socket /* Data to be written out */ std::deque write_buffer; - public: +public: virtual ~BinarySocket() = default; /** Called when there is something to be received for this socket @@ -380,7 +380,7 @@ class CoreExport BinarySocket : public virtual Socket class CoreExport ListenSocket : public virtual Socket { - public: +public: /** Constructor * @param bindip The IP to bind to * @param port The port to listen on @@ -404,7 +404,7 @@ class CoreExport ListenSocket : public virtual Socket class CoreExport ConnectionSocket : public virtual Socket { - public: +public: /* Sockaddrs for connection ip/port */ sockaddrs conaddr; @@ -437,7 +437,7 @@ class CoreExport ConnectionSocket : public virtual Socket class CoreExport ClientSocket : public virtual Socket { - public: +public: /* Listen socket this connection came from */ ListenSocket *ls; /* Clients address */ @@ -471,7 +471,7 @@ class CoreExport ClientSocket : public virtual Socket class CoreExport Pipe : public Socket { - public: +public: /** The FD of the write pipe * this->sock is the readfd */ diff --git a/include/threadengine.h b/include/threadengine.h index 7d7c2dc70..7e59cc117 100644 --- a/include/threadengine.h +++ b/include/threadengine.h @@ -16,11 +16,11 @@ class CoreExport Thread : public Pipe, public Extensible { - private: +private: /* Set to true to tell the thread to finish and we are waiting for it */ bool exit = false; - public: +public: /* Handle for this thread */ pthread_t handle; @@ -60,11 +60,11 @@ class CoreExport Thread : public Pipe, public Extensible class CoreExport Mutex { - protected: +protected: /* A mutex, used to keep threads in sync */ pthread_mutex_t mutex; - public: +public: /** Constructor */ Mutex(); @@ -90,11 +90,11 @@ class CoreExport Mutex class CoreExport Condition : public Mutex { - private: +private: /* A condition */ pthread_cond_t cond; - public: +public: /** Constructor */ Condition(); diff --git a/include/timers.h b/include/timers.h index d3a5b9532..46f82c60a 100644 --- a/include/timers.h +++ b/include/timers.h @@ -15,7 +15,7 @@ class CoreExport Timer { - private: +private: /** The owner of the timer, if any */ Module *owner; @@ -36,7 +36,7 @@ class CoreExport Timer */ bool repeat; - public: +public: /** Constructor, initializes the triggering time * @param time_from_now The number of seconds from now to trigger the timer * @param now The time now @@ -106,7 +106,7 @@ class CoreExport TimerManager /** A list of timers */ static std::multimap Timers; - public: +public: /** Add a timer to the list * @param t A Timer derived class to add */ diff --git a/include/uplink.h b/include/uplink.h index c14c5fda8..a013de39a 100644 --- a/include/uplink.h +++ b/include/uplink.h @@ -22,7 +22,7 @@ namespace Uplink /* This is the socket to our uplink */ class UplinkSocket : public ConnectionSocket, public BufferedSocket { - public: +public: bool error; UplinkSocket(); ~UplinkSocket(); @@ -36,7 +36,7 @@ class UplinkSocket : public ConnectionSocket, public BufferedSocket MessageSource source; std::stringstream buffer; - public: + public: Message(); Message(const MessageSource &); ~Message(); diff --git a/include/users.h b/include/users.h index 6e94e24f0..46d58a1b3 100644 --- a/include/users.h +++ b/include/users.h @@ -35,9 +35,9 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe /* Users that are in the process of quitting */ static std::list quitting_users; - public: +public: typedef std::map ModeList; - protected: +protected: Anope::string vident; Anope::string ident; Anope::string uid; @@ -54,7 +54,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe time_t invalid_pw_time; - public: // XXX: exposing a tiny bit too much +public: // XXX: exposing a tiny bit too much /* User's current nick */ Anope::string nick; @@ -90,7 +90,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe /* Last time this user sent an email */ time_t lastmail; - protected: +protected: /** Create a new user object, initialising necessary fields and * adds it to the hash * @@ -112,7 +112,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe */ virtual ~User(); - public: +public: static User* OnIntroduce(const Anope::string &snick, const Anope::string &sident, const Anope::string &shost, const Anope::string &svhost, const Anope::string &sip, Server *sserver, const Anope::string &srealname, time_t ts, const Anope::string &smodes, const Anope::string &suid, NickCore *nc); /** Update the nickname of a user record accordingly, should be diff --git a/include/xline.h b/include/xline.h index 951f74563..b42e23ad6 100644 --- a/include/xline.h +++ b/include/xline.h @@ -17,7 +17,7 @@ class CoreExport XLine : public Serializable { void Init(); Anope::string nick, user, host, real; - public: +public: cidr *c; Anope::string mask; Regex *regex; @@ -55,7 +55,7 @@ class CoreExport XLineManager : public Service Serialize::Checker > xlines; /* Akills can have the same IDs, sometimes */ static Serialize::Checker > XLinesByUID; - public: +public: /* List of XLine managers we check users against in XLineManager::CheckAll */ static std::list XLineManagers; -- cgit