diff options
| author | Sadie Powell <sadie@witchery.services> | 2023-12-17 13:59:49 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2023-12-17 13:59:49 +0000 |
| commit | 6538641e8703084460df70d04196ac271eff1266 (patch) | |
| tree | 2bf8ab8fdd0fb4839d86607826bc09c3366e3870 /include | |
| parent | eb0e5c89b2a1e59091001ffd0e54582c2ff04212 (diff) | |
Remove some unnecessary spaces that break editor indentation.
Diffstat (limited to 'include')
54 files changed, 206 insertions, 206 deletions
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<Privilege> 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<AccessProvider *> Providers; - public: +public: static const std::list<AccessProvider *>& GetProviders(); }; @@ -76,7 +76,7 @@ class CoreExport ChanAccess : public Serializable /* account this access entry is for, if any */ Serialize::Reference<NickCore> nc; - public: +public: typedef std::vector<ChanAccess *> 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<ChanAccess::Path> 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<std::map<ChannelInfo *, int> > 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<IdentifyRequest *> 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<ReferenceBase *> *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<typename T> 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<std::set<ChannelInfo *> > 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<Channel *> deleting; - public: +public: typedef std::multimap<Anope::string, Anope::string> 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<User> u; - public: +public: /* The account executing the command */ Reference<NickCore> 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<Anope::string> item_map; typedef Anope::multimap<Block> 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<Extensible *, void *> 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<ExtensibleBase *> extension_items; virtual ~Extensible(); @@ -55,10 +55,10 @@ class CoreExport Extensible template<typename T> 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<typename T> class ExtensibleItem : public BaseExtensibleItem<T> { - protected: +protected: T* Create(Extensible *obj) override { return new T(obj); } - public: +public: ExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem<T>(m, n) { } }; template<typename T> class PrimitiveExtensibleItem : public BaseExtensibleItem<T> { - protected: +protected: T* Create(Extensible *obj) override { return new T(); } - public: +public: PrimitiveExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem<T>(m, n) { } }; template<> class PrimitiveExtensibleItem<bool> : public BaseExtensibleItem<bool> { - protected: +protected: bool* Create(Extensible *) override { return NULL; } - public: +public: PrimitiveExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem<bool>(m, n) { } }; template<typename T> class SerializableExtensibleItem : public PrimitiveExtensibleItem<T> { - public: +public: SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { } void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override @@ -184,7 +184,7 @@ class SerializableExtensibleItem : public PrimitiveExtensibleItem<T> template<> class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool> { - public: +public: SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(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<typename char_type> class ascii_ctype : public std::ctype<char_type> { - public: + public: char_type do_toupper(char_type c) const override { if (c >= 'a' && c <= 'z') @@ -51,7 +51,7 @@ namespace Anope template<typename char_type> class rfc1459_ctype : public ascii_ctype<char_type> { - 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<unsigned> 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<Anope::string, Anope::string> ListEntry; - private: +private: NickCore *nc; std::vector<Anope::string> columns; std::vector<ListEntry> 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<std::pair<Anope::string, Anope::string> > replies; unsigned longest = 0; - public: +public: InfoFormatter(NickCore *nc); void Process(std::vector<Anope::string> &); 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<typename T> 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<Anope::string> targets; std::vector<LogFile *> 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<ChannelMode *> 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 C |
