diff options
Diffstat (limited to 'src/modules')
190 files changed, 1003 insertions, 1003 deletions
diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp index e4299a1c2..7e2c1d43d 100644 --- a/src/modules/extra/m_geoip.cpp +++ b/src/modules/extra/m_geoip.cpp @@ -89,7 +89,7 @@ class ModuleGeoIP : public Module, public Stats::EventListener, public Whois::Ev { } - void init() CXX11_OVERRIDE + void init() override { ipv4db = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD); if (!ipv4db) @@ -119,24 +119,24 @@ class ModuleGeoIP : public Module, public Stats::EventListener, public Whois::Ev GeoIP_delete(ipv6db); } - void ReadConfig(ConfigStatus&) CXX11_OVERRIDE + void ReadConfig(ConfigStatus&) override { ConfigTag* tag = ServerInstance->Config->ConfValue("geoip"); extban = tag->getBool("extban"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides a way to assign users to connect classes by country using GeoIP lookup", VF_OPTCOMMON|VF_VENDOR); } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { if (extban) tokens["EXTBAN"].push_back('G'); } - ModResult OnCheckBan(User* user, Channel*, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User* user, Channel*, const std::string& mask) override { if (extban && (mask.length() > 2) && (mask[0] == 'G') && (mask[1] == ':')) { @@ -150,7 +150,7 @@ class ModuleGeoIP : public Module, public Stats::EventListener, public Whois::Ev return MOD_RES_PASSTHRU; } - ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) override { std::string* cc = ext.get(user); if (!cc) @@ -167,14 +167,14 @@ class ModuleGeoIP : public Module, public Stats::EventListener, public Whois::Ev return MOD_RES_DENY; } - void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE + void OnSetUserIP(LocalUser* user) override { // If user has sent NICK/USER, re-set the ExtItem as this is likely CGI:IRC changing the IP if (user->registered == REG_NICKUSER) SetExt(user); } - void OnWhois(Whois::Context& whois) CXX11_OVERRIDE + void OnWhois(Whois::Context& whois) override { // If the extban is disabled we don't expose users location. if (!extban) @@ -187,7 +187,7 @@ class ModuleGeoIP : public Module, public Stats::EventListener, public Whois::Ev whois.SendLine(RPL_WHOISCOUNTRY, *cc, "is located in this country"); } - ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE + ModResult OnStats(Stats::Context& stats) override { if (stats.GetSymbol() != 'G') return MOD_RES_PASSTHRU; diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp index 8c2752dbf..e2c5fd1c5 100644 --- a/src/modules/extra/m_ldap.cpp +++ b/src/modules/extra/m_ldap.cpp @@ -84,7 +84,7 @@ class LDAPBind : public LDAPRequest type = QUERY_BIND; } - int run() CXX11_OVERRIDE; + int run() override; }; class LDAPSearch : public LDAPRequest @@ -103,7 +103,7 @@ class LDAPSearch : public LDAPRequest type = QUERY_SEARCH; } - int run() CXX11_OVERRIDE; + int run() override; }; class LDAPAdd : public LDAPRequest @@ -120,7 +120,7 @@ class LDAPAdd : public LDAPRequest type = QUERY_ADD; } - int run() CXX11_OVERRIDE; + int run() override; }; class LDAPDel : public LDAPRequest @@ -135,7 +135,7 @@ class LDAPDel : public LDAPRequest type = QUERY_DELETE; } - int run() CXX11_OVERRIDE; + int run() override; }; class LDAPModify : public LDAPRequest @@ -152,7 +152,7 @@ class LDAPModify : public LDAPRequest type = QUERY_MODIFY; } - int run() CXX11_OVERRIDE; + int run() override; }; class LDAPCompare : public LDAPRequest @@ -169,7 +169,7 @@ class LDAPCompare : public LDAPRequest type = QUERY_COMPARE; } - int run() CXX11_OVERRIDE; + int run() override; }; class LDAPService : public LDAPProvider, public SocketThread @@ -330,20 +330,20 @@ class LDAPService : public LDAPProvider, public SocketThread } } - void BindAsManager(LDAPInterface* i) CXX11_OVERRIDE + void BindAsManager(LDAPInterface* i) override { std::string binddn = config->getString("binddn"); std::string bindauth = config->getString("bindauth"); this->Bind(i, binddn, bindauth); } - void Bind(LDAPInterface* i, const std::string& who, const std::string& pass) CXX11_OVERRIDE + void Bind(LDAPInterface* i, const std::string& who, const std::string& pass) override { LDAPBind* b = new LDAPBind(this, i, who, pass); QueueRequest(b); } - void Search(LDAPInterface* i, const std::string& base, const std::string& filter) CXX11_OVERRIDE + void Search(LDAPInterface* i, const std::string& base, const std::string& filter) override { if (i == NULL) throw LDAPException("No interface"); @@ -352,25 +352,25 @@ class LDAPService : public LDAPProvider, public SocketThread QueueRequest(s); } - void Add(LDAPInterface* i, const std::string& dn, LDAPMods& attributes) CXX11_OVERRIDE + void Add(LDAPInterface* i, const std::string& dn, LDAPMods& attributes) override { LDAPAdd* add = new LDAPAdd(this, i, dn, attributes); QueueRequest(add); } - void Del(LDAPInterface* i, const std::string& dn) CXX11_OVERRIDE + void Del(LDAPInterface* i, const std::string& dn) override { LDAPDel* del = new LDAPDel(this, i, dn); QueueRequest(del); } - void Modify(LDAPInterface* i, const std::string& base, LDAPMods& attributes) CXX11_OVERRIDE + void Modify(LDAPInterface* i, const std::string& base, LDAPMods& attributes) override { LDAPModify* mod = new LDAPModify(this, i, base, attributes); QueueRequest(mod); } - void Compare(LDAPInterface* i, const std::string& dn, const std::string& attr, const std::string& val) CXX11_OVERRIDE + void Compare(LDAPInterface* i, const std::string& dn, const std::string& attr, const std::string& val) override { LDAPCompare* comp = new LDAPCompare(this, i, dn, attr, val); QueueRequest(comp); @@ -476,7 +476,7 @@ class LDAPService : public LDAPProvider, public SocketThread } public: - void Run() CXX11_OVERRIDE + void Run() override { while (!this->GetExitFlag()) { @@ -489,7 +489,7 @@ class LDAPService : public LDAPProvider, public SocketThread } } - void OnNotify() CXX11_OVERRIDE + void OnNotify() override { query_queue r; @@ -524,7 +524,7 @@ class ModuleLDAP : public Module ServiceMap LDAPServices; public: - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ServiceMap conns; @@ -566,7 +566,7 @@ class ModuleLDAP : public Module LDAPServices.swap(conns); } - void OnUnloadModule(Module* m) CXX11_OVERRIDE + void OnUnloadModule(Module* m) override { for (ServiceMap::iterator it = this->LDAPServices.begin(); it != this->LDAPServices.end(); ++it) { @@ -615,7 +615,7 @@ class ModuleLDAP : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("LDAP support", VF_VENDOR); } diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 7c6729603..c1f7bde34 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -112,11 +112,11 @@ class ModuleSQL : public Module ConnMap connections; // main thread only ModuleSQL(); - void init() CXX11_OVERRIDE; + void init() override; ~ModuleSQL(); - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE; - void OnUnloadModule(Module* mod) CXX11_OVERRIDE; - Version GetVersion() CXX11_OVERRIDE; + void ReadConfig(ConfigStatus& status) override; + void OnUnloadModule(Module* mod) override; + Version GetVersion() override; }; class DispatcherThread : public SocketThread @@ -126,8 +126,8 @@ class DispatcherThread : public SocketThread public: DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { } ~DispatcherThread() { } - void Run() CXX11_OVERRIDE; - void OnNotify() CXX11_OVERRIDE; + void Run() override; + void OnNotify() override; }; #if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224 @@ -193,17 +193,17 @@ class MySQLresult : public SQL::Result } - int Rows() CXX11_OVERRIDE + int Rows() override { return rows; } - void GetCols(std::vector<std::string>& result) CXX11_OVERRIDE + void GetCols(std::vector<std::string>& result) override { result.assign(colnames.begin(), colnames.end()); } - bool HasColumn(const std::string& column, size_t& index) CXX11_OVERRIDE + bool HasColumn(const std::string& column, size_t& index) override { for (size_t i = 0; i < colnames.size(); ++i) { @@ -225,7 +225,7 @@ class MySQLresult : public SQL::Result return SQL::Field(); } - bool GetRow(SQL::Row& result) CXX11_OVERRIDE + bool GetRow(SQL::Row& result) override { if (currentrow < rows) { @@ -332,14 +332,14 @@ class SQLConnection : public SQL::Provider mysql_close(connection); } - void Submit(SQL::Query* q, const std::string& qs) CXX11_OVERRIDE + void Submit(SQL::Query* q, const std::string& qs) override { Parent()->Dispatcher->LockQueue(); Parent()->qq.push_back(QQueueItem(q, qs, this)); Parent()->Dispatcher->UnlockQueueWakeup(); } - void Submit(SQL::Query* call, const std::string& q, const SQL::ParamList& p) CXX11_OVERRIDE + void Submit(SQL::Query* call, const std::string& q, const SQL::ParamList& p) override { std::string res; unsigned int param = 0; @@ -366,7 +366,7 @@ class SQLConnection : public SQL::Provider Submit(call, res); } - void Submit(SQL::Query* call, const std::string& q, const SQL::ParamMap& p) CXX11_OVERRIDE + void Submit(SQL::Query* call, const std::string& q, const SQL::ParamMap& p) override { std::string res; for(std::string::size_type i = 0; i < q.length(); i++) diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index bb727b623..32bbd4459 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -65,7 +65,7 @@ class ReconnectTimer : public Timer ReconnectTimer(ModulePgSQL* m) : Timer(5, false), mod(m) { } - bool Tick(time_t TIME) CXX11_OVERRIDE; + bool Tick(time_t TIME) override; }; struct QueueItem @@ -110,19 +110,19 @@ class PgSQLresult : public SQL::Result PQclear(res); } - int Rows() CXX11_OVERRIDE + int Rows() override { return rows; } - void GetCols(std::vector<std::string>& result) CXX11_OVERRIDE + void GetCols(std::vector<std::string>& result) override { if (colnames.empty()) getColNames(); result = colnames; } - bool HasColumn(const std::string& column, size_t& index) CXX11_OVERRIDE + bool HasColumn(const std::string& column, size_t& index) override { if (colnames.empty()) getColNames(); @@ -147,7 +147,7 @@ class PgSQLresult : public SQL::Result return SQL::Field(std::string(v, PQgetlength(res, row, column))); } - bool GetRow(SQL::Row& result) CXX11_OVERRIDE + bool GetRow(SQL::Row& result) override { if (currentrow >= PQntuples(res)) return false; @@ -184,7 +184,7 @@ class SQLConn : public SQL::Provider, public EventHandler } } - CullResult cull() CXX11_OVERRIDE + CullResult cull() override { this->SQL::Provider::cull(); ServerInstance->Modules->DelService(*this); @@ -207,17 +207,17 @@ class SQLConn : public SQL::Provider, public EventHandler } } - void OnEventHandlerRead() CXX11_OVERRIDE + void OnEventHandlerRead() override { DoEvent(); } - void OnEventHandlerWrite() CXX11_OVERRIDE + void OnEventHandlerWrite() override { DoEvent(); } - void OnEventHandlerError(int errornum) CXX11_OVERRIDE + void OnEventHandlerError(int errornum) override { DelayReconnect(); } @@ -414,7 +414,7 @@ restart: } } - void Submit(SQL::Query *req, const std::string& q) CXX11_OVERRIDE + void Submit(SQL::Query *req, const std::string& q) override { if (qinprog.q.empty()) { @@ -427,7 +427,7 @@ restart: } } - void Submit(SQL::Query *req, const std::string& q, const SQL::ParamList& p) CXX11_OVERRIDE + void Submit(SQL::Query *req, const std::string& q, const SQL::ParamList& p) override { std::string res; unsigned int param = 0; @@ -452,7 +452,7 @@ restart: Submit(req, res); } - void Submit(SQL::Query *req, const std::string& q, const SQL::ParamMap& p) CXX11_OVERRIDE + void Submit(SQL::Query *req, const std::string& q, const SQL::ParamMap& p) override { std::string res; for(std::string::size_type i = 0; i < q.length(); i++) @@ -535,7 +535,7 @@ class ModulePgSQL : public Module ClearAllConnections(); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ReadConf(); } @@ -576,7 +576,7 @@ class ModulePgSQL : public Module connections.clear(); } - void OnUnloadModule(Module* mod) CXX11_OVERRIDE + void OnUnloadModule(Module* mod) override { SQL::Error err(SQL::BAD_DBID); for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++) @@ -604,7 +604,7 @@ class ModulePgSQL : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API", VF_VENDOR); } diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp index e8ef96c22..7896d3e05 100644 --- a/src/modules/extra/m_regex_pcre.cpp +++ b/src/modules/extra/m_regex_pcre.cpp @@ -56,7 +56,7 @@ class PCRERegex : public Regex pcre_free(regex); } - bool Matches(const std::string& text) CXX11_OVERRIDE + bool Matches(const std::string& text) override { return (pcre_exec(regex, NULL, text.c_str(), text.length(), 0, 0, NULL, 0) >= 0); } @@ -66,7 +66,7 @@ class PCREFactory : public RegexFactory { public: PCREFactory(Module* m) : RegexFactory(m, "regex/pcre") {} - Regex* Create(const std::string& expr) CXX11_OVERRIDE + Regex* Create(const std::string& expr) override { return new PCRERegex(expr); } @@ -80,7 +80,7 @@ class ModuleRegexPCRE : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Regex Provider Module for PCRE", VF_VENDOR); } diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp index b5fddfab8..7b8e37e6a 100644 --- a/src/modules/extra/m_regex_posix.cpp +++ b/src/modules/extra/m_regex_posix.cpp @@ -54,7 +54,7 @@ class POSIXRegex : public Regex regfree(®buf); } - bool Matches(const std::string& text) CXX11_OVERRIDE + bool Matches(const std::string& text) override { return (regexec(®buf, text.c_str(), 0, NULL, 0) == 0); } @@ -65,7 +65,7 @@ class PosixFactory : public RegexFactory public: bool extended; PosixFactory(Module* m) : RegexFactory(m, "regex/posix") {} - Regex* Create(const std::string& expr) CXX11_OVERRIDE + Regex* Create(const std::string& expr) override { return new POSIXRegex(expr, extended); } @@ -80,12 +80,12 @@ class ModuleRegexPOSIX : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Regex Provider Module for POSIX Regular Expressions", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ref.extended = ServerInstance->Config->ConfValue("posix")->getBool("extended"); } diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp index 4bcf287ca..0cc341a35 100644 --- a/src/modules/extra/m_regex_re2.cpp +++ b/src/modules/extra/m_regex_re2.cpp @@ -52,7 +52,7 @@ class RE2Regex : public Regex } } - bool Matches(const std::string& text) CXX11_OVERRIDE + bool Matches(const std::string& text) override { return RE2::FullMatch(text, regexcl); } @@ -62,7 +62,7 @@ class RE2Factory : public RegexFactory { public: RE2Factory(Module* m) : RegexFactory(m, "regex/re2") { } - Regex* Create(const std::string& expr) CXX11_OVERRIDE + Regex* Create(const std::string& expr) override { return new RE2Regex(expr); } @@ -77,7 +77,7 @@ class ModuleRegexRE2 : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Regex Provider Module for RE2", VF_VENDOR); } diff --git a/src/modules/extra/m_regex_stdlib.cpp b/src/modules/extra/m_regex_stdlib.cpp index 42e5c8bf1..4065ec014 100644 --- a/src/modules/extra/m_regex_stdlib.cpp +++ b/src/modules/extra/m_regex_stdlib.cpp @@ -39,7 +39,7 @@ class StdRegex : public Regex } } - bool Matches(const std::string& text) CXX11_OVERRIDE + bool Matches(const std::string& text) override { return std::regex_search(text, regexcl); } @@ -50,7 +50,7 @@ class StdRegexFactory : public RegexFactory public: std::regex::flag_type regextype; StdRegexFactory(Module* m) : RegexFactory(m, "regex/stdregex") {} - Regex* Create(const std::string& expr) CXX11_OVERRIDE + Regex* Create(const std::string& expr) override { return new StdRegex(expr, regextype); } @@ -64,12 +64,12 @@ public: { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Regex Provider Module for std::regex", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* Conf = ServerInstance->Config->ConfValue("stdregex"); std::string regextype = Conf->getString("type", "ecmascript"); diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp index aa3f1d41e..8bec3a908 100644 --- a/src/modules/extra/m_regex_tre.cpp +++ b/src/modules/extra/m_regex_tre.cpp @@ -60,7 +60,7 @@ public: regfree(®buf); } - bool Matches(const std::string& text) CXX11_OVERRIDE + bool Matches(const std::string& text) override { return (regexec(®buf, text.c_str(), 0, NULL, 0) == 0); } @@ -70,7 +70,7 @@ class TREFactory : public RegexFactory { public: TREFactory(Module* m) : RegexFactory(m, "regex/tre") {} - Regex* Create(const std::string& expr) CXX11_OVERRIDE + Regex* Create(const std::string& expr) override { return new TRERegex(expr); } @@ -85,7 +85,7 @@ class ModuleRegexTRE : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Regex Provider Module for TRE Regular Expressions", VF_VENDOR); } diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 4558e087a..e31a41c5c 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -58,12 +58,12 @@ class SQLite3Result : public SQL::Result { } - int Rows() CXX11_OVERRIDE + int Rows() override { return rows; } - bool GetRow(SQL::Row& result) CXX11_OVERRIDE + bool GetRow(SQL::Row& result) override { if (currentrow < rows) { @@ -78,12 +78,12 @@ class SQLite3Result : public SQL::Result } } - void GetCols(std::vector<std::string>& result) CXX11_OVERRIDE + void GetCols(std::vector<std::string>& result) override { result.assign(columns.begin(), columns.end()); } - bool HasColumn(const std::string& column, size_t& index) CXX11_OVERRIDE + bool HasColumn(const std::string& column, size_t& index) override { for (size_t i = 0; i < columns.size(); ++i) { @@ -172,13 +172,13 @@ class SQLConn : public SQL::Provider sqlite3_finalize(stmt); } - void Submit(SQL::Query* query, const std::string& q) CXX11_OVERRIDE + void Submit(SQL::Query* query, const std::string& q) override { Query(query, q); delete query; } - void Submit(SQL::Query* query, const std::string& q, const SQL::ParamList& p) CXX11_OVERRIDE + void Submit(SQL::Query* query, const std::string& q, const SQL::ParamList& p) override { std::string res; unsigned int param = 0; @@ -199,7 +199,7 @@ class SQLConn : public SQL::Provider Submit(query, res); } - void Submit(SQL::Query* query, const std::string& q, const SQL::ParamMap& p) CXX11_OVERRIDE + void Submit(SQL::Query* query, const std::string& q, const SQL::ParamMap& p) override { std::string res; for(std::string::size_type i = 0; i < q.length(); i++) @@ -248,7 +248,7 @@ class ModuleSQLite3 : public Module conns.clear(); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ClearConns(); ConfigTagList tags = ServerInstance->Config->ConfTags("database"); @@ -262,7 +262,7 @@ class ModuleSQLite3 : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("sqlite3 provider", VF_VENDOR); } diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index f5711cbd7..8317ed93d 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -1070,12 +1070,12 @@ info_done_dealloc: Handshake(sock); } - void OnStreamSocketClose(StreamSocket* user) CXX11_OVERRIDE + void OnStreamSocketClose(StreamSocket* user) override { CloseSession(); } - int OnStreamSocketRead(StreamSocket* user, std::string& recvq) CXX11_OVERRIDE + int OnStreamSocketRead(StreamSocket* user, std::string& recvq) override { // Finish handshake if needed int prepret = PrepareIO(user); @@ -1113,7 +1113,7 @@ info_done_dealloc: } } - int OnStreamSocketWrite(StreamSocket* user, StreamSocket::SendQueue& sendq) CXX11_OVERRIDE + int OnStreamSocketWrite(StreamSocket* user, StreamSocket::SendQueue& sendq) override { // Finish handshake if needed int prepret = PrepareIO(user); @@ -1176,7 +1176,7 @@ info_done_dealloc: return 1; } - void GetCiphersuite(std::string& out) const CXX11_OVERRIDE + void GetCiphersuite(std::string& out) const override { if (!IsHandshakeDone()) return; @@ -1186,7 +1186,7 @@ info_done_dealloc: out.append(UnknownIfNULL(gnutls_mac_get_name(gnutls_mac_get(sess)))); } - bool GetServerName(std::string& out) const CXX11_OVERRIDE + bool GetServerName(std::string& out) const override { std::vector<char> nameBuffer; size_t nameLength = 0; @@ -1245,12 +1245,12 @@ class GnuTLSIOHookProvider : public IOHookProvider ServerInstance->Modules->DelService(*this); } - void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE + void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override { new GnuTLSIOHook(this, sock, GNUTLS_SERVER); } - void OnConnect(StreamSocket* sock) CXX11_OVERRIDE + void OnConnect(StreamSocket* sock) override { new GnuTLSIOHook(this, sock, GNUTLS_CLIENT); } @@ -1345,14 +1345,14 @@ class ModuleSSLGnuTLS : public Module thismod = this; } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "GnuTLS lib version %s module was compiled for " GNUTLS_VERSION, gnutls_check_version(NULL)); ReadProfiles(); ServerInstance->GenRandom = RandGen::Call; } - void OnModuleRehash(User* user, const std::string ¶m) CXX11_OVERRIDE + void OnModuleRehash(User* user, const std::string ¶m) override { if(param != "ssl") return; @@ -1372,7 +1372,7 @@ class ModuleSSLGnuTLS : public Module ServerInstance->GenRandom = &InspIRCd::DefaultGenRandom; } - void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) override { if (type == ExtensionItem::EXT_USER) { @@ -1387,12 +1387,12 @@ class ModuleSSLGnuTLS : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides SSL support for clients", VF_VENDOR); } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { const GnuTLSIOHook* const iohook = static_cast<GnuTLSIOHook*>(user->eh.GetModHook(this)); if ((iohook) && (!iohook->IsHandshakeDone())) diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index 75b25fbc4..2786cd129 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -677,12 +677,12 @@ class mbedTLSIOHook : public SSLIOHook Handshake(sock); } - void OnStreamSocketClose(StreamSocket* sock) CXX11_OVERRIDE + void OnStreamSocketClose(StreamSocket* sock) override { CloseSession(); } - int OnStreamSocketRead(StreamSocket* sock, std::string& recvq) CXX11_OVERRIDE + int OnStreamSocketRead(StreamSocket* sock, std::string& recvq) override { // Finish handshake if needed int prepret = PrepareIO(sock); @@ -726,7 +726,7 @@ class mbedTLSIOHook : public SSLIOHook } } - int OnStreamSocketWrite(StreamSocket* sock, StreamSocket::SendQueue& sendq) CXX11_OVERRIDE + int OnStreamSocketWrite(StreamSocket* sock, StreamSocket::SendQueue& sendq) override { // Finish handshake if needed int prepret = PrepareIO(sock); @@ -778,7 +778,7 @@ class mbedTLSIOHook : public SSLIOHook return 1; } - void GetCiphersuite(std::string& out) const CXX11_OVERRIDE + void GetCiphersuite(std::string& out) const override { if (!IsHandshakeDone()) return; @@ -793,7 +793,7 @@ class mbedTLSIOHook : public SSLIOHook out.append(ciphersuitestr + skip); } - bool GetServerName(std::string& out) const CXX11_OVERRIDE + bool GetServerName(std::string& out) const override { // TODO: Implement SNI support. return false; @@ -820,12 +820,12 @@ class mbedTLSIOHookProvider : public IOHookProvider ServerInstance->Modules->DelService(*this); } - void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE + void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override { new mbedTLSIOHook(this, sock, true); } - void OnConnect(StreamSocket* sock) CXX11_OVERRIDE + void OnConnect(StreamSocket* sock) override { new mbedTLSIOHook(this, sock, false); } @@ -912,7 +912,7 @@ class ModuleSSLmbedTLS : public Module } public: - void init() CXX11_OVERRIDE + void init() override { char verbuf[16]; // Should be at least 9 bytes in size mbedtls_version_get_string(verbuf); @@ -923,7 +923,7 @@ class ModuleSSLmbedTLS : public Module ReadProfiles(); } - void OnModuleRehash(User* user, const std::string ¶m) CXX11_OVERRIDE + void OnModuleRehash(User* user, const std::string ¶m) override { if (param != "ssl") return; @@ -938,7 +938,7 @@ class ModuleSSLmbedTLS : public Module } } - void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) override { if (type != ExtensionItem::EXT_USER) return; @@ -952,7 +952,7 @@ class ModuleSSLmbedTLS : public Module } } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { const mbedTLSIOHook* const iohook = static_cast<mbedTLSIOHook*>(user->eh.GetModHook(this)); if ((iohook) && (!iohook->IsHandshakeDone())) @@ -960,7 +960,7 @@ class ModuleSSLmbedTLS : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides SSL support via mbedTLS (PolarSSL)", VF_VENDOR); } diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 5f61c71a9..125190c7d 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -695,12 +695,12 @@ class OpenSSLIOHook : public SSLIOHook Handshake(sock); } - void OnStreamSocketClose(StreamSocket* user) CXX11_OVERRIDE + void OnStreamSocketClose(StreamSocket* user) override { CloseSession(); } - int OnStreamSocketRead(StreamSocket* user, std::string& recvq) CXX11_OVERRIDE + int OnStreamSocketRead(StreamSocket* user, std::string& recvq) override { // Finish handshake if needed int prepret = PrepareIO(user); @@ -760,7 +760,7 @@ class OpenSSLIOHook : public SSLIOHook } } - int OnStreamSocketWrite(StreamSocket* user, StreamSocket::SendQueue& sendq) CXX11_OVERRIDE + int OnStreamSocketWrite(StreamSocket* user, StreamSocket::SendQueue& sendq) override { // Finish handshake if needed int prepret = PrepareIO(user); @@ -823,7 +823,7 @@ class OpenSSLIOHook : public SSLIOHook return 1; } - void GetCiphersuite(std::string& out) const CXX11_OVERRIDE + void GetCiphersuite(std::string& out) const override { if (!IsHandshakeDone()) return; @@ -831,7 +831,7 @@ class OpenSSLIOHook : public SSLIOHook out.append(SSL_get_cipher(sess)); } - bool GetServerName(std::string& out) const CXX11_OVERRIDE + bool GetServerName(std::string& out) const override { const char* name = SSL_get_servername(sess, TLSEXT_NAMETYPE_host_name); if (!name) @@ -914,12 +914,12 @@ class OpenSSLIOHookProvider : public IOHookProvider ServerInstance->Modules->DelService(*this); } - void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE + void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override { new OpenSSLIOHook(this, sock, profile.CreateServerSession()); } - void OnConnect(StreamSocket* sock) CXX11_OVERRIDE + void OnConnect(StreamSocket* sock) override { new OpenSSLIOHook(this, sock, profile.CreateClientSession()); } @@ -1010,7 +1010,7 @@ class ModuleSSLOpenSSL : public Module #endif } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "OpenSSL lib version \"%s\" module was compiled for \"" OPENSSL_VERSION_TEXT "\"", OpenSSL_version(OPENSSL_VERSION)); @@ -1023,7 +1023,7 @@ class ModuleSSLOpenSSL : public Module ReadProfiles(); } - void OnModuleRehash(User* user, const std::string ¶m) CXX11_OVERRIDE + void OnModuleRehash(User* user, const std::string ¶m) override { if (param != "ssl") return; @@ -1038,7 +1038,7 @@ class ModuleSSLOpenSSL : public Module } } - void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) override { if (type == ExtensionItem::EXT_USER) { @@ -1053,7 +1053,7 @@ class ModuleSSLOpenSSL : public Module } } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { const OpenSSLIOHook* const iohook = static_cast<OpenSSLIOHook*>(user->eh.GetModHook(this)); if ((iohook) && (!iohook->IsHandshakeDone())) @@ -1061,7 +1061,7 @@ class ModuleSSLOpenSSL : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides SSL support for clients", VF_VENDOR); } diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp index f5065c73f..4745a68af 100644 --- a/src/modules/m_abbreviation.cpp +++ b/src/modules/m_abbreviation.cpp @@ -28,17 +28,17 @@ enum class ModuleAbbreviation : public Module { public: - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_FIRST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords.",VF_VENDOR); } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { /* Command is already validated, has a length of 0, or last character is not a . */ if (validated || command.empty() || *command.rbegin() != '.') diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 3e00db765..99f362522 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -72,7 +72,7 @@ class ModuleAlias : public Module bool active; public: - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { AliasMap newAliases; ConfigTagList tags = ServerInstance->Config->ConfTags("alias"); @@ -111,7 +111,7 @@ class ModuleAlias : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides aliases of commands.", VF_VENDOR); } @@ -155,7 +155,7 @@ class ModuleAlias : public Module return message; } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { /* If theyre not registered yet, we dont want * to know. @@ -189,7 +189,7 @@ class ModuleAlias : public Module return MOD_RES_PASSTHRU; } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { // Don't echo anything which is caused by an alias. if (active) @@ -198,7 +198,7 @@ class ModuleAlias : public Module return MOD_RES_PASSTHRU; } - void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE + void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) override { if ((target.type != MessageTarget::TYPE_CHANNEL) || (details.type != MSG_PRIVMSG)) { @@ -378,7 +378,7 @@ class ModuleAlias : public Module active = false; } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { // Prioritise after spanningtree so that channel aliases show the alias before the effects. Module* linkmod = ServerInstance->Modules->Find("m_spanningtree.so"); diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp index 41edbc855..feb521f02 100644 --- a/src/modules/m_allowinvite.cpp +++ b/src/modules/m_allowinvite.cpp @@ -29,12 +29,12 @@ class ModuleAllowInvite : public Module { } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('A'); } - ModResult OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout) CXX11_OVERRIDE + ModResult OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout) override { if (IS_LOCAL(user)) { @@ -55,7 +55,7 @@ class ModuleAllowInvite : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for channel mode +A, allowing /invite freely on a channel and extban A to deny specific users it",VF_VENDOR); } diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp index 486ad1c18..218af1ab5 100644 --- a/src/modules/m_alltime.cpp +++ b/src/modules/m_alltime.cpp @@ -29,7 +29,7 @@ class CommandAlltime : public Command flags_needed = 'o'; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { const std::string fmtdate = InspIRCd::TimeString(ServerInstance->Time(), "%Y-%m-%d %H:%M:%S", true); @@ -41,7 +41,7 @@ class CommandAlltime : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_BCAST; } @@ -56,7 +56,7 @@ class Modulealltime : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Display timestamps from all servers connected to the network", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp index 6cb9b940b..efb3d091b 100644 --- a/src/modules/m_anticaps.cpp +++ b/src/modules/m_anticaps.cpp @@ -103,7 +103,7 @@ class AntiCapsMode : public ParamMode<AntiCapsMode, SimpleExtItem<AntiCapsSettin { } - ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) override { irc::sepstream stream(parameter, ':'); AntiCapsMethod method; @@ -183,7 +183,7 @@ class ModuleAntiCaps : public Module { } - void ReadConfig(ConfigStatus&) CXX11_OVERRIDE + void ReadConfig(ConfigStatus&) override { ConfigTag* tag = ServerInstance->Config->ConfValue("anticaps"); @@ -198,7 +198,7 @@ class ModuleAntiCaps : public Module lowercase.set(static_cast<unsigned char>(*iter)); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { // We only want to operate on messages from local users. if (!IS_LOCAL(user)) @@ -295,7 +295,7 @@ class ModuleAntiCaps : public Module return MOD_RES_DENY; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for punishing users that send capitalised messages.", VF_COMMON|VF_VENDOR); } diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index 818242795..b88f865f4 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -50,8 +50,8 @@ class JoinHook : public ClientProtocol::EventHook public: JoinHook(ModuleAuditorium* mod); - void OnEventInit(const ClientProtocol::Event& ev) CXX11_OVERRIDE; - ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) CXX11_OVERRIDE; + void OnEventInit(const ClientProtocol::Event& ev) override; + ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) override; }; } @@ -76,7 +76,7 @@ class ModuleAuditorium { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("auditorium"); OpsVisible = tag->getBool("opvisible"); @@ -84,7 +84,7 @@ class ModuleAuditorium OperCanSee = tag->getBool("opercansee", true); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_VENDOR); } @@ -118,7 +118,7 @@ class ModuleAuditorium return false; } - ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE + ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) override { if (IsVisible(memb)) return MOD_RES_PASSTHRU; @@ -144,17 +144,17 @@ class ModuleAuditorium } } - void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE + void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) override { BuildExcept(memb, excepts); } - void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) override { BuildExcept(memb, excepts); } - void OnBuildNeighborList(User* source, IncludeChanList& include, std::map<User*, bool>& exception) CXX11_OVERRIDE + void OnBuildNeighborList(User* source, IncludeChanList& include, std::map<User*, bool>& exception) override { for (IncludeChanList::iterator i = include.begin(); i != include.end(); ) { @@ -177,7 +177,7 @@ class ModuleAuditorium } } - ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE + ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) override { if (!memb) return MOD_RES_PASSTHRU; diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp index ffad7e0f1..bdf7162e7 100644 --- a/src/modules/m_autoop.cpp +++ b/src/modules/m_autoop.cpp @@ -42,7 +42,7 @@ class AutoOpList : public ListModeBase return mh ? mh->IsPrefixMode() : NULL; } - ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) CXX11_OVERRIDE + ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) override { std::string::size_type pos = parameter.find(':'); if (pos == 0 || pos == std::string::npos) @@ -80,7 +80,7 @@ class ModuleAutoOp : public Module { } - void OnPostJoin(Membership *memb) CXX11_OVERRIDE + void OnPostJoin(Membership *memb) override { if (!IS_LOCAL(memb->user)) return; @@ -105,12 +105,12 @@ class ModuleAutoOp : public Module } } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { mh.DoRehash(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the +w channel mode", VF_VENDOR); } diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index d9ceeaab1..5d55ad78d 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -54,12 +54,12 @@ class ModuleBanException : public Module { } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXCEPTS"] = ConvToStr(be.GetModeChar()); } - ModResult OnExtBanCheck(User *user, Channel *chan, char type) CXX11_OVERRIDE + ModResult OnExtBanCheck(User *user, Channel *chan, char type) override { ListModeBase::ModeList* list = be.GetList(chan); if (!list) @@ -80,7 +80,7 @@ class ModuleBanException : public Module return MOD_RES_PASSTHRU; } - ModResult OnCheckChannelBan(User* user, Channel* chan) CXX11_OVERRIDE + ModResult OnCheckChannelBan(User* user, Channel* chan) override { ListModeBase::ModeList* list = be.GetList(chan); if (!list) @@ -100,12 +100,12 @@ class ModuleBanException : public Module return MOD_RES_PASSTHRU; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { be.DoRehash(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the +e channel mode", VF_VENDOR); } diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 7246527d3..906653668 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -54,7 +54,7 @@ class BanRedirect : public ModeWatcher { } - bool BeforeMode(User* source, User* dest, Channel* channel, std::string& param, bool adding) CXX11_OVERRIDE + bool BeforeMode(User* source, User* dest, Channel* channel, std::string& param, bool adding) override { /* nick!ident@host -> nick!ident@host * nick!ident@host#chan -> nick!ident@host#chan @@ -254,7 +254,7 @@ class ModuleBanRedirect : public Module { } - void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) override { if (type == ExtensionItem::EXT_CHANNEL) { @@ -277,7 +277,7 @@ class ModuleBanRedirect : public Module } } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { if (chan) { @@ -344,7 +344,7 @@ class ModuleBanRedirect : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR); } diff --git a/src/modules/m_bcrypt.cpp b/src/modules/m_bcrypt.cpp index 59ee1556c..ec225de38 100644 --- a/src/modules/m_bcrypt.cpp +++ b/src/modules/m_bcrypt.cpp @@ -50,12 +50,12 @@ class BCryptProvider : public HashProvider return hash; } - std::string GenerateRaw(const std::string& data) CXX11_OVERRIDE + std::string GenerateRaw(const std::string& data) override { return Generate(data, Salt()); } - bool Compare(const std::string& input, const std::string& hash) CXX11_OVERRIDE + bool Compare(const std::string& input, const std::string& hash) override { std::string ret = Generate(input, hash); if (ret.empty()) @@ -66,7 +66,7 @@ class BCryptProvider : public HashProvider return false; } - std::string ToPrintable(const std::string& raw) CXX11_OVERRIDE + std::string ToPrintable(const std::string& raw) override { return raw; } @@ -87,13 +87,13 @@ class ModuleBCrypt : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* conf = ServerInstance->Config->ConfValue("bcrypt"); bcrypt.rounds = conf->getUInt("rounds", 10, 1); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements bcrypt hashing", VF_VENDOR); } diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index c4af2fd7f..ff9e361f2 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -58,12 +58,12 @@ class ModuleBlockAmsg : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("blockamsg"); ForgetDelay = tag->getDuration("delay", 3); @@ -81,7 +81,7 @@ class ModuleBlockAmsg : public Module action = IBLOCK_KILLOPERS; } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { // Don't do anything with unregistered users if (user->registered != REG_ALL) diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index fa780427c..386486f2e 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -39,12 +39,12 @@ public: { } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('B'); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (target.type == MessageTarget::TYPE_CHANNEL) { @@ -101,7 +101,7 @@ public: return MOD_RES_PASSTHRU; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps"); percent = tag->getUInt("percent", 100, 1, 100); @@ -118,7 +118,7 @@ public: uppercase.set(static_cast<unsigned char>(*iter)); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR); } diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp index 273d1204e..c16643877 100644 --- a/src/modules/m_blockcolor.cpp +++ b/src/modules/m_blockcolor.cpp @@ -36,12 +36,12 @@ class ModuleBlockColor : public Module { } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('c'); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user))) { @@ -67,7 +67,7 @@ class ModuleBlockColor : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides channel mode +c to block color",VF_VENDOR); } diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp index 1931666d1..1bb06e687 100644 --- a/src/modules/m_botmode.cpp +++ b/src/modules/m_botmode.cpp @@ -38,12 +38,12 @@ class ModuleBotMode : public Module, public Whois::EventListener { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides user mode +B to mark the user as a bot",VF_VENDOR); } - void OnWhois(Whois::Context& whois) CXX11_OVERRIDE + void OnWhois(Whois::Context& whois) override { if (whois.GetTarget()->IsModeSet(bm)) { diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 3810fcf32..c0cb92663 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -74,7 +74,7 @@ struct CallerIDExtInfo : public ExtensionItem { } - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE + std::string serialize(SerializeFormat format, const Extensible* container, void* item) const override { std::string ret; if (format != FORMAT_NETWORK) @@ -85,7 +85,7 @@ struct CallerIDExtInfo : public ExtensionItem return ret; } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) override { if (format == FORMAT_NETWORK) return; @@ -126,7 +126,7 @@ struct CallerIDExtInfo : public ExtensionItem return dat; } - void free(Extensible* container, void* item) CXX11_OVERRIDE + void free(Extensible* container, void* item) override { callerid_data* dat = static_cast<callerid_data*>(item); @@ -183,7 +183,7 @@ public: TRANSLATE1(TR_CUSTOM); } - void EncodeParameter(std::string& parameter, unsigned int index) CXX11_OVERRIDE + void EncodeParameter(std::string& parameter, unsigned int index) override { // Send lists as-is (part of 2.0 compat) if (parameter.find(',') != std::string::npos) @@ -202,7 +202,7 @@ public: * /accept nick1,nick2,nick3,* * to add 3 nicks and then show your list */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (CommandParser::LoopCall(user, this, parameters, 0)) return CMD_SUCCESS; @@ -235,7 +235,7 @@ public: return (RemoveAccept(user, action.first) ? CMD_SUCCESS : CMD_FAILURE); } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { // There is a list in parameters[0] in two cases: // Either when the source is remote, this happens because 2.0 servers send comma seperated uuid lists, @@ -337,7 +337,7 @@ class CallerIDAPIImpl : public CallerID::APIBase { } - bool IsOnAcceptList(User* source, User* target) CXX11_OVERRIDE + bool IsOnAcceptList(User* source, User* target) override { callerid_data* dat = ext.get(target, true); return dat->accepting.count(source); @@ -386,18 +386,18 @@ public: { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implementation of callerid, usermode +g, /accept", VF_COMMON | VF_VENDOR); } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["ACCEPT"] = ConvToStr(cmd.maxaccepts); tokens["CALLERID"] = ConvToStr(myumode.GetModeChar()); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (!IS_LOCAL(user) || target.type != MessageTarget::TYPE_USER) return MOD_RES_PASSTHRU; @@ -427,18 +427,18 @@ public: return MOD_RES_PASSTHRU; } - void OnUserPostNick(User* user, const std::string& oldnick) CXX11_OVERRIDE + void OnUserPostNick(User* user, const std::string& oldnick) override { if (!tracknick) RemoveFromAllAccepts(user); } - void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) CXX11_OVERRIDE + void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) override { RemoveFromAllAccepts(user); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("callerid"); cmd.maxaccepts = tag->getUInt("maxaccepts", 30); @@ -446,7 +446,7 @@ public: notify_cooldown = tag->getDuration("cooldown", 60); } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { // Want to be after modules like silence or services_account ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST); diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp index 922061757..838f6abe0 100644 --- a/src/modules/m_cap.cpp +++ b/src/modules/m_cap.cpp @@ -86,7 +86,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener throw ModuleException("Too many caps"); } - void OnReloadModuleSave(Module* mod, ReloadModule::CustomData& cd) CXX11_OVERRIDE + void OnReloadModuleSave(Module* mod, ReloadModule::CustomData& cd) override { ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "OnReloadModuleSave()"); if (mod == creator) @@ -117,7 +117,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener } } - void OnReloadModuleRestore(Module* mod, void* data) CXX11_OVERRIDE + void OnReloadModuleRestore(Module* mod, void* data) override { CapModData* capmoddata = static_cast<CapModData*>(data); for (std::vector<CapModData::Data>::const_iterator i = capmoddata->caps.begin(); i != capmoddata->caps.end(); ++i) @@ -166,7 +166,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener } } - void AddCap(Cap::Capability* cap) CXX11_OVERRIDE + void AddCap(Cap::Capability* cap) override { // No-op if the cap is already registered. // This allows modules to call SetActive() on a cap without checking if it's active first. @@ -182,7 +182,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener FOREACH_MOD_CUSTOM(evprov, Cap::EventListener, OnCapAddDel, (cap, true)); } - void DelCap(Cap::Capability* cap) CXX11_OVERRIDE + void DelCap(Cap::Capability* cap) override { // No-op if the cap is not registered, see AddCap() above if (!cap->IsRegistered()) @@ -206,7 +206,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener caps.erase(cap->GetName()); } - Capability* Find(const std::string& capname) const CXX11_OVERRIDE + Capability* Find(const std::string& capname) const override { CapMap::const_iterator it = caps.find(capname); if (it != caps.end()) @@ -214,7 +214,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener return NULL; } - void NotifyValueChange(Capability* cap) CXX11_OVERRIDE + void NotifyValueChange(Capability* cap) override { ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cap %s changed value", cap->GetName().c_str()); FOREACH_MOD_CUSTOM(evprov, Cap::EventListener, OnCapValueChange, (cap)); @@ -385,7 +385,7 @@ class CommandCap : public SplitCommand works_before_reg = true; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { if (user->registered != REG_ALL) holdext.set(user, 1); @@ -442,12 +442,12 @@ class ModuleCap : public Module { } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { return (cmd.holdext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for CAP capability negotiation", VF_VENDOR); } diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 3cdbbbdfb..724ebc10f 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -45,17 +45,17 @@ public: } // XXX I shouldn't have to define this - bool Matches(User* u) CXX11_OVERRIDE + bool Matches(User* u) override { return false; } - bool Matches(const std::string& s) CXX11_OVERRIDE + bool Matches(const std::string& s) override { return irc::equals(matchtext, s); } - const std::string& Displayable() CXX11_OVERRIDE + const std::string& Displayable() override { return matchtext; } @@ -70,12 +70,12 @@ class CBanFactory : public XLineFactory /** Generate a CBAN */ - XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) override { return new CBan(set_time, duration, source, reason, xline_specific_mask); } - bool AutoApplyToUserList(XLine* x) CXX11_OVERRIDE + bool AutoApplyToUserList(XLine* x) override { return false; // No, we apply to channels. } @@ -91,7 +91,7 @@ class CommandCBan : public Command flags_needed = 'o'; this->syntax = "<channel> [<duration> :<reason>]"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { /* syntax: CBAN #channel time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ @@ -143,7 +143,7 @@ class CommandCBan : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { if (IS_LOCAL(user)) return ROUTE_LOCALONLY; // spanningtree will send ADDLINE @@ -164,7 +164,7 @@ class ModuleCBan : public Module, public Stats::EventListener { } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->XLines->RegisterFactory(&f); } @@ -175,7 +175,7 @@ class ModuleCBan : public Module, public Stats::EventListener ServerInstance->XLines->UnregisterFactory(&f); } - ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE + ModResult OnStats(Stats::Context& stats) override { if (stats.GetSymbol() != 'C') return MOD_RES_PASSTHRU; @@ -184,7 +184,7 @@ class ModuleCBan : public Module, public Stats::EventListener return MOD_RES_DENY; } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname); @@ -200,7 +200,7 @@ class ModuleCBan : public Module, public Stats::EventListener return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Gives /cban, aka C-lines. Think Q-lines, for channels.", VF_COMMON | VF_VENDOR); } diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index 31309ed2f..838c8e77a 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -41,7 +41,7 @@ class ModuleCensor : public Module } // format of a config entry is <badword text="shit" replace="poo"> - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; @@ -98,7 +98,7 @@ class ModuleCensor : public Module return MOD_RES_PASSTHRU; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { /* * reload our config file on rehash - we must destroy and re-allocate the classes @@ -120,7 +120,7 @@ class ModuleCensor : public Module censors.swap(newcensors); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides user and channel +G mode",VF_VENDOR); } diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index df8201bde..55129b78e 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -135,7 +135,7 @@ class CommandWebIRC : public SplitCommand this->syntax = "<password> <gateway> <hostname> <ip> [flags]"; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { if (user->registered == REG_ALL || realhost.get(user)) return CMD_FAILURE; @@ -269,12 +269,12 @@ class ModuleCgiIRC { } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->SNO->EnableSnomask('w', "CGIIRC"); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { std::vector<IdentHost> identhosts; std::vector<WebIRCHost> webirchosts; @@ -323,7 +323,7 @@ class ModuleCgiIRC cmd.notify = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true); } - ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) override { // If <connect:webirc> is not set then we have nothing to do. const std::string webirc = myclass->config->getString("webirc"); @@ -341,7 +341,7 @@ class ModuleCgiIRC return InspIRCd::Match(*gateway, webirc) ? MOD_RES_PASSTHRU : MOD_RES_DENY; } - ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE + ModResult OnUserRegister(LocalUser* user) override { // There is no need to check for gateways if one is already being used. if (cmd.realhost.get(user)) @@ -374,7 +374,7 @@ class ModuleCgiIRC return MOD_RES_PASSTHRU; } - void OnWebIRCAuth(LocalUser* user, const WebIRC::FlagMap* flags) CXX11_OVERRIDE + void OnWebIRCAuth(LocalUser* user, const WebIRC::FlagMap* flags) override { // We are only interested in connection flags. If none have been // given then we have nothing to do. @@ -434,7 +434,7 @@ class ModuleCgiIRC } } - void OnWhois(Whois::Context& whois) CXX11_OVERRIDE + void OnWhois(Whois::Context& whois) override { if (!whois.IsSelfWhois() && !whois.GetSource()->HasPrivPermission("users/auspex")) return; @@ -452,7 +452,7 @@ class ModuleCgiIRC whois.SendLine(RPL_WHOISGATEWAY, *realhost, *realip, "is connected via an ident gateway"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Enables forwarding the real IP address of a user from a gateway to the IRC server", VF_VENDOR); } diff --git a/src/modules/m_chancreate.cpp b/src/modules/m_chancreate.cpp index 6cf4af235..d6dd36bd3 100644 --- a/src/modules/m_chancreate.cpp +++ b/src/modules/m_chancreate.cpp @@ -24,17 +24,17 @@ class ModuleChanCreate : public Module { public: - void init() CXX11_OVERRIDE + void init() override { ServerInstance->SNO->EnableSnomask('j', "CHANCREATE"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides snomasks 'j' and 'J', to which notices about newly created channels are sent",VF_VENDOR); } - void OnUserJoin(Membership* memb, bool sync, bool created, CUList& except) CXX11_OVERRIDE + void OnUserJoin(Membership* memb, bool sync, bool created, CUList& except) override { if ((created) && (IS_LOCAL(memb->user))) { diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index 051b8c60d..c2a53a8d8 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -39,7 +39,7 @@ class ChanFilter : public ListModeBase { } - bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE + bool ValidateParam(User* user, Channel* chan, std::string& word) override { if (word.length() > maxlen) { @@ -66,7 +66,7 @@ class ModuleChanFilter : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("chanfilter"); hidemask = tag->getBool("hidemask"); @@ -75,7 +75,7 @@ class ModuleChanFilter : public Module cf.DoRehash(); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (target.type != MessageTarget::TYPE_CHANNEL) return MOD_RES_PASSTHRU; @@ -112,7 +112,7 @@ class ModuleChanFilter : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { // We don't send any link data if the length is 35 for compatibility with the 2.0 branch. std::string maxfilterlen; diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp index 1057e63b6..ef52a9447 100644 --- a/src/modules/m_chanhistory.cpp +++ b/src/modules/m_chanhistory.cpp @@ -55,7 +55,7 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> > { } - ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) override { std::string::size_type colon = parameter.find(':'); if (colon == std::string::npos) @@ -130,7 +130,7 @@ class ModuleChanHistory { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory"); m.maxlines = tag->getUInt("maxlines", 50, 1); @@ -138,12 +138,12 @@ class ModuleChanHistory dobots = tag->getBool("bots", true); } - ModResult OnBroadcastMessage(Channel* channel, const Server* server) CXX11_OVERRIDE + ModResult OnBroadcastMessage(Channel* channel, const Server* server) override { return channel->IsModeSet(m) ? MOD_RES_ALLOW : MOD_RES_PASSTHRU; } - void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE + void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) override { if ((target.type == MessageTarget::TYPE_CHANNEL) && (target.status == 0) && (details.type == MSG_PRIVMSG)) { @@ -158,7 +158,7 @@ class ModuleChanHistory } } - void OnPostJoin(Membership* memb) CXX11_OVERRIDE + void OnPostJoin(Membership* memb) override { LocalUser* localuser = IS_LOCAL(memb->user); if (!localuser) @@ -205,7 +205,7 @@ class ModuleChanHistory batchmanager->End(batch); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides channel history replayed on join", VF_VENDOR); } diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp index afe213f61..c7b288818 100644 --- a/src/modules/m_chanlog.cpp +++ b/src/modules/m_chanlog.cpp @@ -29,7 +29,7 @@ class ModuleChanLog : public Module ChanLogTargets logstreams; public: - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { std::string snomasks; std::string channel; @@ -56,7 +56,7 @@ class ModuleChanLog : public Module } - ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg) CXX11_OVERRIDE + ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg) override { std::pair<ChanLogTargets::const_iterator, ChanLogTargets::const_iterator> itpair = logstreams.equal_range(sno); if (itpair.first == itpair.second) @@ -78,7 +78,7 @@ class ModuleChanLog : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Logs snomask output to channel(s).", VF_VENDOR); } diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp index b3a882c20..0da3aa579 100644 --- a/src/modules/m_channames.cpp +++ b/src/modules/m_channames.cpp @@ -56,7 +56,7 @@ class ModuleChannelNames : public Module { } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->IsChannel = NewIsChannelHandler::Call; } @@ -98,7 +98,7 @@ class ModuleChannelNames : public Module badchan = false; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("channames"); std::string denyToken = tag->getString("denyrange"); @@ -128,7 +128,7 @@ class ModuleChannelNames : public Module ValidateChans(); } - void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except_list) CXX11_OVERRIDE + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except_list) override { if (badchan) { @@ -139,14 +139,14 @@ class ModuleChannelNames : public Module } } - CullResult cull() CXX11_OVERRIDE + CullResult cull() override { ServerInstance->IsChannel = rememberer; ValidateChans(); return Module::cull(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements config tags which allow changing characters allowed in channel names", VF_VENDOR); } diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp index ffb43eef1..61ca9cf1e 100644 --- a/src/modules/m_channelban.cpp +++ b/src/modules/m_channelban.cpp @@ -23,12 +23,12 @@ class ModuleBadChannelExtban : public Module { public: - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Extban 'j' - channel status/join ban", VF_OPTCOMMON|VF_VENDOR); } - ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) override { if ((mask.length() > 2) && (mask[0] == 'j') && (mask[1] == ':')) { @@ -52,7 +52,7 @@ class ModuleBadChannelExtban : public Module return MOD_RES_PASSTHRU; } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('j'); } diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 1d030acc6..ca9541176 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -140,7 +140,7 @@ class CommandCheck : public Command return ret; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName) return CMD_SUCCESS; @@ -301,7 +301,7 @@ class CommandCheck : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { if ((parameters.size() > 1) && (parameters[1].find('.') != std::string::npos)) return ROUTE_OPT_UCAST(parameters[1]); @@ -317,7 +317,7 @@ class ModuleCheck : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("CHECK command, view user, channel, IP address or hostname information", VF_VENDOR|VF_OPTCOMMON); } diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index 6e498a8be..bddcc783c 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -37,7 +37,7 @@ class CommandChghost : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (parameters[1].length() > ServerInstance->Config->Limits.MaxHost) { @@ -75,7 +75,7 @@ class CommandChghost : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -92,7 +92,7 @@ class ModuleChgHost : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789"); @@ -101,7 +101,7 @@ class ModuleChgHost : public Module cmd.hostmap.set(static_cast<unsigned char>(*n)); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index 9a2d3b2ea..d5f70eaf7 100644 --- a/src/modules/m_chgident.cpp +++ b/src/modules/m_chgident.cpp @@ -35,7 +35,7 @@ class CommandChgident : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* dest = ServerInstance->FindNick(parameters[0]); @@ -68,7 +68,7 @@ class CommandChgident : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -83,7 +83,7 @@ public: { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index aedd75d94..17fcf9c4b 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -33,7 +33,7 @@ class CommandChgname : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* dest = ServerInstance->FindNick(parameters[0]); @@ -64,7 +64,7 @@ class CommandChgname : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -79,7 +79,7 @@ public: { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the CHGNAME command", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_classban.cpp b/src/modules/m_classban.cpp index 066834079..3e268d794 100644 --- a/src/modules/m_classban.cpp +++ b/src/modules/m_classban.cpp @@ -22,7 +22,7 @@ class ModuleClassBan : public Module { public: - ModResult OnCheckBan(User* user, Channel* c, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User* user, Channel* c, const std::string& mask) override { LocalUser* localUser = IS_LOCAL(user); if ((localUser) && (mask.length() > 2) && (mask[0] == 'n') && (mask[1] == ':')) @@ -33,12 +33,12 @@ class ModuleClassBan : public Module return MOD_RES_PASSTHRU; } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('n'); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Class 'n' - Connection class ban", VF_VENDOR | VF_OPTCOMMON); } diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp index dec49866c..41c681cf5 100644 --- a/src/modules/m_clearchan.cpp +++ b/src/modules/m_clearchan.cpp @@ -35,7 +35,7 @@ class CommandClearChan : public Command force_manual_route = true; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { Channel* chan = activechan = ServerInstance->FindChan(parameters[0]); if (!chan) @@ -150,13 +150,13 @@ class ModuleClearChan : public Module { } - void init() CXX11_OVERRIDE + void init() override { // Only attached while we are working; don't react to events otherwise ServerInstance->Modules->DetachAll(this); } - void OnBuildNeighborList(User* source, IncludeChanList& include, std::map<User*, bool>& exception) CXX11_OVERRIDE + void OnBuildNeighborList(User* source, IncludeChanList& include, std::map<User*, bool>& exception) override { bool found = false; for (IncludeChanList::iterator i = include.begin(); i != include.end(); ++i) @@ -196,7 +196,7 @@ class ModuleClearChan : public Module } } - void OnUserKick(User* source, Membership* memb, const std::string& reason, CUList& excepts) CXX11_OVERRIDE + void OnUserKick(User* source, Membership* memb, const std::string& reason, CUList& excepts) override { // Hide the KICK from all non-opers User* leaving = memb->user; @@ -209,7 +209,7 @@ class ModuleClearChan : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Adds /CLEARCHAN that allows opers to masskick, masskill or mass G/Z-line users on a channel.", VF_VENDOR|VF_OPTCOMMON); } diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index 3b00d3347..bf96216c3 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -90,7 +90,7 @@ class CloakUser : public ModeHandler { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override { LocalUser* user = IS_LOCAL(dest); @@ -171,7 +171,7 @@ class CommandCloak : public Command syntax = "<host>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; class ModuleCloaking : public Module @@ -326,7 +326,7 @@ class ModuleCloaking : public Module return rv; } - ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) override { LocalUser* lu = IS_LOCAL(user); if (!lu) @@ -354,7 +354,7 @@ class ModuleCloaking : public Module return MOD_RES_PASSTHRU; } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { /* Needs to be after m_banexception etc. */ ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIORITY_LAST); @@ -362,7 +362,7 @@ class ModuleCloaking : public Module // this unsets umode +x on every host change. If we are actually doing a +x // mode change, we will call SetMode back to true AFTER the host change is done. - void OnChangeHost(User* u, const std::string& host) CXX11_OVERRIDE + void OnChangeHost(User* u, const std::string& host) override { if (u->IsModeSet(cu) && !cu.active) { @@ -378,7 +378,7 @@ class ModuleCloaking : public Module cu.active = false; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { std::string testcloak = "broken"; if (Hash && !cloaks.empty()) @@ -404,7 +404,7 @@ class ModuleCloaking : public Module return Version("Provides masking of user hostnames", VF_COMMON|VF_VENDOR, testcloak); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTagList tags = ServerInstance->Config->ConfTags("cloak"); if (tags.first == tags.second) @@ -466,7 +466,7 @@ class ModuleCloaking : public Module return chost; } - void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE + void OnSetUserIP(LocalUser* user) override { // Connecting users are handled in OnUserConnect not here. if (user->registered != REG_ALL) @@ -484,7 +484,7 @@ class ModuleCloaking : public Module } } - void OnUserConnect(LocalUser* dest) CXX11_OVERRIDE + void OnUserConnect(LocalUser* dest) override { if (cu.ext.get(dest)) return; diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp index 06956c564..69219124e 100644 --- a/src/modules/m_clones.cpp +++ b/src/modules/m_clones.cpp @@ -44,7 +44,7 @@ class CommandClones : public SplitCommand syntax = "<limit>"; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { unsigned int limit = ConvToNum<unsigned int>(parameters[0]); @@ -94,7 +94,7 @@ class ModuleClones : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the /CLONES command to retrieve information on clones.", VF_VENDOR); } diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp index b0b45b4b6..ae1d42d62 100644 --- a/src/modules/m_close.cpp +++ b/src/modules/m_close.cpp @@ -31,7 +31,7 @@ class CommandClose : public Command flags_needed = 'o'; } - CmdResult Handle(User* src, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* src, const Params& parameters) override { std::map<std::string,int> closed; @@ -74,7 +74,7 @@ class ModuleClose : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides /CLOSE functionality", VF_VENDOR); } diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp index 4cef93029..a1ba25007 100644 --- a/src/modules/m_commonchans.cpp +++ b/src/modules/m_commonchans.cpp @@ -28,12 +28,12 @@ class ModulePrivacyMode : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Adds user mode +c, which if set, users must be on a common channel with you to private message you", VF_VENDOR); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (target.type == MessageTarget::TYPE_USER) { diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp index 7a06aedd3..585d71925 100644 --- a/src/modules/m_conn_join.cpp +++ b/src/modules/m_conn_join.cpp @@ -49,7 +49,7 @@ class JoinTimer : public Timer ServerInstance->Timers.AddTimer(this); } - bool Tick(time_t time) CXX11_OVERRIDE + bool Tick(time_t time) override { if (user->chans.empty()) JoinChannels(user, channels); @@ -71,24 +71,24 @@ class ModuleConnJoin : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("autojoin"); defchans = tag->getString("channel"); defdelay = tag->getDuration("delay", 0, 0, 60); } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR); } - void OnPostConnect(User* user) CXX11_OVERRIDE + void OnPostConnect(User* user) override { LocalUser* localuser = IS_LOCAL(user); if (!localuser) diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp index 3132aed40..7e53a7a2f 100644 --- a/src/modules/m_conn_umodes.cpp +++ b/src/modules/m_conn_umodes.cpp @@ -25,18 +25,18 @@ class ModuleModesOnConnect : public Module { public: - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { // for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR); } - void OnUserConnect(LocalUser* user) CXX11_OVERRIDE + void OnUserConnect(LocalUser* user) override { ConfigTag* tag = user->MyClass->config; std::string ThisModes = tag->getString("modes"); diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp index f2e9590c8..d1caec375 100644 --- a/src/modules/m_conn_waitpong.cpp +++ b/src/modules/m_conn_waitpong.cpp @@ -36,14 +36,14 @@ class ModuleWaitPong : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("waitpong"); sendsnotice = tag->getBool("sendsnotice", true); killonbadreply = tag->getBool("killonbadreply", true); } - ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE + ModResult OnUserRegister(LocalUser* user) override { std::string pingrpl = ServerInstance->GenRandomStr(10); { @@ -58,7 +58,7 @@ class ModuleWaitPong : public Module return MOD_RES_PASSTHRU; } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { if (command == "PONG") { @@ -82,12 +82,12 @@ class ModuleWaitPong : public Module return MOD_RES_PASSTHRU; } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Require pong prior to registration", VF_VENDOR); } diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp index 20121f5f9..6a880f827 100644 --- a/src/modules/m_connectban.cpp +++ b/src/modules/m_connectban.cpp @@ -31,12 +31,12 @@ class ModuleConnectBan : public Module std::string banmessage; public: - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Throttles the connections of IP ranges who try to connect flood.", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("connectban"); @@ -47,7 +47,7 @@ class ModuleConnectBan : public Module banmessage = tag->getString("banmessage", "Your IP range has been attempting to connect too many times in too short a duration. Wait a while, and you will be able to connect."); } - void OnSetUserIP(LocalUser* u) CXX11_OVERRIDE + void OnSetUserIP(LocalUser* u) override { if (u->exempt) return; @@ -95,7 +95,7 @@ class ModuleConnectBan : public Module } } - void OnGarbageCollect() CXX11_OVERRIDE + void OnGarbageCollect() override { ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Clearing map."); connects.clear(); diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp index 5070dd3a7..a7c4b2b37 100644 --- a/src/modules/m_connflood.cpp +++ b/src/modules/m_connflood.cpp @@ -38,12 +38,12 @@ public: { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Connection throttle", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { /* read configuration variables */ ConfigTag* tag = ServerInstance->Config->ConfValue("connflood"); @@ -59,7 +59,7 @@ public: first = ServerInstance->Time(); } - ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE + ModResult OnUserRegister(LocalUser* user) override { if (user->exempt) return MOD_RES_PASSTHRU; diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp index befc9750d..d2f33de43 100644 --- a/src/modules/m_customprefix.cpp +++ b/src/modules/m_customprefix.cpp @@ -43,7 +43,7 @@ class ModuleCustomPrefix : public Module { std::vector<CustomPrefixMode*> modes; public: - void init() CXX11_OVERRIDE + void init() override { ConfigTagList tags = ServerInstance->Config->ConfTags("customprefix"); for (ConfigIter iter = tags.first; iter != tags.second; ++iter) @@ -101,7 +101,7 @@ class ModuleCustomPrefix : public Module stdalgo::delete_all(modes); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides custom prefix channel modes", VF_VENDOR); } diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 2dd378062..6b81a7932 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -77,7 +77,7 @@ class CommandTitle : public Command syntax = "<user> <password>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { MatchingConfigs matching = configs.equal_range(parameters[0]); @@ -116,7 +116,7 @@ class ModuleCustomTitle : public Module, public Whois::LineEventListener { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTagList tags = ServerInstance->Config->ConfTags("title"); CustomVhostMap newtitles; @@ -142,7 +142,7 @@ class ModuleCustomTitle : public Module, public Whois::LineEventListener } // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games. - ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE + ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) override { /* We use this and not OnWhois because this triggers for remote, too */ if (numeric.GetNumeric() == 312) @@ -158,7 +158,7 @@ class ModuleCustomTitle : public Module, public Whois::LineEventListener return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Custom Title for users", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp index 3ead72a45..e9c9580e5 100644 --- a/src/modules/m_cycle.cpp +++ b/src/modules/m_cycle.cpp @@ -31,7 +31,7 @@ class CommandCycle : public SplitCommand Penalty = 3; syntax = "<channel> :[reason]"; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { Channel* channel = ServerInstance->FindChan(parameters[0]); std::string reason = "Cycling"; @@ -82,7 +82,7 @@ class ModuleCycle : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides command CYCLE, acts as a server-side HOP command to part and rejoin a channel.", VF_VENDOR); } diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index d9e26d28f..94ddcce02 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -115,7 +115,7 @@ class CommandDccallow : public Command /* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */ } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { /* syntax: DCCALLOW [+|-]<nick> (<time>) */ if (!parameters.size()) @@ -256,7 +256,7 @@ class CommandDccallow : public Command return CMD_FAILURE; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_BROADCAST; } @@ -307,7 +307,7 @@ class ModuleDCCAllow : public Module { } - void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) CXX11_OVERRIDE + void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) override { dccallowlist* udl = ext.get(user); @@ -320,12 +320,12 @@ class ModuleDCCAllow : public Module RemoveNick(user); } - void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE + void OnUserPostNick(User* user, const std::string &oldnick) override { RemoveNick(user); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; @@ -507,7 +507,7 @@ class ModuleDCCAllow : public Module } } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { bannedfilelist newbfl; ConfigTagList tags = ServerInstance->Config->ConfTags("banfile"); @@ -527,7 +527,7 @@ class ModuleDCCAllow : public Module defaultaction = tag->getString("action"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the /DCCALLOW command", VF_COMMON | VF_VENDOR); } diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp index e58d130a5..8aef18ad2 100644 --- a/src/modules/m_deaf.cpp +++ b/src/modules/m_deaf.cpp @@ -28,7 +28,7 @@ class User_d : public ModeHandler public: User_d(Module* Creator) : ModeHandler(Creator, "deaf", 'd', PARAM_NONE, MODETYPE_USER) { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override { if (adding == dest->IsModeSet(this)) return MODEACTION_DENY; @@ -53,14 +53,14 @@ class ModuleDeaf : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("deaf"); deaf_bypasschars = tag->getString("bypasschars"); deaf_bypasschars_uline = tag->getString("bypasscharsuline"); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (target.type != MessageTarget::TYPE_CHANNEL) return MOD_RES_PASSTHRU; @@ -101,7 +101,7 @@ class ModuleDeaf : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides usermode +d to block channel messages and channel notices", VF_VENDOR); } diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index 8b06f060a..8afb27c92 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -35,7 +35,7 @@ class DelayJoinMode : public ModeHandler ranktoset = ranktounset = OP_VALUE; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE; + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override; void RevealUser(User* user, Channel* chan); }; @@ -59,7 +59,7 @@ class JoinHook : public ClientProtocol::EventHook { } - ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) CXX11_OVERRIDE + ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) override { const ClientProtocol::Events::Join& join = static_cast<const ClientProtocol::Events::Join&>(ev); const Membership* const memb = join.GetMember(); @@ -86,15 +86,15 @@ class ModuleDelayJoin : public Module { } - Version GetVersion() CXX11_OVERRIDE; - ModResult OnNamesListItem(User* issuer, Membership*, std::string& prefixes, std::string& nick) CXX11_OVERRIDE; - void OnUserJoin(Membership*, bool, bool, CUList&) CXX11_OVERRIDE; + Version GetVersion() override; + ModResult OnNamesListItem(User* issuer, Membership*, std::string& prefixes, std::string& nick) override; + void OnUserJoin(Membership*, bool, bool, CUList&) override; void CleanUser(User* user); - void OnUserPart(Membership*, std::string &partmessage, CUList&) CXX11_OVERRIDE; - void OnUserKick(User* source, Membership*, const std::string &reason, CUList&) CXX11_OVERRIDE; - void OnBuildNeighborList(User* source, IncludeChanList& include, std::map<User*, bool>& exception) CXX11_OVERRIDE; - void OnUserMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE; - ModResult OnRawMode(User* user, Channel* channel, ModeHandler* mh, const std::string& param, bool adding) CXX11_OVERRIDE; + void OnUserPart(Membership*, std::string &partmessage, CUList&) override; + void OnUserKick(User* source, Membership*, const std::string &reason, CUList&) override; + void OnBuildNeighborList(User* source, IncludeChanList& include, std::map<User*, bool>& exception) override; + void OnUserMessage(User* user, const MessageTarget& target, const MessageDetails& details) override; + ModResult OnRawMode(User* user, Channel* channel, ModeHandler* mh, const std::string& param, bool adding) override; }; ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp index f13ea48ea..a83e2cf63 100644 --- a/src/modules/m_delaymsg.cpp +++ b/src/modules/m_delaymsg.cpp @@ -30,13 +30,13 @@ class DelayMsgMode : public ParamMode<DelayMsgMode, LocalIntExt> ranktoset = ranktounset = OP_VALUE; } - bool ResolveModeConflict(std::string& their_param, const std::string& our_param, Channel*) CXX11_OVERRIDE + bool ResolveModeConflict(std::string& their_param, const std::string& our_param, Channel*) override { return (atoi(their_param.c_str()) < atoi(our_param.c_str())); } - ModeAction OnSet(User* source, Channel* chan, std::string& parameter) CXX11_OVERRIDE; - void OnUnset(User* source, Channel* chan) CXX11_OVERRIDE; + ModeAction OnSet(User* source, Channel* chan, std::string& parameter) override; + void OnUnset(User* source, Channel* chan) override; void SerializeParam(Channel* chan, intptr_t n, std::string& out) { @@ -53,10 +53,10 @@ class ModuleDelayMsg : public Module { } - Version GetVersion() CXX11_OVERRIDE; - void OnUserJoin(Membership* memb, bool sync, bool created, CUList&) CXX11_OVERRIDE; - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE; - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE; + Version GetVersion() override; + void OnUserJoin(Membership* memb, bool sync, bool created, CUList&) override; + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override; + void ReadConfig(ConfigStatus& status) override; }; ModeAction DelayMsgMode::OnSet(User* source, Channel* chan, std::string& parameter) diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp index cc4172529..df8c0e8a0 100644 --- a/src/modules/m_denychans.cpp +++ b/src/modules/m_denychans.cpp @@ -63,7 +63,7 @@ class ModuleDenyChannels : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { GoodChannels goodchans; ConfigTagList tags = ServerInstance->Config->ConfTags("goodchan"); @@ -135,13 +135,13 @@ class ModuleDenyChannels : public Module goodchannels.swap(goodchans); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements config tags which allow blocking of joins to channels", VF_VENDOR); } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { for (BadChannels::const_iterator j = badchannels.begin(); j != badchannels.end(); ++j) { diff --git a/src/modules/m_disable.cpp b/src/modules/m_disable.cpp index 203f9ee64..c45d47d7d 100644 --- a/src/modules/m_disable.cpp +++ b/src/modules/m_disable.cpp @@ -77,7 +77,7 @@ class ModuleDisable : public Module } public: - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("disabled"); @@ -121,7 +121,7 @@ class ModuleDisable : public Module notifyopers = tag->getBool("notifyopers"); } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { // If a command is unvalidated or the source is not registered we do nothing. if (!validated || user->registered != REG_ALL) @@ -149,7 +149,7 @@ class ModuleDisable : public Module return MOD_RES_DENY; } - ModResult OnRawMode(User* user, Channel* chan, ModeHandler* mh, const std::string& param, bool adding) CXX11_OVERRIDE + ModResult OnRawMode(User* user, Channel* chan, ModeHandler* mh, const std::string& param, bool adding) override { // If a mode change is remote or the source is not registered we do nothing. if (!IS_LOCAL(user) || user->registered != REG_ALL) @@ -180,7 +180,7 @@ class ModuleDisable : public Module return MOD_RES_DENY; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for disabling commands and modes", VF_VENDOR); } diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index eade39bd7..9597922da 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -60,7 +60,7 @@ class DNSBLResolver : public DNS::Request } /* Note: This may be called multiple times for multiple A record results */ - void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE + void OnLookupComplete(const DNS::Query *r) override { /* Check the user still exists */ LocalUser* them = (LocalUser*)ServerInstance->FindUUID(theiruid); @@ -207,7 +207,7 @@ class DNSBLResolver : public DNS::Request ConfEntry->stats_misses++; } - void OnError(const DNS::Query *q) CXX11_OVERRIDE + void OnError(const DNS::Query *q) override { LocalUser* them = (LocalUser*)ServerInstance->FindUUID(theiruid); if (!them) @@ -264,19 +264,19 @@ class ModuleDNSBL : public Module, public Stats::EventListener { } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->SNO->EnableSnomask('d', "DNSBL"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides handling of DNS blacklists", VF_VENDOR); } /** Fill our conf vector with data */ - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { DNSBLConfList newentries; @@ -346,7 +346,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener DNSBLConfEntries.swap(newentries); } - void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE + void OnSetUserIP(LocalUser* user) override { if ((user->exempt) || !DNS) return; @@ -415,7 +415,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener } } - ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) override { std::string dnsbl; if (!myclass->config->readString("dnsbl", dnsbl)) @@ -431,14 +431,14 @@ class ModuleDNSBL : public Module, public Stats::EventListener return MOD_RES_DENY; } - ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser *user) override { if (countExt.get(user)) return MOD_RES_DENY; return MOD_RES_PASSTHRU; } - ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE + ModResult OnStats(Stats::Context& stats) override { if (stats.GetSymbol() != 'd') return MOD_RES_PASSTHRU; diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp index a7f86cdb5..8f40ee8fb 100644 --- a/src/modules/m_exemptchanops.cpp +++ b/src/modules/m_exemptchanops.cpp @@ -31,7 +31,7 @@ class ExemptChanOps : public ListModeBase { } - bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE + bool ValidateParam(User* user, Channel* chan, std::string& word) override { std::string::size_type p = word.find(':'); if (p == std::string::npos) @@ -76,7 +76,7 @@ class ExemptHandler : public CheckExemption::EventListener return mh ? mh->IsPrefixMode() : NULL; } - ModResult OnCheckExemption(User* user, Channel* chan, const std::string& restriction) CXX11_OVERRIDE + ModResult OnCheckExemption(User* user, Channel* chan, const std::string& restriction) override { unsigned int mypfx = chan->GetPrefixValue(user); std::string minmode; @@ -114,12 +114,12 @@ class ModuleExemptChanOps : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { eh.ec.DoRehash(); } diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 849f99086..63fcc398b 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -157,9 +157,9 @@ class CommandFilter : public Command flags_needed = 'o'; this->syntax = "<filter-definition> <action> <flags> [<duration>] :<reason>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_BROADCAST; } @@ -188,21 +188,21 @@ class ModuleFilter : public Module, public ServerEventListener, public Stats::Ev ExemptTargetSet exemptednicks; ModuleFilter(); - void init() CXX11_OVERRIDE; - CullResult cull() CXX11_OVERRIDE; - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE; + void init() override; + CullResult cull() override; + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override; FilterResult* FilterMatch(User* user, const std::string &text, int flags); bool DeleteFilter(const std::string &freeform); std::pair<bool, std::string> AddFilter(const std::string& freeform, FilterAction type, const std::string& reason, unsigned long duration, const std::string& flags); - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE; - Version GetVersion() CXX11_OVERRIDE; + void ReadConfig(ConfigStatus& status) override; + Version GetVersion() override; std::string EncodeFilter(FilterResult* filter); FilterResult DecodeFilter(const std::string &data); - void OnSyncNetwork(ProtocolInterface::Server& server) CXX11_OVERRIDE; - void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata) CXX11_OVERRIDE; - ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE; - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE; - void OnUnloadModule(Module* mod) CXX11_OVERRIDE; + void OnSyncNetwork(ProtocolInterface::Server& server) override; + void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata) override; + ModResult OnStats(Stats::Context& stats) override; + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override; + void OnUnloadModule(Module* mod) override; bool AppliesToMe(User* user, FilterResult* filter, int flags); void ReadFilters(); static bool StringToFilterAction(const std::string& str, FilterAction& fa); diff --git a/src/modules/m_flashpolicyd.cpp b/src/modules/m_flashpolicyd.cpp index db0eeb1f1..c745552a6 100644 --- a/src/modules/m_flashpolicyd.cpp +++ b/src/modules/m_flashpolicyd.cpp @@ -34,7 +34,7 @@ class FlashPDSocket : public BufferedSocket, public Timer, public insp::intrusiv */ bool waitingcull; - bool Tick(time_t currtime) CXX11_OVERRIDE + bool Tick(time_t currtime) override { AddToCull(); return false; @@ -54,12 +54,12 @@ class FlashPDSocket : public BufferedSocket, public Timer, public insp::intrusiv sockets.erase(this); } - void OnError(BufferedSocketError) CXX11_OVERRIDE + void OnError(BufferedSocketError) override { AddToCull(); } - void OnDataReady() CXX11_OVERRIDE + void OnDataReady() override { if (recvq == expected_request) WriteData(policy_reply); @@ -82,7 +82,7 @@ class ModuleFlashPD : public Module unsigned int timeout; public: - ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE + ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override { if (!stdalgo::string::equalsci(from->bind_tag->getString("type"), "flashpolicyd")) return MOD_RES_PASSTHRU; @@ -94,7 +94,7 @@ class ModuleFlashPD : public Module return MOD_RES_ALLOW; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("flashpolicyd"); std::string file = tag->getString("file"); @@ -143,7 +143,7 @@ class ModuleFlashPD : public Module timeout = tag->getDuration("timeout", 5, 1); } - CullResult cull() CXX11_OVERRIDE + CullResult cull() override { for (insp::intrusive_list<FlashPDSocket>::const_iterator i = sockets.begin(); i != sockets.end(); ++i) { @@ -153,7 +153,7 @@ class ModuleFlashPD : public Module return Module::cull(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Flash Policy Daemon. Allows Flash IRC clients to connect", VF_VENDOR); } diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp index 09f3c9dc7..b5126a8b9 100644 --- a/src/modules/m_gecosban.cpp +++ b/src/modules/m_gecosban.cpp @@ -22,12 +22,12 @@ class ModuleGecosBan : public Module { public: - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides a way to ban users by their real name with the 'a' and 'r' extbans", VF_OPTCOMMON|VF_VENDOR); } - ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) override { if ((mask.length() > 2) && (mask[1] == ':')) { @@ -55,7 +55,7 @@ class ModuleGecosBan : public Module return MOD_RES_PASSTHRU; } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('a'); tokens["EXTBAN"].push_back('r'); diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index c0ce025bd..2ed428611 100644 --- a/src/modules/m_globalload.cpp +++ b/src/modules/m_globalload.cpp @@ -35,7 +35,7 @@ class CommandGloadmodule : public Command syntax = "<modulename> [servermask]"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { std::string servername = parameters.size() > 1 ? parameters[1] : "*"; @@ -57,7 +57,7 @@ class CommandGloadmodule : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_BROADCAST; } @@ -74,7 +74,7 @@ class CommandGunloadmodule : public Command syntax = "<modulename> [servermask]"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (!ServerInstance->Config->ConfValue("security")->getBool("allowcoreunload") && InspIRCd::Match(parameters[0], "core_*.so", ascii_case_insensitive_map)) @@ -109,7 +109,7 @@ class CommandGunloadmodule : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_BROADCAST; } @@ -125,7 +125,7 @@ class CommandGreloadmodule : public Command flags_needed = 'o'; syntax = "<modulename> [servermask]"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { std::string servername = parameters.size() > 1 ? parameters[1] : "*"; @@ -149,7 +149,7 @@ class CommandGreloadmodule : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_BROADCAST; } @@ -167,7 +167,7 @@ class ModuleGlobalLoad : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allows global loading of a module.", VF_COMMON | VF_VENDOR); } diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp index b98adce35..350320b4a 100644 --- a/src/modules/m_globops.cpp +++ b/src/modules/m_globops.cpp @@ -33,7 +33,7 @@ class CommandGlobops : public Command flags_needed = 'o'; syntax = "<any-text>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { ServerInstance->SNO->WriteGlobalSno('g', "From " + user->nick + ": " + parameters[0]); return CMD_SUCCESS; @@ -46,12 +46,12 @@ class ModuleGlobops : public Module public: ModuleGlobops() : cmd(this) {} - void init() CXX11_OVERRIDE + void init() override { ServerInstance->SNO->EnableSnomask('g',"GLOBOPS"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for GLOBOPS and snomask +g", VF_VENDOR); } diff --git a/src/modules/m_haproxy.cpp b/src/modules/m_haproxy.cpp index ee9079cbf..a32b29a60 100644 --- a/src/modules/m_haproxy.cpp +++ b/src/modules/m_haproxy.cpp @@ -117,9 +117,9 @@ class HAProxyHookProvider : public IOHookProvider { } - void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE; + void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override; - void OnConnect(StreamSocket* sock) CXX11_OVERRIDE + void OnConnect(StreamSocket* sock) override { // We don't need to implement this. } @@ -371,14 +371,14 @@ class HAProxyHook : public IOHookMiddle sock->AddIOHook(this); } - int OnStreamSocketWrite(StreamSocket* sock, StreamSocket::SendQueue& uppersendq) CXX11_OVERRIDE + int OnStreamSocketWrite(StreamSocket* sock, StreamSocket::SendQueue& uppersendq) override { // We don't need to implement this. GetSendQ().moveall(uppersendq); return 1; } - int OnStreamSocketRead(StreamSocket* sock, std::string& destrecvq) CXX11_OVERRIDE + int OnStreamSocketRead(StreamSocket* sock, std::string& destrecvq) override { switch (state) { @@ -399,7 +399,7 @@ class HAProxyHook : public IOHookMiddle return -1; } - void OnStreamSocketClose(StreamSocket* sock) CXX11_OVERRIDE + void OnStreamSocketClose(StreamSocket* sock) override { // We don't need to implement this. } @@ -421,7 +421,7 @@ class ModuleHAProxy : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the HAProxy PROXY protocol", VF_VENDOR); } diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp index f913140d6..f6e9fac7c 100644 --- a/src/modules/m_helpop.cpp +++ b/src/modules/m_helpop.cpp @@ -67,7 +67,7 @@ class CommandHelpop : public Command syntax = "<any-text>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { const std::string& parameter = (!parameters.empty() ? parameters[0] : startkey); @@ -120,7 +120,7 @@ class ModuleHelpop : public Module, public Whois::EventListener { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { HelpopMap help; @@ -152,7 +152,7 @@ class ModuleHelpop : public Module, public Whois::EventListener cmd.nohelp = tag->getString("nohelp", "There is no help for the topic you searched for. Please try again.", 1); } - void OnWhois(Whois::Context& whois) CXX11_OVERRIDE + void OnWhois(Whois::Context& whois) override { if (whois.GetTarget()->IsModeSet(ho)) { @@ -160,7 +160,7 @@ class ModuleHelpop : public Module, public Whois::EventListener } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the /HELPOP command for useful information", VF_VENDOR); } diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp index 1664582e0..a97ce5c99 100644 --- a/src/modules/m_hidechans.cpp +++ b/src/modules/m_hidechans.cpp @@ -40,17 +40,17 @@ class ModuleHideChans : public Module, public Whois::LineEventListener { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for hiding channels with user mode +I", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { AffectsOpers = ServerInstance->Config->ConfValue("hidechans")->getBool("affectsopers"); } - ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE + ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) override { /* always show to self */ if (whois.IsSelfWhois()) diff --git a/src/modules/m_hidelist.cpp b/src/modules/m_hidelist.cpp index 9c8811fb8..9662df7b4 100644 --- a/src/modules/m_hidelist.cpp +++ b/src/modules/m_hidelist.cpp @@ -31,7 +31,7 @@ class ListWatcher : public ModeWatcher { } - bool BeforeMode(User* user, User* destuser, Channel* chan, std::string& param, bool adding) CXX11_OVERRIDE + bool BeforeMode(User* user, User* destuser, Channel* chan, std::string& param, bool adding) override { // Only handle listmode list requests if (!param.empty()) @@ -56,7 +56,7 @@ class ModuleHideList : public Module std::vector<ListWatcher*> watchers; public: - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTagList tags = ServerInstance->Config->ConfTags("hidelist"); typedef std::vector<std::pair<std::string, unsigned int> > NewConfigs; @@ -85,7 +85,7 @@ class ModuleHideList : public Module stdalgo::delete_all(watchers); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for hiding the list of listmodes", VF_VENDOR); } diff --git a/src/modules/m_hidemode.cpp b/src/modules/m_hidemode.cpp index d5ac57115..fac636b70 100644 --- a/src/modules/m_hidemode.cpp +++ b/src/modules/m_hidemode.cpp @@ -111,7 +111,7 @@ class ModeHook : public ClientProtocol::EventHook return modechangelist; } - void OnEventInit(const ClientProtocol::Event& ev) CXX11_OVERRIDE + void OnEventInit(const ClientProtocol::Event& ev) override { cache.clear(); filteredmsgplists.clear(); @@ -123,7 +123,7 @@ class ModeHook : public ClientProtocol::EventHook modechangelists.reserve(numprefixmodes); } - ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) CXX11_OVERRIDE + ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) override { const ClientProtocol::Events::Mode& mode = static_cast<const ClientProtocol::Events::Mode&>(ev); Channel* const chan = mode.GetMessages().front().GetChanTarget(); @@ -188,12 +188,12 @@ class ModuleHideMode : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { modehook.settings.Load(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for hiding mode changes", VF_VENDOR); } diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp index f04d88809..791a3060c 100644 --- a/src/modules/m_hideoper.cpp +++ b/src/modules/m_hideoper.cpp @@ -37,7 +37,7 @@ class HideOper : public SimpleUserModeHandler oper = true; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override { if (SimpleUserModeHandler::OnModeChange(source, dest, channel, parameter, adding) == MODEACTION_DENY) return MODEACTION_DENY; @@ -71,18 +71,18 @@ class ModuleHideOper { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR); } - void OnUserQuit(User* user, const std::string&, const std::string&) CXX11_OVERRIDE + void OnUserQuit(User* user, const std::string&, const std::string&) override { if (user->IsModeSet(hm)) hm.opercount--; } - ModResult OnNumeric(User* user, const Numeric::Numeric& numeric) CXX11_OVERRIDE + ModResult OnNumeric(User* user, const Numeric::Numeric& numeric) override { if (numeric.GetNumeric() != RPL_LUSEROP || active || user->HasPrivPermission("users/auspex")) return MOD_RES_PASSTHRU; @@ -98,7 +98,7 @@ class ModuleHideOper return MOD_RES_DENY; } - ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE + ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) override { /* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the * person doing the WHOIS is not an oper @@ -115,7 +115,7 @@ class ModuleHideOper return MOD_RES_PASSTHRU; } - ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE + ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) override { if (user->IsModeSet(hm) && !source->HasPrivPermission("users/auspex")) { @@ -153,7 +153,7 @@ class ModuleHideOper return MOD_RES_PASSTHRU; } - ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE + ModResult OnStats(Stats::Context& stats) override { if (stats.GetSymbol() != 'P') return MOD_RES_PASSTHRU; diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp index 4c9b24140..b676e19a7 100644 --- a/src/modules/m_hostchange.cpp +++ b/src/modules/m_hostchange.cpp @@ -120,7 +120,7 @@ private: } public: - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { HostRules rules; @@ -179,12 +179,12 @@ private: hostrules.swap(rules); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides rule-based masking of user hostnames", VF_VENDOR); } - void OnUserConnect(LocalUser* user) CXX11_OVERRIDE + void OnUserConnect(LocalUser* user) override { for (HostRules::const_iterator iter = hostrules.begin(); iter != hostrules.end(); ++iter) { diff --git a/src/modules/m_hostcycle.cpp b/src/modules/m_hostcycle.cpp index a3c81df6e..b07ca41c6 100644 --- a/src/modules/m_hostcycle.cpp +++ b/src/modules/m_hostcycle.cpp @@ -101,17 +101,17 @@ class ModuleHostCycle : public Module { } - void OnChangeIdent(User* user, const std::string& newident) CXX11_OVERRIDE + void OnChangeIdent(User* user, const std::string& newident) override { DoHostCycle(user, newident, user->GetDisplayedHost(), quitmsgident); } - void OnChangeHost(User* user, const std::string& newhost) CXX11_OVERRIDE + void OnChangeHost(User* user, const std::string& newhost) override { DoHostCycle(user, user->ident, newhost, quitmsghost); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Cycles users in all their channels when their host or ident changes", VF_VENDOR); } diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 3a0d4f861..ecde57944 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -70,7 +70,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru */ bool waitingcull; - bool Tick(time_t currtime) CXX11_OVERRIDE + bool Tick(time_t currtime) override { AddToCull(); return false; @@ -216,7 +216,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru sockets.erase(this); } - void OnError(BufferedSocketError) CXX11_OVERRIDE + void OnError(BufferedSocketError) override { AddToCull(); } @@ -267,7 +267,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru WriteData("\r\n"); } - void OnDataReady() CXX11_OVERRIDE + void OnDataReady() override { if (parser.upgrade || HTTP_PARSER_ERRNO(&parser)) return; @@ -319,7 +319,7 @@ class HTTPdAPIImpl : public HTTPdAPIBase { } - void SendResponse(HTTPDocumentResponse& resp) CXX11_OVERRIDE + void SendResponse(HTTPDocumentResponse& resp) override { resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers); } @@ -343,18 +343,18 @@ class ModuleHttpServer : public Module HttpServerSocket::ConfigureParser(); } - void init() CXX11_OVERRIDE + void init() override { HttpModule = this; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("httpd"); timeoutsec = tag->getDuration("timeout", 10, 1); } - ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE + ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override { if (!stdalgo::string::equalsci(from->bind_tag->getString("type"), "httpd")) return MOD_RES_PASSTHRU; @@ -363,7 +363,7 @@ class ModuleHttpServer : public Module return MOD_RES_ALLOW; } - void OnUnloadModule(Module* mod) CXX11_OVERRIDE + void OnUnloadModule(Module* mod) override { for (insp::intrusive_list<HttpServerSocket>::const_iterator i = sockets.begin(); i != sockets.end(); ) { @@ -377,7 +377,7 @@ class ModuleHttpServer : public Module } } - CullResult cull() CXX11_OVERRIDE + CullResult cull() override { for (insp::intrusive_list<HttpServerSocket>::const_iterator i = sockets.begin(); i != sockets.end(); ++i) { @@ -387,7 +387,7 @@ class ModuleHttpServer : public Module return Module::cull(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides HTTP serving facilities to modules", VF_VENDOR); } diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp index 49710c219..1e7a3f395 100644 --- a/src/modules/m_httpd_acl.cpp +++ b/src/modules/m_httpd_acl.cpp @@ -49,7 +49,7 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { std::vector<HTTPACL> new_acls; ConfigTagList acls = ServerInstance->Config->ConfTags("httpdacl"); @@ -216,14 +216,14 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener return true; } - ModResult OnHTTPACLCheck(HTTPRequest& req) CXX11_OVERRIDE + ModResult OnHTTPACLCheck(HTTPRequest& req) override { if (IsAccessAllowed(&req)) return MOD_RES_PASSTHRU; return MOD_RES_DENY; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd dependent modules", VF_VENDOR); } diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp index f729b2774..12e42428a 100644 --- a/src/modules/m_httpd_config.cpp +++ b/src/modules/m_httpd_config.cpp @@ -32,7 +32,7 @@ class ModuleHttpConfig : public Module, public HTTPRequestEventListener { } - ModResult OnHTTPRequest(HTTPRequest& request) CXX11_OVERRIDE + ModResult OnHTTPRequest(HTTPRequest& request) override { if ((request.GetURI() != "/config") && (request.GetURI() != "/config/")) return MOD_RES_PASSTHRU; @@ -68,7 +68,7 @@ class ModuleHttpConfig : public Module, public HTTPRequestEventListener return MOD_RES_DENY; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allows for the server configuration to be viewed over HTTP via m_httpd", VF_VENDOR); } diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 6db292eb3..927e6c906 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -240,12 +240,12 @@ class ModuleHttpStats : public Module, public HTTPRequestEventListener return MOD_RES_PASSTHRU; } - ModResult OnHTTPRequest(HTTPRequest& req) CXX11_OVERRIDE + ModResult OnHTTPRequest(HTTPRequest& req) override { return HandleRequest(&req); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides statistics over HTTP via m_httpd", VF_VENDOR); } diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index 803c19846..dec07ce73 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -140,7 +140,7 @@ class IdentRequestSocket : public EventHandler } } - void OnEventHandlerWrite() CXX11_OVERRIDE + void OnEventHandlerWrite() override { SocketEngine::ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); @@ -179,7 +179,7 @@ class IdentRequestSocket : public EventHandler return done; } - void OnEventHandlerRead() CXX11_OVERRIDE + void OnEventHandlerRead() override { /* We don't really need to buffer for incomplete replies here, since IDENT replies are * extremely short - there is *no* sane reason it'd be in more than one packet @@ -239,13 +239,13 @@ class IdentRequestSocket : public EventHandler } } - void OnEventHandlerError(int errornum) CXX11_OVERRIDE + void OnEventHandlerError(int errornum) override { Close(); done = true; } - CullResult cull() CXX11_OVERRIDE + CullResult cull() override { Close(); return EventHandler::cull(); @@ -263,19 +263,19 @@ class ModuleIdent : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for RFC1413 ident lookups", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("ident"); RequestTimeout = tag->getDuration("timeout", 5, 1); NoLookupPrefix = tag->getBool("nolookupprefix", false); } - void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE + void OnSetUserIP(LocalUser* user) override { IdentRequestSocket* isock = ext.get(user); if (isock) @@ -314,7 +314,7 @@ class ModuleIdent : public Module * creating a Timer object and especially better than creating a * Timer per ident lookup! */ - ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser *user) override { /* Does user have an ident socket attached at all? */ IdentRequestSocket *isock = ext.get(user); @@ -358,7 +358,7 @@ class ModuleIdent : public Module return MOD_RES_PASSTHRU; } - ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) override { if (myclass->config->getBool("requireident") && user->ident[0] == '~') return MOD_RES_DENY; diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp index 3f9459d19..eddfec74f 100644 --- a/src/modules/m_inviteexception.cpp +++ b/src/modules/m_inviteexception.cpp @@ -54,12 +54,12 @@ public: { } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["INVEX"] = ConvToStr(ie.GetModeChar()); } - ModResult OnCheckInvite(User* user, Channel* chan) CXX11_OVERRIDE + ModResult OnCheckInvite(User* user, Channel* chan) override { ListModeBase::ModeList* list = ie.GetList(chan); if (list) @@ -76,20 +76,20 @@ public: return MOD_RES_PASSTHRU; } - ModResult OnCheckKey(User* user, Channel* chan, const std::string& key) CXX11_OVERRIDE + ModResult OnCheckKey(User* user, Channel* chan, const std::string& key) override { if (invite_bypass_key) return OnCheckInvite(user, chan); return MOD_RES_PASSTHRU; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ie.DoRehash(); invite_bypass_key = ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the +I channel mode", VF_VENDOR); } diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp index 14b1cf8a1..08733aa55 100644 --- a/src/modules/m_ircv3.cpp +++ b/src/modules/m_ircv3.cpp @@ -65,7 +65,7 @@ class JoinHook : public ClientProtocol::EventHook { } - void OnEventInit(const ClientProtocol::Event& ev) CXX11_OVERRIDE + void OnEventInit(const ClientProtocol::Event& ev) override { const ClientProtocol::Events::Join& join = static_cast<const ClientProtocol::Events::Join&>(ev); @@ -97,7 +97,7 @@ class JoinHook : public ClientProtocol::EventHook } } - ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) CXX11_OVERRIDE + ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) override { if (extendedjoincap.get(user)) messagelist.front() = &extendedjoinmsg; @@ -129,7 +129,7 @@ class ModuleIRCv3 { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* conf = ServerInstance->Config->ConfValue("ircv3"); cap_accountnotify.SetActive(conf->getBool("accountnotify", true)); @@ -137,7 +137,7 @@ class ModuleIRCv3 joinhook.extendedjoincap.SetActive(conf->getBool("extendedjoin", true)); } - void OnAccountChange(User* user, const std::string& newaccount) CXX11_OVERRIDE + void OnAccountChange(User* user, const std::string& newaccount) override { // Logged in: 1 parameter which is the account name // Logged out: 1 parameter which is a "*" @@ -148,7 +148,7 @@ class ModuleIRCv3 IRCv3::WriteNeighborsWithCap(user, accountevent, cap_accountnotify); } - void OnUserAway(User* user) CXX11_OVERRIDE + void OnUserAway(User* user) override { if (!joinhook.awaycap.IsActive()) return; @@ -159,7 +159,7 @@ class ModuleIRCv3 IRCv3::WriteNeighborsWithCap(user, awayevent, joinhook.awaycap); } - void OnUserBack(User* user) CXX11_OVERRIDE + void OnUserBack(User* user) override { if (!joinhook.awaycap.IsActive()) return; @@ -170,7 +170,7 @@ class ModuleIRCv3 IRCv3::WriteNeighborsWithCap(user, awayevent, joinhook.awaycap); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for extended-join, away-notify and account-notify CAP capabilities", VF_VENDOR); } diff --git a/src/modules/m_ircv3_accounttag.cpp b/src/modules/m_ircv3_accounttag.cpp index 45fcf8022..1762ad525 100644 --- a/src/modules/m_ircv3_accounttag.cpp +++ b/src/modules/m_ircv3_accounttag.cpp @@ -53,7 +53,7 @@ class ModuleIRCv3AccountTag : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the account-tag IRCv3 extension", VF_VENDOR); } diff --git a/src/modules/m_ircv3_batch.cpp b/src/modules/m_ircv3_batch.cpp index df2b00f49..02b8aea85 100644 --- a/src/modules/m_ircv3_batch.cpp +++ b/src/modules/m_ircv3_batch.cpp @@ -62,7 +62,7 @@ class IRCv3::Batch::ManagerImpl : public Manager BatchList active_batches; bool unloading; - bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) CXX11_OVERRIDE + bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) override { if (!cap.get(user)) return false; @@ -133,7 +133,7 @@ class IRCv3::Batch::ManagerImpl : public Manager } } - void Start(Batch& batch) CXX11_OVERRIDE + void Start(Batch& batch) override { if (unloading) return; @@ -154,7 +154,7 @@ class IRCv3::Batch::ManagerImpl : public Manager active_batches.push_back(&batch); } - void End(Batch& batch) CXX11_OVERRIDE + void End(Batch& batch) override { if (!batch.IsRunning()) return; @@ -190,24 +190,24 @@ class ModuleIRCv3Batch : public Module { } - void init() CXX11_OVERRIDE + void init() override { manager.Init(); } - void OnUnloadModule(Module* mod) CXX11_OVERRIDE + void OnUnloadModule(Module* mod) override { if (mod == this) manager.Shutdown(); } - void OnUserDisconnect(LocalUser* user) CXX11_OVERRIDE + void OnUserDisconnect(LocalUser* user) override { // Remove the user from all internal lists manager.RemoveFromAll(user); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the batch IRCv3 extension", VF_VENDOR); } diff --git a/src/modules/m_ircv3_capnotify.cpp b/src/modules/m_ircv3_capnotify.cpp index 6190f15a8..aaabb1914 100644 --- a/src/modules/m_ircv3_capnotify.cpp +++ b/src/modules/m_ircv3_capnotify.cpp @@ -23,7 +23,7 @@ class CapNotify : public Cap::Capability { - bool OnRequest(LocalUser* user, bool add) CXX11_OVERRIDE + bool OnRequest(LocalUser* user, bool add) override { // Users using the negotiation protocol v3.2 or newer may not turn off cap-notify if ((!add) && (GetProtocol(user) != Cap::CAP_LEGACY)) @@ -31,7 +31,7 @@ class CapNotify : public Cap::Capability return true; } - bool OnList(LocalUser* user) CXX11_OVERRIDE + bool OnList(LocalUser* user) override { // If the client supports 3.2 enable cap-notify for them if (GetProtocol(user) != Cap::CAP_LEGACY) @@ -127,7 +127,7 @@ class ModuleIRCv3CapNotify : public Module, public Cap::EventListener, public Re { } - void OnCapAddDel(Cap::Capability* cap, bool add) CXX11_OVERRIDE + void OnCapAddDel(Cap::Capability* cap, bool add) override { if (cap->creator == this) return; @@ -141,14 +141,14 @@ class ModuleIRCv3CapNotify : public Module, public Cap::EventListener, public Re Send(cap->GetName(), cap, add); } - void OnCapValueChange(Cap::Capability* cap) CXX11_OVERRIDE + void OnCapValueChange(Cap::Capability* cap) override { // The value of a cap has changed, send CAP DEL and CAP NEW with the new value Send(cap->GetName(), cap, false); Send(cap->GetName(), cap, true); } - void OnReloadModuleSave(Module* mod, ReloadModule::CustomData& cd) CXX11_OVERRIDE + void OnReloadModuleSave(Module* mod, ReloadModule::CustomData& cd) override { if (mod == this) return; @@ -157,7 +157,7 @@ class ModuleIRCv3CapNotify : public Module, public Cap::EventListener, public Re cd.add(this, NULL); } - void OnReloadModuleRestore(Module* mod, void* data) CXX11_OVERRIDE + void OnReloadModuleRestore(Module* mod, void* data) override { // Reloading can change the set of caps provided by a module so assuming that if the reload succeded all // caps that the module previously provided are available or all were lost if the reload failed is wrong. @@ -176,7 +176,7 @@ class ModuleIRCv3CapNotify : public Module, public Cap::EventListener, public Re reloadedcaps.clear(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the cap-notify IRCv3 extension", VF_VENDOR); } diff --git a/src/modules/m_ircv3_chghost.cpp b/src/modules/m_ircv3_chghost.cpp index fd142803f..31e2c1519 100644 --- a/src/modules/m_ircv3_chghost.cpp +++ b/src/modules/m_ircv3_chghost.cpp @@ -42,17 +42,17 @@ class ModuleIRCv3ChgHost : public Module { } - void OnChangeIdent(User* user, const std::string& newident) CXX11_OVERRIDE + void OnChangeIdent(User* user, const std::string& newident) override { DoChgHost(user, newident, user->GetDisplayedHost()); } - void OnChangeHost(User* user, const std::string& newhost) CXX11_OVERRIDE + void OnChangeHost(User* user, const std::string& newhost) override { DoChgHost(user, user->ident, newhost); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the chghost IRCv3 extension", VF_VENDOR); } diff --git a/src/modules/m_ircv3_echomessage.cpp b/src/modules/m_ircv3_echomessage.cpp index b407aece4..16d6751d9 100644 --- a/src/modules/m_ircv3_echomessage.cpp +++ b/src/modules/m_ircv3_echomessage.cpp @@ -31,7 +31,7 @@ class ModuleIRCv3EchoMessage : public Module { } - void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE + void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) override { if (!cap.get(user) || !details.echo) return; @@ -64,14 +64,14 @@ class ModuleIRCv3EchoMessage : public Module } } - void OnUserMessageBlocked(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE + void OnUserMessageBlocked(User* user, const MessageTarget& target, const MessageDetails& details) override { // Prevent spammers from knowing that their spam was blocked. if (details.echo_original) OnUserPostMessage(user, target, details); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the echo-message IRCv3 extension", VF_VENDOR); } diff --git a/src/modules/m_ircv3_invitenotify.cpp b/src/modules/m_ircv3_invitenotify.cpp index 8bd4d5642..5bcb2f167 100644 --- a/src/modules/m_ircv3_invitenotify.cpp +++ b/src/modules/m_ircv3_invitenotify.cpp @@ -30,7 +30,7 @@ class ModuleIRCv3InviteNotify : public Module { } - void OnUserInvite(User* source, User* dest, Channel* chan, time_t expiry, unsigned int notifyrank, CUList& notifyexcepts) CXX11_OVERRIDE + void OnUserInvite(User* source, User* dest, Channel* chan, time_t expiry, unsigned int notifyrank, CUList& notifyexcepts) override { ClientProtocol::Messages::Invite invitemsg(source, dest, chan); ClientProtocol::Event inviteevent(ServerInstance->GetRFCEvents().invite, invitemsg); @@ -55,13 +55,13 @@ class ModuleIRCv3InviteNotify : public Module } } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { // Prioritize after all modules to see all excepted users ServerInstance->Modules.SetPriority(this, I_OnUserInvite, PRIORITY_LAST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the invite-notify IRCv3 extension", VF_VENDOR); } diff --git a/src/modules/m_ircv3_servertime.cpp b/src/modules/m_ircv3_servertime.cpp index 1c35c422b..836d70791 100644 --- a/src/modules/m_ircv3_servertime.cpp +++ b/src/modules/m_ircv3_servertime.cpp @@ -63,7 +63,7 @@ class ModuleIRCv3ServerTime : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the server-time IRCv3 extension", VF_VENDOR); } diff --git a/src/modules/m_ircv3_sts.cpp b/src/modules/m_ircv3_sts.cpp index cbfdd1307..0a83c6e0b 100644 --- a/src/modules/m_ircv3_sts.cpp +++ b/src/modules/m_ircv3_sts.cpp @@ -29,7 +29,7 @@ class STSCap : public Cap::Capability std::string plaintextpolicy; std::string securepolicy; - bool OnList(LocalUser* user) CXX11_OVERRIDE + bool OnList(LocalUser* user) override { // Don't send the cap to clients that only support cap-3.1. if (GetProtocol(user) == Cap::CAP_LEGACY) @@ -51,14 +51,14 @@ class STSCap : public Cap::Capability return InspIRCd::Match(snihost, host, ascii_case_insensitive_map); } - bool OnRequest(LocalUser* user, bool adding) CXX11_OVERRIDE + bool OnRequest(LocalUser* user, bool adding) override { // Clients MUST NOT request this capability with CAP REQ. Servers MAY reply with a CAP NAK message if a // client requests this capability. return false; } - const std::string* GetValue(LocalUser* user) const CXX11_OVERRIDE + const std::string* GetValue(LocalUser* user) const override { return SSLIOHook::IsSSL(&user->eh) ? &securepolicy : &plaintextpolicy; } @@ -152,7 +152,7 @@ class ModuleIRCv3STS : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { // TODO: Multiple SNI profiles ConfigTag* tag = ServerInstance->Config->ConfValue("sts"); @@ -172,7 +172,7 @@ class ModuleIRCv3STS : public Module cap.SetPolicy(host, duration, port, preload); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides IRCv3 Strict Transport Security policy advertisement", VF_OPTCOMMON|VF_VENDOR); } diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index cc62eb13b..6fde5933f 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -99,7 +99,7 @@ class JoinFlood : public ParamMode<JoinFlood, SimpleExtItem<joinfloodsettings> > { } - ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) override { std::string::size_type colon = parameter.find(':'); if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos)) @@ -138,13 +138,13 @@ class ModuleJoinFlood : public Module { } - void ReadConfig(ConfigStatus&) CXX11_OVERRIDE + void ReadConfig(ConfigStatus&) override { ConfigTag* tag = ServerInstance->Config->ConfValue("joinflood"); duration = tag->getDuration("duration", 60, 10, 600); } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { if (chan) { @@ -158,7 +158,7 @@ class ModuleJoinFlood : public Module return MOD_RES_PASSTHRU; } - void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE + void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) override { /* We arent interested in JOIN events caused by a network burst */ if (sync) @@ -179,7 +179,7 @@ class ModuleJoinFlood : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides channel mode +j (join flood protection)", VF_VENDOR); } diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp index 02950e0e9..7bfe907e7 100644 --- a/src/modules/m_jumpserver.cpp +++ b/src/modules/m_jumpserver.cpp @@ -51,7 +51,7 @@ class CommandJumpserver : public Command redirect_new_users = false; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { int n_done = 0; reason = (parameters.size() < 4) ? "Please use this server/port instead" : parameters[3]; @@ -164,13 +164,13 @@ class ModuleJumpServer : public Module { } - void OnModuleRehash(User* user, const std::string& param) CXX11_OVERRIDE + void OnModuleRehash(User* user, const std::string& param) override { if (irc::equals(param, "jumpserver") && js.redirect_new_users) js.redirect_new_users = false; } - ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE + ModResult OnUserRegister(LocalUser* user) override { if (js.redirect_new_users) { @@ -182,14 +182,14 @@ class ModuleJumpServer : public Module return MOD_RES_PASSTHRU; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { // Emergency way to unlock if (!status.srcuser) js.redirect_new_users = false; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the RPL_REDIR numeric and the /JUMPSERVER command.", VF_VENDOR); } diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 70f3578b2..262082129 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -99,7 +99,7 @@ class KickRejoin : public ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> > { } - ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) override { unsigned int v = ConvToNum<unsigned int>(parameter); if (v <= 0) @@ -138,7 +138,7 @@ public: { } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { if (chan) { @@ -152,7 +152,7 @@ public: return MOD_RES_PASSTHRU; } - void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) override { if ((!IS_LOCAL(memb->user)) || (source == memb->user)) return; @@ -164,7 +164,7 @@ public: } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Channel mode to delay rejoin after kick", VF_VENDOR | VF_COMMON, kr.GetModuleSettings()); } diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp index 1b66e01a4..5d76a9d66 100644 --- a/src/modules/m_knock.cpp +++ b/src/modules/m_knock.cpp @@ -50,7 +50,7 @@ class CommandKnock : public Command Penalty = 5; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { Channel* c = ServerInstance->FindChan(parameters[0]); if (!c) @@ -93,7 +93,7 @@ class CommandKnock : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_BCAST; } @@ -111,7 +111,7 @@ class ModuleKnock : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { std::string knocknotify = ServerInstance->Config->ConfValue("knock")->getString("notify"); if (stdalgo::string::equalsci(knocknotify, "numeric")) @@ -131,7 +131,7 @@ class ModuleKnock : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for /KNOCK and channel mode +K", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp index fedf02b4d..28d5efc1e 100644 --- a/src/modules/m_ldapauth.cpp +++ b/src/modules/m_ldapauth.cpp @@ -107,7 +107,7 @@ class BindInterface : public LDAPInterface { } - void OnResult(const LDAPResult& r) CXX11_OVERRIDE + void OnResult(const LDAPResult& r) override { User* user = ServerInstance->FindUUID(uid); dynamic_reference<LDAPProvider> LDAP(me, provider); @@ -180,7 +180,7 @@ class BindInterface : public LDAPInterface } } - void OnError(const LDAPResult& err) CXX11_OVERRIDE + void OnError(const LDAPResult& err) override { if (checkingAttributes && --attrCount) return; @@ -214,7 +214,7 @@ class SearchInterface : public LDAPInterface { } - void OnResult(const LDAPResult& r) CXX11_OVERRIDE + void OnResult(const LDAPResult& r) override { LocalUser* user = static_cast<LocalUser*>(ServerInstance->FindUUID(uid)); dynamic_reference<LDAPProvider> LDAP(me, provider); @@ -246,7 +246,7 @@ class SearchInterface : public LDAPInterface delete this; } - void OnError(const LDAPResult& err) CXX11_OVERRIDE + void OnError(const LDAPResult& err) override { ServerInstance->SNO->WriteToSnoMask('a', "Error searching LDAP server: %s", err.getError().c_str()); User* user = ServerInstance->FindUUID(uid); @@ -269,7 +269,7 @@ class AdminBindInterface : public LDAPInterface { } - void OnResult(const LDAPResult& r) CXX11_OVERRIDE + void OnResult(const LDAPResult& r) override { dynamic_reference<LDAPProvider> LDAP(me, provider); if (LDAP) @@ -286,7 +286,7 @@ class AdminBindInterface : public LDAPInterface delete this; } - void OnError(const LDAPResult& err) CXX11_OVERRIDE + void OnError(const LDAPResult& err) override { ServerInstance->SNO->WriteToSnoMask('a', "Error binding as manager to LDAP server: " + err.getError()); delete this; @@ -315,7 +315,7 @@ public: vhosts = &ldapVhost; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("ldapauth"); whitelistedcidrs.clear(); @@ -360,7 +360,7 @@ public: } } - void OnUserConnect(LocalUser *user) CXX11_OVERRIDE + void OnUserConnect(LocalUser *user) override { std::string* cc = ldapVhost.get(user); if (cc) @@ -370,7 +370,7 @@ public: } } - ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE + ModResult OnUserRegister(LocalUser* user) override { for (std::vector<std::string>::const_iterator i = allowpatterns.begin(); i != allowpatterns.end(); ++i) { @@ -433,12 +433,12 @@ public: return MOD_RES_DENY; } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { return ldapAuthed.get(user) ? MOD_RES_PASSTHRU : MOD_RES_DENY; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allow/Deny connections based upon answer from LDAP server", VF_VENDOR); } diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp index cde5b00d7..27b2ca347 100644 --- a/src/modules/m_ldapoper.cpp +++ b/src/modules/m_ldapoper.cpp @@ -65,7 +65,7 @@ class LDAPOperBase : public LDAPInterface { } - void OnError(const LDAPResult& err) CXX11_OVERRIDE + void OnError(const LDAPResult& err) override { ServerInstance->SNO->WriteToSnoMask('a', "Error searching LDAP server: %s", err.getError().c_str()); Fallback(); @@ -81,7 +81,7 @@ class BindInterface : public LDAPOperBase { } - void OnResult(const LDAPResult& r) CXX11_OVERRIDE + void OnResult(const LDAPResult& r) override { User* user = ServerInstance->FindUUID(uid); ServerConfig::OperIndex::const_iterator iter = ServerInstance->Config->oper_blocks.find(opername); @@ -133,7 +133,7 @@ class SearchInterface : public LDAPOperBase { } - void OnResult(const LDAPResult& result) CXX11_OVERRIDE + void OnResult(const LDAPResult& result) override { if (!HandleResult(result)) Fallback(); @@ -156,7 +156,7 @@ class AdminBindInterface : public LDAPInterface { } - void OnResult(const LDAPResult& r) CXX11_OVERRIDE + void OnResult(const LDAPResult& r) override { dynamic_reference<LDAPProvider> LDAP(me, provider); if (LDAP) @@ -173,7 +173,7 @@ class AdminBindInterface : public LDAPInterface delete this; } - void OnError(const LDAPResult& err) CXX11_OVERRIDE + void OnError(const LDAPResult& err) override { ServerInstance->SNO->WriteToSnoMask('a', "Error binding as manager to LDAP server: " + err.getError()); delete this; @@ -193,7 +193,7 @@ class ModuleLDAPAuth : public Module me = this; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("ldapoper"); @@ -202,7 +202,7 @@ class ModuleLDAPAuth : public Module attribute = tag->getString("attribute"); } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { if (validated && command == "OPER" && parameters.size() >= 2) { @@ -240,7 +240,7 @@ class ModuleLDAPAuth : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Adds the ability to authenticate opers via LDAP", VF_VENDOR); } diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp index 2db01b99a..3d993d90b 100644 --- a/src/modules/m_lockserv.cpp +++ b/src/modules/m_lockserv.cpp @@ -42,7 +42,7 @@ class CommandLockserv : public Command flags_needed = 'o'; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (!locked.empty()) { @@ -67,7 +67,7 @@ class CommandUnlockserv : public Command flags_needed = 'o'; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (locked.empty()) { @@ -93,20 +93,20 @@ class ModuleLockserv : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { // Emergency way to unlock if (!status.srcuser) locked.clear(); } - void OnModuleRehash(User* user, const std::string& param) CXX11_OVERRIDE + void OnModuleRehash(User* user, const std::string& param) override { if (irc::equals(param, "lockserv") && !locked.empty()) locked.clear(); } - ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE + ModResult OnUserRegister(LocalUser* user) override { if (!locked.empty()) { @@ -116,12 +116,12 @@ class ModuleLockserv : public Module return MOD_RES_PASSTHRU; } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { return !locked.empty() ? MOD_RES_DENY : MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allows locking of the server to stop all incoming connections until unlocked again", VF_VENDOR); } diff --git a/src/modules/m_maphide.cpp b/src/modules/m_maphide.cpp index aade5ea60..34b869c45 100644 --- a/src/modules/m_maphide.cpp +++ b/src/modules/m_maphide.cpp @@ -23,12 +23,12 @@ class ModuleMapHide : public Module { std::string url; public: - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { url = ServerInstance->Config->ConfValue("security")->getString("maphide"); } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { if (validated && !user->IsOper() && !url.empty() && (command == "MAP" || command == "LINKS")) { @@ -39,7 +39,7 @@ class ModuleMapHide : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Replaces the output of /MAP and /LINKS with an URL.", VF_VENDOR); } diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp index 8de70872f..7825ce383 100644 --- a/src/modules/m_md5.cpp +++ b/src/modules/m_md5.cpp @@ -235,7 +235,7 @@ class MD5Provider : public HashProvider } public: - std::string GenerateRaw(const std::string& data) CXX11_OVERRIDE + std::string GenerateRaw(const std::string& data) override { char res[16]; MyMD5(res, (void*)data.data(), data.length()); @@ -253,7 +253,7 @@ class ModuleMD5 : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements MD5 hashing",VF_VENDOR); } diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index af976afd5..9e0bc57e2 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -72,7 +72,7 @@ class MsgFlood : public ParamMode<MsgFlood, SimpleExtItem<floodsettings> > { } - ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) override { std::string::size_type colon = parameter.find(':'); if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos)) @@ -118,7 +118,7 @@ class ModuleMsgFlood : public Module { } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (target.type != MessageTarget::TYPE_CHANNEL) return MOD_RES_PASSTHRU; @@ -157,13 +157,13 @@ class ModuleMsgFlood : public Module return MOD_RES_PASSTHRU; } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { // we want to be after all modules that might deny the message (e.g. m_muteban, m_noctcp, m_blockcolor, etc.) ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides channel mode +f (message flood protection)", VF_VENDOR); } diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp index 85787ae96..4bb2c87dd 100644 --- a/src/modules/m_mlock.cpp +++ b/src/modules/m_mlock.cpp @@ -35,12 +35,12 @@ class ModuleMLock : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements the ability to have server-side MLOCK enforcement.", VF_VENDOR); } - ModResult OnRawMode(User* source, Channel* channel, ModeHandler* mh, const std::string& parameter, bool adding) CXX11_OVERRIDE + ModResult OnRawMode(User* source, Channel* channel, ModeHandler* mh, const std::string& parameter, bool adding) override { if (!channel) return MOD_RES_PASSTHRU; diff --git a/src/modules/m_modenotice.cpp b/src/modules/m_modenotice.cpp index 5311015b7..4a94c89ee 100644 --- a/src/modules/m_modenotice.cpp +++ b/src/modules/m_modenotice.cpp @@ -28,7 +28,7 @@ class CommandModeNotice : public Command flags_needed = 'o'; } - CmdResult Handle(User* src, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* src, const Params& parameters) override { std::string msg = "*** From " + src->nick + ": " + parameters[1]; int mlen = parameters[0].length(); @@ -47,7 +47,7 @@ next_user: ; return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_BCAST; } @@ -63,7 +63,7 @@ class ModuleModeNotice : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the /MODENOTICE command", VF_VENDOR); } diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp index 7632f6a04..4225d5fb2 100644 --- a/src/modules/m_monitor.cpp +++ b/src/modules/m_monitor.cpp @@ -82,7 +82,7 @@ class IRCv3::Monitor::Manager free(container, unset_raw(container)); } - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE + std::string serialize(SerializeFormat format, const Extensible* container, void* item) const override { std::string ret; if (format == FORMAT_NETWORK) @@ -99,9 +99,9 @@ class IRCv3::Monitor::Manager return ret; } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE; + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) override; - void free(Extensible* container, void* item) CXX11_OVERRIDE + void free(Extensible* container, void* item) override { delete static_cast<ExtData*>(item); } @@ -319,7 +319,7 @@ class CommandMonitor : public SplitCommand syntax = "[C|L|S|+ <nick1>[,<nick2>]|- <nick1>[,<nick2>]"; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { char subcmd = toupper(parameters[0][0]); if (subcmd == '+') @@ -399,18 +399,18 @@ class ModuleMonitor : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("monitor"); cmd.maxmonitor = tag->getUInt("maxentries", 30, 1); } - void OnPostConnect(User* user) CXX11_OVERRIDE + void OnPostConnect(User* user) override { SendAlert(RPL_MONONLINE, user->nick); } - void OnUserPostNick(User* user, const std::string& oldnick) CXX11_OVERRIDE + void OnUserPostNick(User* user, const std::string& oldnick) override { // Detect and ignore nickname case change if (ServerInstance->FindNickOnly(oldnick) == user) @@ -420,7 +420,7 @@ class ModuleMonitor : public Module SendAlert(RPL_MONONLINE, user->nick); } - void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) CXX11_OVERRIDE + void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) override { LocalUser* localuser = IS_LOCAL(user); if (localuser) @@ -428,12 +428,12 @@ class ModuleMonitor : public Module SendAlert(RPL_MONOFFLINE, user->nick); } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["MONITOR"] = ConvToStr(cmd.maxmonitor); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides MONITOR support", VF_VENDOR); } diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp index 7698835b1..97104f0c5 100644 --- a/src/modules/m_muteban.cpp +++ b/src/modules/m_muteban.cpp @@ -23,12 +23,12 @@ class ModuleQuietBan : public Module { public: - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements extban +b m: - mute bans",VF_OPTCOMMON|VF_VENDOR); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (!IS_LOCAL(user) || target.type != MessageTarget::TYPE_CHANNEL) return MOD_RES_PASSTHRU; @@ -50,7 +50,7 @@ class ModuleQuietBan : public Module return MOD_RES_PASSTHRU; } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('m'); } diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp index 8872ba629..119f4058b 100644 --- a/src/modules/m_namedmodes.cpp +++ b/src/modules/m_namedmodes.cpp @@ -59,7 +59,7 @@ class CommandProp : public SplitCommand syntax = "<user|channel> {[+-]<mode> [<value>]}*"; } - CmdResult HandleLocal(LocalUser* src, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* src, const Params& parameters) override { Channel* const chan = ServerInstance->FindChan(parameters[0]); if (!chan) @@ -110,7 +110,7 @@ class DummyZ : public ModeHandler } // Handle /MODE #chan Z - void DisplayList(User* user, Channel* chan) CXX11_OVERRIDE + void DisplayList(User* user, Channel* chan) override { if (IS_LOCAL(user)) ::DisplayList(static_cast<LocalUser*>(user), chan); @@ -126,17 +126,17 @@ class ModuleNamedModes : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the ability to manipulate modes via long names.",VF_VENDOR); } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST); } - ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE + ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) override { if (!channel) return MOD_RES_PASSTHRU; diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp index defb66b78..5d265fc56 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -38,17 +38,17 @@ class ModuleNamesX { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR); } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["NAMESX"]; } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { /* We don't actually create a proper command handler class for PROTOCTL, * because other modules might want to have PROTOCTL hooks too. @@ -66,7 +66,7 @@ class ModuleNamesX return MOD_RES_PASSTHRU; } - ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE + ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) override { if (cap.get(issuer)) prefixes = memb->GetAllPrefixChars(); @@ -74,7 +74,7 @@ class ModuleNamesX return MOD_RES_PASSTHRU; } - ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE + ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) override { if ((!memb) || (!cap.get(source))) return MOD_RES_PASSTHRU; diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp index 15711a4c1..329f3e4f8 100644 --- a/src/modules/m_nationalchars.cpp +++ b/src/modules/m_nationalchars.cpp @@ -253,7 +253,7 @@ class ModuleNationalChars : public Module memcpy(prev_map, national_case_insensitive_map, sizeof(prev_map)); } - void init() CXX11_OVERRIDE + void init() override { memcpy(m_lower, rfc_case_insensitive_map, 256); national_case_insensitive_map = m_lower; @@ -261,7 +261,7 @@ class ModuleNationalChars : public Module ServerInstance->IsNick = &lwbNickHandler::Call; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("nationalchars"); charset = tag->getString("file"); @@ -309,7 +309,7 @@ class ModuleNationalChars : public Module CheckRehash(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING", VF_VENDOR | VF_COMMON, charset); } diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp index ce8b364e4..f0ea92dd5 100644 --- a/src/modules/m_nickflood.cpp +++ b/src/modules/m_nickflood.cpp @@ -90,7 +90,7 @@ class NickFlood : public ParamMode<NickFlood, SimpleExtItem<nickfloodsettings> > { } - ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) override { std::string::size_type colon = parameter.find(':'); if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos)) @@ -132,13 +132,13 @@ class ModuleNickFlood : public Module { } - void ReadConfig(ConfigStatus&) CXX11_OVERRIDE + void ReadConfig(ConfigStatus&) override { ConfigTag* tag = ServerInstance->Config->ConfValue("nickflood"); duration = tag->getDuration("duration", 60, 10, 600); } - ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE + ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) override { for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++) { @@ -174,7 +174,7 @@ class ModuleNickFlood : public Module /* * XXX: HACK: We do the increment on the *POST* event here (instead of all together) because we have no way of knowing whether other modules would block a nickchange. */ - void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE + void OnUserPostNick(User* user, const std::string &oldnick) override { if (isdigit(user->nick[0])) /* allow switches to UID */ return; @@ -200,7 +200,7 @@ class ModuleNickFlood : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Channel mode F - nick flood protection", VF_VENDOR); } diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 964ed9780..f4ea299d3 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -44,7 +44,7 @@ class CommandNicklock : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* target = ServerInstance->FindNick(parameters[0]); @@ -84,7 +84,7 @@ class CommandNicklock : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -104,7 +104,7 @@ class CommandNickunlock : public Command TRANSLATE1(TR_NICK); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* target = ServerInstance->FindNick(parameters[0]); @@ -131,7 +131,7 @@ class CommandNickunlock : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -150,12 +150,12 @@ class ModuleNickLock : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the NICKLOCK command, allows an oper to change a users nick and lock them to it until they quit", VF_OPTCOMMON | VF_VENDOR); } - ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE + ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) override { if (locked.get(user)) { @@ -165,7 +165,7 @@ class ModuleNickLock : public Module return MOD_RES_PASSTHRU; } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { Module *nflood = ServerInstance->Modules->Find("m_nickflood.so"); ServerInstance->Modules->SetPriority(this, I_OnUserPreNick, PRIORITY_BEFORE, nflood); diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp index af14c73ec..66f97e6a7 100644 --- a/src/modules/m_noctcp.cpp +++ b/src/modules/m_noctcp.cpp @@ -47,12 +47,12 @@ class ModuleNoCTCP : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides user mode +T and channel mode +C to block CTCPs", VF_VENDOR); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; @@ -86,7 +86,7 @@ class ModuleNoCTCP : public Module return MOD_RES_PASSTHRU; } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('C'); } diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp index 3155dcb6c..bfb7fbef0 100644 --- a/src/modules/m_nokicks.cpp +++ b/src/modules/m_nokicks.cpp @@ -32,12 +32,12 @@ class ModuleNoKicks : public Module { } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('Q'); } - ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE + ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) override { if (!memb->chan->GetExtBanStatus(source, 'Q').check(!memb->chan->IsModeSet(nk))) { @@ -48,7 +48,7 @@ class ModuleNoKicks : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides channel mode +Q to prevent kicks on the channel.", VF_VENDOR); } diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp index 998662c3c..9c4c90cfe 100644 --- a/src/modules/m_nonicks.cpp +++ b/src/modules/m_nonicks.cpp @@ -33,17 +33,17 @@ class ModuleNoNickChange : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR); } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('N'); } - ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE + ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) override { for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++) { diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp index 77b0c9aa3..c3633e9a9 100644 --- a/src/modules/m_nonotice.cpp +++ b/src/modules/m_nonotice.cpp @@ -34,12 +34,12 @@ class ModuleNoNotice : public Module { } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('T'); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { ModResult res; if ((details.type == MSG_NOTICE) && (target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user))) @@ -60,7 +60,7 @@ class ModuleNoNotice : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides channel mode +T to block notices to the channel", VF_VENDOR); } diff --git a/src/modules/m_nopartmsg.cpp b/src/modules/m_nopartmsg.cpp index 7aeb66920..858912044 100644 --- a/src/modules/m_nopartmsg.cpp +++ b/src/modules/m_nopartmsg.cpp @@ -22,12 +22,12 @@ class ModulePartMsgBan : public Module { public: - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements extban +b p: - part message bans", VF_OPTCOMMON|VF_VENDOR); } - void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE + void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) override { if (!IS_LOCAL(memb->user)) return; @@ -36,7 +36,7 @@ class ModulePartMsgBan : public Module partmessage.clear(); } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('p'); } diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp index 67b79e07c..010ede051 100644 --- a/src/modules/m_ojoin.cpp +++ b/src/modules/m_ojoin.cpp @@ -38,7 +38,7 @@ class CommandOjoin : public SplitCommand active = false; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { // Make sure the channel name is allowable. if (!ServerInstance->IsChannel(parameters[0])) @@ -92,7 +92,7 @@ class NetworkPrefix : public PrefixMode ranktoset = ranktounset = UINT_MAX; } - ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) CXX11_OVERRIDE + ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) override { User* theuser = ServerInstance->FindNick(parameter); // remove own privs? @@ -116,7 +116,7 @@ class ModuleOjoin : public Module { } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { if (mycommand.active) { @@ -129,14 +129,14 @@ class ModuleOjoin : public Module return MOD_RES_PASSTHRU; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* Conf = ServerInstance->Config->ConfValue("ojoin"); mycommand.notice = Conf->getBool("notice", true); mycommand.op = Conf->getBool("op", true); } - ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE + ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) override { // Don't do anything if they're not +Y if (!memb->HasMode(&np)) @@ -150,12 +150,12 @@ class ModuleOjoin : public Module return MOD_RES_DENY; } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_FIRST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Network Business Join", VF_VENDOR); } diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp index f0812ce27..aea6329ef 100644 --- a/src/modules/m_operchans.cpp +++ b/src/modules/m_operchans.cpp @@ -46,7 +46,7 @@ class ModuleOperChans : public Module { } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { if (chan && chan->IsModeSet(oc) && !user->IsOper()) { @@ -56,7 +56,7 @@ class ModuleOperChans : public Module return MOD_RES_PASSTHRU; } - ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) override { if ((mask.length() > 2) && (mask[0] == 'O') && (mask[1] == ':')) { @@ -66,12 +66,12 @@ class ModuleOperChans : public Module return MOD_RES_PASSTHRU; } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('O'); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR); } diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp index dd80d99ba..1551e6d30 100644 --- a/src/modules/m_operjoin.cpp +++ b/src/modules/m_operjoin.cpp @@ -30,7 +30,7 @@ class ModuleOperjoin : public Module bool override; public: - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin"); @@ -42,12 +42,12 @@ class ModuleOperjoin : public Module operChans.push_back(channame); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR); } - void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE + void OnPostOper(User* user, const std::string &opertype, const std::string &opername) override { LocalUser* localuser = IS_LOCAL(user); if (!localuser) diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp index 2e02ffddf..d97e1aa33 100644 --- a/src/modules/m_operlevels.cpp +++ b/src/modules/m_operlevels.cpp @@ -25,12 +25,12 @@ class ModuleOperLevels : public Module { public: - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR); } - ModResult OnKill(User* source, User* dest, const std::string &reason) CXX11_OVERRIDE + ModResult OnKill(User* source, User* dest, const std::string &reason) override { // oper killing an oper? if (dest->IsOper() && source->IsOper()) diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp index b64e18870..76c5f5d06 100644 --- a/src/modules/m_operlog.cpp +++ b/src/modules/m_operlog.cpp @@ -26,22 +26,22 @@ class ModuleOperLog : public Module bool tosnomask; public: - void init() CXX11_OVERRIDE + void init() override { ServerInstance->SNO->EnableSnomask('r', "OPERLOG"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("A module which logs all oper commands to the ircd log at default loglevel.", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { tosnomask = ServerInstance->Config->ConfValue("operlog")->getBool("tosnomask", false); } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { /* If the command doesnt appear to be valid, we dont want to mess with it. */ if (!validated) @@ -62,7 +62,7 @@ class ModuleOperLog : public Module return MOD_RES_PASSTHRU; } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["OPERLOG"]; } diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp index 475d561ba..5e644123f 100644 --- a/src/modules/m_opermodes.cpp +++ b/src/modules/m_opermodes.cpp @@ -25,12 +25,12 @@ class ModuleModesOnOper : public Module { public: - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR); } - void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE + void OnPostOper(User* user, const std::string &opertype, const std::string &opername) override { if (!IS_LOCAL(user)) return; diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp index 49409a1c0..f277d8f6a 100644 --- a/src/modules/m_opermotd.cpp +++ b/src/modules/m_opermotd.cpp @@ -34,14 +34,14 @@ class CommandOpermotd : public Command flags_needed = 'o'; syntax = "[<servername>]"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if ((parameters.empty()) || (parameters[0] == ServerInstance->Config->ServerName)) ShowOperMOTD(user); return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { if ((!parameters.empty()) && (parameters[0].find('.') != std::string::npos)) return ROUTE_OPT_UCAST(parameters[0]); @@ -79,18 +79,18 @@ class ModuleOpermotd : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR | VF_OPTCOMMON); } - void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE + void OnOper(User* user, const std::string &opertype) override { if (onoper && IS_LOCAL(user)) cmd.ShowOperMOTD(user); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { cmd.opermotd.clear(); ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd"); diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp index a8afd7c96..6283f2471 100644 --- a/src/modules/m_operprefix.cpp +++ b/src/modules/m_operprefix.cpp @@ -44,7 +44,7 @@ class HideOperWatcher : public ModeWatcher public: HideOperWatcher(ModuleOperPrefixMode* parent); - void AfterMode(User* source, User* dest, Channel* channel, const std::string ¶meter, bool adding) CXX11_OVERRIDE; + void AfterMode(User* source, User* dest, Channel* channel, const std::string ¶meter, bool adding) override; }; class ModuleOperPrefixMode : public Module @@ -64,14 +64,14 @@ class ModuleOperPrefixMode : public Module */ } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { if ((user->IsOper()) && (!user->IsModeSet(hideopermode))) privs.push_back('y'); return MOD_RES_PASSTHRU; } - void OnPostJoin(Membership* memb) CXX11_OVERRIDE + void OnPostJoin(Membership* memb) override { if ((!IS_LOCAL(memb->user)) || (!memb->user->IsOper()) || (memb->user->IsModeSet(hideopermode))) return; @@ -93,18 +93,18 @@ class ModuleOperPrefixMode : public Module ServerInstance->Modes->Process(ServerInstance->FakeClient, (*v)->chan, NULL, changelist); } - void OnPostOper(User* user, const std::string& opername, const std::string& opertype) CXX11_OVERRIDE + void OnPostOper(User* user, const std::string& opername, const std::string& opertype) override { if (IS_LOCAL(user) && (!user->IsModeSet(hideopermode))) SetOperPrefix(user, true); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR); } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { // m_opermodes may set +H on the oper to hide him, we don't want to set the oper prefix in that case Module* opermodes = ServerInstance->Modules->Find("m_opermodes.so"); diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 7155e7e76..9c6914459 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -88,13 +88,13 @@ class ModuleOverride : public Module { } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->SNO->EnableSnomask('v', "OVERRIDE"); UmodeEnabled = ServerInstance->Config->ConfValue("override")->getBool("enableumode"); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { // re-read our config options ConfigTag* tag = ServerInstance->Config->ConfValue("override"); @@ -102,7 +102,7 @@ class ModuleOverride : public Module RequireKey = tag->getBool("requirekey"); } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["OVERRIDE"]; } @@ -119,7 +119,7 @@ class ModuleOverride : public Module } - ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) CXX11_OVERRIDE + ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) override { if (IS_LOCAL(source) && source->IsOper() && CanOverride(source, "TOPIC")) { @@ -135,7 +135,7 @@ class ModuleOverride : public Module return MOD_RES_PASSTHRU; } - ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE + ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) override { if (source->IsOper() && CanOverride(source,"KICK")) { @@ -150,7 +150,7 @@ class ModuleOverride : public Module return MOD_RES_PASSTHRU; } - ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE + ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) override { if (!channel) return MOD_RES_PASSTHRU; @@ -192,7 +192,7 @@ class ModuleOverride : public Module return MOD_RES_PASSTHRU; } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { if (user->IsOper()) { @@ -218,7 +218,7 @@ class ModuleOverride : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for allowing opers to override certain things",VF_VENDOR); } diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp index 37efec02b..4f1730594 100644 --- a/src/modules/m_passforward.cpp +++ b/src/modules/m_passforward.cpp @@ -25,12 +25,12 @@ class ModulePassForward : public Module std::string nickrequired, forwardmsg, forwardcmd; public: - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Sends server password to NickServ", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("passforward"); nickrequired = tag->getString("nick", "NickServ"); @@ -73,7 +73,7 @@ class ModulePassForward : public Module } } - void OnPostConnect(User* ruser) CXX11_OVERRIDE + void OnPostConnect(User* ruser) override { LocalUser* user = IS_LOCAL(ruser); if (!user || user->password.empty()) diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp index 137ddb96c..726526d62 100644 --- a/src/modules/m_password_hash.cpp +++ b/src/modules/m_password_hash.cpp @@ -32,7 +32,7 @@ class CommandMkpasswd : public Command Penalty = 5; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (!parameters[0].compare(0, 5, "hmac-", 5)) { @@ -82,7 +82,7 @@ class ModulePasswordHash : public Module { } - ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) CXX11_OVERRIDE + ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) override { if (!hashtype.compare(0, 5, "hmac-", 5)) { @@ -126,7 +126,7 @@ class ModulePasswordHash : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the ability to hash passwords to other modules", VF_VENDOR); } diff --git a/src/modules/m_pbkdf2.cpp b/src/modules/m_pbkdf2.cpp index 036538a39..3b2c3052a 100644 --- a/src/modules/m_pbkdf2.cpp +++ b/src/modules/m_pbkdf2.cpp @@ -109,14 +109,14 @@ class PBKDF2Provider : public HashProvider return output; } - std::string GenerateRaw(const std::string& data) CXX11_OVERRIDE + std::string GenerateRaw(const std::string& data) override { PBKDF2Hash hs(this->iterations, this->dkey_length, ServerInstance->GenRandomStr(dkey_length, false)); hs.hash = PBKDF2(data, hs.salt, this->iterations, this->dkey_length); return hs.ToString(); } - bool Compare(const std::string& input, const std::string& hash) CXX11_OVERRIDE + bool Compare(const std::string& input, const std::string& hash) override { PBKDF2Hash hs(hash); if (!hs.IsValid()) @@ -126,7 +126,7 @@ class PBKDF2Provider : public HashProvider return (cmp == hs.hash); } - std::string ToPrintable(const std::string& raw) CXX11_OVERRIDE + std::string ToPrintable(const std::string& raw) override { return raw; } @@ -206,7 +206,7 @@ class ModulePBKDF2 : public Module stdalgo::delete_all(providers); } - void OnServiceAdd(ServiceProvider& provider) CXX11_OVERRIDE + void OnServiceAdd(ServiceProvider& provider) override { // Check if it's a hash provider if (provider.name.compare(0, 5, "hash/")) @@ -223,7 +223,7 @@ class ModulePBKDF2 : public Module ConfigureProviders(); } - void OnServiceDel(ServiceProvider& prov) CXX11_OVERRIDE + void OnServiceDel(ServiceProvider& prov) override { for (std::vector<PBKDF2Provider*>::iterator i = providers.begin(); i != providers.end(); ++i) { @@ -238,12 +238,12 @@ class ModulePBKDF2 : public Module } } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { GetConfig(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements PBKDF2 hashing", VF_VENDOR); } diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index a7be6df08..2ed7032b0 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -34,7 +34,7 @@ class PermChannel : public ModeHandler oper = true; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override { if (adding == channel->IsModeSet(this)) return MODEACTION_DENY; @@ -170,7 +170,7 @@ public: { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("permchanneldb"); permchannelsconf = tag->getString("filename"); @@ -252,7 +252,7 @@ public: } } - ModResult OnRawMode(User* user, Channel* chan, ModeHandler* mh, const std::string& param, bool adding) CXX11_OVERRIDE + ModResult OnRawMode(User* user, Channel* chan, ModeHandler* mh, const std::string& param, bool adding) override { if (chan && (chan->IsModeSet(p) || mh == &p)) dirty = true; @@ -260,20 +260,20 @@ public: return MOD_RES_PASSTHRU; } - void OnPostTopicChange(User*, Channel *c, const std::string&) CXX11_OVERRIDE + void OnPostTopicChange(User*, Channel *c, const std::string&) override { if (c->IsModeSet(p)) dirty = true; } - void OnBackgroundTimer(time_t) CXX11_OVERRIDE + void OnBackgroundTimer(time_t) override { if (dirty) WriteDatabase(p, this, save_listmodes); dirty = false; } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { // XXX: Load the DB here because the order in which modules are init()ed at boot is // alphabetical, this means we must wait until all modules have done their init() @@ -303,12 +303,12 @@ public: } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for channel mode +P to provide permanent channels",VF_VENDOR); } - ModResult OnChannelPreDelete(Channel *c) CXX11_OVERRIDE + ModResult OnChannelPreDelete(Channel *c) override { if (c->IsModeSet(p)) return MOD_RES_DENY; diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp index 1bb28583e..5c9947565 100644 --- a/src/modules/m_randquote.cpp +++ b/src/modules/m_randquote.cpp @@ -31,7 +31,7 @@ class ModuleRandQuote : public Module std::vector<std::string> quotes; public: - void init() CXX11_OVERRIDE + void init() override { ConfigTag* conf = ServerInstance->Config->ConfValue("randquote"); prefix = conf->getString("prefix"); @@ -40,7 +40,7 @@ class ModuleRandQuote : public Module quotes = reader.GetVector(); } - void OnUserConnect(LocalUser* user) CXX11_OVERRIDE + void OnUserConnect(LocalUser* user) override { if (!quotes.empty()) { @@ -49,7 +49,7 @@ class ModuleRandQuote : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides random quotes on connect.", VF_VENDOR); } diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index b71a2f3db..f8fdf3480 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -32,7 +32,7 @@ class Redirect : public ParamMode<Redirect, LocalStringExt> Redirect(Module* Creator) : ParamMode<Redirect, LocalStringExt>(Creator, "redirect", 'L') { } - ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) override { if (IS_LOCAL(source)) { @@ -86,7 +86,7 @@ class ModuleRedirect : public Module { } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { if (chan) { @@ -121,7 +121,7 @@ class ModuleRedirect : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides channel mode +L (limit redirection) and user mode +L (no forced redirection)", VF_VENDOR); } diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp index 9c3162885..929dc04d5 100644 --- a/src/modules/m_regex_glob.cpp +++ b/src/modules/m_regex_glob.cpp @@ -28,7 +28,7 @@ public: { } - bool Matches(const std::string& text) CXX11_OVERRIDE + bool Matches(const std::string& text) override { return InspIRCd::Match(text, this->regex_string); } @@ -37,7 +37,7 @@ public: class GlobFactory : public RegexFactory { public: - Regex* Create(const std::string& expr) CXX11_OVERRIDE + Regex* Create(const std::string& expr) override { return new GlobRegex(expr); } @@ -54,7 +54,7 @@ public: { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Regex module using plain wildcard matching.", VF_VENDOR); } diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index 8d60ff8c6..a163e6dc8 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -169,7 +169,7 @@ class CommandRemove : public RemoveBase TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { return HandleRMB(user, parameters, false); } @@ -187,7 +187,7 @@ class CommandFpart : public RemoveBase TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { return HandleRMB(user, parameters, true); } @@ -208,19 +208,19 @@ class ModuleRemove : public Module { } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["REMOVE"]; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("remove"); supportnokicks = tag->getBool("supportnokicks"); cmd1.protectedrank = cmd2.protectedrank = tag->getUInt("protectedrank", 50000); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp index a8dd49e2d..8b4d7afd7 100644 --- a/src/modules/m_repeat.cpp +++ b/src/modules/m_repeat.cpp @@ -127,7 +127,7 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> > { } - void OnUnset(User* source, Channel* chan) CXX11_OVERRIDE + void OnUnset(User* source, Channel* chan) override { // Unset the per-membership extension when the mode is removed const Channel::MemberMap& users = chan->GetUsers(); @@ -135,7 +135,7 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> > MemberInfoExt.unset(i->second); } - ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) override { ChannelSettings settings; if (!ParseSettings(source, parameter, settings)) @@ -361,12 +361,12 @@ class RepeatModule : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { rm.ReadConfig(); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (target.type != MessageTarget::TYPE_CHANNEL || !IS_LOCAL(user)) return MOD_RES_PASSTHRU; @@ -405,12 +405,12 @@ class RepeatModule : public Module return MOD_RES_PASSTHRU; } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the +E channel mode - for blocking of similar messages", VF_COMMON|VF_VENDOR, rm.GetModuleSettings()); } diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp index 853b6b75c..ed31530aa 100644 --- a/src/modules/m_restrictchans.cpp +++ b/src/modules/m_restrictchans.cpp @@ -54,7 +54,7 @@ class ModuleRestrictChans : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { AllowChans newallows; ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel"); @@ -73,7 +73,7 @@ class ModuleRestrictChans : public Module allowregistered = tag->getBool("allowregistered", false); } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { // channel does not yet exist (record is null, about to be created IF we were to allow it) if (!chan && !CanCreateChannel(user, cname)) @@ -82,7 +82,7 @@ class ModuleRestrictChans : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allows restricting who can create channels", VF_VENDOR); } diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp index 16a9bae86..3cc02ab48 100644 --- a/src/modules/m_restrictmsg.cpp +++ b/src/modules/m_restrictmsg.cpp @@ -24,7 +24,7 @@ class ModuleRestrictMsg : public Module { public: - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if ((target.type == MessageTarget::TYPE_USER) && (IS_LOCAL(user))) { @@ -47,7 +47,7 @@ class ModuleRestrictMsg : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers.",VF_VENDOR); } diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 1247e81d3..23093ae3c 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -57,7 +57,7 @@ class RLine : public XLine delete regex; } - bool Matches(User* u) CXX11_OVERRIDE + bool Matches(User* u) override { LocalUser* lu = IS_LOCAL(u); if (lu && lu->exempt) @@ -68,12 +68,12 @@ class RLine : public XLine return (regex->Matches(host) || regex->Matches(ip)); } - bool Matches(const std::string& compare) CXX11_OVERRIDE + bool Matches(const std::string& compare) override { return regex->Matches(compare); } - void Apply(User* u) CXX11_OVERRIDE + void Apply(User* u) override { if (ZlineOnMatch) { @@ -91,7 +91,7 @@ class RLine : public XLine DefaultApply(u, "R", false); } - const std::string& Displayable() CXX11_OVERRIDE + const std::string& Displayable() override { return matchtext; } @@ -114,7 +114,7 @@ class RLineFactory : public XLineFactory /** Generate a RLine */ - XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) override { if (!rxfactory) { @@ -140,7 +140,7 @@ class CommandRLine : public Command flags_needed = 'o'; this->syntax = "<regex> [<rline-duration>] :<reason>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (parameters.size() >= 3) @@ -203,7 +203,7 @@ class CommandRLine : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { if (IS_LOCAL(user)) return ROUTE_LOCALONLY; // spanningtree will send ADDLINE @@ -231,7 +231,7 @@ class ModuleRLine : public Module, public Stats::EventListener { } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->XLines->RegisterFactory(&f); } @@ -242,12 +242,12 @@ class ModuleRLine : public Module, public Stats::EventListener ServerInstance->XLines->UnregisterFactory(&f); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("RLINE: Regexp user banning.", VF_COMMON | VF_VENDOR, rxfactory ? rxfactory->name : ""); } - ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE + ModResult OnUserRegister(LocalUser* user) override { // Apply lines on user connect XLine *rl = ServerInstance->XLines->MatchesLine("R", user); @@ -261,7 +261,7 @@ class ModuleRLine : public Module, public Stats::EventListener return MOD_RES_PASSTHRU; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("rline"); @@ -294,7 +294,7 @@ class ModuleRLine : public Module, public Stats::EventListener initing = false; } - ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE + ModResult OnStats(Stats::Context& stats) override { if (stats.GetSymbol() != 'R') return MOD_RES_PASSTHRU; @@ -303,7 +303,7 @@ class ModuleRLine : public Module, public Stats::EventListener return MOD_RES_DENY; } - void OnUserPostNick(User *user, const std::string &oldnick) CXX11_OVERRIDE + void OnUserPostNick(User *user, const std::string &oldnick) override { if (!IS_LOCAL(user)) return; @@ -320,7 +320,7 @@ class ModuleRLine : public Module, public Stats::EventListener } } - void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE + void OnBackgroundTimer(time_t curtime) override { if (added_zline) { @@ -329,7 +329,7 @@ class ModuleRLine : public Module, public Stats::EventListener } } - void OnUnloadModule(Module* mod) CXX11_OVERRIDE + void OnUnloadModule(Module* mod) override { // If the regex engine became unavailable or has changed, remove all R-lines. if (!rxfactory) @@ -343,7 +343,7 @@ class ModuleRLine : public Module, public Stats::EventListener } } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { Module* mod = ServerInstance->Modules->Find("m_cgiirc.so"); ServerInstance->Modules->SetPriority(this, I_OnUserRegister, PRIORITY_AFTER, mod); diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp index ce28630b4..09f65beba 100644 --- a/src/modules/m_rmode.cpp +++ b/src/modules/m_rmode.cpp @@ -31,7 +31,7 @@ class CommandRMode : public Command syntax = "<channel> <mode> [pattern]"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { ModeHandler* mh; Channel* chan = ServerInstance->FindChan(parameters[0]); @@ -101,7 +101,7 @@ class ModuleRMode : public Module public: ModuleRMode() : cmd(this) { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allows glob-based removal of list modes", VF_VENDOR); } diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index 9aa8837e0..c81168bbc 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -33,7 +33,7 @@ class CommandSajoin : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { const unsigned int channelindex = (parameters.size() > 1) ? 1 : 0; if (CommandParser::LoopCall(user, this, parameters, channelindex)) @@ -101,7 +101,7 @@ class CommandSajoin : public Command } } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -116,7 +116,7 @@ class ModuleSajoin : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides command SAJOIN to allow opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp index 6a9e11fe7..8530d672a 100644 --- a/src/modules/m_sakick.cpp +++ b/src/modules/m_sakick.cpp @@ -31,7 +31,7 @@ class CommandSakick : public Command TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* dest = ServerInstance->FindNick(parameters[1]); Channel* channel = ServerInstance->FindChan(parameters[0]); @@ -73,7 +73,7 @@ class CommandSakick : public Command return CMD_FAILURE; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[1]); } @@ -88,7 +88,7 @@ class ModuleSakick : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides a SAKICK command", VF_OPTCOMMON|VF_VENDOR); } diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp index db3345b98..564864b31 100644 --- a/src/modules/m_samode.cpp +++ b/src/modules/m_samode.cpp @@ -37,7 +37,7 @@ class CommandSamode : public Command active = false; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (parameters[0].c_str()[0] != '#') { @@ -91,19 +91,19 @@ class ModuleSaMode : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR); } - ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE + ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) override { if (cmd.active) return MOD_RES_ALLOW; return MOD_RES_PASSTHRU; } - void OnMode(User* user, User* destuser, Channel* destchan, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) CXX11_OVERRIDE + void OnMode(User* user, User* destuser, Channel* destchan, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) override { if (!cmd.active) return; @@ -122,7 +122,7 @@ class ModuleSaMode : public Module cmd.LogUsage(user, logtext); } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { Module* disabled = ServerInstance->Modules->Find("m_disabled.so"); ServerInstance->Modules->SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disabled); diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp index 4744ca1de..fd917cd93 100644 --- a/src/modules/m_sanick.cpp +++ b/src/modules/m_sanick.cpp @@ -33,7 +33,7 @@ class CommandSanick : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* target = ServerInstance->FindNick(parameters[0]); @@ -77,7 +77,7 @@ class CommandSanick : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -93,7 +93,7 @@ class ModuleSanick : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for SANICK command", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp index 0cd82fa15..250eec1fc 100644 --- a/src/modules/m_sapart.cpp +++ b/src/modules/m_sapart.cpp @@ -32,7 +32,7 @@ class CommandSapart : public Command TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (CommandParser::LoopCall(user, this, parameters, 1)) return CMD_FAILURE; @@ -78,7 +78,7 @@ class CommandSapart : public Command return CMD_FAILURE; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -94,7 +94,7 @@ class ModuleSapart : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides command SAPART to force-part users from a channel.", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp index 9034016d2..6ccb163e5 100644 --- a/src/modules/m_saquit.cpp +++ b/src/modules/m_saquit.cpp @@ -32,7 +32,7 @@ class CommandSaquit : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* dest = ServerInstance->FindNick(parameters[0]); if ((dest) && (dest->registered == REG_ALL)) @@ -59,7 +59,7 @@ class CommandSaquit : public Command } } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -74,7 +74,7 @@ class ModuleSaquit : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for an SAQUIT command, exits user with a reason", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index cb5245111..a0a308719 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -53,12 +53,12 @@ class ServerTracker : public ServerEventListener } } - void OnServerLink(const Server* server) CXX11_OVERRIDE + void OnServerLink(const Server* server) override { Update(server, true); } - void OnServerSplit(const Server* server) CXX11_OVERRIDE + void OnServerSplit(const Server* server) override { Update(server, false); } @@ -101,7 +101,7 @@ class SASLCap : public Cap::Capability std::string mechlist; const ServerTracker& servertracker; - bool OnRequest(LocalUser* user, bool adding) CXX11_OVERRIDE + bool OnRequest(LocalUser* user, bool adding) override { // Requesting this cap is allowed anytime if (adding) @@ -111,12 +111,12 @@ class SASLCap : public Cap::Capability return (user->registered != REG_ALL); } - bool OnList(LocalUser* user) CXX11_OVERRIDE + bool OnList(LocalUser* user) override { return servertracker.IsOnline(); } - const std::string* GetValue(LocalUser* user) const CXX11_OVERRIDE + const std::string* GetValue(LocalUser* user) const override { return &mechlist; } @@ -319,7 +319,7 @@ class CommandAuthenticate : public SplitCommand allow_empty_last_param = false; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { { if (!cap.get(user)) @@ -356,7 +356,7 @@ class CommandSASL : public Command this->flags_needed = FLAG_SERVERONLY; // should not be called by users } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* target = ServerInstance->FindUUID(parameters[1]); if (!target) @@ -378,7 +378,7 @@ class CommandSASL : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_BROADCAST; } @@ -408,13 +408,13 @@ class ModuleSASL : public Module g_protoev = &protoev; } - void init() CXX11_OVERRIDE + void init() override { if (!ServerInstance->Modules->Find("m_services_account.so") || !ServerInstance->Modules->Find("m_cap.so")) ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WARNING: m_services_account and m_cap are not loaded! m_sasl will NOT function correctly until these two modules are loaded!"); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { std::string target = ServerInstance->Config->ConfValue("sasl")->getString("target"); if (target.empty()) @@ -424,13 +424,13 @@ class ModuleSASL : public Module servertracker.Reset(); } - void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string& extdata) CXX11_OVERRIDE + void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string& extdata) override { if ((target == NULL) && (extname == "saslmechlist")) cap.SetMechlist(extdata); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for IRC Authentication Layer (aka: SASL) via AUTHENTICATE.", VF_VENDOR); } diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp index 8c8629221..12465d2b3 100644 --- a/src/modules/m_satopic.cpp +++ b/src/modules/m_satopic.cpp @@ -29,7 +29,7 @@ class CommandSATopic : public Command flags_needed = 'o'; syntax = "<target> <topic>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { /* * Handles a SATOPIC request. Notifies all +s users. @@ -67,7 +67,7 @@ class ModuleSATopic : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides a SATOPIC command", VF_VENDOR); } diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp index 6d9b64df2..6c494d1ed 100644 --- a/src/modules/m_securelist.cpp +++ b/src/modules/m_securelist.cpp @@ -31,12 +31,12 @@ class ModuleSecureList : public Module unsigned int WaitTime; public: - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { AllowList newallows; @@ -61,7 +61,7 @@ class ModuleSecureList : public Module * OnPreCommand() * Intercept the LIST command. */ - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { /* If the command doesnt appear to be valid, we dont want to mess with it. */ if (!validated) @@ -90,7 +90,7 @@ class ModuleSecureList : public Module return MOD_RES_PASSTHRU; } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["SECURELIST"]; } diff --git a/src/modules/m_seenicks.cpp b/src/modules/m_seenicks.cpp index bff3516f1..5035d8bc1 100644 --- a/src/modules/m_seenicks.cpp +++ b/src/modules/m_seenicks.cpp @@ -24,17 +24,17 @@ class ModuleSeeNicks : public Module { public: - void init() CXX11_OVERRIDE + void init() override { ServerInstance->SNO->EnableSnomask('n',"NICK"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for seeing local and remote nickchanges via snomasks", VF_VENDOR); } - void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE + void OnUserPostNick(User* user, const std::string &oldnick) override { ServerInstance->SNO->WriteToSnoMask(IS_LOCAL(user) ? 'n' : 'N',"User %s changed their nickname to %s", oldnick.c_str(), user->nick.c_str()); } diff --git a/src/modules/m_serverban.cpp b/src/modules/m_serverban.cpp index f51d1d373..d978ad708 100644 --- a/src/modules/m_serverban.cpp +++ b/src/modules/m_serverban.cpp @@ -22,12 +22,12 @@ class ModuleServerBan : public Module { public: - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Extban 's' - server ban",VF_OPTCOMMON|VF_VENDOR); } - ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) override { if ((mask.length() > 2) && (mask[0] == 's') && (mask[1] == ':')) { @@ -37,7 +37,7 @@ class ModuleServerBan : public Module return MOD_RES_PASSTHRU; } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('s'); } diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 08a29f27d..e7413743f 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -51,7 +51,7 @@ class Channel_r : public ModeHandler public: Channel_r(Module* Creator) : ModeHandler(Creator, "c_registered", 'r', PARAM_NONE, MODETYPE_CHANNEL) { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override { // only a u-lined server may add or remove the +r mode. if (!IS_LOCAL(source)) @@ -79,7 +79,7 @@ class User_r : public ModeHandler public: User_r(Module* Creator) : ModeHandler(Creator, "u_registered", 'r', PARAM_NONE, MODETYPE_USER) { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override { if (!IS_LOCAL(source)) { @@ -108,7 +108,7 @@ class AccountExtItemImpl : public AccountExtItem { } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) override { User* user = static_cast<User*>(container); @@ -164,14 +164,14 @@ class ModuleServicesAccount : public Module, public Whois::EventListener { } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('R'); tokens["EXTBAN"].push_back('U'); } /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */ - void OnWhois(Whois::Context& whois) CXX11_OVERRIDE + void OnWhois(Whois::Context& whois) override { std::string* account = accountname.get(whois.GetTarget()); @@ -187,14 +187,14 @@ class ModuleServicesAccount : public Module, public Whois::EventListener } } - void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE + void OnUserPostNick(User* user, const std::string &oldnick) override { /* On nickchange, if they have +r, remove it */ if ((user->IsModeSet(m5)) && (ServerInstance->FindNickOnly(oldnick) != user)) m5.RemoveMode(user); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; @@ -232,7 +232,7 @@ class ModuleServicesAccount : public Module, public Whois::EventListener return MOD_RES_PASSTHRU; } - ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) override { if (checking_ban) return MOD_RES_PASSTHRU; @@ -268,7 +268,7 @@ class ModuleServicesAccount : public Module, public Whois::EventListener return MOD_RES_PASSTHRU; } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { std::string *account = accountname.get(user); bool is_registered = account && !account->empty(); @@ -288,14 +288,14 @@ class ModuleServicesAccount : public Module, public Whois::EventListener return MOD_RES_PASSTHRU; } - ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) override { if (myclass->config->getBool("requireaccount") && !accountname.get(user)) return MOD_RES_DENY; return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for ircu-style services accounts, including chmode +R, etc.",VF_OPTCOMMON|VF_VENDOR); } diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp index a5d7a82e4..6850bf592 100644 --- a/src/modules/m_servprotect.cpp +++ b/src/modules/m_servprotect.cpp @@ -38,7 +38,7 @@ class ServProtectMode : public ModeHandler public: ServProtectMode(Module* Creator) : ModeHandler(Creator, "servprotect", 'k', PARAM_NONE, MODETYPE_USER) { oper = true; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override { /* Because this returns MODEACTION_DENY all the time, there is only ONE * way to add this mode and that is at client introduction in the UID command, @@ -63,12 +63,12 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides usermode +k to protect services from kicks, kills, and mode changes.", VF_VENDOR); } - void OnWhois(Whois::Context& whois) CXX11_OVERRIDE + void OnWhois(Whois::Context& whois) override { if (whois.GetTarget()->IsModeSet(bm)) { @@ -76,7 +76,7 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public } } - ModResult OnRawMode(User* user, Channel* chan, ModeHandler* mh, const std::string& param, bool adding) CXX11_OVERRIDE + ModResult OnRawMode(User* user, Channel* chan, ModeHandler* mh, const std::string& param, bool adding) override { /* Check that the mode is not a server mode, it is being removed, the user making the change is local, there is a parameter, * and the user making the change is not a uline @@ -109,7 +109,7 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public return MOD_RES_PASSTHRU; } - ModResult OnKill(User* src, User* dst, const std::string &reason) CXX11_OVERRIDE + ModResult OnKill(User* src, User* dst, const std::string &reason) override { if (src == NULL) return MOD_RES_PASSTHRU; @@ -123,7 +123,7 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public return MOD_RES_PASSTHRU; } - ModResult OnUserPreKick(User *src, Membership* memb, const std::string &reason) CXX11_OVERRIDE + ModResult OnUserPreKick(User *src, Membership* memb, const std::string &reason) override { if (memb->user->IsModeSet(bm)) { @@ -134,7 +134,7 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public return MOD_RES_PASSTHRU; } - ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE + ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) override { return ((numeric.GetNumeric() == 319) && whois.GetTarget()->IsModeSet(bm)) ? MOD_RES_DENY : MOD_RES_PASSTHRU; } diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp index 87eed4022..86e7533d1 100644 --- a/src/modules/m_sethost.cpp +++ b/src/modules/m_sethost.cpp @@ -35,7 +35,7 @@ class CommandSethost : public Command flags_needed = 'o'; syntax = "<new-hostname>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (parameters[0].length() > ServerInstance->Config->Limits.MaxHost) { @@ -73,7 +73,7 @@ class ModuleSetHost : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789"); @@ -82,7 +82,7 @@ class ModuleSetHost : public Module cmd.hostmap.set(static_cast<unsigned char>(*n)); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the SETHOST command", VF_VENDOR); } diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp index 11ce8f015..8f8fe307b 100644 --- a/src/modules/m_setident.cpp +++ b/src/modules/m_setident.cpp @@ -33,7 +33,7 @@ class CommandSetident : public Command flags_needed = 'o'; syntax = "<new-ident>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (parameters[0].size() > ServerInstance->Config->Limits.IdentMax) { @@ -63,7 +63,7 @@ class ModuleSetIdent : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the SETIDENT command", VF_VENDOR); } diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp index 8bca7000b..e4e992e62 100644 --- a/src/modules/m_setidle.cpp +++ b/src/modules/m_setidle.cpp @@ -38,7 +38,7 @@ class CommandSetidle : public SplitCommand flags_needed = 'o'; syntax = "<duration>"; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { unsigned long idle; if (!InspIRCd::Duration(parameters[0], idle)) @@ -67,7 +67,7 @@ class ModuleSetIdle : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allows opers to set their idle time", VF_VENDOR); } diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp index efe7028b7..17a8669e3 100644 --- a/src/modules/m_setname.cpp +++ b/src/modules/m_setname.cpp @@ -32,7 +32,7 @@ class CommandSetname : public Command syntax = "<new real name>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (parameters[0].size() > ServerInstance->Config->Limits.MaxReal) { @@ -59,7 +59,7 @@ class ModuleSetName : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the SETNAME command", VF_VENDOR); } diff --git a/src/modules/m_sha1.cpp b/src/modules/m_sha1.cpp index 561a7b6cb..5b0e92896 100644 --- a/src/modules/m_sha1.cpp +++ b/src/modules/m_sha1.cpp @@ -170,7 +170,7 @@ class SHA1HashProvider : public HashProvider { } - std::string GenerateRaw(const std::string& data) CXX11_OVERRIDE + std::string GenerateRaw(const std::string& data) override { SHA1Context ctx; ctx.Update(reinterpret_cast<const unsigned char*>(data.data()), data.length()); @@ -190,7 +190,7 @@ class ModuleSHA1 : public Module big_endian = (htonl(1337) == 1337); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements SHA-1 hashing", VF_VENDOR); } diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp index e3ca22a2b..1243c6a13 100644 --- a/src/modules/m_sha256.cpp +++ b/src/modules/m_sha256.cpp @@ -38,7 +38,7 @@ class HashSHA256 : public HashProvider { public: - std::string GenerateRaw(const std::string& data) CXX11_OVERRIDE + std::string GenerateRaw(const std::string& data) override { unsigned char bytes[SHA256_DIGEST_SIZE]; sha256((unsigned char*)data.data(), data.length(), bytes); @@ -59,7 +59,7 @@ class ModuleSHA256 : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements SHA-256 hashing", VF_VENDOR); } diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp index 150b43ebc..52f2ded11 100644 --- a/src/modules/m_showfile.cpp +++ b/src/modules/m_showfile.cpp @@ -51,7 +51,7 @@ class CommandShowFile : public Command { } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (method == SF_NUMERIC) { @@ -139,7 +139,7 @@ class ModuleShowFile : public Module } public: - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { std::vector<CommandShowFile*> newcmds; @@ -171,7 +171,7 @@ class ModuleShowFile : public Module stdalgo::delete_all(cmds); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for showing text files to users", VF_VENDOR); } diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp index d01e1a83b..58109a67d 100644 --- a/src/modules/m_showwhois.cpp +++ b/src/modules/m_showwhois.cpp @@ -55,7 +55,7 @@ class WhoisNoticeCmd : public Command ") did a /whois on you"); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* dest = ServerInstance->FindNick(parameters[0]); if (!dest) @@ -85,7 +85,7 @@ class ModuleShowwhois : public Module, public Whois::EventListener { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("showwhois"); @@ -93,12 +93,12 @@ class ModuleShowwhois : public Module, public Whois::EventListener ShowWhoisFromOpers = tag->getBool("showfromopers", true); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_OPTCOMMON|VF_VENDOR); } - void OnWhois(Whois::Context& whois) CXX11_OVERRIDE + void OnWhois(Whois::Context& whois) override { User* const source = whois.GetSource(); User* const dest = whois.GetTarget(); diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index 6453ace81..eff3557f0 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -35,12 +35,12 @@ class ShunFactory : public XLineFactory /** Generate a shun */ - XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) override { return new Shun(set_time, duration, source, reason, xline_specific_mask); } - bool AutoApplyToUserList(XLine* x) CXX11_OVERRIDE + bool AutoApplyToUserList(XLine* x) override { return false; } @@ -56,7 +56,7 @@ class CommandShun : public Command flags_needed = 'o'; this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { /* syntax: SHUN nick!user@host time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ @@ -129,7 +129,7 @@ class CommandShun : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { if (IS_LOCAL(user)) return ROUTE_LOCALONLY; // spanningtree will send ADDLINE @@ -153,7 +153,7 @@ class ModuleShun : public Module, public Stats::EventListener { } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->XLines->RegisterFactory(&f); } @@ -164,13 +164,13 @@ class ModuleShun : public Module, public Stats::EventListener ServerInstance->XLines->UnregisterFactory(&f); } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { Module* alias = ServerInstance->Modules->Find("m_alias.so"); ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, alias); } - ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE + ModResult OnStats(Stats::Context& stats) override { if (stats.GetSymbol() != 'H') return MOD_RES_PASSTHRU; @@ -179,7 +179,7 @@ class ModuleShun : public Module, public Stats::EventListener return MOD_RES_DENY; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("shun"); std::string cmds = tag->getString("enabledcommands"); @@ -202,7 +202,7 @@ class ModuleShun : public Module, public Stats::EventListener affectopers = tag->getBool("affectopers", false); } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { if (validated) return MOD_RES_PASSTHRU; @@ -241,7 +241,7 @@ class ModuleShun : public Module, public Stats::EventListener return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the /SHUN command, which stops a user from executing all except configured commands.",VF_VENDOR|VF_COMMON); } diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 165e083bb..b650cf91d 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -78,7 +78,7 @@ class CommandSVSSilence : public Command TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { /* * XXX: thought occurs to me @@ -103,7 +103,7 @@ class CommandSVSSilence : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -122,7 +122,7 @@ class CommandSilence : public Command syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (parameters.empty()) { @@ -310,7 +310,7 @@ class ModuleSilence : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("silence"); @@ -318,7 +318,7 @@ class ModuleSilence : public Module ExemptULine = tag->getBool("exemptuline", true); } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["ESILENCE"]; tokens["SILENCE"] = ConvToStr(maxsilence); @@ -341,7 +341,7 @@ class ModuleSilence : public Module } } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (target.type == MessageTarget::TYPE_USER && IS_LOCAL(target.Get<User>())) { @@ -355,7 +355,7 @@ class ModuleSilence : public Module return MOD_RES_PASSTHRU; } - ModResult OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout) CXX11_OVERRIDE + ModResult OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout) override { return MatchPattern(dest, source, SILENCE_INVITE); } @@ -377,7 +377,7 @@ class ModuleSilence : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the /SILENCE command", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_spanningtree/cachetimer.h b/src/modules/m_spanningtree/cachetimer.h index 489194b86..f3658c8b5 100644 --- a/src/modules/m_spanningtree/cachetimer.h +++ b/src/modules/m_spanningtree/cachetimer.h @@ -25,5 +25,5 @@ class CacheRefreshTimer : public Timer { public: CacheRefreshTimer(); - bool Tick(time_t TIME) CXX11_OVERRIDE; + bool Tick(time_t TIME) override; }; diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h index 434528e46..3f1a4faf8 100644 --- a/src/modules/m_spanningtree/commands.h +++ b/src/modules/m_spanningtree/commands.h @@ -45,55 +45,55 @@ class CommandRConnect : public Command { public: CommandRConnect(Module* Creator); - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; class CommandRSQuit : public Command { public: CommandRSQuit(Module* Creator); - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; class CommandMap : public Command { public: CommandMap(Module* Creator); - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; class CommandSVSJoin : public ServerCommand { public: CommandSVSJoin(Module* Creator) : ServerCommand(Creator, "SVSJOIN", 2) { } - CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, Params& params) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; class CommandSVSPart : public ServerCommand { public: CommandSVSPart(Module* Creator) : ServerCommand(Creator, "SVSPART", 2) { } - CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, Params& params) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; class CommandSVSNick : public ServerCommand { public: CommandSVSNick(Module* Creator) : ServerCommand(Creator, "SVSNICK", 3) { } - CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, Params& params) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; class CommandMetadata : public ServerCommand { public: CommandMetadata(Module* Creator) : ServerCommand(Creator, "METADATA", 2) { } - CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE; + CmdResult Handle(User* user, Params& params) override; class Builder : public CmdBuilder { @@ -150,8 +150,8 @@ class CommandFJoin : public ServerCommand void ProcessModeUUIDPair(const std::string& item, TreeServer* sourceserver, Channel* chan, Modes::ChangeList* modechangelist, FwdFJoinBuilder& fwdfjoin); public: CommandFJoin(Module* Creator) : ServerCommand(Creator, "FJOIN", 3) { } - CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_LOCALONLY; } + CmdResult Handle(User* user, Params& params) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_LOCALONLY; } class Builder : public CmdBuilder { @@ -187,14 +187,14 @@ class CommandFMode : public ServerCommand { public: CommandFMode(Module* Creator) : ServerCommand(Creator, "FMODE", 3) { } - CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE; + CmdResult Handle(User* user, Params& params) override; }; class CommandFTopic : public ServerCommand { public: CommandFTopic(Module* Creator) : ServerCommand(Creator, "FTOPIC", 4, 5) { } - CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE; + CmdResult Handle(User* user, Params& params) override; class Builder : public CmdBuilder { @@ -237,7 +237,7 @@ class CommandResync : public ServerOnlyServerCommand<CommandResync> public: CommandResync(Module* Creator) : ServerOnlyServerCommand<CommandResync>(Creator, "RESYNC", 1) { } CmdResult HandleServer(TreeServer* server, Params& parameters); - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_LOCALONLY; } + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_LOCALONLY; } }; class SpanningTree::CommandAway : public UserOnlyServerCommand<SpanningTree::CommandAway> @@ -265,7 +265,7 @@ class CommandAddLine : public ServerCommand { public: CommandAddLine(Module* Creator) : ServerCommand(Creator, "ADDLINE", 6, 6) { } - CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, Params& parameters) override; class Builder : public CmdBuilder { @@ -278,15 +278,15 @@ class CommandDelLine : public ServerCommand { public: CommandDelLine(Module* Creator) : ServerCommand(Creator, "DELLINE", 2, 2) { } - CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, Params& parameters) override; }; class CommandEncap : public ServerCommand { public: CommandEncap(Module* Creator) : ServerCommand(Creator, "ENCAP", 2) { } - CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, Params& parameters) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; class CommandIdle : public UserOnlyServerCommand<CommandIdle> @@ -294,7 +294,7 @@ class CommandIdle : public UserOnlyServerCommand<CommandIdle> public: CommandIdle(Module* Creator) : UserOnlyServerCommand<CommandIdle>(Creator, "IDLE", 1) { } CmdResult HandleRemote(RemoteUser* user, Params& parameters); - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_UNICAST(parameters[0]); } + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_UNICAST(parameters[0]); } }; class SpanningTree::CommandNick : public UserOnlyServerCommand<SpanningTree::CommandNick> @@ -308,8 +308,8 @@ class SpanningTree::CommandPing : public ServerCommand { public: CommandPing(Module* Creator) : ServerCommand(Creator, "PING", 1) { } - CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_UNICAST(parameters[0]); } + CmdResult Handle(User* user, Params& parameters) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_UNICAST(parameters[0]); } }; class SpanningTree::CommandPong : public ServerOnlyServerCommand<SpanningTree::CommandPong> @@ -317,7 +317,7 @@ class SpanningTree::CommandPong : public ServerOnlyServerCommand<SpanningTree::C public: CommandPong(Module* Creator) : ServerOnlyServerCommand<SpanningTree::CommandPong>(Creator, "PONG", 1) { } CmdResult HandleServer(TreeServer* server, Params& parameters); - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_UNICAST(parameters[0]); } + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_UNICAST(parameters[0]); } }; class CommandSave : public ServerCommand @@ -328,7 +328,7 @@ class CommandSave : public ServerCommand static const time_t SavedTimestamp = 100; CommandSave(Module* Creator) : ServerCommand(Creator, "SAVE", 2) { } - CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, Params& parameters) override; }; class SpanningTree::CommandServer : public ServerOnlyServerCommand<SpanningTree::CommandServer> @@ -361,7 +361,7 @@ class CommandSNONotice : public ServerCommand { public: CommandSNONotice(Module* Creator) : ServerCommand(Creator, "SNONOTICE", 2) { } - CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, Params& parameters) override; }; class CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst> @@ -389,7 +389,7 @@ class CommandNum : public ServerOnlyServerCommand<CommandNum> public: CommandNum(Module* Creator) : ServerOnlyServerCommand<CommandNum>(Creator, "NUM", 3) { } CmdResult HandleServer(TreeServer* server, Params& parameters); - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; class Builder : public CmdBuilder { diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index fa2928687..7ffa4a748 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -96,7 +96,7 @@ class ModuleSpanningTree /** Constructor */ ModuleSpanningTree(); - void init() CXX11_OVERRIDE; + void init() override; /** Shows /LINKS */ @@ -148,36 +148,36 @@ class ModuleSpanningTree ** *** MODULE EVENTS *** **/ - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE; - void OnPostCommand(Command*, const CommandBase::Params& parameters, LocalUser* user, CmdResult result, bool loop) CXX11_OVERRIDE; - void OnUserConnect(LocalUser* source) CXX11_OVERRIDE; - void OnUserInvite(User* source, User* dest, Channel* channel, time_t timeout, unsigned int notifyrank, CUList& notifyexcepts) CXX11_OVERRIDE; - ModResult OnPreTopicChange(User* user, Channel* chan, const std::string& topic) CXX11_OVERRIDE; - void OnPostTopicChange(User* user, Channel* chan, const std::string &topic) CXX11_OVERRIDE; - void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE; - void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE; - void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE; - void OnChangeHost(User* user, const std::string &newhost) CXX11_OVERRIDE; - void OnChangeRealName(User* user, const std::string& real) CXX11_OVERRIDE; - void OnChangeIdent(User* user, const std::string &ident) CXX11_OVERRIDE; - void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE; - void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) CXX11_OVERRIDE; - void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE; - void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE; - void OnPreRehash(User* user, const std::string ¶meter) CXX11_OVERRIDE; - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE; - void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE; - void OnAddLine(User *u, XLine *x) CXX11_OVERRIDE; - void OnDelLine(User *u, XLine *x) CXX11_OVERRIDE; - ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE; - void OnUserAway(User* user) CXX11_OVERRIDE; - void OnUserBack(User* user) CXX11_OVERRIDE; - void OnLoadModule(Module* mod) CXX11_OVERRIDE; - void OnUnloadModule(Module* mod) CXX11_OVERRIDE; - ModResult OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE; - void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) CXX11_OVERRIDE; - CullResult cull() CXX11_OVERRIDE; + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override; + void OnPostCommand(Command*, const CommandBase::Params& parameters, LocalUser* user, CmdResult result, bool loop) override; + void OnUserConnect(LocalUser* source) override; + void OnUserInvite(User* source, User* dest, Channel* channel, time_t timeout, unsigned int notifyrank, CUList& notifyexcepts) override; + ModResult OnPreTopicChange(User* user, Channel* chan, const std::string& topic) override; + void OnPostTopicChange(User* user, Channel* chan, const std::string &topic) override; + void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) override; + void OnBackgroundTimer(time_t curtime) override; + void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) override; + void OnChangeHost(User* user, const std::string &newhost) override; + void OnChangeRealName(User* user, const std::string& real) override; + void OnChangeIdent(User* user, const std::string &ident) override; + void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) override; + void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) override; + void OnUserPostNick(User* user, const std::string &oldnick) override; + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) override; + void OnPreRehash(User* user, const std::string ¶meter) override; + void ReadConfig(ConfigStatus& status) override; + void OnOper(User* user, const std::string &opertype) override; + void OnAddLine(User *u, XLine *x) override; + void OnDelLine(User *u, XLine *x) override; + ModResult OnStats(Stats::Context& stats) override; + void OnUserAway(User* user) override; + void OnUserBack(User* user) override; + void OnLoadModule(Module* mod) override; + void OnUnloadModule(Module* mod) override; + ModResult OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override; + void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) override; + CullResult cull() override; ~ModuleSpanningTree(); - Version GetVersion() CXX11_OVERRIDE; - void Prioritize() CXX11_OVERRIDE; + Version GetVersion() override; + void Prioritize() override; }; diff --git a/src/modules/m_spanningtree/pingtimer.h b/src/modules/m_spanningtree/pingtimer.h index 753558689..9529d9b52 100644 --- a/src/modules/m_spanningtree/pingtimer.h +++ b/src/modules/m_spanningtree/pingtimer.h @@ -63,7 +63,7 @@ class PingTimer : public Timer * @param currtime Time now * @return Always false, we reschedule ourselves instead */ - bool Tick(time_t currtime) CXX11_OVERRIDE; + bool Tick(time_t currtime) override; public: /** Construct the timer. This doesn't schedule the timer. diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h index 969ed68bf..857ac02a2 100644 --- a/src/modules/m_spanningtree/protocolinterface.h +++ b/src/modules/m_spanningtree/protocolinterface.h @@ -28,16 +28,16 @@ class SpanningTreeProtocolInterface : public ProtocolInterface public: Server(TreeSocket* s) : sock(s) { } - void SendMetaData(const std::string& key, const std::string& data) CXX11_OVERRIDE; + void SendMetaData(const std::string& key, const std::string& data) override; }; - bool SendEncapsulatedData(const std::string& targetmask, const std::string& cmd, const CommandBase::Params& params, User* source) CXX11_OVERRIDE; - void BroadcastEncap(const std::string& cmd, const CommandBase::Params& params, User* source, User* omit) CXX11_OVERRIDE; - void SendMetaData(User* user, const std::string& key, const std::string& data) CXX11_OVERRIDE; - void SendMetaData(Channel* chan, const std::string& key, const std::string& data) CXX11_OVERRIDE; - void SendMetaData(const std::string& key, const std::string& data) CXX11_OVERRIDE; - void SendSNONotice(char snomask, const std::string& text) CXX11_OVERRIDE; - void SendMessage(Channel* target, char status, const std::string& text, MessageType msgtype) CXX11_OVERRIDE; - void SendMessage(User* target, const std::string& text, MessageType msgtype) CXX11_OVERRIDE; - void GetServerList(ServerList& sl) CXX11_OVERRIDE; + bool SendEncapsulatedData(const std::string& targetmask, const std::string& cmd, const CommandBase::Params& params, User* source) override; + void BroadcastEncap(const std::string& cmd, const CommandBase::Params& params, User* source, User* omit) override; + void SendMetaData(User* user, const std::string& key, const std::string& data) override; + void SendMetaData(Channel* chan, const std::string& key, const std::string& data) override; + void SendMetaData(const std::string& key, const std::string& data) override; + void SendSNONotice(char snomask, const std::string& text) override; + void SendMessage(Channel* target, char status, const std::string& text, MessageType msgtype) override; + void SendMessage(User* target, const std::string& text, MessageType msgtype) override; + void GetServerList(ServerList& sl) override; }; diff --git a/src/modules/m_spanningtree/remoteuser.h b/src/modules/m_spanningtree/remoteuser.h index 416f2f760..c08168b98 100644 --- a/src/modules/m_spanningtree/remoteuser.h +++ b/src/modules/m_spanningtree/remoteuser.h @@ -28,5 +28,5 @@ class SpanningTree::RemoteUser : public ::RemoteUser { public: RemoteUser(const std::string& uid, Server* srv); - void WriteRemoteNumeric(const Numeric::Numeric& numeric) CXX11_OVERRIDE; + void WriteRemoteNumeric(const Numeric::Numeric& numeric) override; }; diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h index 782ac86ef..5c765de89 100644 --- a/src/modules/m_spanningtree/resolvers.h +++ b/src/modules/m_spanningtree/resolvers.h @@ -37,8 +37,8 @@ class SecurityIPResolver : public DNS::Request DNS::QueryType query; public: SecurityIPResolver(Module* me, DNS::Manager* mgr, const std::string& hostname, Link* x, DNS::QueryType qt); - void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE; - void OnError(const DNS::Query *q) CXX11_OVERRIDE; + void OnLookupComplete(const DNS::Query *r) override; + void OnError(const DNS::Query *q) override; }; /** This class is used to resolve server hostnames during /connect and autoconnect. @@ -56,6 +56,6 @@ class ServernameResolver : public DNS::Request reference<Autoconnect> myautoconnect; public: ServernameResolver(DNS::Manager* mgr, const std::string& hostname, Link* x, DNS::QueryType qt, Autoconnect* myac); - void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE; - void OnError(const DNS::Query *q) CXX11_OVERRIDE; + void OnLookupComplete(const DNS::Query *r) override; + void OnError(const DNS::Query *q) override; }; diff --git a/src/modules/m_spanningtree/servercommand.h b/src/modules/m_spanningtree/servercommand.h index 7e4af3b48..ce8a718ab 100644 --- a/src/modules/m_spanningtree/servercommand.h +++ b/src/modules/m_spanningtree/servercommand.h @@ -40,10 +40,10 @@ class ServerCommand : public CommandBase /** Register this object in the ServerCommandManager */ - void RegisterService() CXX11_OVERRIDE; + void RegisterService() override; virtual CmdResult Handle(User* user, Params& parameters) = 0; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; /** * Extract the TS from a string. @@ -65,7 +65,7 @@ class UserOnlyServerCommand : public ServerCommand UserOnlyServerCommand(Module* Creator, const std::string& Name, unsigned int MinPara = 0, unsigned int MaxPara = 0) : ServerCommand(Creator, Name, MinPara, MaxPara) { } - CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, Params& parameters) override { RemoteUser* remoteuser = IS_REMOTE(user); if (!remoteuser) @@ -84,7 +84,7 @@ class ServerOnlyServerCommand : public ServerCommand ServerOnlyServerCommand(Module* Creator, const std::string& Name, unsigned int MinPara = 0, unsigned int MaxPara = 0) : ServerCommand(Creator, Name, MinPara, MaxPara) { } - CmdResult Handle(User* user, CommandBase::Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, CommandBase::Params& parameters) override { if (!IS_SERVER(user)) throw ProtocolException("Invalid source"); diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h index 037edd194..506273638 100644 --- a/src/modules/m_spanningtree/treeserver.h +++ b/src/modules/m_spanningtree/treeserver.h @@ -228,7 +228,7 @@ class TreeServer : public Server */ void OnPong() { pingtimer.OnPong(); } - CullResult cull() CXX11_OVERRIDE; + CullResult cull() override; /** Destructor, deletes ServerUser unless IsRoot() */ diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index 6206448c1..4cf75ba1e 100644 --- a/src/modules/m_spanningtree/treesocket.h +++ b/src/modules/m_spanningtree/treesocket.h @@ -200,7 +200,7 @@ class TreeSocket : public BufferedSocket */ void CleanNegotiationInfo(); - CullResult cull() CXX11_OVERRIDE; + CullResult cull() override; /** Destructor */ ~TreeSocket(); @@ -216,11 +216,11 @@ class TreeSocket : public BufferedSocket * to server docs on the inspircd.org site, the other side * will then send back its own server string. */ - void OnConnected() CXX11_OVERRIDE; + void OnConnected() override; /** Handle socket error event */ - void OnError(BufferedSocketError e) CXX11_OVERRIDE; + void OnError(BufferedSocketError e) override; /** Sends an error to the remote server, and displays it locally to show * that it was sent. @@ -275,7 +275,7 @@ class TreeSocket : public BufferedSocket /** This function is called when we receive data from a remote * server. */ - void OnDataReady() CXX11_OVERRIDE; + void OnDataReady() override; /** Send one or more complete lines down the socket */ @@ -308,10 +308,10 @@ class TreeSocket : public BufferedSocket /** Handle socket timeout from connect() */ - void OnTimeout() CXX11_OVERRIDE; + void OnTimeout() override; /** Handle server quit on close */ - void Close() CXX11_OVERRIDE; + void Close() override; /** Fixes messages coming from old servers so the new command handlers understand them */ diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h index 6fd36438f..af8e4bc8f 100644 --- a/src/modules/m_spanningtree/utils.h +++ b/src/modules/m_spanningtree/utils.h @@ -113,7 +113,7 @@ class SpanningTreeUtilities : public classbase /** Prepare for class destruction */ - CullResult cull() CXX11_OVERRIDE; + CullResult cull() override; /** Destroy class and free listeners etc */ diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp index d2466f719..016a9d918 100644 --- a/src/modules/m_sqlauth.cpp +++ b/src/modules/m_sqlauth.cpp @@ -47,7 +47,7 @@ class AuthQuery : public SQL::Query { } - void OnResult(SQL::Result& res) CXX11_OVERRIDE + void OnResult(SQL::Result& res) override { LocalUser* user = static_cast<LocalUser*>(ServerInstance->FindUUID(uid)); if (!user) @@ -101,7 +101,7 @@ class AuthQuery : public SQL::Query } } - void OnError(SQL::Error& error) CXX11_OVERRIDE + void OnError(SQL::Error& error) override { User* user = ServerInstance->FindNick(uid); if (!user) @@ -134,7 +134,7 @@ class ModuleSQLAuth : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* conf = ServerInstance->Config->ConfValue("sqlauth"); std::string dbid = conf->getString("dbid"); @@ -156,7 +156,7 @@ class ModuleSQLAuth : public Module hash_algos.push_back(algo); } - ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE + ModResult OnUserRegister(LocalUser* user) override { // Note this is their initial (unresolved) connect block ConfigTag* tag = user->MyClass->config; @@ -195,7 +195,7 @@ class ModuleSQLAuth : public Module return MOD_RES_PASSTHRU; } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { switch (pendingExt.get(user)) { @@ -210,7 +210,7 @@ class ModuleSQLAuth : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allow/Deny connections based upon an arbitrary SQL table", VF_VENDOR); } diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp index da538caef..7d1490e4d 100644 --- a/src/modules/m_sqloper.cpp +++ b/src/modules/m_sqloper.cpp @@ -44,7 +44,7 @@ class OperQuery : public SQL::Query { } - void OnResult(SQL::Result& res) CXX11_OVERRIDE + void OnResult(SQL::Result& res) override { ServerConfig::OperIndex& oper_blocks = ServerInstance->Config->oper_blocks; @@ -106,7 +106,7 @@ class OperQuery : public SQL::Query } } - void OnError(SQL::Error& error) CXX11_OVERRIDE + void OnError(SQL::Error& error) override { ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "query failed (%s)", error.ToString()); ServerInstance->SNO->WriteGlobalSno('a', "m_sqloper: failed to update blocks from database"); @@ -169,7 +169,7 @@ public: { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { // Clear list of our blocks, as ConfigReader just wiped them anyway my_blocks.clear(); @@ -196,7 +196,7 @@ public: } } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { // If we are not in the middle of an existing /OPER and someone is trying to oper-up if (validated && command == "OPER" && parameters.size() >= 2 && !active) @@ -231,7 +231,7 @@ public: SQL->Submit(new OperQuery(this, my_blocks, u, un, pw), query); } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { /** Run before other /OPER hooks that expect populated blocks, i.e. sslinfo or a TOTP module. * We issue a DENY first, and will re-run OnPreCommand later to trigger the other hooks post-DB update. @@ -239,7 +239,7 @@ public: ServerInstance->Modules.SetPriority(this, I_OnPreCommand, PRIORITY_FIRST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allows storage of oper credentials in an SQL table", VF_VENDOR); } diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index 30dfd9a76..2266b6861 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -57,12 +57,12 @@ class SSLCertExt : public ExtensionItem free(container, unset_raw(container)); } - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE + std::string serialize(SerializeFormat format, const Extensible* container, void* item) const override { return static_cast<ssl_cert*>(item)->GetMetaLine(); } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) override { ssl_cert* cert = new ssl_cert; set(container, cert); @@ -87,7 +87,7 @@ class SSLCertExt : public ExtensionItem } } - void free(Extensible* container, void* item) CXX11_OVERRIDE + void free(Extensible* container, void* item) override { ssl_cert* old = static_cast<ssl_cert*>(item); if (old && old->refcount_dec()) @@ -108,7 +108,7 @@ class UserCertificateAPIImpl : public UserCertificateAPIBase { } - ssl_cert* GetCertificate(User* user) CXX11_OVERRIDE + ssl_cert* GetCertificate(User* user) override { ssl_cert* cert = sslext.get(user); if (cert) @@ -126,7 +126,7 @@ class UserCertificateAPIImpl : public UserCertificateAPIBase return cert; } - void SetCertificate(User* user, ssl_cert* cert) CXX11_OVERRIDE + void SetCertificate(User* user, ssl_cert* cert) override { ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Setting SSL certificate for %s: %s", user->GetFullHost().c_str(), cert->GetMetaLine().c_str()); @@ -146,7 +146,7 @@ class CommandSSLInfo : public Command this->syntax = "<nick>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* target = ServerInstance->FindNickOnly(parameters[0]); @@ -196,12 +196,12 @@ class ModuleSSLInfo { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("SSL Certificate Utilities", VF_VENDOR); } - void OnWhois(Whois::Context& whois) CXX11_OVERRIDE + void OnWhois(Whois::Context& whois) override { ssl_cert* cert = cmd.sslapi.GetCertificate(whois.GetTarget()); if (cert) @@ -213,7 +213,7 @@ class ModuleSSLInfo } } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { if ((command == "OPER") && (validated)) { @@ -244,7 +244,7 @@ class ModuleSSLInfo return MOD_RES_PASSTHRU; } - void OnPostConnect(User* user) CXX11_OVERRIDE + void OnPostConnect(User* user) override { LocalUser* const localuser = IS_LOCAL(user); if (!localuser) @@ -280,7 +280,7 @@ class ModuleSSLInfo } } - ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) override { ssl_cert* cert = SSLClientCert::GetCertificate(&user->eh); bool ok = true; @@ -300,7 +300,7 @@ class ModuleSSLInfo return MOD_RES_PASSTHRU; } - void OnWebIRCAuth(LocalUser* user, const WebIRC::FlagMap* flags) CXX11_OVERRIDE + void OnWebIRCAuth(LocalUser* user, const WebIRC::FlagMap* flags) override { // We are only interested in connection flags. If none have been // given then we have nothing to do. diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp index f162ceb87..5ec6db960 100644 --- a/src/modules/m_sslmodes.cpp +++ b/src/modules/m_sslmodes.cpp @@ -46,7 +46,7 @@ class SSLMode : public ModeHandler { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override { if (adding) { @@ -108,7 +108,7 @@ class SSLModeUser : public ModeHandler DisableAutoRegister(); } - ModeAction OnModeChange(User* user, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE + ModeAction OnModeChange(User* user, User* dest, Channel* channel, std::string& parameter, bool adding) override { if (adding) { @@ -149,7 +149,7 @@ class ModuleSSLModes : public Module { } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { if(chan && chan->IsModeSet(sslm)) { @@ -169,7 +169,7 @@ class ModuleSSLModes : public Module return MOD_RES_PASSTHRU; } - ModResult OnUserPreMessage(User* user, const MessageTarget& msgtarget, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& msgtarget, MessageDetails& details) override { if (msgtarget.type != MessageTarget::TYPE_USER) return MOD_RES_PASSTHRU; @@ -203,7 +203,7 @@ class ModuleSSLModes : public Module return MOD_RES_PASSTHRU; } - ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) override { if ((mask.length() > 2) && (mask[0] == 'z') && (mask[1] == ':')) { @@ -214,12 +214,12 @@ class ModuleSSLModes : public Module return MOD_RES_PASSTHRU; } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('z'); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides user and channel mode +z to allow for SSL-only channels, queries and notices.", VF_VENDOR); } diff --git a/src/modules/m_starttls.cpp b/src/modules/m_starttls.cpp index ea6536ed1..e69eda6c8 100644 --- a/src/modules/m_starttls.cpp +++ b/src/modules/m_starttls.cpp @@ -40,7 +40,7 @@ class CommandStartTLS : public SplitCommand works_before_reg = true; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { if (!ssl) { @@ -91,7 +91,7 @@ class ModuleStartTLS : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* conf = ServerInstance->Config->ConfValue("starttls"); @@ -102,7 +102,7 @@ class ModuleStartTLS : public Module ssl.SetProvider("ssl/" + newprovider); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the STARTTLS command", VF_VENDOR); } diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index 3699fc3aa..687cde943 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -36,12 +36,12 @@ class ModuleStripColor : public Module { } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["EXTBAN"].push_back('S'); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; @@ -71,7 +71,7 @@ class ModuleStripColor : public Module return MOD_RES_PASSTHRU; } - void OnUserPart(Membership* memb, std::string& partmessage, CUList& except_list) CXX11_OVERRIDE + void OnUserPart(Membership* memb, std::string& partmessage, CUList& except_list) override { User* user = memb->user; Channel* channel = memb->chan; @@ -88,7 +88,7 @@ class ModuleStripColor : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides channel +S mode (strip ansi color)", VF_VENDOR); } diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index 0aaf113f0..ede845fd8 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -42,19 +42,19 @@ public: this->nickname = nick; } - bool Matches(User* u) CXX11_OVERRIDE + bool Matches(User* u) override { if (u->nick == nickname) return true; return false; } - bool Matches(const std::string& s) CXX11_OVERRIDE + bool Matches(const std::string& s) override { return InspIRCd::Match(s, nickname); } - void DisplayExpiry() CXX11_OVERRIDE + void DisplayExpiry() override { if (!silent) { @@ -63,7 +63,7 @@ public: } } - const std::string& Displayable() CXX11_OVERRIDE + const std::string& Displayable() override { return nickname; } @@ -78,12 +78,12 @@ class SVSHoldFactory : public XLineFactory /** Generate an SVSHOLD */ - XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) override { return new SVSHold(set_time, duration, source, reason, xline_specific_mask); } - bool AutoApplyToUserList(XLine* x) CXX11_OVERRIDE + bool AutoApplyToUserList(XLine* x) override { return false; } @@ -99,7 +99,7 @@ class CommandSvshold : public Command flags_needed = 'o'; this->syntax = "<nickname> [<duration> :<reason>]"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { /* syntax: svshold nickname time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ @@ -161,7 +161,7 @@ class CommandSvshold : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_BROADCAST; } @@ -180,18 +180,18 @@ class ModuleSVSHold : public Module, public Stats::EventListener { } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->XLines->RegisterFactory(&s); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("svshold"); silent = tag->getBool("silent", true); } - ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE + ModResult OnStats(Stats::Context& stats) override { if (stats.GetSymbol() != 'S') return MOD_RES_PASSTHRU; @@ -200,7 +200,7 @@ class ModuleSVSHold : public Module, public Stats::EventListener return MOD_RES_DENY; } - ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE + ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) override { XLine *rl = ServerInstance->XLines->MatchesLine("SVSHOLD", newnick); @@ -219,7 +219,7 @@ class ModuleSVSHold : public Module, public Stats::EventListener ServerInstance->XLines->UnregisterFactory(&s); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements SVSHOLD. Like Q-lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR); } diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 6c420ca3a..708f6b072 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -48,7 +48,7 @@ class CommandSwhois : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* dest = ServerInstance->FindNick(parameters[0]); @@ -103,7 +103,7 @@ class ModuleSWhois : public Module, public Whois::LineEventListener } // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games. - ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE + ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) override { /* We use this and not OnWhois because this triggers for remote, too */ if (numeric.GetNumeric() == 312) @@ -120,7 +120,7 @@ class ModuleSWhois : public Module, public Whois::LineEventListener return MOD_RES_PASSTHRU; } - void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE + void OnPostOper(User* user, const std::string &opertype, const std::string &opername) override { if (!IS_LOCAL(user)) return; @@ -135,7 +135,7 @@ class ModuleSWhois : public Module, public Whois::LineEventListener ServerInstance->PI->SendMetaData(user, "swhois", swhois); } - void OnPostDeoper(User* user) CXX11_OVERRIDE + void OnPostDeoper(User* user) override { std::string* swhois = cmd.swhois.get(user); if (!swhois) @@ -149,14 +149,14 @@ class ModuleSWhois : public Module, public Whois::LineEventListener ServerInstance->PI->SendMetaData(user, "swhois", ""); } - void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string&) CXX11_OVERRIDE + void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string&) override { User* dest = static_cast<User*>(target); if (dest && (extname == "swhois")) cmd.operblock.set(dest, 0); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the SWHOIS command which allows setting of arbitrary WHOIS lines", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 32b376c79..80762e320 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -68,7 +68,7 @@ class CommandTban : public Command syntax = "<channel> <duration> <banmask>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { Channel* channel = ServerInstance->FindChan(parameters[0]); if (!channel) @@ -129,7 +129,7 @@ class CommandTban : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_BROADCAST; } @@ -143,7 +143,7 @@ class BanWatcher : public ModeWatcher { } - void AfterMode(User* source, User* dest, Channel* chan, const std::string& banmask, bool adding) CXX11_OVERRIDE + void AfterMode(User* source, User* dest, Channel* chan, const std::string& banmask, bool adding) override { if (adding) return; @@ -191,7 +191,7 @@ class ModuleTimedBans : public Module { } - void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE + void OnBackgroundTimer(time_t curtime) override { timedbans expired; for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end();) @@ -226,13 +226,13 @@ class ModuleTimedBans : public Module } } - void OnChannelDelete(Channel* chan) CXX11_OVERRIDE + void OnChannelDelete(Channel* chan) override { // Remove all timed bans affecting the channel from internal bookkeeping TimedBanList.erase(std::remove_if(TimedBanList.begin(), TimedBanList.end(), ChannelMatcher(chan)), TimedBanList.end()); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Adds timed bans", VF_COMMON | VF_VENDOR); } diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp index 692472e11..19133ea25 100644 --- a/src/modules/m_tline.cpp +++ b/src/modules/m_tline.cpp @@ -30,7 +30,7 @@ class CommandTline : public Command flags_needed = 'o'; this->syntax = "<mask>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { unsigned int n_matched = 0; unsigned int n_match_host = 0; @@ -77,7 +77,7 @@ class ModuleTLine : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides /tline command used to test who a mask matches", VF_VENDOR); } diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp index b0d004b1c..1ddc6e65a 100644 --- a/src/modules/m_topiclock.cpp +++ b/src/modules/m_topiclock.cpp @@ -33,7 +33,7 @@ class CommandSVSTOPIC : public Command flags_needed = FLAG_SERVERONLY; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (!user->server->IsULine()) { @@ -67,7 +67,7 @@ class CommandSVSTOPIC : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_BROADCAST; } @@ -86,7 +86,7 @@ class FlagExtItem : public ExtensionItem return (get_raw(container) != NULL); } - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE + std::string serialize(SerializeFormat format, const Extensible* container, void* item) const override { if (format == FORMAT_USER) return "true"; @@ -94,7 +94,7 @@ class FlagExtItem : public ExtensionItem return "1"; } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) override { if (value == "1") set_raw(container, this); @@ -115,7 +115,7 @@ class FlagExtItem : public ExtensionItem unset_raw(container); } - void free(Extensible* container, void* item) CXX11_OVERRIDE + void free(Extensible* container, void* item) override { // nothing to free } @@ -132,7 +132,7 @@ class ModuleTopicLock : public Module { } - ModResult OnPreTopicChange(User* user, Channel* chan, const std::string &topic) CXX11_OVERRIDE + ModResult OnPreTopicChange(User* user, Channel* chan, const std::string &topic) override { // Only fired for local users currently, but added a check anyway if ((IS_LOCAL(user)) && (topiclock.get(chan))) @@ -144,7 +144,7 @@ class ModuleTopicLock : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements server-side topic locks and the server-to-server command SVSTOPIC", VF_COMMON | VF_VENDOR); } diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp index a8814b343..db24c67cd 100644 --- a/src/modules/m_uhnames.cpp +++ b/src/modules/m_uhnames.cpp @@ -31,17 +31,17 @@ class ModuleUHNames : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the UHNAMES facility.",VF_VENDOR); } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["UHNAMES"]; } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { /* We don't actually create a proper command handler class for PROTOCTL, * because other modules might want to have PROTOCTL hooks too. @@ -59,7 +59,7 @@ class ModuleUHNames : public Module return MOD_RES_PASSTHRU; } - ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE + ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) override { if (cap.get(issuer)) nick = memb->user->GetFullHost(); diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp index ae1553a23..0df60f08a 100644 --- a/src/modules/m_uninvite.cpp +++ b/src/modules/m_uninvite.cpp @@ -43,7 +43,7 @@ class CommandUninvite : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* u; if (IS_LOCAL(user)) @@ -109,7 +109,7 @@ class CommandUninvite : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -125,7 +125,7 @@ class ModuleUninvite : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the UNINVITE command which lets users un-invite other users from channels", VF_VENDOR | VF_OPTCOMMON); } diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp index c64f53684..444ff6fe7 100644 --- a/src/modules/m_userip.cpp +++ b/src/modules/m_userip.cpp @@ -31,7 +31,7 @@ class CommandUserip : public Command syntax = "<nick> [<nick> ...]"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { std::string retbuf; int nicks = 0; @@ -85,12 +85,12 @@ class ModuleUserIP : public Module { } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["USERIP"]; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for USERIP command",VF_VENDOR); } diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp index 478a5100a..df8ca73ae 100644 --- a/src/modules/m_vhost.cpp +++ b/src/modules/m_vhost.cpp @@ -59,7 +59,7 @@ class CommandVhost : public Command syntax = "<username> <password>"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { MatchingConfigs matching = vhosts.equal_range(parameters[0]); @@ -89,7 +89,7 @@ class ModuleVHost : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { CustomVhostMap newhosts; ConfigTagList tags = ServerInstance->Config->ConfTags("vhost"); @@ -114,7 +114,7 @@ class ModuleVHost : public Module cmd.vhosts.swap(newhosts); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides masking of user hostnames via traditional /VHOST command", VF_VENDOR); } diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp index 8b84132b2..46870eceb 100644 --- a/src/modules/m_watch.cpp +++ b/src/modules/m_watch.cpp @@ -136,7 +136,7 @@ class CommandWatch : public SplitCommand syntax = "[<C|L|S|l|+<nick1>|-<nick>>]"; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { if (parameters.empty()) { @@ -220,18 +220,18 @@ class ModuleWatch { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("watch"); cmd.maxwatch = tag->getUInt("maxwatch", 30, 1); } - void OnPostConnect(User* user) CXX11_OVERRIDE + void OnPostConnect(User* user) override { Online(user); } - void OnUserPostNick(User* user, const std::string& oldnick) CXX11_OVERRIDE + void OnUserPostNick(User* user, const std::string& oldnick) override { // Detect and ignore nickname case change if (ServerInstance->FindNickOnly(oldnick) == user) @@ -241,7 +241,7 @@ class ModuleWatch Online(user); } - void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) CXX11_OVERRIDE + void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) override { LocalUser* localuser = IS_LOCAL(user); if (localuser) @@ -249,22 +249,22 @@ class ModuleWatch Offline(user, user->nick); } - void OnUserAway(User* user) CXX11_OVERRIDE + void OnUserAway(User* user) override { SendAlert(user, user->nick, RPL_GONEAWAY, user->awaymsg.c_str(), user->awaytime); } - void OnUserBack(User* user) CXX11_OVERRIDE + void OnUserBack(User* user) override { SendAlert(user, user->nick, RPL_NOTAWAY, "is no longer away", ServerInstance->Time()); } - void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE + void On005Numeric(std::map<std::string, std::string>& tokens) override { tokens["WATCH"] = ConvToStr(cmd.maxwatch); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides WATCH support", VF_VENDOR); } diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp index 51dada299..fece5fdb1 100644 --- a/src/modules/m_websocket.cpp +++ b/src/modules/m_websocket.cpp @@ -42,9 +42,9 @@ class WebSocketHookProvider : public IOHookProvider { } - void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE; + void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override; - void OnConnect(StreamSocket* sock) CXX11_OVERRIDE + void OnConnect(StreamSocket* sock) override { } }; @@ -374,7 +374,7 @@ class WebSocketHook : public IOHookMiddle sock->AddIOHook(this); } - int OnStreamSocketWrite(StreamSocket* sock, StreamSocket::SendQueue& uppersendq) CXX11_OVERRIDE + int OnStreamSocketWrite(StreamSocket* sock, StreamSocket::SendQueue& uppersendq) override { StreamSocket::SendQueue& mysendq = GetSendQ(); @@ -425,7 +425,7 @@ class WebSocketHook : public IOHookMiddle return 1; } - int OnStreamSocketRead(StreamSocket* sock, std::string& destrecvq) CXX11_OVERRIDE + int OnStreamSocketRead(StreamSocket* sock, std::string& destrecvq) override { if (state == STATE_HTTPREQ) { @@ -444,7 +444,7 @@ class WebSocketHook : public IOHookMiddle return wsret; } - void OnStreamSocketClose(StreamSocket* sock) CXX11_OVERRIDE + void OnStreamSocketClose(StreamSocket* sock) override { } }; @@ -467,7 +467,7 @@ class ModuleWebSocket : public Module sha1 = &hash; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTagList tags = ServerInstance->Config->ConfTags("wsorigin"); if (tags.first == tags.second) @@ -491,7 +491,7 @@ class ModuleWebSocket : public Module hookprov->allowedorigins.swap(allowedorigins); } - void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) override { if (type != ExtensionItem::EXT_USER) return; @@ -501,7 +501,7 @@ class ModuleWebSocket : public Module ServerInstance->Users.QuitUser(user, "WebSocket module unloading"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides RFC 6455 WebSocket support", VF_VENDOR); } diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp index 90f9de9d2..9d9c9e431 100644 --- a/src/modules/m_xline_db.cpp +++ b/src/modules/m_xline_db.cpp @@ -27,7 +27,7 @@ class ModuleXLineDB : public Module bool dirty; std::string xlinedbpath; public: - void init() CXX11_OVERRIDE + void init() override { /* Load the configuration * Note: @@ -49,7 +49,7 @@ class ModuleXLineDB : public Module * @param source The sender of the line or NULL for local server * @param line The xline being added */ - void OnAddLine(User* source, XLine* line) CXX11_OVERRIDE + void OnAddLine(User* source, XLine* line) override { dirty = true; } @@ -59,12 +59,12 @@ class ModuleXLineDB : public Module * @param source The user removing the line or NULL for local server * @param line the line being deleted */ - void OnDelLine(User* source, XLine* line) CXX11_OVERRIDE + void OnDelLine(User* source, XLine* line) override { dirty = true; } - void OnBackgroundTimer(time_t now) CXX11_OVERRIDE + void OnBackgroundTimer(time_t now) override { if (dirty) { @@ -210,7 +210,7 @@ class ModuleXLineDB : public Module return true; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Keeps a dynamic log of all XLines created, and stores them in a separate conf file (xline.db).", VF_VENDOR); } |