From d79147e7afe2eca34780c607f78b11f8b3dd017d Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 25 Jan 2022 13:59:42 +0000 Subject: Abolish the infernal space before accessibility keywords. --- include/modules/account.h | 2 +- include/modules/away.h | 6 +++--- include/modules/callerid.h | 4 ++-- include/modules/cap.h | 14 +++++++------- include/modules/ctctags.h | 10 +++++----- include/modules/dns.h | 8 ++++---- include/modules/exemption.h | 6 +++--- include/modules/extban.h | 20 ++++++++++---------- include/modules/geolocation.h | 6 +++--- include/modules/hash.h | 2 +- include/modules/httpd.h | 20 ++++++++++---------- include/modules/invite.h | 8 ++++---- include/modules/ircv3.h | 8 ++++---- include/modules/ircv3_batch.h | 8 ++++---- include/modules/ircv3_replies.h | 8 ++++---- include/modules/ircv3_servertime.h | 6 +++--- include/modules/isupport.h | 6 +++--- include/modules/ldap.h | 6 +++--- include/modules/names.h | 2 +- include/modules/regex.h | 16 ++++++++-------- include/modules/reload.h | 4 ++-- include/modules/server.h | 8 ++++---- include/modules/shun.h | 4 ++-- include/modules/sql.h | 14 +++++++------- include/modules/ssl.h | 12 ++++++------ include/modules/stats.h | 6 +++--- include/modules/webirc.h | 4 ++-- include/modules/who.h | 6 +++--- include/modules/whois.h | 8 ++++---- 29 files changed, 116 insertions(+), 116 deletions(-) (limited to 'include/modules') diff --git a/include/modules/account.h b/include/modules/account.h index 95bd954e1..c543a7725 100644 --- a/include/modules/account.h +++ b/include/modules/account.h @@ -44,7 +44,7 @@ inline AccountExtItem* GetAccountIdExtItem() class AccountEventListener : public Events::ModuleEventListener { - public: +public: AccountEventListener(Module* mod) : ModuleEventListener(mod, "event/account") { diff --git a/include/modules/away.h b/include/modules/away.h index c99ea18e5..9e81d14a2 100644 --- a/include/modules/away.h +++ b/include/modules/away.h @@ -30,13 +30,13 @@ namespace Away class Away::EventListener : public Events::ModuleEventListener { - protected: +protected: EventListener(Module* mod) : ModuleEventListener(mod, "event/away") { } - public: +public: /** Called when a user wishes to mark themselves as away. * @param user The user who is going away. * @param message The away message that the user set. @@ -74,7 +74,7 @@ class Away::EventListener class Away::EventProvider final : public Events::ModuleEventProvider { - public: +public: EventProvider(Module* mod) : ModuleEventProvider(mod, "event/away") { diff --git a/include/modules/callerid.h b/include/modules/callerid.h index 7b69d137f..683a8e291 100644 --- a/include/modules/callerid.h +++ b/include/modules/callerid.h @@ -28,7 +28,7 @@ namespace CallerID class CallerID::APIBase : public DataProvider { - public: +public: APIBase(Module* parent) : DataProvider(parent, "m_callerid_api") { @@ -45,7 +45,7 @@ class CallerID::APIBase class CallerID::API final : public dynamic_reference { - public: +public: API(Module* parent) : dynamic_reference(parent, "m_callerid_api") { diff --git a/include/modules/cap.h b/include/modules/cap.h index ce03ea063..3404a2d18 100644 --- a/include/modules/cap.h +++ b/include/modules/cap.h @@ -31,7 +31,7 @@ namespace Cap typedef intptr_t Ext; class ExtItem : public IntExtItem { - public: + public: ExtItem(Module* mod); void FromInternal(Extensible* container, const std::string& value) noexcept override; std::string ToHuman(const Extensible* container, void* item) const noexcept override; @@ -53,7 +53,7 @@ namespace Cap class EventListener : public Events::ModuleEventListener { - public: + public: EventListener(Module* mod) : ModuleEventListener(mod, "event/cap") { @@ -73,7 +73,7 @@ namespace Cap class Manager : public DataProvider { - public: + public: Manager(Module* mod) : DataProvider(mod, "capmanager") { @@ -154,7 +154,7 @@ namespace Cap friend class ManagerImpl; - protected: + protected: /** Notify the manager that the value of the capability changed. * Must be called if the value of the cap changes for any reason. */ @@ -164,7 +164,7 @@ namespace Cap manager->NotifyValueChange(this); } - public: + public: /** Constructor, initializes the capability. * Caps are active by default. * @param mod Module providing the cap @@ -293,7 +293,7 @@ namespace Cap { dynamic_reference_nocheck ref; - public: + public: /** Constructor, initializes the capability reference * @param mod Module creating this object * @param Name Raw name of the cap as used in the protocol (CAP LS, etc.) @@ -334,7 +334,7 @@ namespace Cap class MessageBase : public ClientProtocol::Message { - public: + public: MessageBase(const std::string& subcmd) : ClientProtocol::Message("CAP", ServerInstance->Config->GetServerName()) { diff --git a/include/modules/ctctags.h b/include/modules/ctctags.h index bf7d373e4..b58506a1d 100644 --- a/include/modules/ctctags.h +++ b/include/modules/ctctags.h @@ -33,7 +33,7 @@ namespace CTCTags class CTCTags::CapReference final : public Cap::Reference { - public: +public: CapReference(Module* mod) : Cap::Reference(mod, "message-tags") { @@ -56,7 +56,7 @@ private: PushParam(target); } - public: +public: TagMessage(User* source, const Channel* targetchan, const ClientProtocol::TagMap& Tags, char status = 0) : ClientProtocol::Message("TAGMSG", source) { @@ -91,7 +91,7 @@ private: class CTCTags::TagMessageDetails final { - public: +public: /** Whether to echo the tags at all. */ bool echo = true; @@ -119,13 +119,13 @@ class CTCTags::TagMessageDetails final class CTCTags::EventListener : public Events::ModuleEventListener { - protected: +protected: EventListener(Module* mod, unsigned int eventprio = DefaultPriority) : ModuleEventListener(mod, "event/tagmsg", eventprio) { } - public: +public: /** Called before a user sends a tag message to a channel, a user, or a server glob mask. * @param user The user sending the message. * @param target The target of the message. This can either be a channel, a user, or a server diff --git a/include/modules/dns.h b/include/modules/dns.h index 4473d2be7..817e3fd53 100644 --- a/include/modules/dns.h +++ b/include/modules/dns.h @@ -82,7 +82,7 @@ namespace DNS class Exception final : public ModuleException { - public: + public: Exception(const Module* mod, const std::string& message) : ModuleException(mod, message) { @@ -172,7 +172,7 @@ namespace DNS */ class Manager : public DataProvider { - public: + public: Manager(Module* mod) : DataProvider(mod, "DNS") { } virtual void Process(Request* req) = 0; @@ -185,9 +185,9 @@ namespace DNS */ class Request : public Timer { - protected: + protected: Manager* const manager; - public: + public: Question question; /* Use result cache if available */ bool use_cache; diff --git a/include/modules/exemption.h b/include/modules/exemption.h index 9fa059f7b..c1acfe223 100644 --- a/include/modules/exemption.h +++ b/include/modules/exemption.h @@ -40,13 +40,13 @@ namespace CheckExemption class CheckExemption::EventListener : public Events::ModuleEventListener { - protected: +protected: EventListener(Module* mod, unsigned int eventprio = DefaultPriority) : ModuleEventListener(mod, "event/exemption", eventprio) { } - public: +public: /** Called when checking if a user is exempt from something. * @param user The user to check exemption for. * @param chan The channel to check exemption on. @@ -60,7 +60,7 @@ class CheckExemption::EventListener class CheckExemption::EventProvider final : public Events::ModuleEventProvider { - public: +public: EventProvider(Module* mod) : ModuleEventProvider(mod, "event/exemption") { diff --git a/include/modules/extban.h b/include/modules/extban.h index 5bf491d13..f716e82f6 100644 --- a/include/modules/extban.h +++ b/include/modules/extban.h @@ -53,7 +53,7 @@ namespace ExtBan class ExtBan::Manager : public DataProvider { - protected: +protected: /** Initializes an instance of the ExtBan::Base class. * @param Creator The module which created this instance. */ @@ -62,7 +62,7 @@ class ExtBan::Manager { } - public: +public: /** A mapping of extban letters to their associated object. */ typedef std::unordered_map LetterMap; @@ -110,7 +110,7 @@ class ExtBan::Base : public ServiceProvider , private dynamic_reference_base::CaptureHook { - private: +private: /** Whether this ExtBan is currently enabled. */ bool active = false; @@ -127,7 +127,7 @@ class ExtBan::Base SetActive(true); } - protected: +protected: /** Initializes an instance of the ExtBan::Base class. * @param Creator The module which created this instance. * @param Name The name used in bans to signify this extban. @@ -140,7 +140,7 @@ class ExtBan::Base { } - public: +public: /** Retrieves the character used in bans to signify this extban. */ unsigned char GetLetter() const { return letter; } @@ -191,7 +191,7 @@ class ExtBan::Base class ExtBan::Acting final : public Base { - public: +public: /** Initializes an instance of the ExtBan::Acting class. * @param Creator The module which created this instance. * @param Name The name used in bans to signify this extban. @@ -224,7 +224,7 @@ class ExtBan::Acting final class ExtBan::MatchingBase : public Base { - protected: +protected: /** Initializes an instance of the ExtBan::MatchingBase class. * @param Creator The module which created this instance. * @param Name The name used in bans to signify this extban. @@ -235,7 +235,7 @@ class ExtBan::MatchingBase { } - public: +public: /** @copydoc ExtBan::Base::GetType */ Type GetType() const override { return ExtBan::Type::MATCHING; } @@ -247,13 +247,13 @@ class ExtBan::MatchingBase class ExtBan::EventListener : public Events::ModuleEventListener { - protected: +protected: EventListener(Module* mod, unsigned int eventprio = DefaultPriority) : ModuleEventListener(mod, "event/extban", eventprio) { } - public: +public: /** Called when an extban is being checked. * @param user The user which the extban is being checked against. * @param chan The channel which the extban is set on. diff --git a/include/modules/geolocation.h b/include/modules/geolocation.h index b40ee8074..eff8c4c89 100644 --- a/include/modules/geolocation.h +++ b/include/modules/geolocation.h @@ -29,7 +29,7 @@ namespace Geolocation class Geolocation::APIBase : public DataProvider { - public: +public: APIBase(Module* parent) : DataProvider(parent, "geolocationapi") { @@ -51,7 +51,7 @@ class Geolocation::APIBase class Geolocation::API final : public dynamic_reference { - public: +public: API(Module* parent) : dynamic_reference(parent, "geolocationapi") { @@ -68,7 +68,7 @@ private: /** The country name for this location. */ std::string name; - public: +public: Location(const std::string& Code, const std::string& Name) : code(Code) , name(Name) diff --git a/include/modules/hash.h b/include/modules/hash.h index 2c176868f..249d2fcd1 100644 --- a/include/modules/hash.h +++ b/include/modules/hash.h @@ -29,7 +29,7 @@ class HashProvider : public DataProvider { - public: +public: const unsigned int out_size; const unsigned int block_size; HashProvider(Module* mod, const std::string& Name, unsigned int osiz = 0, unsigned int bsiz = 0) diff --git a/include/modules/httpd.h b/include/modules/httpd.h index 92b2d855f..23b40a485 100644 --- a/include/modules/httpd.h +++ b/include/modules/httpd.h @@ -36,7 +36,7 @@ class HTTPQueryParameters final : public insp::flat_multimap { - public: +public: bool get(const std::string& key, std::string& value) const { const_iterator it = find(key); @@ -92,9 +92,9 @@ struct HTTPRequestURI final */ class HTTPHeaders final { - protected: +protected: std::map headers; - public: +public: /** Set the value of a header * Sets the value of the named header. If the header is already present, it will be replaced @@ -166,13 +166,13 @@ class HttpServerSocket; */ class HTTPRequest final { - protected: +protected: std::string type; std::string ipaddr; std::string postdata; HTTPRequestURI parseduri; - public: +public: HTTPHeaders *headers; int errorcode; @@ -248,7 +248,7 @@ class HTTPRequest final */ class HTTPDocumentResponse final { - public: +public: /** Module that generated this reply */ Module* const module; @@ -278,7 +278,7 @@ class HTTPDocumentResponse final class HTTPdAPIBase : public DataProvider { - public: +public: HTTPdAPIBase(Module* parent) : DataProvider(parent, "m_httpd_api") { @@ -296,7 +296,7 @@ class HTTPdAPIBase class HTTPdAPI final : public dynamic_reference { - public: +public: HTTPdAPI(Module* parent) : dynamic_reference(parent, "m_httpd_api") { @@ -306,7 +306,7 @@ class HTTPdAPI final class HTTPACLEventListener : public Events::ModuleEventListener { - public: +public: HTTPACLEventListener(Module* mod) : ModuleEventListener(mod, "event/http-acl") { @@ -318,7 +318,7 @@ class HTTPACLEventListener class HTTPRequestEventListener : public Events::ModuleEventListener { - public: +public: HTTPRequestEventListener(Module* mod) : ModuleEventListener(mod, "event/http-request") { diff --git a/include/modules/invite.h b/include/modules/invite.h index 1e8f417c4..9cd3862c7 100644 --- a/include/modules/invite.h +++ b/include/modules/invite.h @@ -32,7 +32,7 @@ namespace Invite class Invite::APIBase : public DataProvider { - public: +public: APIBase(Module* parent); /** Create or extend an Invite. @@ -76,7 +76,7 @@ class Invite::APIBase class Invite::API final : public dynamic_reference { - public: +public: API(Module* parent) : dynamic_reference(parent, "core_channel_invite") { @@ -90,7 +90,7 @@ class Invite::API final class Invite::Invite final : public insp::intrusive_list_node, public insp::intrusive_list_node { - public: +public: /** User the invite is for */ LocalUser* const user; @@ -113,7 +113,7 @@ class Invite::Invite final friend class APIImpl; - private: +private: /** Timer handling expiration. If NULL this invite doesn't expire. */ Timer* expiretimer = nullptr; diff --git a/include/modules/ircv3.h b/include/modules/ircv3.h index cb0b7853c..d98d6b167 100644 --- a/include/modules/ircv3.h +++ b/include/modules/ircv3.h @@ -32,7 +32,7 @@ namespace IRCv3 class IRCv3::WriteNeighborsWithCap final : public User::ForEachNeighborHandler { - private: +private: const Cap::Capability& cap; ClientProtocol::Event& protoev; uint64_t sentid; @@ -43,7 +43,7 @@ class IRCv3::WriteNeighborsWithCap final user->Send(protoev); } - public: +public: WriteNeighborsWithCap(User* user, ClientProtocol::Event& ev, const Cap::Capability& capability, bool include_self = false) : cap(capability) , protoev(ev) @@ -74,7 +74,7 @@ template class IRCv3::CapTag : public ClientProtocol::MessageTagProvider { - protected: +protected: Cap::Capability cap; const std::string tagname; @@ -91,7 +91,7 @@ class IRCv3::CapTag msg.AddTag(tagname, this, *val); } - public: +public: /** Constructor. * @param mod Module that owns the tag. * @param capname Name of the client capability. diff --git a/include/modules/ircv3_batch.h b/include/modules/ircv3_batch.h index 8d2fb2ff0..30d3cb94d 100644 --- a/include/modules/ircv3_batch.h +++ b/include/modules/ircv3_batch.h @@ -47,7 +47,7 @@ class IRCv3::Batch::Manager : public DataProvider , public ClientProtocol::MessageTagProvider { - public: +public: /** Constructor. * @param mod Module that owns the Manager. */ @@ -104,7 +104,7 @@ class IRCv3::Batch::Batch final unsigned int GetId() const { return bit; } intptr_t GetBit() const { return reftag; } - public: +public: /** Constructor. * The batch is initially stopped. To start it, pass it to Manager::Start(). * @param Type Batch type string, used to indicate what kind of grouping the batch does. May be empty. @@ -176,7 +176,7 @@ class IRCv3::Batch::Batch final class IRCv3::Batch::API final : public dynamic_reference_nocheck { - public: +public: API(Module* mod) : dynamic_reference_nocheck(mod, "batchapi") { @@ -189,7 +189,7 @@ class IRCv3::Batch::API final class IRCv3::Batch::CapReference final : public Cap::Reference { - public: +public: CapReference(Module* mod) : Cap::Reference(mod, "batch") { diff --git a/include/modules/ircv3_replies.h b/include/modules/ircv3_replies.h index 7bf594170..4cd80688d 100644 --- a/include/modules/ircv3_replies.h +++ b/include/modules/ircv3_replies.h @@ -37,7 +37,7 @@ namespace IRCv3 class IRCv3::Replies::CapReference final : public Cap::Reference { - public: +public: CapReference(Module* mod) : Cap::Reference(mod, "inspircd.org/standard-replies") { @@ -47,7 +47,7 @@ class IRCv3::Replies::CapReference final /** Base class for standard replies. */ class IRCv3::Replies::Reply { - private: +private: /** The name of the command for this reply. */ const std::string cmd; @@ -72,7 +72,7 @@ class IRCv3::Replies::Reply user->WriteNotice(InspIRCd::Format("*** %s", description.c_str())); } - protected: +protected: /** Initializes a new instance of the Reply class. * @param Creator The module which created this instance. * @param Cmd The name of the command to reply with. @@ -83,7 +83,7 @@ class IRCv3::Replies::Reply { } - public: +public: /** * Sends a standard reply to the specified user. * @param user The user to send the reply to. diff --git a/include/modules/ircv3_servertime.h b/include/modules/ircv3_servertime.h index 7737b35d4..85d9611ed 100644 --- a/include/modules/ircv3_servertime.h +++ b/include/modules/ircv3_servertime.h @@ -49,10 +49,10 @@ namespace IRCv3 class IRCv3::ServerTime::Manager : public DataProvider { - protected: +protected: ClientProtocol::MessageTagProvider* tagprov; - public: +public: /** Constructor. * @param mod Module that owns the Manager. */ @@ -86,7 +86,7 @@ class IRCv3::ServerTime::Manager class IRCv3::ServerTime::API final : public dynamic_reference_nocheck { - public: +public: API(Module* mod) : dynamic_reference_nocheck(mod, "servertimeapi") { diff --git a/include/modules/isupport.h b/include/modules/isupport.h index 7ea28aea1..3e23caddf 100644 --- a/include/modules/isupport.h +++ b/include/modules/isupport.h @@ -33,13 +33,13 @@ namespace ISupport class ISupport::EventListener : public Events::ModuleEventListener { - protected: +protected: EventListener(Module* mod) : ModuleEventListener(mod, "event/isupport") { } - public: +public: virtual void OnBuildISupport(TokenMap& tokens) { } virtual void OnBuildClassISupport(ConnectClass::Ptr klass, TokenMap& tokens) { } }; @@ -47,7 +47,7 @@ class ISupport::EventListener class ISupport::EventProvider final : public Events::ModuleEventProvider { - public: +public: EventProvider(Module* mod) : Events::ModuleEventProvider(mod, "event/isupport") { diff --git a/include/modules/ldap.h b/include/modules/ldap.h index 5d11d89fb..5de9e2fbc 100644 --- a/include/modules/ldap.h +++ b/include/modules/ldap.h @@ -24,7 +24,7 @@ typedef int LDAPQuery; class LDAPException final : public CoreException { - public: +public: LDAPException(const std::string& msg) : CoreException(msg) { @@ -130,7 +130,7 @@ struct LDAPResult final class LDAPInterface { - public: +public: ModuleRef creator; LDAPInterface(Module* m) : creator(m) { } @@ -143,7 +143,7 @@ class LDAPInterface class LDAPProvider : public DataProvider { - public: +public: LDAPProvider(Module* Creator, const std::string& Name) : DataProvider(Creator, Name) { } diff --git a/include/modules/names.h b/include/modules/names.h index 6f21221ac..4f1d940bd 100644 --- a/include/modules/names.h +++ b/include/modules/names.h @@ -29,7 +29,7 @@ namespace Names class Names::EventListener : public Events::ModuleEventListener { - public: +public: EventListener(Module* mod) : ModuleEventListener(mod, "event/names") { diff --git a/include/modules/regex.h b/include/modules/regex.h index 89010a629..5964f5a2f 100644 --- a/include/modules/regex.h +++ b/include/modules/regex.h @@ -53,7 +53,7 @@ namespace Regex class Regex::Engine : public DataProvider { - protected: +protected: /** Initializes a new instance of the Regex::Engine class. * @param Creator The module which created this instance. * @param Name The name of this regular expression engine. @@ -63,7 +63,7 @@ class Regex::Engine { } - public: +public: /** Compiles a regular expression pattern. * @param pattern The pattern to compile. * @param options One or more options to use when matching the pattern. @@ -83,7 +83,7 @@ template class Regex::SimpleEngine final : public Regex::Engine { - public: +public: /** @copydoc Regex::Engine::Engine */ SimpleEngine(Module* Creator, const std::string& Name) : Regex::Engine(Creator, Name) @@ -101,7 +101,7 @@ class Regex::SimpleEngine final class Regex::EngineReference final : public dynamic_reference_nocheck { - public: +public: /** Initializes a new instance of the Regex::EngineReference class. * @param Creator The module which created this instance. * @param Name The name of the regular expression engine to reference. @@ -124,7 +124,7 @@ class Regex::EngineReference final class Regex::Exception final : public ModuleException { - public: +public: /** Initializes a new instance of the Regex::Exception class. * @param mod The module which caused this exception to be thrown. * @param regex A regular expression which failed to compile. @@ -150,14 +150,14 @@ class Regex::Exception final /** Represents a compiled regular expression pattern. */ class Regex::Pattern { - private: +private: /** The options used when matching this pattern. */ const uint8_t optionflags; /** The pattern as a string. */ const std::string patternstr; - protected: +protected: /** Initializes a new instance of the Pattern class. * @param pattern The pattern as a string. * @param options The options used when matching this pattern. @@ -168,7 +168,7 @@ class Regex::Pattern { } - public: +public: /** Destroys an instance of the Pattern class. */ virtual ~Pattern() = default; diff --git a/include/modules/reload.h b/include/modules/reload.h index cffae0724..2f3022816 100644 --- a/include/modules/reload.h +++ b/include/modules/reload.h @@ -39,7 +39,7 @@ namespace ReloadModule typedef std::vector List; List list; - public: + public: /** Add data to the saved state of a module. * The provided handler's OnReloadModuleRestore() method will be called when the reload is done with the pointer * provided. @@ -57,7 +57,7 @@ namespace ReloadModule class EventListener : public Events::ModuleEventListener { - public: + public: EventListener(Module* mod) : ModuleEventListener(mod, "event/reloadmodule") { diff --git a/include/modules/server.h b/include/modules/server.h index 3ed06c355..e56b3e0dc 100644 --- a/include/modules/server.h +++ b/include/modules/server.h @@ -36,7 +36,7 @@ namespace ServerProtocol class ServerProtocol::BroadcastEventListener : public Events::ModuleEventListener { - public: +public: BroadcastEventListener(Module* mod) : ModuleEventListener(mod, "event/server-broadcast") { @@ -54,7 +54,7 @@ class ServerProtocol::BroadcastEventListener class ServerProtocol::LinkEventListener : public Events::ModuleEventListener { - public: +public: LinkEventListener(Module* mod) : ModuleEventListener(mod, "event/server-link") { @@ -80,7 +80,7 @@ class ServerProtocol::LinkEventListener class ServerProtocol::MessageEventListener : public Events::ModuleEventListener { - public: +public: MessageEventListener(Module* mod) : ModuleEventListener(mod, "event/server-message") { @@ -104,7 +104,7 @@ class ServerProtocol::MessageEventListener class ServerProtocol::SyncEventListener : public Events::ModuleEventListener { - public: +public: SyncEventListener(Module* mod) : ModuleEventListener(mod, "event/server-sync") { diff --git a/include/modules/shun.h b/include/modules/shun.h index d49c141da..a162c0581 100644 --- a/include/modules/shun.h +++ b/include/modules/shun.h @@ -27,7 +27,7 @@ class Shun final : public XLine { - public: +public: /** Create a Shun. * @param s_time The set time * @param d The duration of the xline @@ -66,7 +66,7 @@ class Shun final return matchtext; } - private: +private: /** Matching mask **/ std::string matchtext; }; diff --git a/include/modules/sql.h b/include/modules/sql.h index 3447dc8e4..291a64012 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -72,7 +72,7 @@ namespace SQL class SQL::Result : public Cullable { - public: +public: /** * Return the number of rows in the result. * @@ -111,11 +111,11 @@ class SQL::Result */ class SQL::Error final { - private: +private: /** The custom error message if one has been specified. */ const std::string message; - public: +public: /** The code which represents this error. */ const ErrorCode code; @@ -170,14 +170,14 @@ class SQL::Error final class SQL::Query : public Cullable { - protected: +protected: /** Creates a new SQL query. */ Query(Module* Creator) : creator(Creator) { } - public: +public: const ModuleRef creator; /* Destroys this Query instance. */ @@ -200,11 +200,11 @@ class SQL::Query class SQL::Provider : public DataProvider { - private: +private: /** The name of the database tag in the config. */ const std::string dbid; - public: +public: Provider(Module* Creator, const std::string& Name) : DataProvider(Creator, "SQL/" + Name) { diff --git a/include/modules/ssl.h b/include/modules/ssl.h index 2b812700e..837f4eda0 100644 --- a/include/modules/ssl.h +++ b/include/modules/ssl.h @@ -42,7 +42,7 @@ class ssl_cert final : public refcountbase { - public: +public: std::string dn; std::string issuer; std::string error; @@ -155,7 +155,7 @@ public: class SSLIOHook : public IOHook { - protected: +protected: /** An enumeration of possible TLS socket states. */ enum Status { @@ -201,7 +201,7 @@ class SSLIOHook sendq.push_front(tmp); } - public: +public: static SSLIOHook* IsSSL(StreamSocket* sock) { IOHook* const lasthook = sock->GetLastHook(); @@ -259,7 +259,7 @@ class SSLIOHook */ class SSLClientCert final { - public: +public: /** * Get the client certificate from a socket * @param sock The socket to get the certificate from, the socket does not have to use TLS @@ -293,7 +293,7 @@ class SSLClientCert final class UserCertificateAPIBase : public DataProvider { - public: +public: UserCertificateAPIBase(Module* parent) : DataProvider(parent, "m_sslinfo_api") { @@ -332,7 +332,7 @@ class UserCertificateAPIBase class UserCertificateAPI final : public dynamic_reference { - public: +public: UserCertificateAPI(Module* parent) : dynamic_reference(parent, "m_sslinfo_api") { diff --git a/include/modules/stats.h b/include/modules/stats.h index a2a8dc28b..7244c8761 100644 --- a/include/modules/stats.h +++ b/include/modules/stats.h @@ -38,7 +38,7 @@ enum class Stats::EventListener : public Events::ModuleEventListener { - public: +public: EventListener(Module* mod) : ModuleEventListener(mod, "event/stats") { @@ -54,7 +54,7 @@ class Stats::EventListener class Stats::Row final : public Numeric::Numeric { - public: +public: Row(unsigned int num) : Numeric(num) { @@ -75,7 +75,7 @@ class Stats::Context final */ const char symbol; - public: +public: /** Constructor * @param src Source user of the STATS request, can be a local or remote user * @param sym Symbol (letter) indicating the type of the request diff --git a/include/modules/webirc.h b/include/modules/webirc.h index e335d3b12..e20edd860 100644 --- a/include/modules/webirc.h +++ b/include/modules/webirc.h @@ -31,12 +31,12 @@ namespace WebIRC class WebIRC::EventListener : public Events::ModuleEventListener { - protected: +protected: EventListener(Module* mod) : ModuleEventListener(mod, "event/webirc") { } - public: +public: virtual void OnWebIRCAuth(LocalUser* user, const FlagMap* flags) = 0; }; diff --git a/include/modules/who.h b/include/modules/who.h index e74d878be..779cb6ca5 100644 --- a/include/modules/who.h +++ b/include/modules/who.h @@ -31,7 +31,7 @@ namespace Who class Who::EventListener : public Events::ModuleEventListener { - public: +public: EventListener(Module* mod) : ModuleEventListener(mod, "event/who") { @@ -51,7 +51,7 @@ class Who::EventListener class Who::Request { - public: +public: typedef std::bitset CharState; /** The flags for matching users to include. */ @@ -86,6 +86,6 @@ class Who::Request */ virtual bool GetFieldIndex(char flag, size_t& out) const = 0; - protected: +protected: Request() = default; }; diff --git a/include/modules/whois.h b/include/modules/whois.h index 7b066c53a..02f613e53 100644 --- a/include/modules/whois.h +++ b/include/modules/whois.h @@ -65,7 +65,7 @@ enum class Whois::EventListener : public Events::ModuleEventListener { - public: +public: EventListener(Module* mod) : ModuleEventListener(mod, "event/whois") { @@ -80,7 +80,7 @@ class Whois::EventListener class Whois::LineEventListener : public Events::ModuleEventListener { - public: +public: LineEventListener(Module* mod) : ModuleEventListener(mod, "event/whoisline") { @@ -100,7 +100,7 @@ class Whois::LineEventListener class Whois::Context { - protected: +protected: /** User doing the WHOIS */ LocalUser* const source; @@ -109,7 +109,7 @@ class Whois::Context */ User* const target; - public: +public: Context(LocalUser* sourceuser, User* targetuser) : source(sourceuser) , target(targetuser) -- cgit v1.3.1-10-gc9f91