diff options
201 files changed, 995 insertions, 1003 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 16c7b1d7b..eeaef2983 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -246,7 +246,7 @@ else(MSVC) set(CXXFLAGS "${CXXFLAGS} -Wall -Wshadow") # If on a *nix system, also set the compile flags to remove GNU extensions (favor ISO C++) as well as reject non-ISO C++ code, also remove all leading underscores in exported symbols (only on GNU compiler) if(UNIX) - set(CXXFLAGS "${CXXFLAGS} -ansi -pedantic") + set(CXXFLAGS "${CXXFLAGS} -ansi -pedantic ${CMAKE_CXX_FLAGS}") if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(CXXFLAGS "${CXXFLAGS} -Wno-long-long -fno-leading-underscore") endif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index e04fe31a8..049aa478a 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -19,7 +19,7 @@ endif(NOT WIN32) set(PCH_SOURCES_GCH "") if(CMAKE_COMPILER_IS_GNUCXX) - string(REPLACE " " ";" PCH_CXXFLAGS ${CXXFLAGS}) + string(REPLACE " " ";" PCH_CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_FLAGS}") file(GLOB PCH_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h") sort_list(PCH_SOURCES) diff --git a/include/account.h b/include/account.h index ffdc7b18f..5cc8c1459 100644 --- a/include/account.h +++ b/include/account.h @@ -132,8 +132,8 @@ class CoreExport NickAlias : public Base, public Extensible, public Flags<NickNa time_t last_seen; /* When it was seen online for the last time */ NickCore *nc; /* I'm an alias of this */ - Anope::string serialize_name() const; - serialized_data serialize(); + Anope::string serialize_name() const anope_override; + serialized_data serialize() anope_override; static void unserialize(serialized_data &); /** Release a nick @@ -216,8 +216,8 @@ class CoreExport NickCore : public Base, public Extensible, public Flags<NickCor time_t lastmail; /* Last time this nick record got a mail */ std::list<NickAlias *> aliases; /* List of aliases */ - Anope::string serialize_name() const; - serialized_data serialize(); + Anope::string serialize_name() const anope_override; + serialized_data serialize() anope_override; static void unserialize(serialized_data &); /** Checks whether this account is a services oper or not. diff --git a/include/dns.h b/include/dns.h index c70b6b7b3..3102ec72c 100644 --- a/include/dns.h +++ b/include/dns.h @@ -121,7 +121,7 @@ class CoreExport DNSRequest : public Timer, public Question virtual void OnError(const DNSQuery *r); - void Tick(time_t); + void Tick(time_t) anope_override; }; /** A full packet sent or recieved to/from the nameserver, may contain multiple queries @@ -182,7 +182,7 @@ class CoreExport DNSManager : public Timer, public Socket /** Tick this timer, used to clear the DNS cache. */ - void Tick(time_t now); + void Tick(time_t now) anope_override; /** Cleanup all pending DNS queries for a module * @param mod The module diff --git a/include/memo.h b/include/memo.h index a6df46861..420def504 100644 --- a/include/memo.h +++ b/include/memo.h @@ -38,8 +38,8 @@ class CoreExport Memo : public Flags<MemoFlag>, public Serializable public: Memo(); - Anope::string serialize_name() const; - serialized_data serialize(); + Anope::string serialize_name() const anope_override; + serialized_data serialize() anope_override; static void unserialize(serialized_data &); Anope::string owner; diff --git a/include/modes.h b/include/modes.h index b1195d27d..9cfc607cc 100644 --- a/include/modes.h +++ b/include/modes.h @@ -304,7 +304,7 @@ class CoreExport ChannelModeKey : public ChannelModeParam public: ChannelModeKey(char modeChar) : ChannelModeParam(CMODE_KEY, modeChar) { } - bool IsValid(const Anope::string &value) const; + bool IsValid(const Anope::string &value) const anope_override; }; /** This class is used for channel mode +A (Admin only) @@ -316,7 +316,7 @@ class CoreExport ChannelModeAdmin : public ChannelMode ChannelModeAdmin(char modeChar) : ChannelMode(CMODE_ADMINONLY, modeChar) { } /* Opers only */ - bool CanSet(User *u) const; + bool CanSet(User *u) const anope_override; }; /** This class is used for channel mode +O (Opers only) @@ -328,7 +328,7 @@ class CoreExport ChannelModeOper : public ChannelMode ChannelModeOper(char modeChar) : ChannelMode(CMODE_OPERONLY, modeChar) { } /* Opers only */ - bool CanSet(User *u) const; + bool CanSet(User *u) const anope_override; }; /** This class is used for channel mode +r (registered channel) @@ -340,7 +340,7 @@ class CoreExport ChannelModeRegistered : public ChannelMode ChannelModeRegistered(char modeChar) : ChannelMode(CMODE_REGISTERED, modeChar) { } /* No one mlocks +r */ - bool CanSet(User *u) const; + bool CanSet(User *u) const anope_override; }; enum StackerType diff --git a/include/regchannel.h b/include/regchannel.h index 614b98f19..851d98f19 100644 --- a/include/regchannel.h +++ b/include/regchannel.h @@ -88,8 +88,8 @@ struct CoreExport BadWord : Serializable Anope::string word; BadWordType type; - Anope::string serialize_name() const; - serialized_data serialize(); + Anope::string serialize_name() const anope_override; + serialized_data serialize() anope_override; static void unserialize(serialized_data &); }; @@ -118,8 +118,8 @@ class CoreExport AutoKick : public Flags<AutoKickFlag>, public Serializable time_t addtime; time_t last_used; - Anope::string serialize_name() const; - serialized_data serialize(); + Anope::string serialize_name() const anope_override; + serialized_data serialize() anope_override; static void unserialize(serialized_data &); }; @@ -135,8 +135,8 @@ struct CoreExport ModeLock : Serializable ModeLock(ChannelInfo *ch, bool s, ChannelModeName n, const Anope::string &p, const Anope::string &se = "", time_t c = Anope::CurTime); - Anope::string serialize_name() const; - serialized_data serialize(); + Anope::string serialize_name() const anope_override; + serialized_data serialize() anope_override; static void unserialize(serialized_data &); }; @@ -153,8 +153,8 @@ struct CoreExport LogSetting : Serializable Anope::string creator; time_t created; - Anope::string serialize_name() const; - serialized_data serialize(); + Anope::string serialize_name() const anope_override; + serialized_data serialize() anope_override; static void unserialize(serialized_data &); }; @@ -212,8 +212,8 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag, int16_t floodlines, floodsecs; /* For FLOOD kicker */ int16_t repeattimes; /* For REPEAT kicker */ - Anope::string serialize_name() const; - serialized_data serialize(); + Anope::string serialize_name() const anope_override; + serialized_data serialize() anope_override; static void unserialize(serialized_data &); /** Change the founder of the channek diff --git a/include/services.h b/include/services.h index abe262cad..c03991a13 100644 --- a/include/services.h +++ b/include/services.h @@ -53,6 +53,12 @@ # include "anope_windows.h" #endif +#ifdef __GXX_EXPERIMENTAL_CXX0X__ +# define anope_override override +#else +# define anope_override +#endif + /** * RFC: defination of a valid nick * nickname = ( letter / special ) *8( letter / digit / special / "-" ) diff --git a/include/signals.h b/include/signals.h index 70fdead42..f057bdfee 100644 --- a/include/signals.h +++ b/include/signals.h @@ -42,7 +42,7 @@ class Signal : public Pipe * important. This is always called on the main thread, even on systems that * spawn threads for signals, like Windows. */ - virtual void OnNotify() = 0; + virtual void OnNotify() anope_override = 0; }; #endif diff --git a/include/sockets.h b/include/sockets.h index a7a8bb257..16cd10a1a 100644 --- a/include/sockets.h +++ b/include/sockets.h @@ -272,12 +272,12 @@ class CoreExport BufferedSocket : public virtual Socket /** Called when there is something to be received for this socket * @return true on success, false to drop this socket */ - bool ProcessRead(); + bool ProcessRead() anope_override; /** Called when the socket is ready to be written to * @return true on success, false to drop this socket */ - bool ProcessWrite(); + bool ProcessWrite() anope_override; /** Called with a line received from the socket * @param buf The line @@ -327,12 +327,12 @@ class CoreExport BinarySocket : public virtual Socket /** Called when there is something to be received for this socket * @return true on success, false to drop this socket */ - bool ProcessRead(); + bool ProcessRead() anope_override; /** Called when the socket is ready to be written to * @return true on success, false to drop this socket */ - bool ProcessWrite(); + bool ProcessWrite() anope_override; /** Write data to the socket * @param buffer The data to write @@ -395,12 +395,12 @@ class CoreExport ConnectionSocket : public virtual Socket * Used to determine whether or not this socket is connected yet. * @return true to continue to call ProcessRead/ProcessWrite, false to not continue */ - bool Process(); + bool Process() anope_override; /** Called when there is an error for this socket * @return true on success, false to drop this socket */ - void ProcessError(); + void ProcessError() anope_override; /** Called on a successful connect */ @@ -430,12 +430,12 @@ class CoreExport ClientSocket : public virtual Socket * Used to determine whether or not this socket is connected yet. * @return true to continue to call ProcessRead/ProcessWrite, false to not continue */ - bool Process(); + bool Process() anope_override; /** Called when there is an error for this socket * @return true on success, false to drop this socket */ - void ProcessError(); + void ProcessError() anope_override; /** Called when a client has been accepted() successfully. */ @@ -464,15 +464,15 @@ class CoreExport Pipe : public Socket /** Called when data is to be read */ - bool ProcessRead(); + bool ProcessRead() anope_override; /** Called when this pipe needs to be woken up */ void Notify(); - /** Should be overloaded to do something useful + /** Overload to do something useful */ - virtual void OnNotify(); + virtual void OnNotify() = 0; }; extern uint32_t TotalRead; diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp index b4d272d7b..5c1691047 100644 --- a/modules/commands/bs_assign.cpp +++ b/modules/commands/bs_assign.cpp @@ -22,7 +22,7 @@ class CommandBSAssign : public Command this->SetSyntax(_("\037channel\037 \037nick\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &nick = params[1]; @@ -74,7 +74,7 @@ class CommandBSAssign : public Command source.Reply(_("Bot \002%s\002 has been assigned to %s."), bi->nick.c_str(), ci->name.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -94,7 +94,7 @@ class CommandBSUnassign : public Command this->SetSyntax(_("\037channel\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -136,7 +136,7 @@ class CommandBSUnassign : public Command source.Reply(_("There is no bot assigned to %s anymore."), ci->name.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp index a700fa6c9..bb7a073f1 100644 --- a/modules/commands/bs_badwords.cpp +++ b/modules/commands/bs_badwords.cpp @@ -38,7 +38,7 @@ class BadwordsDelCallback : public NumberList source.Reply(_("Deleted %d entries from %s bad words list."), Deleted, ci->name.c_str()); } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > ci->GetBadWordCount()) return; @@ -76,7 +76,7 @@ class CommandBSBadwords : public Command { } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > ci->GetBadWordCount()) return; @@ -229,7 +229,7 @@ class CommandBSBadwords : public Command this->SetSyntax(_("\037channel\037 CLEAR")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &cmd = params[1]; const Anope::string &word = params.size() > 2 ? params[2] : ""; @@ -274,7 +274,7 @@ class CommandBSBadwords : public Command this->OnSyntaxError(source, ""); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/bs_bot.cpp b/modules/commands/bs_bot.cpp index e5779ef73..526cd922c 100644 --- a/modules/commands/bs_bot.cpp +++ b/modules/commands/bs_bot.cpp @@ -300,7 +300,7 @@ class CommandBSBot : public Command this->SetSyntax(_("\002DEL \037nick\037\002")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &cmd = params[0]; User *u = source.u; @@ -374,7 +374,7 @@ class CommandBSBot : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/bs_botlist.cpp b/modules/commands/bs_botlist.cpp index 45cea0998..ed50371fc 100644 --- a/modules/commands/bs_botlist.cpp +++ b/modules/commands/bs_botlist.cpp @@ -22,7 +22,7 @@ class CommandBSBotList : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; unsigned count = 0; @@ -61,7 +61,7 @@ class CommandBSBotList : public Command } } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/bs_control.cpp b/modules/commands/bs_control.cpp index d6b126672..6ca435b37 100644 --- a/modules/commands/bs_control.cpp +++ b/modules/commands/bs_control.cpp @@ -22,7 +22,7 @@ class CommandBSSay : public Command this->SetSyntax(_("\037channel\037 \037text\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &text = params[1]; @@ -68,7 +68,7 @@ class CommandBSSay : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -86,7 +86,7 @@ class CommandBSAct : public Command this->SetSyntax(_("\037channel\037 \037text\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; Anope::string message = params[1]; @@ -129,7 +129,7 @@ class CommandBSAct : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/bs_info.cpp b/modules/commands/bs_info.cpp index 39a299d32..5026de3c7 100644 --- a/modules/commands/bs_info.cpp +++ b/modules/commands/bs_info.cpp @@ -55,7 +55,7 @@ class CommandBSInfo : public Command this->SetSyntax(_("\002INFO {\037chan\037 | \037nick\037}\002")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &query = params[0]; @@ -221,7 +221,7 @@ class CommandBSInfo : public Command source.Reply(_("\002%s\002 is not a valid bot or registered channel."), query.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp index cccdd5b35..5824a8650 100644 --- a/modules/commands/bs_kick.cpp +++ b/modules/commands/bs_kick.cpp @@ -23,7 +23,7 @@ class CommandBSKick : public Command this->SetSyntax(_("\037channel\037 \037option\037 {\037ON|\037} [\037settings\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &option = params[1]; @@ -459,7 +459,7 @@ class CommandBSKick : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { if (subcommand.empty()) { @@ -626,7 +626,7 @@ struct BanData : public ExtensibleItem } } - void OnDelete() + void OnDelete() anope_override { delete this; } @@ -659,7 +659,7 @@ struct UserData : public ExtensibleItem Anope::string lastline; - void OnDelete() + void OnDelete() anope_override { delete this; } @@ -671,7 +671,7 @@ class BanDataPurger : public CallBack public: BanDataPurger(Module *owner) : CallBack(owner, 300, Anope::CurTime, true) { } - void Tick(time_t) + void Tick(time_t) anope_override { Log(LOG_DEBUG) << "bs_main: Running bandata purger"; @@ -785,7 +785,7 @@ class BSKick : public Module } } - void OnPrivmsg(User *u, Channel *c, Anope::string &msg) + void OnPrivmsg(User *u, Channel *c, Anope::string &msg) anope_override { /* Now we can make kicker stuff. We try to order the checks * from the fastest one to the slowest one, since there's diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp index 0b1aba233..25472baf9 100644 --- a/modules/commands/bs_set.cpp +++ b/modules/commands/bs_set.cpp @@ -22,7 +22,7 @@ class CommandBSSet : public Command this->SetSyntax(_("\037(channel | bot)\037 \037option\037 \037settings\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &option = params[1]; @@ -150,7 +150,7 @@ class CommandBSSet : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { if (subcommand.empty()) { @@ -226,7 +226,7 @@ class CommandBSSet : public Command return true; } - void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) + void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) anope_override { if (subcommand.empty()) Command::OnSyntaxError(source, ""); diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp index 3c36fabbd..b8b5aa546 100644 --- a/modules/commands/cs_access.cpp +++ b/modules/commands/cs_access.cpp @@ -31,7 +31,7 @@ class AccessChanAccess : public ChanAccess { } - bool HasPriv(const Anope::string &name) const + bool HasPriv(const Anope::string &name) const anope_override { return this->ci->GetLevel(name) != ACCESS_INVALID && this->level >= this->ci->GetLevel(name); } @@ -41,7 +41,7 @@ class AccessChanAccess : public ChanAccess return stringify(this->level); } - void Unserialize(const Anope::string &data) + void Unserialize(const Anope::string &data) anope_override { this->level = convertTo<int>(data); } @@ -80,7 +80,7 @@ class AccessAccessProvider : public AccessProvider { } - ChanAccess *Create() + ChanAccess *Create() anope_override { return new AccessChanAccess(this); } @@ -211,7 +211,7 @@ class CommandCSAccess : public Command } } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > ci->GetAccessCount()) return; @@ -294,7 +294,7 @@ class CommandCSAccess : public Command { } - void HandleNumber(unsigned number) + void HandleNumber(unsigned number) anope_override { if (!number || number > ci->GetAccessCount()) return; @@ -434,7 +434,7 @@ class CommandCSAccess : public Command this->SetSyntax(_("\037channel\037 CLEAR\002")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &cmd = params[1]; const Anope::string &nick = params.size() > 2 ? params[2] : ""; @@ -491,7 +491,7 @@ class CommandCSAccess : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -690,7 +690,7 @@ class CommandCSLevels : public Command this->SetSyntax(_("\037channel\037 RESET")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &cmd = params[1]; const Anope::string &what = params.size() > 2 ? params[2] : ""; @@ -726,7 +726,7 @@ class CommandCSLevels : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { if (subcommand.equals_ci("DESC")) { @@ -804,7 +804,7 @@ class CSAccess : public Module } } - void OnReload() + void OnReload() anope_override { defaultLevels.clear(); ConfigReader config; @@ -829,12 +829,12 @@ class CSAccess : public Module } } - void OnCreateChan(ChannelInfo *ci) + void OnCreateChan(ChannelInfo *ci) anope_override { reset_levels(ci); } - EventReturn OnGroupCheckPriv(const AccessGroup *group, const Anope::string &priv) + EventReturn OnGroupCheckPriv(const AccessGroup *group, const Anope::string &priv) anope_override { if (group->ci == NULL) return EVENT_CONTINUE; diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp index 47f174e59..328a169d4 100644 --- a/modules/commands/cs_akick.cpp +++ b/modules/commands/cs_akick.cpp @@ -202,7 +202,7 @@ class CommandCSAKick : public Command source.Reply(_("Deleted %d entries from %s autokick list."), Deleted, ci->name.c_str()); } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > ci->GetAkickCount()) return; @@ -258,7 +258,7 @@ class CommandCSAKick : public Command { } - void HandleNumber(unsigned number) + void HandleNumber(unsigned number) anope_override { if (!number || number > ci->GetAkickCount()) return; @@ -413,7 +413,7 @@ class CommandCSAKick : public Command this->SetSyntax(_("\037channel\037 CLEAR")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { Anope::string chan = params[0]; Anope::string cmd = params[1]; @@ -452,7 +452,7 @@ class CommandCSAKick : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_appendtopic.cpp b/modules/commands/cs_appendtopic.cpp index 4186bdaff..fe1633b8a 100644 --- a/modules/commands/cs_appendtopic.cpp +++ b/modules/commands/cs_appendtopic.cpp @@ -48,7 +48,7 @@ class CommandCSAppendTopic : public Command this->SetSyntax(_("\037channel\037 \037text\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &newtopic = params[1]; @@ -84,7 +84,7 @@ class CommandCSAppendTopic : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp index e0c5dd95e..867d654c5 100644 --- a/modules/commands/cs_ban.cpp +++ b/modules/commands/cs_ban.cpp @@ -23,7 +23,7 @@ class CommandCSBan : public Command this->SetSyntax(_("\037channel\037 \037mask\037 [\037reason\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &target = params[1]; @@ -121,7 +121,7 @@ class CommandCSBan : public Command source.Reply(NICK_X_NOT_IN_USE, target.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_clearusers.cpp b/modules/commands/cs_clearusers.cpp index e65aa34eb..58de57f5a 100644 --- a/modules/commands/cs_clearusers.cpp +++ b/modules/commands/cs_clearusers.cpp @@ -22,7 +22,7 @@ class CommandCSClearUsers : public Command this->SetSyntax(_("\037channel\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; @@ -63,7 +63,7 @@ class CommandCSClearUsers : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_clone.cpp b/modules/commands/cs_clone.cpp index 905a26177..8205b723c 100644 --- a/modules/commands/cs_clone.cpp +++ b/modules/commands/cs_clone.cpp @@ -22,7 +22,7 @@ public: this->SetSyntax(_("\037channel\037 \037target\037 [\037what\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &channel = params[0]; const Anope::string &target = params[1]; @@ -159,7 +159,7 @@ public: return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp index 429f70ad1..e9736851a 100644 --- a/modules/commands/cs_drop.cpp +++ b/modules/commands/cs_drop.cpp @@ -22,7 +22,7 @@ class CommandCSDrop : public Command this->SetSyntax(_("\037channel\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; @@ -68,7 +68,7 @@ class CommandCSDrop : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { User *u = source.u; this->SendSyntax(source); diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp index ed13c3f4f..1c5cabddd 100644 --- a/modules/commands/cs_enforce.cpp +++ b/modules/commands/cs_enforce.cpp @@ -118,7 +118,7 @@ class CommandCSEnforce : public Command this->SetSyntax(_("\037channel\037 [\037what\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &what = params.size() > 1 ? params[1] : ""; @@ -165,7 +165,7 @@ class CommandCSEnforce : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp index 758c3f96c..477f68cb2 100644 --- a/modules/commands/cs_entrymsg.cpp +++ b/modules/commands/cs_entrymsg.cpp @@ -29,12 +29,12 @@ struct EntryMsg : Serializable this->when = ct; } - Anope::string serialize_name() const + Anope::string serialize_name() const anope_override { return "EntryMsg"; } - serialized_data serialize() + serialized_data serialize() anope_override { serialized_data data; @@ -167,7 +167,7 @@ class CommandEntryMessage : public Command this->SetSyntax(_("\037channel\037 {ADD|DEL|LIST|CLEAR} [\037message\037|\037num\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -208,7 +208,7 @@ class CommandEntryMessage : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -233,7 +233,7 @@ class CSEntryMessage : public Module this->OnReload(); } - void OnJoinChannel(User *u, Channel *c) + void OnJoinChannel(User *u, Channel *c) anope_override { if (u && c && c->ci && u->server->IsSynced()) { @@ -245,7 +245,7 @@ class CSEntryMessage : public Module } } - void OnReload() + void OnReload() anope_override { ConfigReader config; MaxEntries = config.ReadInteger("cs_entrymsg", "maxentries", "5", 0, true); diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp index 0e48f59c7..f5dc7fe1c 100644 --- a/modules/commands/cs_flags.cpp +++ b/modules/commands/cs_flags.cpp @@ -24,7 +24,7 @@ class FlagsChanAccess : public ChanAccess { } - bool HasPriv(const Anope::string &priv) const + bool HasPriv(const Anope::string &priv) const anope_override { std::map<Anope::string, char>::iterator it = defaultFlags.find(priv); if (it != defaultFlags.end() && this->flags.count(it->second) > 0) @@ -37,7 +37,7 @@ class FlagsChanAccess : public ChanAccess return Anope::string(this->flags.begin(), this->flags.end()); } - void Unserialize(const Anope::string &data) + void Unserialize(const Anope::string &data) anope_override { for (unsigned i = data.length(); i > 0; --i) this->flags.insert(data[i - 1]); @@ -65,7 +65,7 @@ class FlagsAccessProvider : public AccessProvider { } - ChanAccess *Create() + ChanAccess *Create() anope_override { return new FlagsChanAccess(this); } @@ -300,7 +300,7 @@ class CommandCSFlags : public Command this->SetSyntax(_("\037channel\037 CLEAR\002")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &cmd = params[1]; @@ -336,7 +336,7 @@ class CommandCSFlags : public Command this->OnSyntaxError(source, cmd); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -394,7 +394,7 @@ class CSFlags : public Module this->OnReload(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; defaultFlags.clear(); diff --git a/modules/commands/cs_getkey.cpp b/modules/commands/cs_getkey.cpp index 287ed82b0..f8164707d 100644 --- a/modules/commands/cs_getkey.cpp +++ b/modules/commands/cs_getkey.cpp @@ -22,7 +22,7 @@ class CommandCSGetKey : public Command this->SetSyntax(_("\037channel\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; @@ -55,7 +55,7 @@ class CommandCSGetKey : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp index b86755d58..1554a0693 100644 --- a/modules/commands/cs_info.cpp +++ b/modules/commands/cs_info.cpp @@ -34,7 +34,7 @@ class CommandCSInfo : public Command this->SetSyntax(_("\037channel\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; @@ -119,7 +119,7 @@ class CommandCSInfo : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_invite.cpp b/modules/commands/cs_invite.cpp index 7dc4b9f7d..b38828c9d 100644 --- a/modules/commands/cs_invite.cpp +++ b/modules/commands/cs_invite.cpp @@ -22,7 +22,7 @@ class CommandCSInvite : public Command this->SetSyntax(_("\037channel\037 [\037nick\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; @@ -86,7 +86,7 @@ class CommandCSInvite : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_kick.cpp b/modules/commands/cs_kick.cpp index 09d51b39f..3ee444698 100644 --- a/modules/commands/cs_kick.cpp +++ b/modules/commands/cs_kick.cpp @@ -23,7 +23,7 @@ class CommandCSKick : public Command this->SetSyntax(_("\037channel\037 \037mask\037 [\037reason\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &target = params[1]; @@ -105,7 +105,7 @@ class CommandCSKick : public Command source.Reply(NICK_X_NOT_IN_USE, target.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp index dff564d70..57c14d157 100644 --- a/modules/commands/cs_list.cpp +++ b/modules/commands/cs_list.cpp @@ -23,7 +23,7 @@ class CommandCSList : public Command this->SetSyntax(_("\037pattern\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -117,7 +117,7 @@ class CommandCSList : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_log.cpp b/modules/commands/cs_log.cpp index 35f8831e6..28c7e6f91 100644 --- a/modules/commands/cs_log.cpp +++ b/modules/commands/cs_log.cpp @@ -24,7 +24,7 @@ public: this->SetSyntax(_("\037channel\037 \037command\037 \037method\037 [\037status\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &channel = params[0]; @@ -151,7 +151,7 @@ public: this->OnSyntaxError(source, ""); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -192,7 +192,7 @@ class CSLog : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnLog(Log *l) + void OnLog(Log *l) anope_override { if (l->Type != LOG_COMMAND || l->u == NULL || l->c == NULL || l->ci == NULL || !Me || !Me->IsSynced()) return; diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp index f2e6479c1..e0dda5524 100644 --- a/modules/commands/cs_mode.cpp +++ b/modules/commands/cs_mode.cpp @@ -339,7 +339,7 @@ class CommandCSMode : public Command this->SetSyntax(_("\037channel\037 SET \037modes\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &subcommand = params[1]; @@ -360,7 +360,7 @@ class CommandCSMode : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_modes.cpp b/modules/commands/cs_modes.cpp index 0e1f9ef64..a460c6c87 100644 --- a/modules/commands/cs_modes.cpp +++ b/modules/commands/cs_modes.cpp @@ -90,14 +90,14 @@ class CommandCSOp : public CommandModeBase this->SetDesc(_("Gives Op status to a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OP); return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "OPDEOP", "OPDEOPME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -119,14 +119,14 @@ class CommandCSDeOp : public CommandModeBase this->SetDesc(_("Deops a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OP); return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "OPDEOP", "OPDEOPME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -148,14 +148,14 @@ class CommandCSVoice : public CommandModeBase this->SetDesc(_("Voices a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_VOICE); return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "VOICE", "VOICEME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -178,14 +178,14 @@ class CommandCSDeVoice : public CommandModeBase this->SetDesc(_("Devoices a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_VOICE); return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "VOICE", "VOICEME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -208,7 +208,7 @@ class CommandCSHalfOp : public CommandModeBase this->SetDesc(_("Halfops a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_HALFOP); @@ -218,7 +218,7 @@ class CommandCSHalfOp : public CommandModeBase return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "HALFOP", "HALFOPME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -241,7 +241,7 @@ class CommandCSDeHalfOp : public CommandModeBase this->SetDesc(_("Dehalfops a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_HALFOP); @@ -251,7 +251,7 @@ class CommandCSDeHalfOp : public CommandModeBase return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "HALFOP", "HALFOPME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -274,7 +274,7 @@ class CommandCSProtect : public CommandModeBase this->SetDesc(_("Protects a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PROTECT); @@ -284,7 +284,7 @@ class CommandCSProtect : public CommandModeBase return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "PROTECT", "PROTECTME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -306,7 +306,7 @@ class CommandCSDeProtect : public CommandModeBase this->SetDesc(_("Deprotects a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PROTECT); @@ -316,7 +316,7 @@ class CommandCSDeProtect : public CommandModeBase return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "PROTECT", "PROTECTME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -338,7 +338,7 @@ class CommandCSOwner : public CommandModeBase this->SetDesc(_("Gives you owner status on channel")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OWNER); @@ -348,7 +348,7 @@ class CommandCSOwner : public CommandModeBase return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "OWNER", "OWNERME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -369,7 +369,7 @@ class CommandCSDeOwner : public CommandModeBase this->SetDesc(_("Removes your owner status on a channel")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OWNER); @@ -379,7 +379,7 @@ class CommandCSDeOwner : public CommandModeBase return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "OWNER", "OWNERME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_register.cpp b/modules/commands/cs_register.cpp index bf834c01f..9cf5a7a9b 100644 --- a/modules/commands/cs_register.cpp +++ b/modules/commands/cs_register.cpp @@ -22,7 +22,7 @@ class CommandCSRegister : public Command this->SetSyntax(_("\037channel\037 [\037description\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &chdesc = params.size() > 1 ? params[1] : ""; @@ -101,7 +101,7 @@ class CommandCSRegister : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -142,7 +142,7 @@ class CSRegister : public Module ModuleManager::Attach(I_OnDelChan, this); } - void OnDelChan(ChannelInfo *ci) + void OnDelChan(ChannelInfo *ci) anope_override { if (ci->c && ci->c->HasMode(CMODE_REGISTERED)) ci->c->RemoveMode(NULL, CMODE_REGISTERED, "", false); diff --git a/modules/commands/cs_saset.cpp b/modules/commands/cs_saset.cpp index 3290e7cc3..c564a9c90 100644 --- a/modules/commands/cs_saset.cpp +++ b/modules/commands/cs_saset.cpp @@ -22,13 +22,13 @@ class CommandCSSASet : public Command this->SetSyntax(_("\037option\037 \037channel\037 \037parameters\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->OnSyntaxError(source, ""); return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_saset_noexpire.cpp b/modules/commands/cs_saset_noexpire.cpp index 2e4ff774e..a71544a25 100644 --- a/modules/commands/cs_saset_noexpire.cpp +++ b/modules/commands/cs_saset_noexpire.cpp @@ -22,7 +22,7 @@ class CommandCSSASetNoexpire : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSASetNoexpire : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp index 59f2dcdc9..8466cf82c 100644 --- a/modules/commands/cs_seen.cpp +++ b/modules/commands/cs_seen.cpp @@ -37,12 +37,12 @@ struct SeenInfo : Serializable { } - Anope::string serialize_name() const + Anope::string serialize_name() const anope_override { return "SeenInfo"; } - serialized_data serialize() + serialized_data serialize() anope_override { serialized_data data; @@ -110,7 +110,7 @@ class CommandOSSeen : public Command this->SetSyntax(_("\037CLEAR\037 \037time\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (params[0].equals_ci("STATS")) { @@ -156,7 +156,7 @@ class CommandOSSeen : public Command this->SendSyntax(source); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -181,7 +181,7 @@ class CommandSeen : public Command this->SetSyntax(_("\037nick\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &target = params[0]; User *u = source.u; @@ -276,7 +276,7 @@ class CommandSeen : public Command } } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -292,7 +292,7 @@ class DataBasePurger : public CallBack public: DataBasePurger(Module *owner) : CallBack(owner, 300, Anope::CurTime, true) { } - void Tick(time_t) + void Tick(time_t) anope_override { size_t previous_size = database.size(); for (database_map::iterator it = database.begin(), it_end = database.end(); it != it_end;) @@ -334,7 +334,7 @@ class CSSeen : public Module OnReload(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; purgetime = dotime(config.ReadValue("cs_seen", "purgetime", "30d", 0)); @@ -344,37 +344,38 @@ class CSSeen : public Module purger.SetSecs(expiretimeout); } - void OnUserConnect(User *u) + void OnUserConnect(dynamic_reference<User> &u, bool &exempt) anope_override { UpdateUser(u, NEW, u->nick, "", "", ""); } - void OnUserNickChange(User *u, const Anope::string &oldnick) + void OnUserNickChange(User *u, const Anope::string &oldnick) anope_override { UpdateUser(u, NICK_TO, oldnick, u->nick, "", ""); UpdateUser(u, NICK_FROM, u->nick, oldnick, "", ""); } - void OnUserQuit(User *u, const Anope::string &msg) + void OnUserQuit(User *u, const Anope::string &msg) anope_override { UpdateUser(u, QUIT, u->nick, "", "", msg); } - void OnJoinChannel(User *u, Channel *c) + void OnJoinChannel(User *u, Channel *c) anope_override { UpdateUser(u, JOIN, u->nick, "", c->name, ""); } - void OnPartChannel(User *u, Channel *c, const Anope::string &channel, const Anope::string &msg) + void OnPartChannel(User *u, Channel *c, const Anope::string &channel, const Anope::string &msg) anope_override { UpdateUser(u, PART, u->nick, "", channel, msg); } - void OnUserKicked(Channel *c, User *target, const Anope::string &source, const Anope::string &msg) + void OnUserKicked(Channel *c, User *target, const Anope::string &source, const Anope::string &msg) anope_override { UpdateUser(target, KICK, target->nick, source, c->name, msg); } + private: void UpdateUser(const User *u, const TypeInfo Type, const Anope::string &nick, const Anope::string &nick2, const Anope::string &channel, const Anope::string &message) { SeenInfo *info = FindInfo(nick); diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp index 9a63c8335..ac91d213f 100644 --- a/modules/commands/cs_set.cpp +++ b/modules/commands/cs_set.cpp @@ -22,13 +22,13 @@ class CommandCSSet : public Command this->SetSyntax(_("\037option\037 \037channel\037 \037parameters\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->OnSyntaxError(source, ""); return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_bantype.cpp b/modules/commands/cs_set_bantype.cpp index e55093d6d..af63d0568 100644 --- a/modules/commands/cs_set_bantype.cpp +++ b/modules/commands/cs_set_bantype.cpp @@ -22,7 +22,7 @@ class CommandCSSetBanType : public Command this->SetSyntax(_("\037channel\037 \037bantype\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetBanType : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_description.cpp b/modules/commands/cs_set_description.cpp index 79cb93b24..0abd8462e 100644 --- a/modules/commands/cs_set_description.cpp +++ b/modules/commands/cs_set_description.cpp @@ -22,7 +22,7 @@ class CommandCSSetDescription : public Command this->SetSyntax(_("\037channel\037 [\037description\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -52,7 +52,7 @@ class CommandCSSetDescription : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_founder.cpp b/modules/commands/cs_set_founder.cpp index fade8a27b..0d375f760 100644 --- a/modules/commands/cs_set_founder.cpp +++ b/modules/commands/cs_set_founder.cpp @@ -22,7 +22,7 @@ class CommandCSSetFounder : public Command this->SetSyntax(_("\037channel\037 \037nick\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms)anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -68,7 +68,7 @@ class CommandCSSetFounder : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_keeptopic.cpp b/modules/commands/cs_set_keeptopic.cpp index 2c07d2a7b..3c9df3f3f 100644 --- a/modules/commands/cs_set_keeptopic.cpp +++ b/modules/commands/cs_set_keeptopic.cpp @@ -22,7 +22,7 @@ class CommandCSSetKeepTopic : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetKeepTopic : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_misc.cpp b/modules/commands/cs_set_misc.cpp index beb0cf255..75794697d 100644 --- a/modules/commands/cs_set_misc.cpp +++ b/modules/commands/cs_set_misc.cpp @@ -22,12 +22,12 @@ struct CSMiscData : Anope::string, ExtensibleItem, Serializable { } - Anope::string serialize_name() const + Anope::string serialize_name() const anope_override { return "CSMiscData"; } - serialized_data serialize() + serialized_data serialize() anope_override { serialized_data sdata; @@ -64,7 +64,7 @@ class CommandCSSetMisc : public Command this->SetSyntax(_("\037channel\037 [\037parameters\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { ChannelInfo *ci = cs_findchan(params[0]); if (ci == NULL) @@ -115,7 +115,7 @@ class CSSetMisc : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnChanInfo(CommandSource &source, ChannelInfo *ci, InfoFormatter &info, bool ShowHidden) + void OnChanInfo(CommandSource &source, ChannelInfo *ci, InfoFormatter &info, bool ShowHidden) anope_override { std::deque<Anope::string> list; ci->GetExtList(list); diff --git a/modules/commands/cs_set_peace.cpp b/modules/commands/cs_set_peace.cpp index e670993fd..002690721 100644 --- a/modules/commands/cs_set_peace.cpp +++ b/modules/commands/cs_set_peace.cpp @@ -22,7 +22,7 @@ class CommandCSSetPeace : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetPeace : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_persist.cpp b/modules/commands/cs_set_persist.cpp index 7d31b9fff..4136a2fa2 100644 --- a/modules/commands/cs_set_persist.cpp +++ b/modules/commands/cs_set_persist.cpp @@ -22,7 +22,7 @@ class CommandCSSetPersist : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -126,7 +126,7 @@ class CommandCSSetPersist : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_private.cpp b/modules/commands/cs_set_private.cpp index 733c4a22e..4fd261c45 100644 --- a/modules/commands/cs_set_private.cpp +++ b/modules/commands/cs_set_private.cpp @@ -22,7 +22,7 @@ class CommandCSSetPrivate : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetPrivate : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_restricted.cpp b/modules/commands/cs_set_restricted.cpp index 2ea996224..f02d17f3f 100644 --- a/modules/commands/cs_set_restricted.cpp +++ b/modules/commands/cs_set_restricted.cpp @@ -21,7 +21,7 @@ class CommandCSSetRestricted : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -53,7 +53,7 @@ class CommandCSSetRestricted : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_secure.cpp b/modules/commands/cs_set_secure.cpp index c58501bf4..480071cbc 100644 --- a/modules/commands/cs_set_secure.cpp +++ b/modules/commands/cs_set_secure.cpp @@ -22,7 +22,7 @@ class CommandCSSetSecure : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetSecure : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_securefounder.cpp b/modules/commands/cs_set_securefounder.cpp index cd5666b05..ad4a91033 100644 --- a/modules/commands/cs_set_securefounder.cpp +++ b/modules/commands/cs_set_securefounder.cpp @@ -22,7 +22,7 @@ class CommandCSSetSecureFounder : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -55,7 +55,7 @@ class CommandCSSetSecureFounder : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_secureops.cpp b/modules/commands/cs_set_secureops.cpp index 912c56f57..b83e32a63 100644 --- a/modules/commands/cs_set_secureops.cpp +++ b/modules/commands/cs_set_secureops.cpp @@ -22,7 +22,7 @@ class CommandCSSetSecureOps : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetSecureOps : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_signkick.cpp b/modules/commands/cs_set_signkick.cpp index 8804fdf4e..f8cce4022 100644 --- a/modules/commands/cs_set_signkick.cpp +++ b/modules/commands/cs_set_signkick.cpp @@ -22,7 +22,7 @@ class CommandCSSetSignKick : public Command this->SetSyntax(_("\037channel\037 SIGNKICK {ON | LEVEL | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -61,7 +61,7 @@ class CommandCSSetSignKick : public Command this->OnSyntaxError(source, "SIGNKICK"); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_successor.cpp b/modules/commands/cs_set_successor.cpp index 4b7015b9d..fe2860920 100644 --- a/modules/commands/cs_set_successor.cpp +++ b/modules/commands/cs_set_successor.cpp @@ -22,7 +22,7 @@ class CommandCSSetSuccessor : public Command this->SetSyntax(_("\037channel\037 \037nick\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -77,7 +77,7 @@ class CommandCSSetSuccessor : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_topiclock.cpp b/modules/commands/cs_set_topiclock.cpp index 0f33c911f..3a3c7d47c 100644 --- a/modules/commands/cs_set_topiclock.cpp +++ b/modules/commands/cs_set_topiclock.cpp @@ -22,7 +22,7 @@ class CommandCSSetTopicLock : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetTopicLock : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp index 2d7e6d29c..676ffebfa 100644 --- a/modules/commands/cs_suspend.cpp +++ b/modules/commands/cs_suspend.cpp @@ -27,7 +27,7 @@ struct ChanSuspend : ExtensibleItem, Serializable return "ChanSuspend"; } - serialized_data serialize() + serialized_data serialize() anope_override { serialized_data sd; @@ -61,7 +61,7 @@ class CommandCSSuspend : public Command this->SetSyntax(_("\037channel\037 [+\037expiry\037] [\037reason\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &chan = params[0]; Anope::string expiry = params.size() > 1 ? params[1] : ""; @@ -130,7 +130,7 @@ class CommandCSSuspend : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -155,7 +155,7 @@ class CommandCSUnSuspend : public Command this->SetSyntax(_("\037channel\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -192,7 +192,7 @@ class CommandCSUnSuspend : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -228,7 +228,7 @@ class CSSuspend : public Module } } - void OnPreChanExpire(ChannelInfo *ci, bool &expire) + void OnPreChanExpire(ChannelInfo *ci, bool &expire) anope_override { if (!ci->HasFlag(CI_SUSPENDED)) return; diff --git a/modules/commands/cs_sync.cpp b/modules/commands/cs_sync.cpp index 50c451fa7..d3542398b 100644 --- a/modules/commands/cs_sync.cpp +++ b/modules/commands/cs_sync.cpp @@ -20,7 +20,7 @@ class CommandCSSync : public Command this->SetSyntax(_("\037channel\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -40,7 +40,7 @@ class CommandCSSync : public Command } } - bool OnHelp(CommandSource &source, const Anope::string ¶ms) + bool OnHelp(CommandSource &source, const Anope::string ¶ms) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_tban.cpp b/modules/commands/cs_tban.cpp index 4f063c6e1..61f1f810f 100644 --- a/modules/commands/cs_tban.cpp +++ b/modules/commands/cs_tban.cpp @@ -28,7 +28,7 @@ class TempBan : public CallBack public: TempBan(time_t seconds, Channel *c, const Anope::string &banmask) : CallBack(me, seconds), chan(c), mask(banmask) { } - void Tick(time_t ctime) + void Tick(time_t ctime) anope_override { if (chan && chan->ci) chan->RemoveMode(NULL, CMODE_BAN, mask); @@ -44,7 +44,7 @@ class CommandCSTBan : public Command this->SetSyntax(_("\037channel\037 \037nick\037 \037time\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { Channel *c = findchan(params[0]); @@ -78,7 +78,7 @@ class CommandCSTBan : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->OnSyntaxError(source, ""); source.Reply(" "); diff --git a/modules/commands/cs_topic.cpp b/modules/commands/cs_topic.cpp index 910e2129b..e1aba12fb 100644 --- a/modules/commands/cs_topic.cpp +++ b/modules/commands/cs_topic.cpp @@ -22,7 +22,7 @@ class CommandCSTopic : public Command this->SetSyntax(_("\037channel\037 [\037topic\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &topic = params.size() > 1 ? params[1] : ""; @@ -53,7 +53,7 @@ class CommandCSTopic : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_unban.cpp b/modules/commands/cs_unban.cpp index 6963dd308..24d9caab8 100644 --- a/modules/commands/cs_unban.cpp +++ b/modules/commands/cs_unban.cpp @@ -22,7 +22,7 @@ class CommandCSUnban : public Command this->SetSyntax(_("\037channel\037 [\037nick\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -64,7 +64,7 @@ class CommandCSUnban : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_updown.cpp b/modules/commands/cs_updown.cpp index 50f1297d1..da272835f 100644 --- a/modules/commands/cs_updown.cpp +++ b/modules/commands/cs_updown.cpp @@ -22,7 +22,7 @@ class CommandCSUp : public Command this->SetSyntax(_("[\037channel\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -47,7 +47,7 @@ class CommandCSUp : public Command } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -77,7 +77,7 @@ class CommandCSDown : public Command this->SetSyntax(_("[\037channel\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -101,7 +101,7 @@ class CommandCSDown : public Command } } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp index 39789bf89..5ca488535 100644 --- a/modules/commands/cs_xop.cpp +++ b/modules/commands/cs_xop.cpp @@ -99,7 +99,7 @@ class XOPChanAccess : public ChanAccess { } - bool HasPriv(const Anope::string &priv) const + bool HasPriv(const Anope::string &priv) const anope_override { for (int i = 0; xopAccess[i].type != XOP_UNKNOWN; ++i) { @@ -129,7 +129,7 @@ class XOPChanAccess : public ChanAccess return ""; } - void Unserialize(const Anope::string &data) + void Unserialize(const Anope::string &data) anope_override { for (int i = 0; xopAccess[i].type != XOP_UNKNOWN; ++i) { @@ -188,7 +188,7 @@ class XOPAccessProvider : public AccessProvider { } - ChanAccess *Create() + ChanAccess *Create() anope_override { return new XOPChanAccess(this); } @@ -340,7 +340,7 @@ class XOPBase : public Command } } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > ci->GetAccessCount()) return; @@ -394,17 +394,11 @@ class XOPBase : public Command const Anope::string &nick = params.size() > 2 ? params[2] : ""; AccessGroup access = ci->AccessFor(u); - bool override = false; - if (!access.HasPriv("ACCESS_LIST")) + if (!access.HasPriv("ACCESS_LIST") && !u->HasCommand("chanserv/access/list")) { - if (u->HasCommand("chanserv/access/list")) - override = true; - else - { - source.Reply(ACCESS_DENIED); - return; - } + source.Reply(ACCESS_DENIED); + return; } if (!ci->GetAccessCount()) @@ -428,7 +422,7 @@ class XOPBase : public Command { } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > ci->GetAccessCount()) return; @@ -567,12 +561,12 @@ class CommandCSQOP : public XOPBase this->SetDesc(_("Modify the list of QOP users")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { return this->DoXop(source, params, XOP_QOP); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -621,12 +615,12 @@ class CommandCSAOP : public XOPBase this->SetDesc(_("Modify the list of AOP users")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { return this->DoXop(source, params, XOP_AOP); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -677,12 +671,12 @@ class CommandCSHOP : public XOPBase this->SetDesc(_("Maintains the HOP (HalfOP) list for a channel")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { return this->DoXop(source, params, XOP_HOP); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -731,12 +725,12 @@ class CommandCSSOP : public XOPBase this->SetDesc(_("Modify the list of SOP users")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { return this->DoXop(source, params, XOP_SOP); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -786,12 +780,12 @@ class CommandCSVOP : public XOPBase this->SetDesc(_("Maintains the VOP (VOicePeople) list for a channel")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { return this->DoXop(source, params, XOP_VOP); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/gl_global.cpp b/modules/commands/gl_global.cpp index 3622833ad..0933efb13 100644 --- a/modules/commands/gl_global.cpp +++ b/modules/commands/gl_global.cpp @@ -23,7 +23,7 @@ class CommandGLGlobal : public Command this->SetSyntax(_("\037message\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &msg = params[0]; @@ -37,7 +37,7 @@ class CommandGLGlobal : public Command } } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/help.cpp b/modules/commands/help.cpp index a7356c0d0..a329eb63c 100644 --- a/modules/commands/help.cpp +++ b/modules/commands/help.cpp @@ -23,7 +23,7 @@ class CommandHelp : public Command this->SetFlag(CFLAG_ALLOW_UNREGISTERED); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { EventReturn MOD_RESULT; FOREACH_RESULT(I_OnPreHelp, OnPreHelp(source, params)); diff --git a/modules/commands/hs_del.cpp b/modules/commands/hs_del.cpp index 44b2bf5e6..80b8333d9 100644 --- a/modules/commands/hs_del.cpp +++ b/modules/commands/hs_del.cpp @@ -22,7 +22,7 @@ class CommandHSDel : public Command this->SetSyntax(_("\037nick\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &nick = params[0]; @@ -38,7 +38,7 @@ class CommandHSDel : public Command source.Reply(NICK_X_NOT_REGISTERED, nick.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -57,7 +57,7 @@ class CommandHSDelAll : public Command this->SetSyntax(_("\037nick\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &nick = params[0]; User *u = source.u; @@ -78,7 +78,7 @@ class CommandHSDelAll : public Command source.Reply(NICK_X_NOT_REGISTERED, nick.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/hs_group.cpp b/modules/commands/hs_group.cpp index 78c863a51..79db12536 100644 --- a/modules/commands/hs_group.cpp +++ b/modules/commands/hs_group.cpp @@ -34,7 +34,7 @@ class CommandHSGroup : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; NickAlias *na = findnick(u->nick); @@ -52,7 +52,7 @@ class CommandHSGroup : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/hs_list.cpp b/modules/commands/hs_list.cpp index acba0528f..3bc8be862 100644 --- a/modules/commands/hs_list.cpp +++ b/modules/commands/hs_list.cpp @@ -22,7 +22,7 @@ class CommandHSList : public Command this->SetSyntax(_("\002[<key>|<#X-Y>]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &key = !params.empty() ? params[0] : ""; int from = 0, to = 0, counter = 1; @@ -131,7 +131,7 @@ class CommandHSList : public Command source.Reply(replies[i]); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/hs_off.cpp b/modules/commands/hs_off.cpp index 45a8befd3..c9c2fecd1 100644 --- a/modules/commands/hs_off.cpp +++ b/modules/commands/hs_off.cpp @@ -22,7 +22,7 @@ class CommandHSOff : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; NickAlias *na = findnick(u->nick); @@ -39,7 +39,7 @@ class CommandHSOff : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/hs_on.cpp b/modules/commands/hs_on.cpp index 2c7d12f41..2dfa18c12 100644 --- a/modules/commands/hs_on.cpp +++ b/modules/commands/hs_on.cpp @@ -22,7 +22,7 @@ class CommandHSOn : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; NickAlias *na = findnick(u->nick); @@ -49,7 +49,7 @@ class CommandHSOn : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/hs_request.cpp b/modules/commands/hs_request.cpp index d5f63d175..06308c8cb 100644 --- a/modules/commands/hs_request.cpp +++ b/modules/commands/hs_request.cpp @@ -30,12 +30,12 @@ struct HostRequest : ExtensibleItem, Serializable Anope::string host; time_t time; - Anope::string serialize_name() const + Anope::string serialize_name() const anope_override { return "HostRequest"; } - serialized_data serialize() + serialized_data serialize() anope_override { serialized_data data; @@ -79,7 +79,7 @@ class CommandHSRequest : public Command this->SetSyntax(_("vhost")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -162,7 +162,7 @@ class CommandHSRequest : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -182,7 +182,7 @@ class CommandHSActivate : public Command this->SetSyntax(_("\037nick\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -206,7 +206,7 @@ class CommandHSActivate : public Command source.Reply(_("No request for nick %s found."), nick.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -226,7 +226,7 @@ class CommandHSReject : public Command this->SetDesc(_("Reject the requested vHost of a user")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -259,7 +259,7 @@ class CommandHSReject : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -321,12 +321,12 @@ class CommandHSWaiting : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { return this->DoList(source); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -362,7 +362,7 @@ class HSRequest : public Module it->second->Shrink("hs_request"); } - void OnReload() + void OnReload() anope_override { ConfigReader config; HSRequestMemoUser = config.ReadFlag("hs_request", "memouser", "no", 0); diff --git a/modules/commands/hs_set.cpp b/modules/commands/hs_set.cpp index d648952f7..72ec9f07c 100644 --- a/modules/commands/hs_set.cpp +++ b/modules/commands/hs_set.cpp @@ -22,7 +22,7 @@ class CommandHSSet : public Command this->SetSyntax(_("\037nick\037 \037hostmask\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -90,7 +90,7 @@ class CommandHSSet : public Command source.Reply(_("VHost for \002%s\002 set to \002%s\002."), nick.c_str(), host.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -123,7 +123,7 @@ class CommandHSSetAll : public Command this->SetSyntax(_("\037nick\037 \037hostmask>\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -192,7 +192,7 @@ class CommandHSSetAll : public Command source.Reply(_("VHost for group \002%s\002 set to \002%s\002."), nick.c_str(), host.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ms_cancel.cpp b/modules/commands/ms_cancel.cpp index 7e382ac90..46f410aec 100644 --- a/modules/commands/ms_cancel.cpp +++ b/modules/commands/ms_cancel.cpp @@ -23,7 +23,7 @@ class CommandMSCancel : public Command this->SetSyntax(_("{\037nick\037 | \037channel\037}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!memoserv) return; @@ -53,7 +53,7 @@ class CommandMSCancel : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ms_check.cpp b/modules/commands/ms_check.cpp index e3ad2fcaf..a77b7192f 100644 --- a/modules/commands/ms_check.cpp +++ b/modules/commands/ms_check.cpp @@ -22,7 +22,7 @@ class CommandMSCheck : public Command this->SetSyntax(_("\037nick\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -62,7 +62,7 @@ class CommandMSCheck : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ms_del.cpp b/modules/commands/ms_del.cpp index d1e982309..f0b65eeac 100644 --- a/modules/commands/ms_del.cpp +++ b/modules/commands/ms_del.cpp @@ -23,7 +23,7 @@ class MemoDelCallback : public NumberList { } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > mi->memos.size()) return; @@ -47,7 +47,7 @@ class CommandMSDel : public Command this->SetSyntax(_("[\037channel\037] {\037num\037 | \037list\037 | LAST | ALL}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -124,7 +124,7 @@ class CommandMSDel : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ms_ignore.cpp b/modules/commands/ms_ignore.cpp index a58cb5248..caea7d147 100644 --- a/modules/commands/ms_ignore.cpp +++ b/modules/commands/ms_ignore.cpp @@ -24,7 +24,7 @@ class CommandMSIgnore : public Command this->SetSyntax(_("[\037channel\037] {\002ADD|DEL|LIST\002} [\037entry\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!memoserv) return; @@ -101,7 +101,7 @@ class CommandMSIgnore : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ms_info.cpp b/modules/commands/ms_info.cpp index e04797005..4efac86eb 100644 --- a/modules/commands/ms_info.cpp +++ b/modules/commands/ms_info.cpp @@ -22,7 +22,7 @@ class CommandMSInfo : public Command this->SetSyntax(_("[\037nick\037 | \037channel\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -183,7 +183,7 @@ class CommandMSInfo : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ms_list.cpp b/modules/commands/ms_list.cpp index 37340f18b..41b0d05a7 100644 --- a/modules/commands/ms_list.cpp +++ b/modules/commands/ms_list.cpp @@ -22,7 +22,7 @@ class CommandMSList : public Command this->SetSyntax(_("[\037channel\037] [\037list\037 | NEW]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -77,7 +77,7 @@ class CommandMSList : public Command { } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > mi->memos.size()) return; @@ -137,7 +137,7 @@ class CommandMSList : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ms_read.cpp b/modules/commands/ms_read.cpp index 95953c71d..01dba1592 100644 --- a/modules/commands/ms_read.cpp +++ b/modules/commands/ms_read.cpp @@ -58,7 +58,7 @@ class MemoListCallback : public NumberList { } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > mi->memos.size()) return; @@ -91,7 +91,7 @@ class CommandMSRead : public Command this->SetSyntax(_("[\037channel\037] {\037num\037 | \037list\037 | LAST | NEW}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -163,7 +163,7 @@ class CommandMSRead : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ms_rsend.cpp b/modules/commands/ms_rsend.cpp index 1033060be..aca957b05 100644 --- a/modules/commands/ms_rsend.cpp +++ b/modules/commands/ms_rsend.cpp @@ -23,7 +23,7 @@ class CommandMSRSend : public Command this->SetSyntax(_("{\037nick\037 | \037channel\037} \037memo-text\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!memoserv) return; @@ -74,7 +74,7 @@ class CommandMSRSend : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ms_send.cpp b/modules/commands/ms_send.cpp index d125718a7..ba33233e8 100644 --- a/modules/commands/ms_send.cpp +++ b/modules/commands/ms_send.cpp @@ -23,7 +23,7 @@ class CommandMSSend : public Command this->SetSyntax(_("{\037nick\037 | \037channel\037} \037memo-text\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!memoserv) return; @@ -44,7 +44,7 @@ class CommandMSSend : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ms_sendall.cpp b/modules/commands/ms_sendall.cpp index f52f824d6..db72a4905 100644 --- a/modules/commands/ms_sendall.cpp +++ b/modules/commands/ms_sendall.cpp @@ -23,7 +23,7 @@ class CommandMSSendAll : public Command this->SetSyntax(_("\037memo-text\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!memoserv) return; @@ -51,7 +51,7 @@ class CommandMSSendAll : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ms_set.cpp b/modules/commands/ms_set.cpp index 8fb857661..b4ffa95c1 100644 --- a/modules/commands/ms_set.cpp +++ b/modules/commands/ms_set.cpp @@ -205,7 +205,7 @@ class CommandMSSet : public Command this->SetSyntax(_("\037option\037 \037parameters\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &cmd = params[0]; @@ -225,7 +225,7 @@ class CommandMSSet : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { if (subcommand.empty()) { diff --git a/modules/commands/ms_staff.cpp b/modules/commands/ms_staff.cpp index a41a28be1..254a12b7b 100644 --- a/modules/commands/ms_staff.cpp +++ b/modules/commands/ms_staff.cpp @@ -23,7 +23,7 @@ class CommandMSStaff : public Command this->SetSyntax(_("\037memo-text\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!memoserv) return; @@ -47,7 +47,7 @@ class CommandMSStaff : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_access.cpp b/modules/commands/ns_access.cpp index 14735e408..2d63c472e 100644 --- a/modules/commands/ns_access.cpp +++ b/modules/commands/ns_access.cpp @@ -93,7 +93,7 @@ class CommandNSAccess : public Command this->SetSyntax(_("LIST [\037user\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &cmd = params[0]; @@ -151,7 +151,7 @@ class CommandNSAccess : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp index 933fc19da..5a5dbe7f0 100644 --- a/modules/commands/ns_ajoin.cpp +++ b/modules/commands/ns_ajoin.cpp @@ -19,12 +19,12 @@ struct AJoinList : std::vector<std::pair<Anope::string, Anope::string> >, Extens AJoinList(NickCore *n) : nc(n) { } - Anope::string serialize_name() const + Anope::string serialize_name() const anope_override { return "AJoinList"; } - serialized_data serialize() + serialized_data serialize() anope_override { serialized_data sd; @@ -150,7 +150,7 @@ class CommandNSAJoin : public Command this->SetSyntax(_("{ADD | DEL | LIST} [\037channel\037] [\037key\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (params[0].equals_ci("LIST")) this->DoList(source, params); @@ -166,7 +166,7 @@ class CommandNSAJoin : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -191,7 +191,7 @@ class NSAJoin : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnNickIdentify(User *u) + void OnNickIdentify(User *u) anope_override { AJoinList *channels = u->Account()->GetExt<AJoinList *>("ns_ajoin_channels"); diff --git a/modules/commands/ns_alist.cpp b/modules/commands/ns_alist.cpp index 15b236078..abb8c722c 100644 --- a/modules/commands/ns_alist.cpp +++ b/modules/commands/ns_alist.cpp @@ -22,7 +22,7 @@ class CommandNSAList : public Command this->SetSyntax(_("[\037nickname\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; Anope::string nick = u->Account()->display; @@ -80,7 +80,7 @@ class CommandNSAList : public Command source.Reply(replies[i]); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp index e0d70b88d..6ad106161 100644 --- a/modules/commands/ns_cert.cpp +++ b/modules/commands/ns_cert.cpp @@ -148,7 +148,7 @@ class CommandNSCert : public Command this->SetSyntax("LIST"); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &cmd = params[0]; @@ -172,7 +172,7 @@ class CommandNSCert : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -234,7 +234,7 @@ class NSCert : public Module } - void OnFingerprint(User *u) + void OnFingerprint(User *u) anope_override { DoAutoIdentify(u); } diff --git a/modules/commands/ns_drop.cpp b/modules/commands/ns_drop.cpp index a89cbec8f..0bb6eecc2 100644 --- a/modules/commands/ns_drop.cpp +++ b/modules/commands/ns_drop.cpp @@ -22,7 +22,7 @@ class CommandNSDrop : public Command this->SetDesc(_("Cancel the registration of a nickname")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; Anope::string nick = !params.empty() ? params[0] : ""; @@ -81,7 +81,7 @@ class CommandNSDrop : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { User *u = source.u; if (u->Account() && u->HasPriv("nickserv/drop")) diff --git a/modules/commands/ns_getemail.cpp b/modules/commands/ns_getemail.cpp index 35921dfb1..f8ace530d 100644 --- a/modules/commands/ns_getemail.cpp +++ b/modules/commands/ns_getemail.cpp @@ -26,7 +26,7 @@ class CommandNSGetEMail : public Command this->SetSyntax(_("\037user@email-host\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &email = params[0]; @@ -54,7 +54,7 @@ class CommandNSGetEMail : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_getpass.cpp b/modules/commands/ns_getpass.cpp index 5e1015bb4..8ffc85520 100644 --- a/modules/commands/ns_getpass.cpp +++ b/modules/commands/ns_getpass.cpp @@ -22,7 +22,7 @@ class CommandNSGetPass : public Command this->SetSyntax(_("\037nickname\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &nick = params[0]; @@ -46,7 +46,7 @@ class CommandNSGetPass : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_ghost.cpp b/modules/commands/ns_ghost.cpp index 067feb341..05b60eacd 100644 --- a/modules/commands/ns_ghost.cpp +++ b/modules/commands/ns_ghost.cpp @@ -23,7 +23,7 @@ class CommandNSGhost : public Command this->SetSyntax("\037nickname\037 [\037password\037]"); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &nick = params[0]; const Anope::string &pass = params.size() > 1 ? params[1] : ""; @@ -87,7 +87,7 @@ class CommandNSGhost : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_group.cpp b/modules/commands/ns_group.cpp index 69c66ff16..2f8617c11 100644 --- a/modules/commands/ns_group.cpp +++ b/modules/commands/ns_group.cpp @@ -23,7 +23,7 @@ class CommandNSGroup : public Command this->SetSyntax(_("\037target\037 \037password\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -129,7 +129,7 @@ class CommandNSGroup : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -172,7 +172,7 @@ class CommandNSUngroup : public Command this->SetSyntax(_("[\037nick\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; Anope::string nick = !params.empty() ? params[0] : ""; @@ -216,7 +216,7 @@ class CommandNSUngroup : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -237,7 +237,7 @@ class CommandNSGList : public Command this->SetDesc(_("Lists all nicknames in your group")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; Anope::string nick = !params.empty() ? params[0] : ""; @@ -273,7 +273,7 @@ class CommandNSGList : public Command } } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { User *u = source.u; if (u->IsServicesOper()) diff --git a/modules/commands/ns_identify.cpp b/modules/commands/ns_identify.cpp index 7c3a0b5d0..cd0b14ddb 100644 --- a/modules/commands/ns_identify.cpp +++ b/modules/commands/ns_identify.cpp @@ -23,7 +23,7 @@ class CommandNSIdentify : public Command this->SetSyntax(_("[\037account\037] \037password\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -63,7 +63,7 @@ class CommandNSIdentify : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_info.cpp b/modules/commands/ns_info.cpp index 514757037..2af036a96 100644 --- a/modules/commands/ns_info.cpp +++ b/modules/commands/ns_info.cpp @@ -34,7 +34,7 @@ class CommandNSInfo : public Command this->SetSyntax(_("[\037nickname\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -145,7 +145,7 @@ class CommandNSInfo : public Command } } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_list.cpp b/modules/commands/ns_list.cpp index 2a43fa091..491ed8733 100644 --- a/modules/commands/ns_list.cpp +++ b/modules/commands/ns_list.cpp @@ -22,7 +22,7 @@ class CommandNSList : public Command this->SetSyntax(_("\037pattern\037 [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -129,7 +129,7 @@ class CommandNSList : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_logout.cpp b/modules/commands/ns_logout.cpp index 7bd9b77c9..240054db6 100644 --- a/modules/commands/ns_logout.cpp +++ b/modules/commands/ns_logout.cpp @@ -23,7 +23,7 @@ class CommandNSLogout : public Command this->SetSyntax(_("[\037nickname\037 [REVALIDATE]]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -61,7 +61,7 @@ class CommandNSLogout : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp index 7406378dd..e985f2881 100644 --- a/modules/commands/ns_recover.cpp +++ b/modules/commands/ns_recover.cpp @@ -42,7 +42,7 @@ class CommandNSRecover : public Command this->SetSyntax(_("\037nickname\037 [\037password\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -92,7 +92,7 @@ class CommandNSRecover : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { /* Convert Config->NSReleaseTimeout seconds to string format */ Anope::string relstr = duration(Config->NSReleaseTimeout); diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp index 341397c67..0ebc5dadc 100644 --- a/modules/commands/ns_register.cpp +++ b/modules/commands/ns_register.cpp @@ -25,7 +25,7 @@ class CommandNSConfirm : public Command this->SetSyntax(_("\037passcode\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &passcode = params[0]; @@ -68,7 +68,7 @@ class CommandNSConfirm : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { User *u = source.u; this->SendSyntax(source); @@ -87,7 +87,7 @@ class CommandNSConfirm : public Command return true; } - void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) + void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) anope_override { source.Reply(NICK_CONFIRM_INVALID); } @@ -106,7 +106,7 @@ class CommandNSRegister : public Command this->SetSyntax(_("\037password\037 \037[email]\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; NickAlias *na; @@ -212,7 +212,7 @@ class CommandNSRegister : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply("\n"); @@ -259,7 +259,7 @@ class CommandNSResend : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!Config->NSEmailReg) return; @@ -288,7 +288,7 @@ class CommandNSResend : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { if (!Config->NSEmailReg) return false; @@ -300,7 +300,7 @@ class CommandNSResend : public Command return true; } - void OnServHelp(CommandSource &source) + void OnServHelp(CommandSource &source) anope_override { if (Config->NSEmailReg) Command::OnServHelp(source); diff --git a/modules/commands/ns_release.cpp b/modules/commands/ns_release.cpp index 2725c5f17..d843b2f84 100644 --- a/modules/commands/ns_release.cpp +++ b/modules/commands/ns_release.cpp @@ -23,7 +23,7 @@ class CommandNSRelease : public Command this->SetSyntax(_("\037nickname\037 [\037password\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &nick = params[0]; @@ -70,7 +70,7 @@ class CommandNSRelease : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { /* Convert Config->NSReleaseTimeout seconds to string format */ Anope::string relstr = duration(Config->NSReleaseTimeout); diff --git a/modules/commands/ns_resetpass.cpp b/modules/commands/ns_resetpass.cpp index f3aa47630..f0dfe1aad 100644 --- a/modules/commands/ns_resetpass.cpp +++ b/modules/commands/ns_resetpass.cpp @@ -25,7 +25,7 @@ class CommandNSResetPass : public Command this->SetSyntax(_("\037nickname\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; NickAlias *na; @@ -46,7 +46,7 @@ class CommandNSResetPass : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -79,7 +79,7 @@ class NSResetPass : public Module ModuleManager::Attach(I_OnPreCommand, this); } - EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) + EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) anope_override { if (command->name == "nickserv/confirm" && params.size() > 1) { diff --git a/modules/commands/ns_saset.cpp b/modules/commands/ns_saset.cpp index 793c8c670..1b77c2b57 100644 --- a/modules/commands/ns_saset.cpp +++ b/modules/commands/ns_saset.cpp @@ -22,13 +22,13 @@ class CommandNSSASet : public Command this->SetSyntax(_("\037option\037 \037nickname\037 \037parameters\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->OnSyntaxError(source, ""); return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(_("Sets various nickname options. \037option\037 can be one of:")); @@ -64,7 +64,7 @@ class CommandNSSASetPassword : public Command this->SetSyntax(_("\037nickname\037 \037new-password\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; NickAlias *setter_na = findnick(params[0]); @@ -103,7 +103,7 @@ class CommandNSSASetPassword : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_saset_noexpire.cpp b/modules/commands/ns_saset_noexpire.cpp index 71ecad3f6..5ebfdce89 100644 --- a/modules/commands/ns_saset_noexpire.cpp +++ b/modules/commands/ns_saset_noexpire.cpp @@ -22,7 +22,7 @@ class CommandNSSASetNoexpire : public Command this->SetSyntax(_("\037nickname\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { NickAlias *na = findnick(params[0]); if (na == NULL) @@ -49,7 +49,7 @@ class CommandNSSASetNoexpire : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_sendpass.cpp b/modules/commands/ns_sendpass.cpp index 52128bdc8..678518d5d 100644 --- a/modules/commands/ns_sendpass.cpp +++ b/modules/commands/ns_sendpass.cpp @@ -25,7 +25,7 @@ class CommandNSSendPass : public Command this->SetSyntax(_("\037nickname\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &nick = params[0]; @@ -53,7 +53,7 @@ class CommandNSSendPass : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_set.cpp b/modules/commands/ns_set.cpp index b52bec52a..d81c4c3c8 100644 --- a/modules/commands/ns_set.cpp +++ b/modules/commands/ns_set.cpp @@ -22,13 +22,13 @@ class CommandNSSet : public Command this->SetSyntax(_("\037option\037 \037parameters\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->OnSyntaxError(source, ""); return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -64,7 +64,7 @@ class CommandNSSetPassword : public Command this->SetSyntax(_("\037new-password\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -92,7 +92,7 @@ class CommandNSSetPassword : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_set_autoop.cpp b/modules/commands/ns_set_autoop.cpp index 4a77db52f..452717c3d 100644 --- a/modules/commands/ns_set_autoop.cpp +++ b/modules/commands/ns_set_autoop.cpp @@ -48,12 +48,12 @@ class CommandNSSetAutoOp : public Command return; } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, source.u->Account()->display, params[0]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -72,12 +72,12 @@ class CommandNSSASetAutoOp : public CommandNSSetAutoOp this->SetSyntax(_("\037nickname\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, params[0], params[1]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_set_display.cpp b/modules/commands/ns_set_display.cpp index e3f1e237f..e89655f06 100644 --- a/modules/commands/ns_set_display.cpp +++ b/modules/commands/ns_set_display.cpp @@ -41,12 +41,12 @@ class CommandNSSetDisplay : public Command source.Reply(NICK_SET_DISPLAY_CHANGED, user_na->nc->display.c_str()); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, source.u->Account()->display, params[0]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -65,12 +65,12 @@ class CommandNSSASetDisplay : public CommandNSSetDisplay this->SetSyntax(_("\037nickname\037 \037new-display\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, params[0], params[1]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_set_email.cpp b/modules/commands/ns_set_email.cpp index 8ce71165e..09ef8732c 100644 --- a/modules/commands/ns_set_email.cpp +++ b/modules/commands/ns_set_email.cpp @@ -104,12 +104,12 @@ class CommandNSSetEmail : public Command return; } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, source.u->Account()->display, params.size() ? params[0] : ""); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -129,12 +129,12 @@ class CommandNSSASetEmail : public CommandNSSetEmail this->SetSyntax(_("\037nickname\037 \037address\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, params[0], params.size() > 1 ? params[1] : ""); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -158,7 +158,7 @@ class NSSetEmail : public Module } - EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) + EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; if (command->name == "nickserv/confirm" && !params.empty() && u->IsIdentified()) diff --git a/modules/commands/ns_set_greet.cpp b/modules/commands/ns_set_greet.cpp index c986eadf8..ed620dc05 100644 --- a/modules/commands/ns_set_greet.cpp +++ b/modules/commands/ns_set_greet.cpp @@ -46,12 +46,12 @@ class CommandNSSetGreet : public Command return; } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, source.u->Account()->display, params.size() > 0 ? params[0] : ""); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -72,12 +72,12 @@ class CommandNSSASetGreet : public CommandNSSetGreet this->SetSyntax(_("\037nickname\037 \037message\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, params[0], params.size() > 1 ? params[1] : ""); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_set_hide.cpp b/modules/commands/ns_set_hide.cpp index af6f1998f..8d0ee7fb3 100644 --- a/modules/commands/ns_set_hide.cpp +++ b/modules/commands/ns_set_hide.cpp @@ -81,12 +81,12 @@ class CommandNSSetHide : public Command return; } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, source.u->Account()->display, params[0], params[1]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -109,13 +109,13 @@ class CommandNSSASetHide : public CommandNSSetHide this->SetSyntax("\037nickname\037 {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->ClearSyntax(); this->Run(source, params[0], params[1], params[2]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_set_kill.cpp b/modules/commands/ns_set_kill.cpp index 3ead7aabd..0fc64196d 100644 --- a/modules/commands/ns_set_kill.cpp +++ b/modules/commands/ns_set_kill.cpp @@ -71,12 +71,12 @@ class CommandNSSetKill : public Command return; } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, source.u->Account()->display, params[0]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -104,13 +104,13 @@ class CommandNSSASetKill : public CommandNSSetKill this->SetSyntax(_("\037nickname\037 {ON | QUICK | IMMED | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->ClearSyntax(); this->Run(source, params[0], params[1]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_set_language.cpp b/modules/commands/ns_set_language.cpp index 17be16b06..ecd8d9259 100644 --- a/modules/commands/ns_set_language.cpp +++ b/modules/commands/ns_set_language.cpp @@ -49,12 +49,12 @@ class CommandNSSetLanguage : public Command return; } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶m) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶m) anope_override { this->Run(source, source.u->Account()->display, param[0]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -85,12 +85,12 @@ class CommandNSSASetLanguage : public CommandNSSetLanguage this->SetSyntax(_("\037nickname\037 \037language\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, params[0], params[1]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_set_message.cpp b/modules/commands/ns_set_message.cpp index 33d925f1b..cb0d5107a 100644 --- a/modules/commands/ns_set_message.cpp +++ b/modules/commands/ns_set_message.cpp @@ -54,12 +54,12 @@ class CommandNSSetMessage : public Command return; } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, source.u->Account()->display, params[0]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -79,7 +79,7 @@ class CommandNSSASetMessage : public CommandNSSetMessage this->SetSyntax(_("\037nickname\037 {ON | OFF}")); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -89,7 +89,7 @@ class CommandNSSASetMessage : public CommandNSSetMessage return true; } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, params[0], params[1]); } diff --git a/modules/commands/ns_set_misc.cpp b/modules/commands/ns_set_misc.cpp index 322a7de07..184eddf40 100644 --- a/modules/commands/ns_set_misc.cpp +++ b/modules/commands/ns_set_misc.cpp @@ -23,12 +23,12 @@ struct NSMiscData : Anope::string, ExtensibleItem, Serializable { } - Anope::string serialize_name() const + Anope::string serialize_name() const anope_override { return "NSMiscData"; } - serialized_data serialize() + serialized_data serialize() anope_override { serialized_data sdata; @@ -89,7 +89,7 @@ class CommandNSSetMisc : public Command return; } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, source.u->Account()->display, !params.empty() ? params[0] : ""); } @@ -104,7 +104,7 @@ class CommandNSSASetMisc : public CommandNSSetMisc this->SetSyntax(_("\037nickname\037 [\037parameter\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, params[0], params.size() > 1 ? params[1] : ""); } @@ -126,7 +126,7 @@ class NSSetMisc : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnNickInfo(CommandSource &source, NickAlias *na, InfoFormatter &info, bool ShowHidden) + void OnNickInfo(CommandSource &source, NickAlias *na, InfoFormatter &info, bool ShowHidden) anope_override { std::deque<Anope::string> list; na->nc->GetExtList(list); diff --git a/modules/commands/ns_set_private.cpp b/modules/commands/ns_set_private.cpp index cbdddd561..a7d29b39c 100644 --- a/modules/commands/ns_set_private.cpp +++ b/modules/commands/ns_set_private.cpp @@ -48,12 +48,12 @@ class CommandNSSetPrivate : public Command return; } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, source.u->Account()->display, params[0]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -76,12 +76,12 @@ class CommandNSSASetPrivate : public CommandNSSetPrivate this->SetSyntax(_("\037nickname\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, params[0], params[1]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_set_secure.cpp b/modules/commands/ns_set_secure.cpp index 89fa7dea2..3827197ba 100644 --- a/modules/commands/ns_set_secure.cpp +++ b/modules/commands/ns_set_secure.cpp @@ -46,12 +46,12 @@ class CommandNSSetSecure : public Command this->OnSyntaxError(source, "SECURE"); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, source.u->Account()->display, params[0]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -75,12 +75,12 @@ class CommandNSSASetSecure : public CommandNSSetSecure this->SetSyntax(_("\037nickname\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { this->Run(source, params[0], params[1]); } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_status.cpp b/modules/commands/ns_status.cpp index 24165a2fb..b0ce63797 100644 --- a/modules/commands/ns_status.cpp +++ b/modules/commands/ns_status.cpp @@ -23,7 +23,7 @@ class CommandNSStatus : public Command this->SetSyntax(_("\037nickname\037...")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &nick = !params.empty() ? params[0] : u->nick; @@ -51,7 +51,7 @@ class CommandNSStatus : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/ns_suspend.cpp b/modules/commands/ns_suspend.cpp index a9ff33488..40989c84c 100644 --- a/modules/commands/ns_suspend.cpp +++ b/modules/commands/ns_suspend.cpp @@ -27,7 +27,7 @@ struct NickSuspend : ExtensibleItem, Serializable return "NickSuspend"; } - serialized_data serialize() + serialized_data serialize() anope_override { serialized_data sd; @@ -61,7 +61,7 @@ class CommandNSSuspend : public Command this->SetSyntax(_("\037nickname\037 [+\037expiry\037] \037reason\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -138,7 +138,7 @@ class CommandNSSuspend : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -159,7 +159,7 @@ class CommandNSUnSuspend : public Command this->SetSyntax(_("\037nickname\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &nick = params[0]; @@ -194,7 +194,7 @@ class CommandNSUnSuspend : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -225,7 +225,7 @@ class NSSuspend : public Module it->second->Shrink("ns_suspend_expire"); } - void OnPreNickExpire(NickAlias *na, bool &expire) + void OnPreNickExpire(NickAlias *na, bool &expire) anope_override { if (!na->nc->HasFlag(NI_SUSPENDED)) return; diff --git a/modules/commands/ns_update.cpp b/modules/commands/ns_update.cpp index 8e0d0d5be..5297bc4d3 100644 --- a/modules/commands/ns_update.cpp +++ b/modules/commands/ns_update.cpp @@ -22,7 +22,7 @@ class CommandNSUpdate : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; NickAlias *na = findnick(u->nick); @@ -42,7 +42,7 @@ class CommandNSUpdate : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_akill.cpp b/modules/commands/os_akill.cpp index c34e932b0..89485f706 100644 --- a/modules/commands/os_akill.cpp +++ b/modules/commands/os_akill.cpp @@ -34,7 +34,7 @@ class AkillDelCallback : public NumberList source.Reply(_("Deleted %d entries from the AKILL list."), Deleted); } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number) return; @@ -226,7 +226,7 @@ class CommandOSAKill : public Command { } - void HandleNumber(unsigned number) + void HandleNumber(unsigned number) anope_override { if (!number) return; @@ -337,7 +337,7 @@ class CommandOSAKill : public Command this->SetSyntax(_("CLEAR")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &cmd = params[0]; @@ -360,7 +360,7 @@ class CommandOSAKill : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_chankill.cpp b/modules/commands/os_chankill.cpp index 43ac0b3ee..8b56eb3c2 100644 --- a/modules/commands/os_chankill.cpp +++ b/modules/commands/os_chankill.cpp @@ -24,7 +24,7 @@ class CommandOSChanKill : public Command this->SetSyntax(_("[+\037expiry\037] \037channel\037 \037reason\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!akills) return; @@ -93,7 +93,7 @@ class CommandOSChanKill : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_config.cpp b/modules/commands/os_config.cpp index 45e067d9f..6f7ebb90c 100644 --- a/modules/commands/os_config.cpp +++ b/modules/commands/os_config.cpp @@ -38,7 +38,7 @@ class CommandOSConfig : public Command this->SetSyntax(_("{\037MODIFY\037|\037VIEW\037} [\037block name\037 \037item name\037 \037item value\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &what = params[0]; @@ -197,7 +197,7 @@ class CommandOSConfig : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_defcon.cpp b/modules/commands/os_defcon.cpp index 3bd1fc111..a8b9891a4 100644 --- a/modules/commands/os_defcon.cpp +++ b/modules/commands/os_defcon.cpp @@ -111,7 +111,7 @@ class DefConTimeout : public CallBack public: DefConTimeout(Module *mod, int newlevel) : CallBack(mod, DConfig.timeout), level(newlevel) { } - void Tick(time_t) + void Tick(time_t) anope_override { if (DConfig.defaultlevel != level) { @@ -169,7 +169,7 @@ class CommandOSDefcon : public Command this->SetSyntax(_("[\0021\002|\0022\002|\0023\002|\0024\002|\0025\002]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &lvl = params[0]; @@ -230,7 +230,7 @@ class CommandOSDefcon : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -353,7 +353,7 @@ class OSDefcon : public Module } } - void OnReload() + void OnReload() anope_override { ConfigReader config; DefconConfig dconfig; @@ -438,7 +438,7 @@ class OSDefcon : public Module return EVENT_CONTINUE; } - EventReturn OnChannelModeSet(Channel *c, ChannelModeName Name, const Anope::string ¶m) + EventReturn OnChannelModeSet(Channel *c, ChannelModeName Name, const Anope::string ¶m) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(Name); @@ -452,7 +452,7 @@ class OSDefcon : public Module return EVENT_CONTINUE; } - EventReturn OnChannelModeUnset(Channel *c, ChannelModeName Name, const Anope::string &) + EventReturn OnChannelModeUnset(Channel *c, ChannelModeName Name, const Anope::string &) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(Name); @@ -472,7 +472,7 @@ class OSDefcon : public Module return EVENT_CONTINUE; } - EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) + EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) anope_override { if (command->name == "nickserv/register" || command->name == "nickserv/group") { @@ -510,7 +510,7 @@ class OSDefcon : public Module return EVENT_CONTINUE; } - void OnUserConnect(dynamic_reference<User> &u, bool &exempt) + void OnUserConnect(dynamic_reference<User> &u, bool &exempt) anope_override { if (exempt || !u || !u->server->IsSynced() || u->server->IsULined()) return; @@ -565,13 +565,13 @@ class OSDefcon : public Module } } - void OnChannelModeAdd(ChannelMode *cm) + void OnChannelModeAdd(ChannelMode *cm) anope_override { if (DConfig.chanmodes.find(cm->ModeChar) != Anope::string::npos) this->ParseModeString(); } - void OnChannelCreate(Channel *c) + void OnChannelCreate(Channel *c) anope_override { if (DConfig.Check(DEFCON_FORCE_CHAN_MODES)) c->SetModes(findbot(Config->OperServ), false, "%s", DConfig.chanmodes.c_str()); diff --git a/modules/commands/os_forbid.cpp b/modules/commands/os_forbid.cpp index b5b184740..908e2f2ca 100644 --- a/modules/commands/os_forbid.cpp +++ b/modules/commands/os_forbid.cpp @@ -21,12 +21,12 @@ class MyForbidService : public ForbidService public: MyForbidService(Module *m) : ForbidService(m) { } - void AddForbid(ForbidData *d) + void AddForbid(ForbidData *d) anope_override { this->forbidData.push_back(d); } - void RemoveForbid(ForbidData *d) + void RemoveForbid(ForbidData *d) anope_override { std::vector<ForbidData *>::iterator it = std::find(this->forbidData.begin(), this->forbidData.end(), d); if (it != this->forbidData.end()) @@ -34,7 +34,7 @@ class MyForbidService : public ForbidService delete d; } - ForbidData *FindForbid(const Anope::string &mask, ForbidType ftype) + ForbidData *FindForbid(const Anope::string &mask, ForbidType ftype) anope_override { const std::vector<ForbidData *> &forbids = this->GetForbids(); for (unsigned i = forbids.size(); i > 0; --i) @@ -47,7 +47,7 @@ class MyForbidService : public ForbidService return NULL; } - const std::vector<ForbidData *> &GetForbids() + const std::vector<ForbidData *> &GetForbids() anope_override { for (unsigned i = this->forbidData.size(); i > 0; --i) { @@ -85,7 +85,7 @@ class CommandOSForbid : public Command this->SetSyntax(_("LIST (NICK|CHAN|EMAIL)")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!this->fs) return; @@ -211,7 +211,7 @@ class CommandOSForbid : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -237,7 +237,7 @@ class OSForbid : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnUserConnect(dynamic_reference<User> &u, bool &exempt) + void OnUserConnect(dynamic_reference<User> &u, bool &exempt) anope_override { if (!u || exempt) return; @@ -245,7 +245,7 @@ class OSForbid : public Module this->OnUserNickChange(u, ""); } - void OnUserNickChange(User *u, const Anope::string &) + void OnUserNickChange(User *u, const Anope::string &) anope_override { if (u->HasMode(UMODE_OPER)) return; @@ -265,7 +265,7 @@ class OSForbid : public Module } } - void OnJoinChannel(User *u, Channel *c) + void OnJoinChannel(User *u, Channel *c) anope_override { if (u->HasMode(UMODE_OPER)) return; @@ -293,7 +293,7 @@ class OSForbid : public Module } } - EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) + EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) anope_override { if (source.u->HasMode(UMODE_OPER)) return EVENT_CONTINUE; diff --git a/modules/commands/os_forbid.h b/modules/commands/os_forbid.h index 98e5fdc81..fec721420 100644 --- a/modules/commands/os_forbid.h +++ b/modules/commands/os_forbid.h @@ -18,8 +18,8 @@ struct ForbidData : Serializable time_t expires; ForbidType type; - Anope::string serialize_name() const { return "ForbidData"; } - serialized_data serialize(); + Anope::string serialize_name() const anope_override { return "ForbidData"; } + serialized_data serialize() anope_override; static void unserialize(serialized_data &data); }; diff --git a/modules/commands/os_ignore.cpp b/modules/commands/os_ignore.cpp index 526e19775..f2012f212 100644 --- a/modules/commands/os_ignore.cpp +++ b/modules/commands/os_ignore.cpp @@ -19,7 +19,7 @@ class OSIgnoreService : public IgnoreService public: OSIgnoreService(Module *o) : IgnoreService(o) { } - void AddIgnore(const Anope::string &mask, const Anope::string &creator, const Anope::string &reason, time_t delta = Anope::CurTime) + void AddIgnore(const Anope::string &mask, const Anope::string &creator, const Anope::string &reason, time_t delta = Anope::CurTime) anope_override { /* If it s an existing user, we ignore the hostmask. */ Anope::string realmask = mask; @@ -67,7 +67,7 @@ class OSIgnoreService : public IgnoreService } } - bool DelIgnore(const Anope::string &mask) + bool DelIgnore(const Anope::string &mask) anope_override { for (std::list<IgnoreData>::iterator it = this->ignores.begin(), it_end = this->ignores.end(); it != it_end; ++it) { @@ -82,7 +82,7 @@ class OSIgnoreService : public IgnoreService return false; } - IgnoreData *Find(const Anope::string &mask) + IgnoreData *Find(const Anope::string &mask) anope_override { User *u = finduser(mask); std::list<IgnoreData>::iterator ign = this->ignores.begin(), ign_end = this->ignores.end(); @@ -263,7 +263,7 @@ class CommandOSIgnore : public Command this->SetSyntax(_("CLEAR")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &cmd = params[0]; @@ -281,7 +281,7 @@ class CommandOSIgnore : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -318,7 +318,7 @@ class OSIgnore : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) + EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) anope_override { if (!u->HasMode(UMODE_OPER) && this->osignoreservice.Find(u->nick)) return EVENT_STOP; diff --git a/modules/commands/os_ignore.h b/modules/commands/os_ignore.h index 4a47c947f..44235f7cc 100644 --- a/modules/commands/os_ignore.h +++ b/modules/commands/os_ignore.h @@ -17,8 +17,8 @@ struct IgnoreData : Serializable Anope::string reason; time_t time; /* When do we stop ignoring them? */ - Anope::string serialize_name() const { return "IgnoreData"; } - serialized_data serialize(); + Anope::string serialize_name() const anope_override { return "IgnoreData"; } + serialized_data serialize() anope_override; static void unserialize(serialized_data &data); }; diff --git a/modules/commands/os_jupe.cpp b/modules/commands/os_jupe.cpp index 1e3c2c46c..e11ed9f04 100644 --- a/modules/commands/os_jupe.cpp +++ b/modules/commands/os_jupe.cpp @@ -22,7 +22,7 @@ class CommandOSJupe : public Command this->SetSyntax(_("\037server\037 [\037reason\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &jserver = params[0]; @@ -46,7 +46,7 @@ class CommandOSJupe : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_kick.cpp b/modules/commands/os_kick.cpp index 029264315..f5dce15c7 100644 --- a/modules/commands/os_kick.cpp +++ b/modules/commands/os_kick.cpp @@ -22,7 +22,7 @@ class CommandOSKick : public Command this->SetSyntax(_("\037channel\037 \037user\037 \037reason\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &chan = params[0]; @@ -52,7 +52,7 @@ class CommandOSKick : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_kill.cpp b/modules/commands/os_kill.cpp index 077b3861c..bee5777ea 100644 --- a/modules/commands/os_kill.cpp +++ b/modules/commands/os_kill.cpp @@ -22,7 +22,7 @@ class CommandOSKill : public Command this->SetSyntax(_("\037user\037 [\037reason\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &nick = params[0]; @@ -44,7 +44,7 @@ class CommandOSKill : public Command } } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_list.cpp b/modules/commands/os_list.cpp index 26d11c047..e9d67b52e 100644 --- a/modules/commands/os_list.cpp +++ b/modules/commands/os_list.cpp @@ -22,7 +22,7 @@ class CommandOSChanList : public Command this->SetSyntax(_("[{\037pattern\037 | \037nick\037} [\037SECRET\037]]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &pattern = !params.empty() ? params[0] : ""; const Anope::string &opt = params.size() > 1 ? params[1] : ""; @@ -92,7 +92,7 @@ class CommandOSChanList : public Command source.Reply(_("End of channel list.")); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -115,7 +115,7 @@ class CommandOSUserList : public Command this->SetSyntax(_("[{\037pattern\037 | \037channel\037} [\037INVISIBLE\037]]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &pattern = !params.empty() ? params[0] : ""; const Anope::string &opt = params.size() > 1 ? params[1] : ""; @@ -183,7 +183,7 @@ class CommandOSUserList : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_login.cpp b/modules/commands/os_login.cpp index 620bc0788..1bae1cf58 100644 --- a/modules/commands/os_login.cpp +++ b/modules/commands/os_login.cpp @@ -23,7 +23,7 @@ class CommandOSLogin : public Command this->SetSyntax(_("\037password\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &password = params[0]; @@ -49,7 +49,7 @@ class CommandOSLogin : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -69,7 +69,7 @@ class CommandOSLogout : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { Oper *o = source.u->Account()->o; if (o == NULL) @@ -86,7 +86,7 @@ class CommandOSLogout : public Command } } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -117,7 +117,7 @@ class OSLogin : public Module it->second->Shrink("os_login_password_correct"); } - EventReturn IsServicesOper(User *u) + EventReturn IsServicesOper(User *u) anope_override { if (!u->Account()->o->password.empty()) { diff --git a/modules/commands/os_mode.cpp b/modules/commands/os_mode.cpp index f3f4942c7..d5836fe51 100644 --- a/modules/commands/os_mode.cpp +++ b/modules/commands/os_mode.cpp @@ -22,7 +22,7 @@ class CommandOSMode : public Command this->SetSyntax(_("\037channel\037 \037modes\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &target = params[0]; @@ -41,7 +41,7 @@ class CommandOSMode : public Command } } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -60,7 +60,7 @@ class CommandOSUMode : public Command this->SetSyntax(_("\037user\037 \037modes\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &target = params[0]; @@ -80,7 +80,7 @@ class CommandOSUMode : public Command } } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_modinfo.cpp b/modules/commands/os_modinfo.cpp index 75859a762..032db21f9 100644 --- a/modules/commands/os_modinfo.cpp +++ b/modules/commands/os_modinfo.cpp @@ -22,7 +22,7 @@ class CommandOSModInfo : public Command this->SetSyntax(_("\037modname\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &file = params[0]; @@ -61,7 +61,7 @@ class CommandOSModInfo : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -79,7 +79,7 @@ class CommandOSModList : public Command this->SetSyntax(_("[Core|3rd|protocol|encryption|supported]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string ¶m = !params.empty() ? params[0] : ""; @@ -218,7 +218,7 @@ class CommandOSModList : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_module.cpp b/modules/commands/os_module.cpp index 196a9bed8..6d7a5db04 100644 --- a/modules/commands/os_module.cpp +++ b/modules/commands/os_module.cpp @@ -22,7 +22,7 @@ class CommandOSModLoad : public Command this->SetSyntax(_("\037modname\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &mname = params[0]; @@ -41,7 +41,7 @@ class CommandOSModLoad : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -60,7 +60,7 @@ class CommandOSModReLoad : public Command this->SetSyntax(_("\037modname\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &mname = params[0]; @@ -108,7 +108,7 @@ class CommandOSModReLoad : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -126,7 +126,7 @@ class CommandOSModUnLoad : public Command this->SetSyntax(_("\037modname\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &mname = params[0]; @@ -159,7 +159,7 @@ class CommandOSModUnLoad : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_news.cpp b/modules/commands/os_news.cpp index 1f96337cd..268f2ef0d 100644 --- a/modules/commands/os_news.cpp +++ b/modules/commands/os_news.cpp @@ -258,12 +258,12 @@ class CommandOSLogonNews : public NewsBase this->SetDesc(_("Define messages to be shown to users at logon")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { return this->DoNews(source, params, NEWS_LOGON); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -287,12 +287,12 @@ class CommandOSOperNews : public NewsBase this->SetDesc(_("Define messages to be shown to users who oper")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { return this->DoNews(source, params, NEWS_OPER); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -316,12 +316,12 @@ class CommandOSRandomNews : public NewsBase this->SetDesc(_("Define messages to be randomly shown to users at logon")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { return this->DoNews(source, params, NEWS_RANDOM); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -399,13 +399,13 @@ class OSNews : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnUserModeSet(User *u, UserModeName Name) + void OnUserModeSet(User *u, UserModeName Name) anope_override { if (Name == UMODE_OPER) DisplayNews(u, NEWS_OPER); } - void OnUserConnect(dynamic_reference<User> &user, bool &) + void OnUserConnect(dynamic_reference<User> &user, bool &) anope_override { if (!user || !user->server->IsSynced()) return; diff --git a/modules/commands/os_news.h b/modules/commands/os_news.h index 7bc36d987..d848d73ad 100644 --- a/modules/commands/os_news.h +++ b/modules/commands/os_news.h @@ -22,8 +22,8 @@ struct NewsItem : Serializable Anope::string who; time_t time; - Anope::string serialize_name() const { return "NewsItem"; } - serialized_data serialize(); + Anope::string serialize_name() const anope_override { return "NewsItem"; } + serialized_data serialize() anope_override; static void unserialize(serialized_data &data); }; diff --git a/modules/commands/os_noop.cpp b/modules/commands/os_noop.cpp index a7b324a3a..454299c89 100644 --- a/modules/commands/os_noop.cpp +++ b/modules/commands/os_noop.cpp @@ -23,7 +23,7 @@ class CommandOSNOOP : public Command this->SetSyntax(_("REVOKE \037server\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &cmd = params[0]; @@ -63,7 +63,7 @@ class CommandOSNOOP : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_oline.cpp b/modules/commands/os_oline.cpp index 9ce76d95c..5992f296e 100644 --- a/modules/commands/os_oline.cpp +++ b/modules/commands/os_oline.cpp @@ -22,7 +22,7 @@ class CommandOSOLine : public Command this->SetSyntax(_("\037nick\037 \037flags\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &nick = params[0]; @@ -52,7 +52,7 @@ class CommandOSOLine : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_oper.cpp b/modules/commands/os_oper.cpp index 6b5ebc0ed..6e8800e74 100644 --- a/modules/commands/os_oper.cpp +++ b/modules/commands/os_oper.cpp @@ -17,12 +17,12 @@ struct MyOper : Oper, Serializable { MyOper(const Anope::string &n, OperType *o) : Oper(n, o) { } - Anope::string serialize_name() const + Anope::string serialize_name() const anope_override { return "Oper"; } - serialized_data serialize() + serialized_data serialize() anope_override { serialized_data data; @@ -58,7 +58,7 @@ class CommandOSOper : public Command this->SetSyntax(_("LIST")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &subcommand = params[0]; @@ -188,7 +188,7 @@ class CommandOSOper : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_reload.cpp b/modules/commands/os_reload.cpp index 425ed4842..eec113c3e 100644 --- a/modules/commands/os_reload.cpp +++ b/modules/commands/os_reload.cpp @@ -22,7 +22,7 @@ class CommandOSReload : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { ServerConfig *old_config = Config; @@ -43,7 +43,7 @@ class CommandOSReload : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_session.cpp b/modules/commands/os_session.cpp index d89fbe1a6..e9666c6d2 100644 --- a/modules/commands/os_session.cpp +++ b/modules/commands/os_session.cpp @@ -21,19 +21,19 @@ class MySessionService : public SessionService public: MySessionService(Module *m) : SessionService(m) { } - void AddException(Exception *e) + void AddException(Exception *e) anope_override { this->Exceptions.push_back(e); } - void DelException(Exception *e) + void DelException(Exception *e) anope_override { ExceptionVector::iterator it = std::find(this->Exceptions.begin(), this->Exceptions.end(), e); if (it != this->Exceptions.end()) this->Exceptions.erase(it); } - Exception *FindException(User *u) + Exception *FindException(User *u) anope_override { for (std::vector<Exception *>::const_iterator it = this->Exceptions.begin(), it_end = this->Exceptions.end(); it != it_end; ++it) { @@ -44,7 +44,7 @@ class MySessionService : public SessionService return NULL; } - Exception *FindException(const Anope::string &host) + Exception *FindException(const Anope::string &host) anope_override { for (std::vector<Exception *>::const_iterator it = this->Exceptions.begin(), it_end = this->Exceptions.end(); it != it_end; ++it) { @@ -56,22 +56,22 @@ class MySessionService : public SessionService return NULL; } - ExceptionVector &GetExceptions() + ExceptionVector &GetExceptions() anope_override { return this->Exceptions; } - void AddSession(Session *s) + void AddSession(Session *s) anope_override { this->Sessions[s->host] = s; } - void DelSession(Session *s) + void DelSession(Session *s) anope_override { this->Sessions.erase(s->host); } - Session *FindSession(const Anope::string &mask) + Session *FindSession(const Anope::string &mask) anope_override { SessionMap::iterator it = this->Sessions.find(mask); if (it != this->Sessions.end()) @@ -79,7 +79,7 @@ class MySessionService : public SessionService return NULL; } - SessionMap &GetSessions() + SessionMap &GetSessions() anope_override { return this->Sessions; } @@ -90,7 +90,7 @@ class ExpireTimer : public Timer public: ExpireTimer() : Timer(Config->ExpireTimeout, Anope::CurTime, true) { } - void Tick(time_t) + void Tick(time_t) anope_override { if (!session_service) return; @@ -127,7 +127,7 @@ class ExceptionDelCallback : public NumberList source.Reply(_("Deleted %d entries from session-limit exception list."), Deleted); } - virtual void HandleNumber(unsigned Number) + virtual void HandleNumber(unsigned Number) anope_override { if (!Number || Number > session_service->GetExceptions().size()) return; @@ -217,7 +217,7 @@ class CommandOSSession : public Command this->SetSyntax(_("VIEW \037host\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &cmd = params[0]; @@ -237,7 +237,7 @@ class CommandOSSession : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -451,7 +451,7 @@ class CommandOSException : public Command { } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > session_service->GetExceptions().size()) return; @@ -531,7 +531,7 @@ class CommandOSException : public Command this->SetSyntax(_("VIEW [\037mask\037 | \037list\037]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &cmd = params[0]; @@ -557,7 +557,7 @@ class CommandOSException : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -702,13 +702,13 @@ class OSSession : public Module ModuleManager::SetPriority(this, PRIORITY_FIRST); } - void OnUserConnect(dynamic_reference<User> &user, bool &exempt) + void OnUserConnect(dynamic_reference<User> &user, bool &exempt) anope_override { if (user && Config->LimitSessions) this->AddSession(user, exempt); } - void OnUserLogoff(User *u) + void OnUserLogoff(User *u) anope_override { if (Config->LimitSessions && (!u->server || !u->server->IsULined())) this->DelSession(u); diff --git a/modules/commands/os_session.h b/modules/commands/os_session.h index 0d2cee9ad..561280170 100644 --- a/modules/commands/os_session.h +++ b/modules/commands/os_session.h @@ -17,8 +17,8 @@ struct Exception : Serializable time_t time; /* When this exception was added */ time_t expires; /* Time when it expires. 0 == no expiry */ - Anope::string serialize_name() const { return "Exception"; } - serialized_data serialize(); + Anope::string serialize_name() const anope_override { return "Exception"; } + serialized_data serialize() anope_override; static void unserialize(serialized_data &data); }; @@ -36,7 +36,7 @@ class SessionService : public Service virtual Exception *FindException(User *u) = 0; - virtual Exception *FindException(const Anope::string &host) = 0; + virtual Exception *FindException(const Anope::string &host) = 0; virtual ExceptionVector &GetExceptions() = 0; diff --git a/modules/commands/os_set.cpp b/modules/commands/os_set.cpp index 1cea0e90c..ec08e0322 100644 --- a/modules/commands/os_set.cpp +++ b/modules/commands/os_set.cpp @@ -172,7 +172,7 @@ class CommandOSSet : public Command this->SetSyntax(_("\037option\037 \037setting\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &option = params[0]; @@ -192,7 +192,7 @@ class CommandOSSet : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { if (subcommand.empty()) { diff --git a/modules/commands/os_shutdown.cpp b/modules/commands/os_shutdown.cpp index 597257955..b7ead98b3 100644 --- a/modules/commands/os_shutdown.cpp +++ b/modules/commands/os_shutdown.cpp @@ -22,7 +22,7 @@ class CommandOSQuit : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; quitmsg = "QUIT command received from " + u->nick; @@ -30,7 +30,7 @@ class CommandOSQuit : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -51,7 +51,7 @@ class CommandOSRestart : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; quitmsg = "RESTART command received from " + u->nick; @@ -60,7 +60,7 @@ class CommandOSRestart : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(_("Causes Services to save all databases and then restart\n" @@ -78,7 +78,7 @@ class CommandOSShutdown : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; quitmsg = source.command + " command received from " + u->nick; @@ -87,7 +87,7 @@ class CommandOSShutdown : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_stats.cpp b/modules/commands/os_stats.cpp index 994b330ab..85eed7072 100644 --- a/modules/commands/os_stats.cpp +++ b/modules/commands/os_stats.cpp @@ -141,7 +141,7 @@ class CommandOSStats : public Command this->SetSyntax(_("[AKILL | ALL | RESET | UPLINK]")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { Anope::string extra = !params.empty() ? params[0] : ""; @@ -161,7 +161,7 @@ class CommandOSStats : public Command source.Reply(_("Unknown STATS option \002%s\002."), extra.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_svsnick.cpp b/modules/commands/os_svsnick.cpp index be5f8c320..ef5d151f9 100644 --- a/modules/commands/os_svsnick.cpp +++ b/modules/commands/os_svsnick.cpp @@ -22,7 +22,7 @@ class CommandOSSVSNick : public Command this->SetSyntax(_("\037nick\037 \037newnick\037")); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; const Anope::string &nick = params[0]; @@ -63,7 +63,7 @@ class CommandOSSVSNick : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp index db2cad0e7..e65811571 100644 --- a/modules/commands/os_sxline.cpp +++ b/modules/commands/os_sxline.cpp @@ -34,7 +34,7 @@ class SXLineDelCallback : public NumberList source.Reply(_("Deleted %d entries from the %s list."), Deleted, this->command->name.c_str()); } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number) return; @@ -127,7 +127,7 @@ class CommandOSSXLineBase : public Command { } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number) return; @@ -220,7 +220,7 @@ class CommandOSSXLineBase : public Command this->SetDesc(Anope::printf(_("Manipulate the %s list"), cmd.c_str())); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { const Anope::string &cmd = params[0]; @@ -250,7 +250,7 @@ class CommandOSSNLine : public CommandOSSXLineBase return this->snlines; } - void OnAdd(CommandSource &source, const std::vector<Anope::string> ¶ms) + void OnAdd(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!this->xlm() ||! ircd->snline) { @@ -399,7 +399,7 @@ class CommandOSSNLine : public CommandOSSXLineBase this->SetSyntax(_("CLEAR")); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -451,7 +451,7 @@ class CommandOSSQLine : public CommandOSSXLineBase return this->sqlines; } - void OnAdd(CommandSource &source, const std::vector<Anope::string> ¶ms) + void OnAdd(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!this->xlm() || !ircd->sqline) { @@ -598,7 +598,7 @@ class CommandOSSQLine : public CommandOSSXLineBase this->SetSyntax(_("CLEAR")); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/os_update.cpp b/modules/commands/os_update.cpp index 4d4bc39ad..b9b43230f 100644 --- a/modules/commands/os_update.cpp +++ b/modules/commands/os_update.cpp @@ -22,14 +22,14 @@ class CommandOSUpdate : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { source.Reply(_("Updating databases.")); save_databases(); return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp index 795d0d909..5442e096f 100644 --- a/modules/database/db_flatfile.cpp +++ b/modules/database/db_flatfile.cpp @@ -11,6 +11,7 @@ /*************************************************************************/ #include "module.h" +#include <unistd.h> Anope::string DatabaseFile; @@ -73,13 +74,13 @@ class DBFlatFile : public Module } } - void OnReload() + void OnReload() anope_override { ConfigReader config; DatabaseFile = config.ReadValue("db_flatfile", "database", "anope.db", 0); } - EventReturn OnLoadDatabase() + EventReturn OnLoadDatabase() anope_override { std::fstream db; db.open(DatabaseFile.c_str(), std::ios_base::in); @@ -134,7 +135,7 @@ class DBFlatFile : public Module } - EventReturn OnSaveDatabase() + EventReturn OnSaveDatabase() anope_override { BackupDatabase(); diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp index d699e1a5f..45d6aaaea 100644 --- a/modules/database/db_old.cpp +++ b/modules/database/db_old.cpp @@ -1008,7 +1008,7 @@ class DBOld : public Module throw ModuleException("Invalid hash method"); } - EventReturn OnLoadDatabase() + EventReturn OnLoadDatabase() anope_override { LoadNicks(); LoadVHosts(); diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp index 7f88ae9c1..dcbfeaa28 100644 --- a/modules/database/db_plain.cpp +++ b/modules/database/db_plain.cpp @@ -12,6 +12,7 @@ #include "module.h" #include "../commands/os_session.h" +#include <unistd.h> Anope::string DatabaseFile; std::stringstream db_buffer; @@ -642,13 +643,13 @@ class DBPlain : public Module } } - void OnReload() + void OnReload() anope_override { ConfigReader config; DatabaseFile = config.ReadValue("db_plain", "database", "anope.db", 0); } - EventReturn OnLoadDatabase() + EventReturn OnLoadDatabase() anope_override { ReadDatabase(); @@ -659,7 +660,7 @@ class DBPlain : public Module } - EventReturn OnSaveDatabase() + EventReturn OnSaveDatabase() anope_override { BackupDatabase(); diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp index 6022418de..c8379ca12 100644 --- a/modules/database/db_sql.cpp +++ b/modules/database/db_sql.cpp @@ -16,12 +16,12 @@ class SQLSQLInterface : public SQLInterface public: SQLSQLInterface(Module *o) : SQLInterface(o) { } - void OnResult(const SQLResult &r) + void OnResult(const SQLResult &r) anope_override { Log(LOG_DEBUG) << "SQL successfully executed query: " << r.finished_query; } - void OnError(const SQLResult &r) + void OnError(const SQLResult &r) anope_override { if (!r.GetQuery().query.empty()) Log(LOG_DEBUG) << "Error executing query " << r.finished_query << ": " << r.GetError(); @@ -111,14 +111,14 @@ class DBSQL : public Module this->OnReload(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; Anope::string engine = config.ReadValue("db_sql", "engine", "", 0); this->sql = service_reference<SQLProvider>("SQLProvider", engine); } - EventReturn OnSaveDatabase() + EventReturn OnSaveDatabase() anope_override { if (!this->sql) { @@ -157,7 +157,7 @@ class DBSQL : public Module return EVENT_CONTINUE; } - EventReturn OnLoadDatabase() + EventReturn OnLoadDatabase() anope_override { if (!this->sql) { diff --git a/modules/database/db_sql_live_read.cpp b/modules/database/db_sql_live_read.cpp index e79e4c27d..38e5f6fef 100644 --- a/modules/database/db_sql_live_read.cpp +++ b/modules/database/db_sql_live_read.cpp @@ -19,7 +19,7 @@ class SQLCache : public Timer return false; } - void Tick(time_t) + void Tick(time_t) anope_override { for (cache_map::iterator it = this->cache.begin(), next_it; it != this->cache.end(); it = next_it) { @@ -59,21 +59,21 @@ class MySQLLiveModule : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnReload() + void OnReload() anope_override { ConfigReader config; Anope::string engine = config.ReadValue("db_sql", "engine", "", 0); this->SQL = service_reference<SQLProvider>("SQLProvider", engine); } - void OnShutdown() + void OnShutdown() anope_override { Implementation i[] = { I_OnFindChan, I_OnFindNick, I_OnFindCore }; for (size_t j = 0; j < 3; ++j) ModuleManager::Detach(i[j], this); } - void OnFindChan(const Anope::string &chname) + void OnFindChan(const Anope::string &chname) anope_override { if (chan_cache.Check(chname)) return; @@ -107,7 +107,7 @@ class MySQLLiveModule : public Module } } - void OnFindNick(const Anope::string &nick) + void OnFindNick(const Anope::string &nick) anope_override { if (nick_cache.Check(nick)) return; @@ -141,7 +141,7 @@ class MySQLLiveModule : public Module } } - void OnFindCore(const Anope::string &nick) + void OnFindCore(const Anope::string &nick) anope_override { if (core_cache.Check(nick)) return; diff --git a/modules/database/db_sql_live_write.cpp b/modules/database/db_sql_live_write.cpp index dad5318de..9ac2e17a1 100644 --- a/modules/database/db_sql_live_write.cpp +++ b/modules/database/db_sql_live_write.cpp @@ -7,12 +7,12 @@ class MySQLInterface : public SQLInterface public: MySQLInterface(Module *o) : SQLInterface(o) { } - void OnResult(const SQLResult &r) + void OnResult(const SQLResult &r) anope_override { Log(LOG_DEBUG) << "SQL successfully executed query: " << r.finished_query; } - void OnError(const SQLResult &r) + void OnError(const SQLResult &r) anope_override { if (!r.GetQuery().query.empty()) Log(LOG_DEBUG) << "Error executing query " << r.finished_query << ": " << r.GetError(); @@ -120,14 +120,14 @@ class DBMySQL : public Module OnServerConnect(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; Anope::string engine = config.ReadValue("db_sql", "engine", "", 0); this->SQL = service_reference<SQLProvider>("SQLProvider", engine); } - void OnServerConnect() + void OnServerConnect() anope_override { Implementation i[] = { /* Misc */ @@ -156,7 +156,7 @@ class DBMySQL : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnPostCommand(CommandSource &source, Command *command, const std::vector<Anope::string> ¶ms) + void OnPostCommand(CommandSource &source, Command *command, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -217,32 +217,32 @@ class DBMySQL : public Module } } - void OnNickAddAccess(NickCore *nc, const Anope::string &entry) + void OnNickAddAccess(NickCore *nc, const Anope::string &entry) anope_override { this->Insert(nc->serialize_name(), nc->serialize()); } - void OnNickEraseAccess(NickCore *nc, const Anope::string &entry) + void OnNickEraseAccess(NickCore *nc, const Anope::string &entry) anope_override { this->Insert(nc->serialize_name(), nc->serialize()); } - void OnNickClearAccess(NickCore *nc) + void OnNickClearAccess(NickCore *nc) anope_override { this->Insert(nc->serialize_name(), nc->serialize()); } - void OnDelCore(NickCore *nc) + void OnDelCore(NickCore *nc) anope_override { this->Delete(nc->serialize_name(), nc->serialize()); } - void OnNickForbidden(NickAlias *na) + void OnNickForbidden(NickAlias *na) anope_override { this->Insert(na->serialize_name(), na->serialize()); } - void OnNickGroup(User *u, NickAlias *) + void OnNickGroup(User *u, NickAlias *) anope_override { OnNickRegister(findnick(u->nick)); } @@ -257,13 +257,13 @@ class DBMySQL : public Module this->Insert(nc->serialize_name(), nc->serialize()); } - void OnNickRegister(NickAlias *na) + void OnNickRegister(NickAlias *na) anope_override { this->InsertCore(na->nc); this->InsertAlias(na); } - void OnChangeCoreDisplay(NickCore *nc, const Anope::string &newdisplay) + void OnChangeCoreDisplay(NickCore *nc, const Anope::string &newdisplay) anope_override { Serializable::serialized_data data = nc->serialize(); this->Delete(nc->serialize_name(), data); @@ -283,154 +283,154 @@ class DBMySQL : public Module } } - void OnNickSuspend(NickAlias *na) + void OnNickSuspend(NickAlias *na) anope_override { this->Insert(na->serialize_name(), na->serialize()); } - void OnDelNick(NickAlias *na) + void OnDelNick(NickAlias *na) anope_override { this->Delete(na->serialize_name(), na->serialize()); } - void OnAccessAdd(ChannelInfo *ci, User *, ChanAccess *access) + void OnAccessAdd(ChannelInfo *ci, User *, ChanAccess *access) anope_override { this->Insert(access->serialize_name(), access->serialize()); } - void OnAccessDel(ChannelInfo *ci, User *u, ChanAccess *access) + void OnAccessDel(ChannelInfo *ci, User *u, ChanAccess *access) anope_override { this->Delete(access->serialize_name(), access->serialize()); } - void OnAccessClear(ChannelInfo *ci, User *u) + void OnAccessClear(ChannelInfo *ci, User *u) anope_override { for (unsigned i = 0; i < ci->GetAccessCount(); ++i) this->OnAccessDel(ci, NULL, ci->GetAccess(i)); } - void OnLevelChange(User *u, ChannelInfo *ci, const Anope::string &priv, int16_t what) + void OnLevelChange(User *u, ChannelInfo *ci, const Anope::string &priv, int16_t what) anope_override { this->Insert(ci->serialize_name(), ci->serialize()); } - void OnDelChan(ChannelInfo *ci) + void OnDelChan(ChannelInfo *ci) anope_override { this->Delete(ci->serialize_name(), ci->serialize()); } - void OnChanRegistered(ChannelInfo *ci) + void OnChanRegistered(ChannelInfo *ci) anope_override { this->Insert(ci->serialize_name(), ci->serialize()); } - void OnChanSuspend(ChannelInfo *ci) + void OnChanSuspend(ChannelInfo *ci) anope_override { this->Insert(ci->serialize_name(), ci->serialize()); } - void OnAkickAdd(ChannelInfo *ci, AutoKick *ak) + void OnAkickAdd(User *u, ChannelInfo *ci, AutoKick *ak) anope_override { this->Insert(ak->serialize_name(), ak->serialize()); } - void OnAkickDel(ChannelInfo *ci, AutoKick *ak) + void OnAkickDel(User *u, ChannelInfo *ci, AutoKick *ak) anope_override { this->Delete(ak->serialize_name(), ak->serialize()); } - EventReturn OnMLock(ChannelInfo *ci, ModeLock *lock) + EventReturn OnMLock(ChannelInfo *ci, ModeLock *lock) anope_override { this->Insert(lock->serialize_name(), lock->serialize()); return EVENT_CONTINUE; } - EventReturn OnUnMLock(ChannelInfo *ci, ModeLock *lock) + EventReturn OnUnMLock(ChannelInfo *ci, ModeLock *lock) anope_override { this->Delete(lock->serialize_name(), lock->serialize()); return EVENT_CONTINUE; } - void OnBotCreate(BotInfo *bi) + void OnBotCreate(BotInfo *bi) anope_override { this->Insert(bi->serialize_name(), bi->serialize()); } - void OnBotChange(BotInfo *bi) + void OnBotChange(BotInfo *bi) anope_override { OnBotCreate(bi); } - void OnBotDelete(BotInfo *bi) + void OnBotDelete(BotInfo *bi) anope_override { this->Delete(bi->serialize_name(), bi->serialize()); } - EventReturn OnBotAssign(User *sender, ChannelInfo *ci, BotInfo *bi) + EventReturn OnBotAssign(User *sender, ChannelInfo *ci, BotInfo *bi) anope_override { this->Insert(ci->serialize_name(), ci->serialize()); return EVENT_CONTINUE; } - EventReturn OnBotUnAssign(User *sender, ChannelInfo *ci) + EventReturn OnBotUnAssign(User *sender, ChannelInfo *ci) anope_override { this->Insert(ci->serialize_name(), ci->serialize()); return EVENT_CONTINUE; } - void OnBadWordAdd(ChannelInfo *ci, BadWord *bw) + void OnBadWordAdd(ChannelInfo *ci, BadWord *bw) anope_override { this->Insert(bw->serialize_name(), bw->serialize()); } - void OnBadWordDel(ChannelInfo *ci, BadWord *bw) + void OnBadWordDel(ChannelInfo *ci, BadWord *bw) anope_override { this->Delete(bw->serialize_name(), bw->serialize()); } - void OnMemoSend(const Anope::string &source, const Anope::string &target, MemoInfo *mi, Memo *m) + void OnMemoSend(const Anope::string &source, const Anope::string &target, MemoInfo *mi, Memo *m) anope_override { this->Insert(m->serialize_name(), m->serialize()); } - void OnMemoDel(const NickCore *nc, MemoInfo *mi, Memo *m) + void OnMemoDel(const NickCore *nc, MemoInfo *mi, Memo *m) anope_override { this->Delete(m->serialize_name(), m->serialize()); } - void OnMemoDel(ChannelInfo *ci, MemoInfo *mi, Memo *m) + void OnMemoDel(ChannelInfo *ci, MemoInfo *mi, Memo *m) anope_override { this->Delete(m->serialize_name(), m->serialize()); } - EventReturn OnExceptionAdd(Exception *ex) + EventReturn OnExceptionAdd(Exception *ex) anope_override { this->Insert(ex->serialize_name(), ex->serialize()); return EVENT_CONTINUE; } - void OnExceptionDel(User *, Exception *ex) + void OnExceptionDel(User *, Exception *ex) anope_override { this->Delete(ex->serialize_name(), ex->serialize()); } - EventReturn OnAddXLine(XLine *x, XLineManager *xlm) + EventReturn OnAddXLine(User *u, XLine *x, XLineManager *xlm) anope_override { this->Insert(x->serialize_name(), x->serialize()); return EVENT_CONTINUE; } - void OnDelXLine(User *, XLine *x, XLineManager *xlm) + void OnDelXLine(User *, XLine *x, XLineManager *xlm) anope_override { this->Delete(x->serialize_name(), x->serialize()); } - void OnDeleteVhost(NickAlias *na) + void OnDeleteVhost(NickAlias *na) anope_override { this->Insert(na->serialize_name(), na->serialize()); } - void OnSetVhost(NickAlias *na) + void OnSetVhost(NickAlias *na) anope_override { this->Insert(na->serialize_name(), na->serialize()); } diff --git a/modules/encryption/enc_md5.cpp b/modules/encryption/enc_md5.cpp index 8e676cb3f..0831fea22 100644 --- a/modules/encryption/enc_md5.cpp +++ b/modules/encryption/enc_md5.cpp @@ -323,7 +323,7 @@ class EMD5 : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) + EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) anope_override { MD5_CTX context; char digest[17] = ""; @@ -339,7 +339,7 @@ class EMD5 : public Module return EVENT_ALLOW; } - EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> ¶ms, const Anope::string &account, const Anope::string &password) + EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> ¶ms, const Anope::string &account, const Anope::string &password) anope_override { NickAlias *na = findnick(account); NickCore *nc = na ? na->nc : NULL; diff --git a/modules/encryption/enc_none.cpp b/modules/encryption/enc_none.cpp index 7fde78b37..e528e821c 100644 --- a/modules/encryption/enc_none.cpp +++ b/modules/encryption/enc_none.cpp @@ -20,7 +20,7 @@ class ENone : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) + EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) anope_override { Anope::string buf = "plain:"; Anope::string cpass; @@ -31,7 +31,7 @@ class ENone : public Module return EVENT_ALLOW; } - EventReturn OnDecrypt(const Anope::string &hashm, const Anope::string &src, Anope::string &dest) + EventReturn OnDecrypt(const Anope::string &hashm, const Anope::string &src, Anope::string &dest) anope_override { if (!hashm.equals_cs("plain")) return EVENT_CONTINUE; @@ -41,7 +41,7 @@ class ENone : public Module return EVENT_ALLOW; } - EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> ¶ms, const Anope::string &account, const Anope::string &password) + EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> ¶ms, const Anope::string &account, const Anope::string &password) anope_override { NickAlias *na = findnick(account); NickCore *nc = na ? na->nc : NULL; diff --git a/modules/encryption/enc_old.cpp b/modules/encryption/enc_old.cpp index b3de67439..9b1dad701 100644 --- a/modules/encryption/enc_old.cpp +++ b/modules/encryption/enc_old.cpp @@ -328,7 +328,7 @@ class EOld : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) + EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) anope_override { MD5_CTX context; char digest[33] = "", digest2[17] = ""; @@ -349,7 +349,7 @@ class EOld : public Module return EVENT_ALLOW; } - EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> ¶ms, const Anope::string &account, const Anope::string &password) + EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> ¶ms, const Anope::string &account, const Anope::string &password) anope_override { NickAlias *na = findnick(account); NickCore *nc = na ? na->nc : NULL; diff --git a/modules/encryption/enc_sha1.cpp b/modules/encryption/enc_sha1.cpp index a0854d762..d5d49b63e 100644 --- a/modules/encryption/enc_sha1.cpp +++ b/modules/encryption/enc_sha1.cpp @@ -176,7 +176,7 @@ class ESHA1 : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) + EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) anope_override { SHA1_CTX context; char digest[21] = ""; @@ -192,7 +192,7 @@ class ESHA1 : public Module return EVENT_ALLOW; } - EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> ¶ms, const Anope::string &account, const Anope::string &password) + EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> ¶ms, const Anope::string &account, const Anope::string &password) anope_override { NickAlias *na = findnick(account); NickCore *nc = na ? na->nc : NULL; diff --git a/modules/encryption/enc_sha256.cpp b/modules/encryption/enc_sha256.cpp index d77cd072d..aa31dc9c3 100644 --- a/modules/encryption/enc_sha256.cpp +++ b/modules/encryption/enc_sha256.cpp @@ -257,7 +257,7 @@ class ESHA256 : public Module use_iv = false; } - EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) + EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) anope_override { char digest[SHA256_DIGEST_SIZE + 1]; SHA256Context ctx; @@ -278,7 +278,7 @@ class ESHA256 : public Module return EVENT_ALLOW; } - EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> ¶ms, const Anope::string &account, const Anope::string &password) + EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> ¶ms, const Anope::string &account, const Anope::string &password) anope_override { NickAlias *na = findnick(account); NickCore *nc = na ? na->nc : NULL; diff --git a/modules/extra/bs_autoassign.cpp b/modules/extra/bs_autoassign.cpp index b57564e23..be4b58cf9 100644 --- a/modules/extra/bs_autoassign.cpp +++ b/modules/extra/bs_autoassign.cpp @@ -26,7 +26,7 @@ class BSAutoAssign : public Module this->OnReload(); } - void OnChanRegistered(ChannelInfo *ci) + void OnChanRegistered(ChannelInfo *ci) anope_override { if (this->bot.empty()) return; @@ -41,7 +41,7 @@ class BSAutoAssign : public Module bi->Assign(NULL, ci); } - void OnReload() + void OnReload() anope_override { ConfigReader config; this->bot = config.ReadValue("bs_autoassign", "bot", "", 0); diff --git a/modules/extra/ldap.h b/modules/extra/ldap.h index c21d60b05..232bec808 100644 --- a/modules/extra/ldap.h +++ b/modules/extra/ldap.h @@ -107,9 +107,8 @@ class LDAPInterface LDAPInterface(Module *m) : owner(m) { } virtual ~LDAPInterface() { } - virtual void OnResult(const LDAPResult &r) { } - - virtual void OnError(const LDAPResult &err) { } + virtual void OnResult(const LDAPResult &r) = 0; + virtual void OnError(const LDAPResult &err) = 0; }; class LDAPProvider : public Service diff --git a/modules/extra/m_dnsbl.cpp b/modules/extra/m_dnsbl.cpp index 0d863ad8d..71011760e 100644 --- a/modules/extra/m_dnsbl.cpp +++ b/modules/extra/m_dnsbl.cpp @@ -28,7 +28,7 @@ class DNSBLResolver : public DNSRequest public: DNSBLResolver(Module *c, User *u, const Blacklist &b, const Anope::string &host, bool add_akill) : DNSRequest(host, DNS_QUERY_A, true, c), user(u), blacklist(b), add_to_akill(add_akill) { } - void OnLookupComplete(const DNSQuery *record) + void OnLookupComplete(const DNSQuery *record) anope_override { if (!user || user->HasExt("m_dnsbl_akilled")) return; @@ -95,7 +95,7 @@ class ModuleDNSBL : public Module OnReload(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; @@ -126,7 +126,7 @@ class ModuleDNSBL : public Module } } - void OnUserConnect(dynamic_reference<User> &user, bool &exempt) + void OnUserConnect(dynamic_reference<User> &user, bool &exempt) anope_override { if (exempt || !user || (!this->check_on_connect && !Me->IsSynced())) return; diff --git a/modules/extra/m_helpchan.cpp b/modules/extra/m_helpchan.cpp index baf1429e3..7152f81ae 100644 --- a/modules/extra/m_helpchan.cpp +++ b/modules/extra/m_helpchan.cpp @@ -22,7 +22,7 @@ class HelpChannel : public Module OnReload(); } - EventReturn OnChannelModeSet(Channel *c, ChannelModeName Name, const Anope::string ¶m) + EventReturn OnChannelModeSet(Channel *c, ChannelModeName Name, const Anope::string ¶m) anope_override { if (Name == CMODE_OP && c && c->ci && c->name.equals_ci(this->HelpChan)) { @@ -35,7 +35,7 @@ class HelpChannel : public Module return EVENT_CONTINUE; } - void OnReload() + void OnReload() anope_override { ConfigReader config; diff --git a/modules/extra/m_ldap.cpp b/modules/extra/m_ldap.cpp index ab0aaa928..67a433bbd 100644 --- a/modules/extra/m_ldap.cpp +++ b/modules/extra/m_ldap.cpp @@ -97,7 +97,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition return this->Bind(i, this->admin_binddn, this->admin_pass); } - LDAPQuery Bind(LDAPInterface *i, const Anope::string &who, const Anope::string &pass) + LDAPQuery Bind(LDAPInterface *i, const Anope::string &who, const Anope::string &pass) anope_override { berval cred; cred.bv_val = strdup(pass.c_str()); @@ -120,7 +120,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition return msgid; } - LDAPQuery Search(LDAPInterface *i, const Anope::string &base, const Anope::string &filter) + LDAPQuery Search(LDAPInterface *i, const Anope::string &base, const Anope::string &filter) anope_override { if (i == NULL) throw LDAPException("No interface"); @@ -138,7 +138,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition return msgid; } - LDAPQuery Add(LDAPInterface *i, const Anope::string &dn, LDAPMods &attributes) + LDAPQuery Add(LDAPInterface *i, const Anope::string &dn, LDAPMods &attributes) anope_override { LDAPMod **mods = this->BuildMods(attributes); LDAPQuery msgid; @@ -159,7 +159,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition return msgid; } - LDAPQuery Del(LDAPInterface *i, const Anope::string &dn) + LDAPQuery Del(LDAPInterface *i, const Anope::string &dn) anope_override { LDAPQuery msgid; int ret = ldap_delete_ext(this->con, dn.c_str(), NULL, NULL, &msgid); @@ -178,7 +178,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition return msgid; } - LDAPQuery Modify(LDAPInterface *i, const Anope::string &base, LDAPMods &attributes) + LDAPQuery Modify(LDAPInterface *i, const Anope::string &base, LDAPMods &attributes) anope_override { LDAPMod **mods = this->BuildMods(attributes); LDAPQuery msgid; @@ -199,7 +199,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition return msgid; } - void Run() + void Run() anope_override { while (!this->GetExitState()) { @@ -356,7 +356,7 @@ class ModuleLDAP : public Module, public Pipe LDAPServices.clear(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; int i, num; @@ -412,7 +412,7 @@ class ModuleLDAP : public Module, public Pipe } } - void OnModuleUnload(User *, Module *m) + void OnModuleUnload(User *, Module *m) anope_override { for (std::map<Anope::string, LDAPService *>::iterator it = this->LDAPServices.begin(); it != this->LDAPServices.end(); ++it) { @@ -436,7 +436,7 @@ class ModuleLDAP : public Module, public Pipe } } - void OnNotify() + void OnNotify() anope_override { for (std::map<Anope::string, LDAPService *>::iterator it = this->LDAPServices.begin(); it != this->LDAPServices.end(); ++it) { diff --git a/modules/extra/m_ldap_authentication.cpp b/modules/extra/m_ldap_authentication.cpp index 02fc05649..a34e6a709 100644 --- a/modules/extra/m_ldap_authentication.cpp +++ b/modules/extra/m_ldap_authentication.cpp @@ -32,7 +32,7 @@ class IdentifyInterface : public LDAPInterface this->requests[id] = ii; } - void OnResult(const LDAPResult &r) + void OnResult(const LDAPResult &r) anope_override { std::map<LDAPQuery, IdentifyInfo *>::iterator it = this->requests.find(r.id); if (it == this->requests.end()) @@ -70,7 +70,7 @@ class IdentifyInterface : public LDAPInterface delete ii; } - void OnError(const LDAPResult &r) + void OnError(const LDAPResult &r) anope_override { std::map<LDAPQuery, IdentifyInfo *>::iterator it = this->requests.find(r.id); if (it == this->requests.end()) @@ -107,7 +107,7 @@ class OnIdentifyInterface : public LDAPInterface this->requests[id] = nick; } - void OnResult(const LDAPResult &r) + void OnResult(const LDAPResult &r) anope_override { std::map<LDAPQuery, Anope::string>::iterator it = this->requests.find(r.id); if (it == this->requests.end()) @@ -138,7 +138,7 @@ class OnIdentifyInterface : public LDAPInterface } } - void OnError(const LDAPResult &r) + void OnError(const LDAPResult &r) anope_override { this->requests.erase(r.id); Log() << "m_ldap_authentication: " << r.error; @@ -150,12 +150,12 @@ class OnRegisterInterface : public LDAPInterface public: OnRegisterInterface(Module *m) : LDAPInterface(m) { } - void OnResult(const LDAPResult &r) + void OnResult(const LDAPResult &r) anope_override { Log() << "m_ldap_authentication: Successfully added newly created account to LDAP"; } - void OnError(const LDAPResult &r) + void OnError(const LDAPResult &r) anope_override { Log() << "m_ldap_authentication: Error adding newly created account to LDAP: " << r.getError(); } @@ -187,7 +187,7 @@ class NSIdentifyLDAP : public Module OnReload(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; @@ -200,7 +200,7 @@ class NSIdentifyLDAP : public Module this->disable_reason = config.ReadValue("m_ldap_authentication", "disable_reason", "", 0); } - EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) + EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) anope_override { if (this->disable_register && !this->disable_reason.empty() && command->name == "nickserv/register") { @@ -211,7 +211,7 @@ class NSIdentifyLDAP : public Module return EVENT_CONTINUE; } - EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> ¶ms, const Anope::string &account, const Anope::string &password) + EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> ¶ms, const Anope::string &account, const Anope::string &password) anope_override { if (c == NULL || source == NULL || !this->ldap) @@ -246,7 +246,7 @@ class NSIdentifyLDAP : public Module return EVENT_STOP; } - void OnNickIdentify(User *u) + void OnNickIdentify(User *u) anope_override { if (email_attribute.empty() || !this->ldap) return; @@ -262,7 +262,7 @@ class NSIdentifyLDAP : public Module } } - void OnNickRegister(NickAlias *na) + void OnNickRegister(NickAlias *na) anope_override { if (this->disable_register || !this->ldap) return; diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/m_ldap_oper.cpp index b25dd8eff..6a3bec89f 100644 --- a/modules/extra/m_ldap_oper.cpp +++ b/modules/extra/m_ldap_oper.cpp @@ -19,7 +19,7 @@ class IdentifyInterface : public LDAPInterface this->requests[id] = nick; } - void OnResult(const LDAPResult &r) + void OnResult(const LDAPResult &r) anope_override { std::map<LDAPQuery, Anope::string>::iterator it = this->requests.find(r.id); if (it == this->requests.end()) @@ -68,7 +68,7 @@ class IdentifyInterface : public LDAPInterface } } - void OnError(const LDAPResult &r) + void OnError(const LDAPResult &r) anope_override { this->requests.erase(r.id); } @@ -95,7 +95,7 @@ class LDAPOper : public Module OnReload(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; @@ -110,7 +110,7 @@ class LDAPOper : public Module my_opers.clear(); } - void OnNickIdentify(User *u) + void OnNickIdentify(User *u) anope_override { try { @@ -130,7 +130,7 @@ class LDAPOper : public Module } } - void OnDelCore(NickCore *nc) + void OnDelCore(NickCore *nc) anope_override { if (nc->o != NULL && my_opers.count(nc->o) > 0) { diff --git a/modules/extra/m_mysql.cpp b/modules/extra/m_mysql.cpp index 189a950d8..138c726d8 100644 --- a/modules/extra/m_mysql.cpp +++ b/modules/extra/m_mysql.cpp @@ -119,13 +119,13 @@ class MySQLService : public SQLProvider ~MySQLService(); - void Run(SQLInterface *i, const SQLQuery &query); + void Run(SQLInterface *i, const SQLQuery &query) anope_override; - SQLResult RunQuery(const SQLQuery &query); + SQLResult RunQuery(const SQLQuery &query) anope_override; - SQLQuery CreateTable(const Anope::string &table, const Serializable::serialized_data &data); + SQLQuery CreateTable(const Anope::string &table, const Serializable::serialized_data &data) anope_override; - SQLQuery GetTables(); + SQLQuery GetTables() anope_override; void Connect(); @@ -141,7 +141,7 @@ class DispatcherThread : public Thread, public Condition public: DispatcherThread() : Thread() { } - void Run(); + void Run() anope_override; }; class ModuleSQL; @@ -183,7 +183,7 @@ class ModuleSQL : public Module, public Pipe delete DThread; } - void OnReload() + void OnReload() anope_override { ConfigReader config; int i, num; @@ -238,7 +238,7 @@ class ModuleSQL : public Module, public Pipe } } - void OnModuleUnload(User *, Module *m) + void OnModuleUnload(User *, Module *m) anope_override { this->DThread->Lock(); @@ -263,7 +263,7 @@ class ModuleSQL : public Module, public Pipe this->OnNotify(); } - void OnNotify() + void OnNotify() anope_override { this->DThread->Lock(); std::deque<QueryResult> finishedRequests = this->FinishedRequests; diff --git a/modules/extra/m_proxyscan.cpp b/modules/extra/m_proxyscan.cpp index 37fd7c432..ea35e8f77 100644 --- a/modules/extra/m_proxyscan.cpp +++ b/modules/extra/m_proxyscan.cpp @@ -29,12 +29,12 @@ class ProxyCallbackListener : public ListenSocket { } - void OnAccept() + void OnAccept() anope_override { this->Write(ProxyCheckString); } - bool ProcessWrite() + bool ProcessWrite() anope_override { return !BufferedSocket::ProcessWrite() || this->WriteBuffer.empty() ? false : true; } @@ -45,7 +45,7 @@ class ProxyCallbackListener : public ListenSocket { } - ClientSocket *OnAccept(int fd, const sockaddrs &addr) + ClientSocket *OnAccept(int fd, const sockaddrs &addr) anope_override { return new ProxyCallbackClient(this, fd, addr); } @@ -73,7 +73,7 @@ class ProxyConnect : public ConnectionSocket proxies.erase(this); } - virtual void OnConnect() = 0; + virtual void OnConnect() anope_override = 0; virtual const Anope::string GetType() const = 0; protected: @@ -112,7 +112,7 @@ class HTTPProxyConnect : public ProxyConnect, public BufferedSocket { } - void OnConnect() + void OnConnect() anope_override { this->Write("CONNECT %s:%d HTTP/1.0", target_ip.c_str(), target_port); this->Write("Content-length: 0"); @@ -120,12 +120,12 @@ class HTTPProxyConnect : public ProxyConnect, public BufferedSocket this->Write(""); } - const Anope::string GetType() const + const Anope::string GetType() const anope_override { return "HTTP"; } - bool Read(const Anope::string &buf) + bool Read(const Anope::string &buf) anope_override { if (buf == ProxyCheckString) { @@ -143,7 +143,7 @@ class SOCKS5ProxyConnect : public ProxyConnect, public BinarySocket { } - void OnConnect() + void OnConnect() anope_override { sockaddrs target_addr; char buf[4 + sizeof(target_addr.sa4.sin_addr.s_addr) + sizeof(target_addr.sa4.sin_port)]; @@ -175,12 +175,12 @@ class SOCKS5ProxyConnect : public ProxyConnect, public BinarySocket this->Write(buf, ptr); } - const Anope::string GetType() const + const Anope::string GetType() const anope_override { return "SOCKS5"; } - bool Read(const char *buffer, size_t l) + bool Read(const char *buffer, size_t l) anope_override { if (l >= ProxyCheckString.length() && !strncmp(buffer, ProxyCheckString.c_str(), ProxyCheckString.length())) { @@ -207,7 +207,7 @@ class ModuleProxyScan : public Module { } - void Tick(time_t) + void Tick(time_t) anope_override { for (std::set<ProxyConnect *>::iterator it = ProxyConnect::proxies.begin(), it_end = ProxyConnect::proxies.end(); it != it_end; ++it) { @@ -262,7 +262,7 @@ class ModuleProxyScan : public Module delete this->listener; } - void OnReload() + void OnReload() anope_override { ConfigReader config; @@ -341,7 +341,7 @@ class ModuleProxyScan : public Module } } - void OnUserConnect(dynamic_reference<User> &user, bool &exempt) + void OnUserConnect(dynamic_reference<User> &user, bool &exempt) anope_override { if (exempt || !user || !Me->IsSynced() || !user->server->IsSynced()) return; diff --git a/modules/extra/m_rewrite.cpp b/modules/extra/m_rewrite.cpp index 751e4e5aa..6d8690960 100644 --- a/modules/extra/m_rewrite.cpp +++ b/modules/extra/m_rewrite.cpp @@ -83,7 +83,7 @@ class ModuleRewrite : public Module this->OnReload(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; @@ -104,7 +104,7 @@ class ModuleRewrite : public Module } } - EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) + EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) anope_override { std::vector<Anope::string> tokens = BuildStringVector(message); for (unsigned i = 0; i < this->rewrites.size(); ++i) diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/m_sqlite.cpp index ccb9c2a2f..02923cfa7 100644 --- a/modules/extra/m_sqlite.cpp +++ b/modules/extra/m_sqlite.cpp @@ -40,11 +40,11 @@ class SQLiteService : public SQLProvider ~SQLiteService(); - void Run(SQLInterface *i, const SQLQuery &query); + void Run(SQLInterface *i, const SQLQuery &query) anope_override; SQLResult RunQuery(const SQLQuery &query); - SQLQuery CreateTable(const Anope::string &table, const Serializable::serialized_data &data); + SQLQuery CreateTable(const Anope::string &table, const Serializable::serialized_data &data) anope_override; SQLQuery GetTables(); @@ -71,7 +71,7 @@ class ModuleSQLite : public Module SQLiteServices.clear(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; int i, num; @@ -158,22 +158,17 @@ SQLResult SQLiteService::RunQuery(const SQLQuery &query) SQLiteResult result(query, real_query); - do + while ((err = sqlite3_step(stmt)) == SQLITE_ROW) { - err = sqlite3_step(stmt); - if (err == SQLITE_ROW) + std::map<Anope::string, Anope::string> items; + for (int i = 0; i < cols; ++i) { - std::map<Anope::string, Anope::string> items; - for (int i = 0; i < cols; ++i) - { - const char *data = reinterpret_cast<const char *>(sqlite3_column_text(stmt, i)); - if (data && *data) - items[columns[i]] = data; - } - result.addRow(items); + const char *data = reinterpret_cast<const char *>(sqlite3_column_text(stmt, i)); + if (data && *data) + items[columns[i]] = data; } + result.addRow(items); } - while (err == SQLITE_ROW); sqlite3_finalize(stmt); diff --git a/modules/extra/m_ssl.cpp b/modules/extra/m_ssl.cpp index 829d3e532..fcfbb8f28 100644 --- a/modules/extra/m_ssl.cpp +++ b/modules/extra/m_ssl.cpp @@ -23,7 +23,7 @@ class MySSLService : public SSLService /** Initialize a socket to use SSL * @param s The socket */ - void Init(Socket *s); + void Init(Socket *s) anope_override; }; class SSLSocketIO : public SocketIO @@ -42,43 +42,43 @@ class SSLSocketIO : public SocketIO * @param sz How much to read * @return Number of bytes received */ - int Recv(Socket *s, char *buf, size_t sz); + int Recv(Socket *s, char *buf, size_t sz) anope_override; /** Write something to the socket * @param s The socket * @param buf The data to write * @param size The length of the data */ - int Send(Socket *s, const char *buf, size_t sz); + int Send(Socket *s, const char *buf, size_t sz) anope_override; /** Accept a connection from a socket * @param s The socket * @return The new socket */ - ClientSocket *Accept(ListenSocket *s); + ClientSocket *Accept(ListenSocket *s) anope_override; /** Finished accepting a connection from a socket * @param s The socket * @return SF_ACCEPTED if accepted, SF_ACCEPTING if still in process, SF_DEAD on error */ - SocketFlag FinishAccept(ClientSocket *cs); + SocketFlag FinishAccept(ClientSocket *cs) anope_override; /** Connect the socket * @param s THe socket * @param target IP to connect to * @param port to connect to */ - void Connect(ConnectionSocket *s, const Anope::string &target, int port); + void Connect(ConnectionSocket *s, const Anope::string &target, int port) anope_override; /** Called to potentially finish a pending connection * @param s The socket * @return SF_CONNECTED on success, SF_CONNECTING if still pending, and SF_DEAD on error. */ - SocketFlag FinishConnect(ConnectionSocket *s); + SocketFlag FinishConnect(ConnectionSocket *s) anope_override; /** Called when the socket is destructing */ - void Destroy(); + void Destroy() anope_override; }; class SSLModule; @@ -167,7 +167,7 @@ class SSLModule : public Module SSL_CTX_free(server_ctx); } - void OnPreServerConnect() + void OnPreServerConnect() anope_override { ConfigReader config; diff --git a/modules/extra/m_statusupdate.cpp b/modules/extra/m_statusupdate.cpp index db865e3c1..3caf09f64 100644 --- a/modules/extra/m_statusupdate.cpp +++ b/modules/extra/m_statusupdate.cpp @@ -31,7 +31,7 @@ class StatusUpdate : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnAccessAdd(ChannelInfo *ci, User *u, ChanAccess *access) + void OnAccessAdd(ChannelInfo *ci, User *u, ChanAccess *access) anope_override { if (ci->c) for (CUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it) @@ -48,7 +48,7 @@ class StatusUpdate : public Module } } - void OnAccessDel(ChannelInfo *ci, User *u, ChanAccess *access) + void OnAccessDel(ChannelInfo *ci, User *u, ChanAccess *access) anope_override { if (ci->c) for (CUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it) diff --git a/modules/extra/m_xmlrpc.cpp b/modules/extra/m_xmlrpc.cpp index 40a032092..138f73a2a 100644 --- a/modules/extra/m_xmlrpc.cpp +++ b/modules/extra/m_xmlrpc.cpp @@ -14,7 +14,7 @@ class MyXMLRPCClientSocket : public XMLRPCClientSocket { } - bool Read(const Anope::string &message) + bool Read(const Anope::string &message) anope_override { if (message.find("xml version") != Anope::string::npos) this->in_query = true; @@ -100,7 +100,7 @@ class MyXMLRPCListenSocket : public XMLRPCListenSocket listen_sockets.erase(it); } - ClientSocket *OnAccept(int fd, const sockaddrs &addr) + ClientSocket *OnAccept(int fd, const sockaddrs &addr) anope_override { MyXMLRPCClientSocket *socket = new MyXMLRPCClientSocket(this, fd, addr); @@ -150,7 +150,7 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface this->events.erase(it); } - void Reply(XMLRPCClientSocket *source, XMLRPCRequest *request) + void Reply(XMLRPCClientSocket *source, XMLRPCRequest *request) anope_override { if (!request->id.empty()) request->reply("id", request->id); @@ -174,7 +174,7 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface Log(LOG_DEBUG) << reply; } - Anope::string Sanitize(const Anope::string &string) + Anope::string Sanitize(const Anope::string &string) anope_override { static struct special_chars { @@ -204,7 +204,7 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface return ret; } - void RunXMLRPC(XMLRPCClientSocket *source, XMLRPCRequest *request) + void RunXMLRPC(XMLRPCClientSocket *source, XMLRPCRequest *request) anope_override { for (unsigned i = 0; i < this->events.size(); ++i) { @@ -262,7 +262,7 @@ class ModuleXMLRPC : public Module listen_sockets.clear(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; diff --git a/modules/extra/m_xmlrpc_main.cpp b/modules/extra/m_xmlrpc_main.cpp index 8762872ad..06ed55c86 100644 --- a/modules/extra/m_xmlrpc_main.cpp +++ b/modules/extra/m_xmlrpc_main.cpp @@ -14,22 +14,22 @@ class XMLRPCUser : public User this->server = Me; } - void SendMessage(BotInfo *, Anope::string msg) + void SendMessage(BotInfo *, Anope::string msg) anope_override { this->out += msg + "\n"; } - NickCore *Account() + NickCore *Account() anope_override { return (na ? na->nc : NULL); } - bool IsIdentified(bool CheckNick = false) + bool IsIdentified(bool CheckNick = false) anope_override { return na; } - bool IsRecognized(bool CheckSecure = true) + bool IsRecognized(bool CheckSecure = true) anope_override { return na; } @@ -43,7 +43,7 @@ class XMLRPCUser : public User class MyXMLRPCEvent : public XMLRPCEvent { public: - void Run(XMLRPCServiceInterface *iface, XMLRPCClientSocket *source, XMLRPCRequest *request) + void Run(XMLRPCServiceInterface *iface, XMLRPCClientSocket *source, XMLRPCRequest *request) anope_override { if (request->name == "command") this->DoCommand(iface, source, request); @@ -59,6 +59,7 @@ class MyXMLRPCEvent : public XMLRPCEvent this->DoOperType(iface, source, request); } + private: void DoCommand(XMLRPCServiceInterface *iface, XMLRPCClientSocket *source, XMLRPCRequest *request) { Anope::string service = request->data.size() > 0 ? request->data[0] : ""; diff --git a/modules/extra/ns_maxemail.cpp b/modules/extra/ns_maxemail.cpp index 6973b9c5e..350913fab 100644 --- a/modules/extra/ns_maxemail.cpp +++ b/modules/extra/ns_maxemail.cpp @@ -64,14 +64,14 @@ class NSMaxEmail : public Module OnReload(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; this->NSEmailMax = config.ReadInteger("ns_maxemail", "maxemails", "0", 0, false); Log(LOG_DEBUG) << "[ns_maxemail] NSEmailMax set to " << NSEmailMax; } - EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) + EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) anope_override { if (command->name == "nickserv/register") { diff --git a/modules/extra/sql.h b/modules/extra/sql.h index 40c893722..0b27fe744 100644 --- a/modules/extra/sql.h +++ b/modules/extra/sql.h @@ -101,9 +101,8 @@ class SQLInterface SQLInterface(Module *m) : owner(m) { } - virtual void OnResult(const SQLResult &r) { } - - virtual void OnError(const SQLResult &r) { } + virtual void OnResult(const SQLResult &r) = 0; + virtual void OnError(const SQLResult &r) = 0; }; /** Class providing the SQL service, modules call this to execute queries diff --git a/modules/extra/xmlrpc.h b/modules/extra/xmlrpc.h index ef300e583..baff9b18d 100644 --- a/modules/extra/xmlrpc.h +++ b/modules/extra/xmlrpc.h @@ -13,7 +13,7 @@ class XMLRPCClientSocket : public ClientSocket, public BufferedSocket virtual ~XMLRPCClientSocket() { } - virtual bool Read(const Anope::string &message) = 0; + virtual bool Read(const Anope::string &message) anope_override = 0; virtual bool GetData(Anope::string &tag, Anope::string &data) = 0; @@ -33,7 +33,7 @@ class XMLRPCListenSocket : public ListenSocket virtual ~XMLRPCListenSocket() { } - virtual ClientSocket *OnAccept(int fd, const sockaddrs &addr) = 0; + virtual ClientSocket *OnAccept(int fd, const sockaddrs &addr) anope_override = 0; }; class XMLRPCRequest diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp index b83afa686..8645c7176 100644 --- a/modules/protocol/bahamut.cpp +++ b/modules/protocol/bahamut.cpp @@ -44,7 +44,7 @@ IRCDVar myIrcd[] = { class BahamutIRCdProto : public IRCDProto { - void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf) + void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf) anope_override { if (Capab.count("TSMODE") > 0) UplinkSocket::Message(source ? source->nick : Config->ServerName) << "MODE " << dest->name << " " << dest->creation_time << " " << buf; @@ -52,37 +52,37 @@ class BahamutIRCdProto : public IRCDProto UplinkSocket::Message(source ? source->nick : Config->ServerName) << "MODE " << dest->name << " " << buf; } - void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) + void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) anope_override { UplinkSocket::Message(bi ? bi->nick : Config->ServerName) << "SVSMODE " << u->nick << " " << u->timestamp << " " << buf; } /* SVSHOLD - set */ - void SendSVSHold(const Anope::string &nick) + void SendSVSHold(const Anope::string &nick) anope_override { UplinkSocket::Message(Config->ServerName) << "SVSHOLD " << nick << " " << Config->NSReleaseTimeout << " :Being held for registered user"; } /* SVSHOLD - release */ - void SendSVSHoldDel(const Anope::string &nick) + void SendSVSHoldDel(const Anope::string &nick) anope_override { UplinkSocket::Message(Config->ServerName) << "SVSHOLD " << nick << " 0"; } /* SQLINE */ - void SendSQLine(User *, const XLine *x) + void SendSQLine(User *, const XLine *x) anope_override { UplinkSocket::Message() << "SQLINE " << x->Mask << " :" << x->Reason; } /* UNSLINE */ - void SendSGLineDel(const XLine *x) + void SendSGLineDel(const XLine *x) anope_override { UplinkSocket::Message() << "UNSGLINE 0 :" << x->Mask; } /* UNSZLINE */ - void SendSZLineDel(const XLine *x) + void SendSZLineDel(const XLine *x) anope_override { /* this will likely fail so its only here for legacy */ UplinkSocket::Message() << "UNSZLINE 0 " << x->GetHost(); @@ -91,7 +91,7 @@ class BahamutIRCdProto : public IRCDProto } /* SZLINE */ - void SendSZLine(User *, const XLine *x) + void SendSZLine(User *, const XLine *x) anope_override { // Calculate the time left before this would expire, capping it at 2 days time_t timeleft = x->Expires - Anope::CurTime; @@ -104,37 +104,37 @@ class BahamutIRCdProto : public IRCDProto } /* SVSNOOP */ - void SendSVSNOOP(const Server *server, bool set) + void SendSVSNOOP(const Server *server, bool set) anope_override { UplinkSocket::Message() << "SVSNOOP " << server->GetName() << " " << (set ? "+" : "-"); } /* SGLINE */ - void SendSGLine(User *, const XLine *x) + void SendSGLine(User *, const XLine *x) anope_override { UplinkSocket::Message() << "SGLINE " << x->Mask.length() << " :" << x->Mask << ":" << x->Reason; } /* RAKILL */ - void SendAkillDel(const XLine *x) + void SendAkillDel(const XLine *x) anope_override { UplinkSocket::Message() << "RAKILL " << x->GetHost() << " " << x->GetUser(); } /* TOPIC */ - void SendTopic(BotInfo *whosets, Channel *c) + void SendTopic(BotInfo *whosets, Channel *c) anope_override { UplinkSocket::Message(whosets->nick) << "TOPIC " << c->name << " " << c->topic_setter << " " << c->topic_time << " :" << c->topic; } /* UNSQLINE */ - void SendSQLineDel(const XLine *x) + void SendSQLineDel(const XLine *x) anope_override { UplinkSocket::Message() << "UNSQLINE " << x->Mask; } /* JOIN - SJOIN */ - void SendJoin(User *user, Channel *c, const ChannelStatus *status) + void SendJoin(User *user, Channel *c, const ChannelStatus *status) anope_override { UplinkSocket::Message(user->nick) << "SJOIN " << c->creation_time << " " << c->name; if (status) @@ -155,7 +155,7 @@ class BahamutIRCdProto : public IRCDProto } } - void SendAkill(User *, const XLine *x) + void SendAkill(User *, const XLine *x) anope_override { // Calculate the time left before this would expire, capping it at 2 days time_t timeleft = x->Expires - Anope::CurTime; @@ -167,22 +167,22 @@ class BahamutIRCdProto : public IRCDProto /* Note: if the stamp is null 0, the below usage is correct of Bahamut */ - void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) + void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) anope_override { UplinkSocket::Message(source ? source->nick : "") << "SVSKILL " << user->nick << " :" << buf; } - void SendBOB() + void SendBOB() anope_override { UplinkSocket::Message() << "BURST"; } - void SendEOB() + void SendEOB() anope_override { UplinkSocket::Message() << "BURST 0"; } - void SendKickInternal(const BotInfo *source, const Channel *chan, const User *user, const Anope::string &buf) + void SendKickInternal(const BotInfo *source, const Channel *chan, const User *user, const Anope::string &buf) anope_override { if (!buf.empty()) UplinkSocket::Message(source->nick) << "KICK " << chan->name << " " << user->nick << " :" << buf; @@ -190,19 +190,19 @@ class BahamutIRCdProto : public IRCDProto UplinkSocket::Message(source->nick) << "KICK " << chan->name << " " << user->nick; } - void SendClientIntroduction(const User *u) + void SendClientIntroduction(const User *u) anope_override { Anope::string modes = "+" + u->GetModes(); UplinkSocket::Message() << "NICK " << u->nick << " 1 " << u->timestamp << " " << modes << " " << u->GetIdent() << " " << u->host << " " << u->server->GetName() << " 0 0 :" << u->realname; } /* SERVER */ - void SendServer(const Server *server) + void SendServer(const Server *server) anope_override { UplinkSocket::Message() << "SERVER " << server->GetName() << " " << server->GetHops() << " :" << server->GetDescription(); } - void SendConnect() + void SendConnect() anope_override { UplinkSocket::Message() << "PASS " << Config->Uplinks[CurrentUplink]->password << " :TS"; UplinkSocket::Message() << "CAPAB SSJOIN NOQUIT BURST UNCONNECT NICKIP TSMODE TS3"; @@ -219,7 +219,7 @@ class BahamutIRCdProto : public IRCDProto this->SendBOB(); } - void SendChannel(Channel *c) + void SendChannel(Channel *c) anope_override { Anope::string modes = c->GetModes(true, true); if (modes.empty()) @@ -227,13 +227,13 @@ class BahamutIRCdProto : public IRCDProto UplinkSocket::Message() << "SJOIN " << c->creation_time << " " << c->name << " " << modes << " :"; } - void SendLogin(User *u) + void SendLogin(User *u) anope_override { BotInfo *ns = findbot(Config->NickServ); ircdproto->SendMode(ns, u, "+d %d", u->timestamp); } - void SendLogout(User *u) + void SendLogout(User *u) anope_override { BotInfo *ns = findbot(Config->NickServ); ircdproto->SendMode(ns, u, "+d 1"); @@ -243,7 +243,7 @@ class BahamutIRCdProto : public IRCDProto class BahamutIRCdMessage : public IRCdMessage { public: - bool OnMode(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnMode(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params.size() > 2 && (params[0][0] == '#' || params[0][0] == '&')) do_cmode(source, params[0], params[2], params[1]); @@ -271,7 +271,7 @@ class BahamutIRCdMessage : public IRCdMessage ** parv[0] = new nickname ** parv[1] = hopcount */ - bool OnNick(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnNick(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params.size() != 2) { @@ -299,13 +299,13 @@ class BahamutIRCdMessage : public IRCdMessage return true; } - bool OnServer(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnServer(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { do_server(source, params[0], Anope::string(params[1]).is_pos_number_only() ? convertTo<unsigned>(params[1]) : 0, params[2], ""); return true; } - bool OnTopic(const Anope::string &, const std::vector<Anope::string> ¶ms) + bool OnTopic(const Anope::string &, const std::vector<Anope::string> ¶ms) anope_override { if (params.size() < 4) return true; @@ -322,7 +322,7 @@ class BahamutIRCdMessage : public IRCdMessage return true; } - bool OnSJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnSJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { Channel *c = findchan(params[1]); time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo<time_t>(params[0]) : 0; @@ -480,7 +480,7 @@ class ChannelModeFlood : public ChannelModeParam public: ChannelModeFlood(char modeChar, bool minusNoArg) : ChannelModeParam(CMODE_FLOOD, modeChar, minusNoArg) { } - bool IsValid(const Anope::string &value) const + bool IsValid(const Anope::string &value) const anope_override { try { @@ -560,7 +560,7 @@ class ProtoBahamut : public Module pmodule_ircd_message(NULL); } - void OnUserNickChange(User *u, const Anope::string &) + void OnUserNickChange(User *u, const Anope::string &) anope_override { u->RemoveModeInternal(ModeManager::FindUserModeByName(UMODE_REGISTERED)); } diff --git a/modules/protocol/inspircd-ts6.h b/modules/protocol/inspircd-ts6.h index a13104d78..8ba879c4c 100644 --- a/modules/protocol/inspircd-ts6.h +++ b/modules/protocol/inspircd-ts6.h @@ -14,7 +14,7 @@ class ChannelModeFlood : public ChannelModeParam public: ChannelModeFlood(char modeChar, bool minusNoArg) : ChannelModeParam(CMODE_FLOOD, modeChar, minusNoArg) { } - bool IsValid(const Anope::string &value) const + bool IsValid(const Anope::string &value) const anope_override { try { @@ -49,18 +49,18 @@ class InspIRCdTS6Proto : public IRCDProto public: - void SendAkillDel(const XLine *x) + void SendAkillDel(const XLine *x) anope_override { BotInfo *bi = findbot(Config->OperServ); UplinkSocket::Message(bi ? bi->GetUID() : Config->Numeric) << "GLINE " << x->Mask; } - void SendTopic(BotInfo *whosets, Channel *c) + void SendTopic(BotInfo *whosets, Channel *c) anope_override { UplinkSocket::Message(whosets->GetUID()) << "FTOPIC " << c->name << " " << Anope::CurTime << " " << c->topic_setter << " :" << c->topic; } - void SendVhostDel(User *u) + void SendVhostDel(User *u) anope_override { if (u->HasMode(UMODE_CLOAK)) this->SendChgHostInternal(u->nick, u->chost); @@ -71,7 +71,7 @@ class InspIRCdTS6Proto : public IRCDProto this->SendChgIdentInternal(u->nick, u->GetIdent()); } - void SendAkill(User *, const XLine *x) + void SendAkill(User *, const XLine *x) anope_override { // Calculate the time left before this would expire, capping it at 2 days time_t timeleft = x->Expires - Anope::CurTime; @@ -81,33 +81,33 @@ class InspIRCdTS6Proto : public IRCDProto UplinkSocket::Message(u ? u->GetUID() : Config->Numeric) << "ADDLINE G " << x->GetUser() << "@" << x->GetHost() << " " << x->By << " " << Anope::CurTime << " " << timeleft << " :" << x->Reason; } - void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) + void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) anope_override { UplinkSocket::Message(source ? source->GetUID() : Config->Numeric) << "KILL " << user->GetUID() << " :" << buf; } - void SendNumericInternal(const Anope::string &source, int numeric, const Anope::string &dest, const Anope::string &buf) + void SendNumericInternal(const Anope::string &source, int numeric, const Anope::string &dest, const Anope::string &buf) anope_override { UplinkSocket::Message(Config->Numeric) << "PUSH " << dest << " ::" << source << " " << numeric << " " << dest << " " << buf; } - void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf) + void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf) anope_override { UplinkSocket::Message(source ? source->GetUID() : Config->Numeric) << "FMODE " << dest->name << " " << dest->creation_time << " " << buf; } - void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) + void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) anope_override { UplinkSocket::Message(bi ? bi->GetUID() : Config->Numeric) << "MODE " << u->GetUID() << " " << buf; } - void SendClientIntroduction(const User *u) + void SendClientIntroduction(const User *u) anope_override { Anope::string modes = "+" + u->GetModes(); UplinkSocket::Message(Config->Numeric) << "UID " << u->GetUID() << " " << u->timestamp << " " << u->nick << " " << u->host << " " << u->host << " " << u->GetIdent() << " 0.0.0.0 " << u->my_signon << " " << modes << " :" << u->realname; } - void SendKickInternal(const BotInfo *source, const Channel *chan, const User *user, const Anope::string &buf) + void SendKickInternal(const BotInfo *source, const Channel *chan, const User *user, const Anope::string &buf) anope_override { if (!buf.empty()) UplinkSocket::Message(source->GetUID()) << "KICK " << chan->name << " " << user->GetUID() << " :" << buf; @@ -116,13 +116,13 @@ class InspIRCdTS6Proto : public IRCDProto } /* SERVER services-dev.chatspike.net password 0 :Description here */ - void SendServer(const Server *server) + void SendServer(const Server *server) anope_override { UplinkSocket::Message("") << "SERVER " << server->GetName() << " " << Config->Uplinks[CurrentUplink]->password << " " << server->GetHops() << " " << server->GetSID() << " :" << server->GetDescription(); } /* JOIN */ - void SendJoin(User *user, Channel *c, const ChannelStatus *status) + void SendJoin(User *user, Channel *c, const ChannelStatus *status) anope_override { UplinkSocket::Message(Config->Numeric) << "FJOIN " << c->name << " " << c->creation_time << " +" << c->GetModes(true, true) << " :," << user->GetUID(); /* Note that we can send this with the FJOIN but choose not to @@ -148,13 +148,13 @@ class InspIRCdTS6Proto : public IRCDProto } /* UNSQLINE */ - void SendSQLineDel(const XLine *x) + void SendSQLineDel(const XLine *x) anope_override { UplinkSocket::Message(Config->Numeric) << "DELLINE Q " << x->Mask; } /* SQLINE */ - void SendSQLine(User *, const XLine *x) + void SendSQLine(User *, const XLine *x) anope_override { // Calculate the time left before this would expire, capping it at 2 days time_t timeleft = x->Expires - Anope::CurTime; @@ -165,7 +165,7 @@ class InspIRCdTS6Proto : public IRCDProto /* Functions that use serval cmd functions */ - void SendVhost(User *u, const Anope::string &vIdent, const Anope::string &vhost) + void SendVhost(User *u, const Anope::string &vIdent, const Anope::string &vhost) anope_override { if (!vIdent.empty()) this->SendChgIdentInternal(u->nick, vIdent); @@ -173,7 +173,7 @@ class InspIRCdTS6Proto : public IRCDProto this->SendChgHostInternal(u->nick, vhost); } - void SendConnect() + void SendConnect() anope_override { SendServer(Me); UplinkSocket::Message(Config->Numeric) << "BURST"; @@ -182,7 +182,7 @@ class InspIRCdTS6Proto : public IRCDProto } /* SVSHOLD - set */ - void SendSVSHold(const Anope::string &nick) + void SendSVSHold(const Anope::string &nick) anope_override { BotInfo *bi = findbot(Config->NickServ); if (bi) @@ -190,7 +190,7 @@ class InspIRCdTS6Proto : public IRCDProto } /* SVSHOLD - release */ - void SendSVSHoldDel(const Anope::string &nick) + void SendSVSHoldDel(const Anope::string &nick) anope_override { BotInfo *bi = findbot(Config->NickServ); if (bi) @@ -198,13 +198,13 @@ class InspIRCdTS6Proto : public IRCDProto } /* UNSZLINE */ - void SendSZLineDel(const XLine *x) + void SendSZLineDel(const XLine *x) anope_override { UplinkSocket::Message(Config->Numeric) << "DELLINE Z " << x->GetHost(); } /* SZLINE */ - void SendSZLine(User *, const XLine *x) + void SendSZLine(User *, const XLine *x) anope_override { // Calculate the time left before this would expire, capping it at 2 days time_t timeleft = x->Expires - Anope::CurTime; @@ -213,26 +213,26 @@ class InspIRCdTS6Proto : public IRCDProto UplinkSocket::Message(Config->Numeric) << "ADDLINE Z " << x->GetHost() << " " << x->By << " " << Anope::CurTime << " " << timeleft <<" :" << x->Reason; } - void SendSVSJoin(const Anope::string &source, const Anope::string &nick, const Anope::string &chan, const Anope::string &) + void SendSVSJoin(const Anope::string &source, const Anope::string &nick, const Anope::string &chan, const Anope::string &) anope_override { User *u = finduser(nick); BotInfo *bi = findbot(source); UplinkSocket::Message(bi->GetUID()) << "SVSJOIN " << u->GetUID() << " " << chan; } - void SendSWhois(const Anope::string &, const Anope::string &who, const Anope::string &mask) + void SendSWhois(const Anope::string &, const Anope::string &who, const Anope::string &mask) anope_override { User *u = finduser(who); UplinkSocket::Message(Config->Numeric) << "METADATA " << u->GetUID() << " swhois :" << mask; } - void SendBOB() + void SendBOB() anope_override { UplinkSocket::Message(Config->Numeric) << "BURST " << Anope::CurTime; } - void SendEOB() + void SendEOB() anope_override { UplinkSocket::Message(Config->Numeric) << "ENDBURST"; } @@ -245,7 +245,7 @@ class InspIRCdTS6Proto : public IRCDProto UplinkSocket::Message(source ? source->GetUID() : Config->Numeric) << "SNONOTICE A :" << buf; } - void SendLogin(User *u) + void SendLogin(User *u) anope_override { if (!u->Account() || u->Account()->HasFlag(NI_UNCONFIRMED)) return; @@ -253,17 +253,17 @@ class InspIRCdTS6Proto : public IRCDProto UplinkSocket::Message(Config->Numeric) << "METADATA " << u->GetUID() << " accountname :" << u->Account()->display; } - void SendLogout(User *u) + void SendLogout(User *u) anope_override { UplinkSocket::Message(Config->Numeric) << "METADATA " << u->GetUID() << " accountname :"; } - void SendChannel(Channel *c) + void SendChannel(Channel *c) anope_override { UplinkSocket::Message(Config->Numeric) << "FJOIN " << c->name << " " << c->creation_time << " +" << c->GetModes(true, true) << " :"; } - bool IsNickValid(const Anope::string &nick) + bool IsNickValid(const Anope::string &nick) anope_override { /* InspIRCd, like TS6, uses UIDs on collision, so... */ if (isdigit(nick[0])) @@ -276,7 +276,7 @@ class InspIRCdTS6Proto : public IRCDProto class InspircdIRCdMessage : public IRCdMessage { public: - bool OnMode(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnMode(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params[0][0] == '#' || params[0][0] == '&') do_cmode(source, params[0], params[2], params[1]); @@ -301,15 +301,15 @@ class InspircdIRCdMessage : public IRCdMessage return true; } - virtual bool OnUID(const Anope::string &source, const std::vector<Anope::string> ¶ms) = 0; + virtual bool OnUID(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override = 0; - bool OnNick(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnNick(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { do_nick(source, params[0], "", "", "", "", 0, "", "", "", ""); return true; } - bool OnPrivmsg(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnPrivmsg(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { /* Ignore privmsgs from the server, which can happen. */ if (Server::Find(source) != NULL) @@ -326,13 +326,13 @@ class InspircdIRCdMessage : public IRCdMessage * 3: numeric * 4: desc */ - bool OnServer(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnServer(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { do_server(source, params[0], Anope::string(params[2]).is_pos_number_only() ? convertTo<unsigned>(params[2]) : 0, params[4], params[3]); return true; } - bool OnTopic(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnTopic(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { Channel *c = findchan(params[0]); @@ -347,9 +347,9 @@ class InspircdIRCdMessage : public IRCdMessage return true; } - virtual bool OnCapab(const Anope::string &, const std::vector<Anope::string> &) = 0; + virtual bool OnCapab(const Anope::string &, const std::vector<Anope::string> &) anope_override = 0; - bool OnSJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnSJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { Channel *c = findchan(params[0]); time_t ts = Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : 0; diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp index d984e597e..49a90f831 100644 --- a/modules/protocol/inspircd11.cpp +++ b/modules/protocol/inspircd11.cpp @@ -82,17 +82,17 @@ void inspircd_cmd_pass(const Anope::string &pass) class InspIRCdProto : public IRCDProto { - void SendAkillDel(const XLine *x) + void SendAkillDel(const XLine *x) anope_override { UplinkSocket::Message(Config->OperServ) << "GLINE " << x->Mask; } - void SendTopic(BotInfo *whosets, Channel *c) + void SendTopic(BotInfo *whosets, Channel *c) anope_override { UplinkSocket::Message(whosets->nick) << "FTOPIC " << c->name << " " << c->topic_time << " " << c->topic_setter <<" :" << c->topic; } - void SendVhostDel(User *u) + void SendVhostDel(User *u) anope_override { if (u->HasMode(UMODE_CLOAK)) inspircd_cmd_chghost(u->nick, u->chost); @@ -103,7 +103,7 @@ class InspIRCdProto : public IRCDProto inspircd_cmd_chgident(u->nick, u->GetIdent()); } - void SendAkill(User *, const XLine *x) + void SendAkill(User *, const XLine *x) anope_override { // Calculate the time left before this would expire, capping it at 2 days time_t timeleft = x->Expires - Anope::CurTime; @@ -112,34 +112,34 @@ class InspIRCdProto : public IRCDProto UplinkSocket::Message(Config->ServerName) << "ADDLINE G " << x->Mask << " " << x->By << " " << Anope::CurTime << " " << timeleft << " :" << x->Reason; } - void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) + void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) anope_override { UplinkSocket::Message(source ? source->nick : Config->ServerName) << "KILL " << user->nick << " :" << buf; } - void SendNumericInternal(const Anope::string &source, int numeric, const Anope::string &dest, const Anope::string &buf) + void SendNumericInternal(const Anope::string &source, int numeric, const Anope::string &dest, const Anope::string &buf) anope_override { UplinkSocket::Message(source) << "PUSH " << dest << " ::" << source << " " << numeric << " " << dest << " " << buf; } - void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf) + void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf) anope_override { UplinkSocket::Message(source ? source->nick : Config->ServerName) << "FMODE " << dest->name << " " << dest->creation_time << " " << buf; } - void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) + void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) anope_override { UplinkSocket::Message(bi ? bi->nick : Config->ServerName) << "MODE " << u->nick << " " << buf; } - void SendClientIntroduction(const User *u) + void SendClientIntroduction(const User *u) anope_override { Anope::string modes = "+" + u->GetModes(); UplinkSocket::Message(Config->ServerName) << "NICK " << u->timestamp << " " << u->nick << " " << u->host << " " << u->host << " " << u->GetIdent() << " " << modes << " 0.0.0.0 :" << u->realname; UplinkSocket::Message(u->nick) << "OPERTYPE Service"; } - void SendKickInternal(const BotInfo *source, const Channel *chan, const User *user, const Anope::string &buf) + void SendKickInternal(const BotInfo *source, const Channel *chan, const User *user, const Anope::string &buf) anope_override { if (!buf.empty()) UplinkSocket::Message(source->nick) << "KICK " << chan->name << " " << user->nick << " :" << buf; @@ -148,13 +148,13 @@ class InspIRCdProto : public IRCDProto } /* SERVER services-dev.chatspike.net password 0 :Description here */ - void SendServer(const Server *server) + void SendServer(const Server *server) anope_override { UplinkSocket::Message(Config->ServerName) << "SERVER " << server->GetName() << " " << currentpass << " " << server->GetHops() << " :" << server->GetDescription(); } /* JOIN */ - void SendJoin(User *user, Channel *c, const ChannelStatus *status) + void SendJoin(User *user, Channel *c, const ChannelStatus *status) anope_override { UplinkSocket::Message(user->nick) << "JOIN " << c->name << " " << c->creation_time; if (status) @@ -176,13 +176,13 @@ class InspIRCdProto : public IRCDProto } /* UNSQLINE */ - void SendSQLineDel(const XLine *x) + void SendSQLineDel(const XLine *x) anope_override { UplinkSocket::Message(Config->OperServ) << "QLINE " << x->Mask; } /* SQLINE */ - void SendSQLine(User *, const XLine *x) + void SendSQLine(User *, const XLine *x) anope_override { // Calculate the time left before this would expire, capping it at 2 days time_t timeleft = x->Expires - Anope::CurTime; @@ -193,7 +193,7 @@ class InspIRCdProto : public IRCDProto /* Functions that use serval cmd functions */ - void SendVhost(User *u, const Anope::string &vIdent, const Anope::string &vhost) + void SendVhost(User *u, const Anope::string &vIdent, const Anope::string &vhost) anope_override { if (!vIdent.empty()) inspircd_cmd_chgident(u->nick, vIdent); @@ -201,7 +201,7 @@ class InspIRCdProto : public IRCDProto inspircd_cmd_chghost(u->nick, vhost); } - void SendConnect() + void SendConnect() anope_override { inspircd_cmd_pass(Config->Uplinks[CurrentUplink]->password); SendServer(Me); @@ -224,25 +224,25 @@ class InspIRCdProto : public IRCDProto } /* SVSHOLD - set */ - void SendSVSHold(const Anope::string &nick) + void SendSVSHold(const Anope::string &nick) anope_override { UplinkSocket::Message(Config->OperServ) << "SVSHOLD " << nick << " " << Config->NSReleaseTimeout << "s :Being held for registered user"; } /* SVSHOLD - release */ - void SendSVSHoldDel(const Anope::string &nick) + void SendSVSHoldDel(const Anope::string &nick) anope_override { UplinkSocket::Message(Config->OperServ) << "SVSHOLD " << nick; } /* UNSZLINE */ - void SendSZLineDel(const XLine *x) + void SendSZLineDel(const XLine *x) anope_override { UplinkSocket::Message(Config->OperServ) << "ZLINE " << x->GetHost(); } /* SZLINE */ - void SendSZLine(User *, const XLine *x) + void SendSZLine(User *, const XLine *x) anope_override { // Calculate the time left before this would expire, capping it at 2 days time_t timeleft = x->Expires - Anope::CurTime; @@ -251,22 +251,22 @@ class InspIRCdProto : public IRCDProto UplinkSocket::Message(Config->ServerName) << "ADDLINE Z " << x->GetHost() << " " << x->By << " " << Anope::CurTime << " " << timeleft << " :" << x->Reason; } - void SendSVSJoin(const Anope::string &source, const Anope::string &nick, const Anope::string &chan, const Anope::string &) + void SendSVSJoin(const Anope::string &source, const Anope::string &nick, const Anope::string &chan, const Anope::string &) anope_override { UplinkSocket::Message(source) << "SVSJOIN " << nick << " " << chan; } - void SendBOB() + void SendBOB() anope_override { UplinkSocket::Message() << "BURST " << Anope::CurTime; } - void SendEOB() + void SendEOB() anope_override { UplinkSocket::Message() << "ENDBURST"; } - void SendLogin(User *u) + void SendLogin(User *u) anope_override { if (!u->Account()) return; @@ -275,7 +275,7 @@ class InspIRCdProto : public IRCDProto u->Account()->Extend("authenticationtoken", new ExtensibleString(svidbuf)); } - void SendLogout(User *u) + void SendLogout(User *u) anope_override { } }; @@ -285,7 +285,7 @@ class ChannelModeFlood : public ChannelModeParam public: ChannelModeFlood(char modeChar, bool minusNoArg) : ChannelModeParam(CMODE_FLOOD, modeChar, minusNoArg) { } - bool IsValid(const Anope::string &value) const + bool IsValid(const Anope::string &value) const anope_override { try { @@ -302,7 +302,7 @@ class ChannelModeFlood : public ChannelModeParam class InspircdIRCdMessage : public IRCdMessage { public: - bool OnMode(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnMode(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params.size() < 2) return true; @@ -315,7 +315,7 @@ class InspircdIRCdMessage : public IRCdMessage return true; } - bool OnNick(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnNick(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params.size() == 8) { @@ -343,13 +343,13 @@ class InspircdIRCdMessage : public IRCdMessage return true; } - bool OnServer(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnServer(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { do_server(source, params[0], Anope::string(params[1]).is_pos_number_only() ? convertTo<unsigned>(params[1]) : 0, params[2], ""); return true; } - bool OnTopic(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnTopic(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { Channel *c = findchan(params[0]); @@ -364,7 +364,7 @@ class InspircdIRCdMessage : public IRCdMessage return true; } - bool OnCapab(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnCapab(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params[0].equals_cs("START")) { @@ -598,7 +598,7 @@ class InspircdIRCdMessage : public IRCdMessage return true; } - bool OnSJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnSJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { Channel *c = findchan(params[0]); time_t ts = Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : 0; @@ -925,7 +925,7 @@ class ProtoInspIRCd : public Module ModuleManager::Attach(I_OnUserNickChange, this); } - void OnUserNickChange(User *u, const Anope::string &) + void OnUserNickChange(User *u, const Anope::string &) anope_override { u->RemoveModeInternal(ModeManager::FindUserModeByName(UMODE_REGISTERED)); } diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index 8fd29c7e8..e2ec39ebe 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -268,7 +268,7 @@ class InspIRCdExtBan : public ChannelModeList public: InspIRCdExtBan(ChannelModeName mName, char modeChar) : ChannelModeList(mName, modeChar) { } - bool Matches(User *u, const Entry *e) + bool Matches(User *u, const Entry *e) anope_override { const Anope::string &mask = e->mask; @@ -330,7 +330,7 @@ class Inspircd12IRCdMessage : public InspircdIRCdMessage * 8+: modes and params -- IMPORTANT, some modes (e.g. +s) may have parameters. So don't assume a fixed position of realname! * last: realname */ - bool OnUID(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnUID(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { time_t ts = convertTo<time_t>(params[1]); @@ -344,7 +344,7 @@ class Inspircd12IRCdMessage : public InspircdIRCdMessage return true; } - bool OnCapab(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnCapab(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params[0].equals_cs("START")) { @@ -733,7 +733,7 @@ class ProtoInspIRCd : public Module } - void OnUserNickChange(User *u, const Anope::string &) + void OnUserNickChange(User *u, const Anope::string &) anope_override { /* InspIRCd 1.2 doesn't set -r on nick change, remove -r here. Note that if we have to set +r later * this will cancel out this -r, resulting in no mode changes. @@ -741,7 +741,7 @@ class ProtoInspIRCd : public Module u->RemoveMode(findbot(Config->NickServ), UMODE_REGISTERED); } - void OnServerSync(Server *s) + void OnServerSync(Server *s) anope_override { if (nickserv) for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it) diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index 8af8a999b..619afdbde 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -52,7 +52,7 @@ static bool has_svsholdmod = false; class InspIRCdProto : public InspIRCdTS6Proto { - void SendConnect() + void SendConnect() anope_override { UplinkSocket::Message() << "CAPAB START 1202"; UplinkSocket::Message() << "CAPAB CAPABILITIES :PROTOCOL=1202"; @@ -280,7 +280,7 @@ class InspIRCdExtBan : public ChannelModeList public: InspIRCdExtBan(ChannelModeName mName, char modeChar) : ChannelModeList(mName, modeChar) { } - bool Matches(User *u, const Entry *e) + bool Matches(User *u, const Entry *e) anope_override { const Anope::string &mask = e->mask; @@ -364,7 +364,7 @@ class Inspircd20IRCdMessage : public InspircdIRCdMessage * 8+: modes and params -- IMPORTANT, some modes (e.g. +s) may have parameters. So don't assume a fixed position of realname! * last: realname */ - bool OnUID(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnUID(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { time_t ts = Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : 0; @@ -378,7 +378,7 @@ class Inspircd20IRCdMessage : public InspircdIRCdMessage return true; } - bool OnCapab(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnCapab(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params[0].equals_cs("START")) { @@ -745,12 +745,12 @@ class ProtoInspIRCd : public Module pmodule_ircd_message(NULL); } - void OnUserNickChange(User *u, const Anope::string &) + void OnUserNickChange(User *u, const Anope::string &) anope_override { u->RemoveModeInternal(ModeManager::FindUserModeByName(UMODE_REGISTERED)); } - void OnServerSync(Server *s) + void OnServerSync(Server *s) anope_override { if (nickserv) for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it) diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp index 16e6d3753..0755ac327 100644 --- a/modules/protocol/plexus.cpp +++ b/modules/protocol/plexus.cpp @@ -43,40 +43,40 @@ IRCDVar myIrcd[] = { class PlexusProto : public IRCDProto { - void SendGlobopsInternal(const BotInfo *source, const Anope::string &buf) + void SendGlobopsInternal(const BotInfo *source, const Anope::string &buf) anope_override { UplinkSocket::Message(source ? source->GetUID() : Me->GetSID()) << "OPERWALL :" << buf; } - void SendSQLine(User *, const XLine *x) + void SendSQLine(User *, const XLine *x) anope_override { UplinkSocket::Message(Me->GetSID()) << "RESV * " << x->Mask << " :" << x->Reason; } - void SendSGLineDel(const XLine *x) + void SendSGLineDel(const XLine *x) anope_override { BotInfo *bi = findbot(Config->OperServ); UplinkSocket::Message(bi ? bi->GetUID() : Config->OperServ) << "UNXLINE * " << x->Mask; } - void SendSGLine(User *, const XLine *x) + void SendSGLine(User *, const XLine *x) anope_override { BotInfo *bi = findbot(Config->OperServ); UplinkSocket::Message(bi ? bi->GetUID() : Config->OperServ) << "XLINE * " << x->Mask << " 0 :" << x->Reason; } - void SendAkillDel(const XLine *x) + void SendAkillDel(const XLine *x) anope_override { BotInfo *bi = findbot(Config->OperServ); UplinkSocket::Message(bi ? bi->GetUID() : Config->OperServ) << "UNKLINE * " << x->GetUser() << " " << x->GetHost(); } - void SendSQLineDel(const XLine *x) + void SendSQLineDel(const XLine *x) anope_override { UplinkSocket::Message(Me->GetSID()) << "UNRESV * " << x->Mask; } - void SendJoin(User *user, Channel *c, const ChannelStatus *status) + void SendJoin(User *user, Channel *c, const ChannelStatus *status) anope_override { UplinkSocket::Message(Me->GetSID()) << "SJOIN " << c->creation_time << " " << c->name << " +" << c->GetModes(true, true) << " :" << user->GetUID(); if (status) @@ -97,7 +97,7 @@ class PlexusProto : public IRCDProto } } - void SendAkill(User *, const XLine *x) + void SendAkill(User *, const XLine *x) anope_override { // Calculate the time left before this would expire, capping it at 2 days time_t timeleft = x->Expires - Anope::CurTime; @@ -107,12 +107,12 @@ class PlexusProto : public IRCDProto UplinkSocket::Message(bi ? bi->GetUID() : Config->OperServ) << "KLINE * " << timeleft << " " << x->GetUser() << " " << x->GetHost() << " :" << x->Reason; } - void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) + void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) anope_override { UplinkSocket::Message(source ? source->GetUID() : Me->GetSID()) << "KILL " << user->GetUID() << " :" << buf; } - void SendServer(const Server *server) + void SendServer(const Server *server) anope_override { if (server == Me) UplinkSocket::Message() << "SERVER " << server->GetName() << " " << server->GetHops() << " :" << server->GetDescription(); @@ -120,12 +120,12 @@ class PlexusProto : public IRCDProto UplinkSocket::Message(Me->GetSID()) << "SID " << server->GetName() << " " << server->GetHops() << " " << server->GetSID() << " :" << server->GetDescription(); } - void SendForceNickChange(const User *u, const Anope::string &newnick, time_t when) + void SendForceNickChange(const User *u, const Anope::string &newnick, time_t when) anope_override { UplinkSocket::Message(Me->GetSID()) << "ENCAP " << u->server->GetName() << " SVSNICK " << u->GetUID() << " " << u->timestamp << " " << newnick << " " << when; } - void SendVhostDel(User *u) + void SendVhostDel(User *u) anope_override { BotInfo *bi = findbot(Config->HostServ); if (u->HasMode(UMODE_CLOAK)) @@ -134,14 +134,14 @@ class PlexusProto : public IRCDProto this->SendVhost(u, u->GetIdent(), u->chost); } - void SendVhost(User *u, const Anope::string &ident, const Anope::string &host) + void SendVhost(User *u, const Anope::string &ident, const Anope::string &host) anope_override { if (!ident.empty()) UplinkSocket::Message(Me->GetSID()) << "ENCAP * CHGIDENT " << u->GetUID() << " " << ident; UplinkSocket::Message(Me->GetSID()) << "ENCAP * CHGHOST " << u->GetUID() << " " << host; } - void SendConnect() + void SendConnect() anope_override { UplinkSocket::Message() << "PASS " << Config->Uplinks[CurrentUplink]->password << " TS 6 :" << Me->GetSID(); /* CAPAB @@ -178,13 +178,13 @@ class PlexusProto : public IRCDProto UplinkSocket::Message() << "SVINFO 6 5 0 :" << Anope::CurTime; } - void SendClientIntroduction(const User *u) + void SendClientIntroduction(const User *u) anope_override { Anope::string modes = "+" + u->GetModes(); UplinkSocket::Message(Me->GetSID()) << "UID " << u->nick << " 1 " << u->timestamp << " " << modes << " " << u->GetIdent() << " " << u->host << " 255.255.255.255 " << u->GetUID() << " 0 " << u->host << " :" << u->realname; } - void SendPartInternal(const BotInfo *bi, const Channel *chan, const Anope::string &buf) + void SendPartInternal(const BotInfo *bi, const Channel *chan, const Anope::string &buf) anope_override { if (!buf.empty()) UplinkSocket::Message(bi->GetUID()) << "PART " << chan->name << " :" << buf; @@ -192,17 +192,17 @@ class PlexusProto : public IRCDProto UplinkSocket::Message(bi->GetUID()) << "PART " << chan->name; } - void SendModeInternal(const BotInfo *bi, const Channel *dest, const Anope::string &buf) + void SendModeInternal(const BotInfo *bi, const Channel *dest, const Anope::string &buf) anope_override { UplinkSocket::Message(bi ? bi->GetUID() : Me->GetSID()) << "MODE " << dest->name << " " << buf; } - void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) + void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) anope_override { UplinkSocket::Message(bi ? bi->GetUID() : Me->GetSID()) << "ENCAP * SVSMODE " << u->GetUID() << " " << u->timestamp << " " << buf; } - void SendKickInternal(const BotInfo *bi, const Channel *chan, const User *user, const Anope::string &buf) + void SendKickInternal(const BotInfo *bi, const Channel *chan, const User *user, const Anope::string &buf) anope_override { if (!buf.empty()) UplinkSocket::Message(bi->GetUID()) << "KICK " << chan->name << " " << user->GetUID() << " :" << buf; @@ -211,13 +211,13 @@ class PlexusProto : public IRCDProto } /* INVITE */ - void SendInvite(BotInfo *source, const Anope::string &chan, const Anope::string &nick) + void SendInvite(const BotInfo *source, const Anope::string &chan, const Anope::string &nick) anope_override { User *u = finduser(nick); UplinkSocket::Message(source->GetUID()) << "INVITE " << (u ? u->GetUID() : nick) << " " << chan; } - void SendLogin(User *u) + void SendLogin(User *u) anope_override { if (!u->Account()) return; @@ -225,17 +225,17 @@ class PlexusProto : public IRCDProto UplinkSocket::Message(Me->GetSID()) << "ENCAP * SU " << u->GetUID() << " " << u->Account()->display; } - void SendLogout(User *u) + void SendLogout(User *u) anope_override { UplinkSocket::Message(Me->GetSID()) << "ENCAP * SU " << u->GetUID(); } - void SendTopic(BotInfo *bi, Channel *c) + void SendTopic(BotInfo *bi, Channel *c) anope_override { UplinkSocket::Message(bi->GetUID()) << "ENCAP * TOPIC " << c->name << " " << c->topic_setter << " " << c->topic_time + 1 << " :" << c->topic; } - void SendChannel(Channel *c) + void SendChannel(Channel *c) anope_override { Anope::string modes = c->GetModes(true, true); if (modes.empty()) @@ -251,7 +251,7 @@ class PlexusIRCdMessage : public IRCdMessage * params[0] = ts * params[1] = channel */ - bool OnJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params.size() < 2) return IRCdMessage::OnJoin(source, params); @@ -259,7 +259,7 @@ class PlexusIRCdMessage : public IRCdMessage return true; } - bool OnMode(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnMode(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params.size() < 2) return true; @@ -286,7 +286,7 @@ class PlexusIRCdMessage : public IRCdMessage params[9] = realhost params[10] = info */ - bool OnUID(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnUID(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { /* An IP of 0 means the user is spoofed */ Anope::string ip = params[6]; @@ -299,13 +299,13 @@ class PlexusIRCdMessage : public IRCdMessage return true; } - bool OnNick(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnNick(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { do_nick(source, params[0], "", "", "", "", Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : 0, "", "", "", ""); return true; } - bool OnServer(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnServer(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params[1].equals_cs("1")) do_server(source, params[0], Anope::string(params[1]).is_pos_number_only() ? convertTo<unsigned>(params[1]) : 0, params[2], TS6UPLINK); @@ -328,7 +328,7 @@ class PlexusIRCdMessage : public IRCdMessage params[9] = realhost params[10] = info */ - bool OnTopic(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnTopic(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { Channel *c = findchan(params[0]); if (!c) @@ -345,7 +345,7 @@ class PlexusIRCdMessage : public IRCdMessage return true; } - bool OnSJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnSJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { Channel *c = findchan(params[1]); time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo<time_t>(params[0]) : 0; @@ -683,7 +683,7 @@ class ProtoPlexus : public Module pmodule_ircd_message(NULL); } - void OnServerSync(Server *s) + void OnServerSync(Server *s) anope_override { if (nickserv) for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it) diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp index 16ac806be..c694b1ddc 100644 --- a/modules/protocol/ratbox.cpp +++ b/modules/protocol/ratbox.cpp @@ -43,40 +43,40 @@ IRCDVar myIrcd[] = { class RatboxProto : public IRCDProto { - void SendGlobopsInternal(const BotInfo *source, const Anope::string &buf) + void SendGlobopsInternal(const BotInfo *source, const Anope::string &buf) anope_override { UplinkSocket::Message(source ? source->GetUID() : Me->GetSID()) << "OPERWALL :" << buf; } - void SendSQLine(User *, const XLine *x) + void SendSQLine(User *, const XLine *x) anope_override { UplinkSocket::Message(Me->GetSID()) << "RESV * " << x->Mask << " :" << x->Reason; } - void SendSGLineDel(const XLine *x) + void SendSGLineDel(const XLine *x) anope_override { BotInfo *bi = findbot(Config->OperServ); UplinkSocket::Message(bi ? bi->GetUID() : Config->OperServ) << "UNXLINE * " << x->Mask; } - void SendSGLine(User *, const XLine *x) + void SendSGLine(User *, const XLine *x) anope_override { BotInfo *bi = findbot(Config->OperServ); UplinkSocket::Message(bi ? bi->GetUID() : Config->OperServ) << "XLINE * " << x->Mask << " 0 :" << x->Reason; } - void SendAkillDel(const XLine *x) + void SendAkillDel(const XLine *x) anope_override { BotInfo *bi = findbot(Config->OperServ); UplinkSocket::Message(bi ? bi->GetUID() : Config->OperServ) << "UNKLINE * " << x->GetUser() << " " << x->GetHost(); } - void SendSQLineDel(const XLine *x) + void SendSQLineDel(const XLine *x) anope_override { UplinkSocket::Message(Me->GetSID()) << "UNRESV * " << x->Mask; } - void SendJoin(User *user, Channel *c, const ChannelStatus *status) + void SendJoin(User *user, Channel *c, const ChannelStatus *status) anope_override { /* Note that we must send our modes with the SJOIN and * can not add them to the mode stacker because ratbox @@ -92,7 +92,7 @@ class RatboxProto : public IRCDProto } } - void SendAkill(User *, const XLine *x) + void SendAkill(User *, const XLine *x) anope_override { // Calculate the time left before this would expire, capping it at 2 days time_t timeleft = x->Expires - Anope::CurTime; @@ -102,18 +102,18 @@ class RatboxProto : public IRCDProto UplinkSocket::Message(bi ? bi->GetUID() : Config->OperServ) << "KLINE * " << timeleft << " " << x->GetUser() << " " << x->GetHost() << " :" << x->Reason; } - void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) + void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) anope_override { UplinkSocket::Message(source ? source->GetUID() : Me->GetSID()) << "KILL " << user->GetUID() << " :" << buf; } /* SERVER name hop descript */ - void SendServer(const Server *server) + void SendServer(const Server *server) anope_override { UplinkSocket::Message() << "SERVER " << server->GetName() << " " << server->GetHops() << " :" << server->GetDescription(); } - void SendConnect() + void SendConnect() anope_override { UplinkSocket::Message() << "PASS " << Config->Uplinks[CurrentUplink]->password << " TS 6 :" << Me->GetSID(); /* @@ -148,13 +148,13 @@ class RatboxProto : public IRCDProto UplinkSocket::Message() << "SVINFO 6 3 0 :" << Anope::CurTime; } - void SendClientIntroduction(const User *u) + void SendClientIntroduction(const User *u) anope_override { Anope::string modes = "+" + u->GetModes(); UplinkSocket::Message(Me->GetSID()) << "UID " << u->nick << " 1 " << u->timestamp << " " << modes << " " << u->GetIdent() << " " << u->host << " 0 " << u->GetUID() << " :" << u->realname; } - void SendPartInternal(const BotInfo *bi, const Channel *chan, const Anope::string &buf) + void SendPartInternal(const BotInfo *bi, const Channel *chan, const Anope::string &buf) anope_override { if (!buf.empty()) UplinkSocket::Message(bi->GetUID()) << "PART " << chan->name << " :" << buf; @@ -162,17 +162,17 @@ class RatboxProto : public IRCDProto UplinkSocket::Message(bi->GetUID()) << "PART " << chan->name; } - void SendModeInternal(const BotInfo *bi, const Channel *dest, const Anope::string &buf) + void SendModeInternal(const BotInfo *bi, const Channel *dest, const Anope::string &buf) anope_override { UplinkSocket::Message(bi ? bi->GetUID() : Me->GetSID()) << "MODE " << dest->name << " " << buf; } - void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) + void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) anope_override { UplinkSocket::Message(bi ? bi->GetUID() : Me->GetSID()) << "SVSMODE " << u->nick << " " << buf; } - void SendKickInternal(const BotInfo *bi, const Channel *chan, const User *user, const Anope::string &buf) + void SendKickInternal(const BotInfo *bi, const Channel *chan, const User *user, const Anope::string &buf) anope_override { if (!buf.empty()) UplinkSocket::Message(bi->GetUID()) << "KICK " << chan->name << " " << user->GetUID() << " :" << buf; @@ -181,13 +181,13 @@ class RatboxProto : public IRCDProto } /* INVITE */ - void SendInvite(BotInfo *source, const Anope::string &chan, const Anope::string &nick) + void SendInvite(const BotInfo *source, const Anope::string &chan, const Anope::string &nick) anope_override { User *u = finduser(nick); UplinkSocket::Message(source->GetUID()) << "INVITE " << (u ? u->GetUID() : nick) << " " << chan; } - void SendLogin(User *u) + void SendLogin(User *u) anope_override { if (!u->Account()) return; @@ -195,12 +195,12 @@ class RatboxProto : public IRCDProto UplinkSocket::Message(Me->GetSID()) << "ENCAP * SU " << u->GetUID() << " " << u->Account()->display; } - void SendLogout(User *u) + void SendLogout(User *u) anope_override { UplinkSocket::Message(Me->GetSID()) << "ENCAP * SU " << u->GetUID(); } - void SendChannel(Channel *c) + void SendChannel(Channel *c) anope_override { Anope::string modes = c->GetModes(true, true); if (modes.empty()) @@ -208,7 +208,7 @@ class RatboxProto : public IRCDProto UplinkSocket::Message() << "SJOIN " << c->creation_time << " " << c->name << " " << modes << " :"; } - bool IsNickValid(const Anope::string &nick) + bool IsNickValid(const Anope::string &nick) anope_override { /* TS6 Save extension -Certus */ if (isdigit(nick[0])) @@ -217,7 +217,7 @@ class RatboxProto : public IRCDProto return true; } - void SendTopic(BotInfo *bi, Channel *c) + void SendTopic(BotInfo *bi, Channel *c) anope_override { bool needjoin = c->FindUser(bi) == NULL; if (needjoin) @@ -239,7 +239,7 @@ class RatboxIRCdMessage : public IRCdMessage * params[0] = ts * params[1] = channel */ - bool OnJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params.size() < 2) return IRCdMessage::OnJoin(source, params); @@ -247,7 +247,7 @@ class RatboxIRCdMessage : public IRCdMessage return true; } - bool OnMode(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnMode(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params.size() < 2) return true; @@ -260,7 +260,7 @@ class RatboxIRCdMessage : public IRCdMessage return true; } - bool OnUID(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnUID(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { /* Source is always the server */ User *user = do_nick("", params[0], params[4], params[5], source, params[8], Anope::string(params[2]).is_pos_number_only() ? convertTo<time_t>(params[2]) : 0, params[6], "*", params[7], params[3]); @@ -281,14 +281,14 @@ class RatboxIRCdMessage : public IRCdMessage params[7] = UID params[8] = info */ - bool OnNick(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnNick(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { do_nick(source, params[0], "", "", "", "", Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : 0, "", "", "", ""); return true; } - bool OnServer(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnServer(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params[1].equals_cs("1")) do_server(source, params[0], Anope::string(params[1]).is_pos_number_only() ? convertTo<unsigned>(params[1]) : 0, params[2], TS6UPLINK); @@ -298,7 +298,7 @@ class RatboxIRCdMessage : public IRCdMessage return true; } - bool OnTopic(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnTopic(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { Channel *c = findchan(params[0]); if (!c) @@ -318,7 +318,7 @@ class RatboxIRCdMessage : public IRCdMessage return true; } - bool OnSJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnSJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { Channel *c = findchan(params[1]); time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo<time_t>(params[0]) : 0; @@ -598,7 +598,7 @@ class ProtoRatbox : public Module } - void OnServerSync(Server *s) + void OnServerSync(Server *s) anope_override { if (nickserv) for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it) diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp index 4f45893c8..78d4a04be 100644 --- a/modules/protocol/unreal.cpp +++ b/modules/protocol/unreal.cpp @@ -44,22 +44,22 @@ IRCDVar myIrcd[] = { class UnrealIRCdProto : public IRCDProto { /* SVSNOOP */ - void SendSVSNOOP(const Server *server, bool set) + void SendSVSNOOP(const Server *server, bool set) anope_override { UplinkSocket::Message() << "f " << server->GetName() << " " << (set ? "+" : "-"); } - void SendAkillDel(const XLine *x) + void SendAkillDel(const XLine *x) anope_override { UplinkSocket::Message() << "BD - G " << x->GetUser() << " " << x->GetHost() << " " << Config->OperServ; } - void SendTopic(BotInfo *whosets, Channel *c) + void SendTopic(BotInfo *whosets, Channel *c) anope_override { UplinkSocket::Message(whosets->nick) << ") " << c->name << " " << c->topic_setter << " " << c->topic_time + 1 << " :" << c->topic; } - void SendVhostDel(User *u) + void SendVhostDel(User *u) anope_override { BotInfo *bi = findbot(Config->HostServ); u->RemoveMode(bi, UMODE_CLOAK); @@ -68,7 +68,7 @@ class UnrealIRCdProto : public IRCDProto u->SetMode(bi, UMODE_CLOAK); } - void SendAkill(User *, const XLine *x) + void SendAkill(User *, const XLine *x) anope_override { // Calculate the time left before this would expire, capping it at 2 days time_t timeleft = x->Expires - Anope::CurTime; @@ -77,28 +77,28 @@ class UnrealIRCdProto : public IRCDProto UplinkSocket::Message() << "BD + G " << x->GetUser() << " " << x->GetHost() << " " << x->By << " " << Anope::CurTime + timeleft << " " << x->Created << " :" << x->Reason; } - void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) + void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) anope_override { UplinkSocket::Message(source ? source->nick : Config->ServerName) << "h " << user->nick << " :" << buf; } - void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf) + void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf) anope_override { UplinkSocket::Message(source ? source->nick : Config->ServerName) << "G " << dest->name << " " << buf; } - void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) + void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) anope_override { UplinkSocket::Message(bi ? bi->nick : Config->ServerName) << "v " << u->nick <<" " << buf; } - void SendClientIntroduction(const User *u) + void SendClientIntroduction(const User *u) anope_override { Anope::string modes = "+" + u->GetModes(); UplinkSocket::Message() << "& " << u->nick << " 1 " << u->timestamp << " " << u->GetIdent() << " " << u->host << " " << u->server->GetName() << " 0 " << modes << " " << u->host << " * :" << u->realname; } - void SendKickInternal(const BotInfo *source, const Channel *chan, const User *user, const Anope::string &buf) + void SendKickInternal(const BotInfo *source, const Channel *chan, const User *user, const Anope::string &buf) anope_override { if (!buf.empty()) UplinkSocket::Message(source->nick) << "H " << chan->name << " " << user->nick << " :" << buf; @@ -108,7 +108,7 @@ class UnrealIRCdProto : public IRCDProto /* SERVER name hop descript */ /* Unreal 3.2 actually sends some info about itself in the descript area */ - void SendServer(const Server *server) + void SendServer(const Server *server) anope_override { if (!Config->Numeric.empty()) UplinkSocket::Message() << "SERVER " << server->GetName() << " " << server->GetHops() << " :U0-*-" << Config->Numeric << " " << server->GetDescription(); @@ -117,7 +117,7 @@ class UnrealIRCdProto : public IRCDProto } /* JOIN */ - void SendJoin(User *user, Channel *c, const ChannelStatus *status) + void SendJoin(User *user, Channel *c, const ChannelStatus *status) anope_override { UplinkSocket::Message(Config->ServerName) << "~ " << c->creation_time << " " << c->name << " :" << user->nick; if (status) @@ -140,7 +140,7 @@ class UnrealIRCdProto : public IRCDProto /* unsqline */ - void SendSQLineDel(const XLine *x) + void SendSQLineDel(const XLine *x) anope_override { UplinkSocket::Message() << "d " << x->Mask; } @@ -150,7 +150,7 @@ class UnrealIRCdProto : public IRCDProto ** - Unreal will translate this to TKL for us ** */ - void SendSQLine(User *, const XLine *x) + void SendSQLine(User *, const XLine *x) anope_override { UplinkSocket::Message() << "c " << x->Mask << " :" << x->Reason; } @@ -161,20 +161,20 @@ class UnrealIRCdProto : public IRCDProto ** parv[1] = nick ** parv[2] = options */ - void SendSVSO(const Anope::string &source, const Anope::string &nick, const Anope::string &flag) + void SendSVSO(const Anope::string &source, const Anope::string &nick, const Anope::string &flag) anope_override { UplinkSocket::Message(source) << "BB " << nick << " " << flag; } /* NICK <newnick> */ - void SendChangeBotNick(const BotInfo *oldnick, const Anope::string &newnick) + void SendChangeBotNick(const BotInfo *oldnick, const Anope::string &newnick) anope_override { UplinkSocket::Message(oldnick->nick) << "& " << newnick << " " << Anope::CurTime; } /* Functions that use serval cmd functions */ - void SendVhost(User *u, const Anope::string &vIdent, const Anope::string &vhost) + void SendVhost(User *u, const Anope::string &vIdent, const Anope::string &vhost) anope_override { if (!vIdent.empty()) UplinkSocket::Message(Config->ServerName) << "AZ " << u->nick << " " << vIdent; @@ -182,7 +182,7 @@ class UnrealIRCdProto : public IRCDProto UplinkSocket::Message(Config->ServerName) << "AL " << u->nick << " " << vhost; } - void SendConnect() + void SendConnect() anope_override { /* NICKv2 = Nick Version 2 @@ -207,13 +207,13 @@ class UnrealIRCdProto : public IRCDProto } /* SVSHOLD - set */ - void SendSVSHold(const Anope::string &nick) + void SendSVSHold(const Anope::string &nick) anope_override { UplinkSocket::Message() << "BD + Q H " << nick << " " << Config->ServerName << " " << Anope::CurTime + Config->NSReleaseTimeout << " " << Anope::CurTime << " :Being held for registered user"; } /* SVSHOLD - release */ - void SendSVSHoldDel(const Anope::string &nick) + void SendSVSHoldDel(const Anope::string &nick) anope_override { UplinkSocket::Message() << "BD - Q * " << nick << " " << Config->ServerName; } @@ -222,19 +222,19 @@ class UnrealIRCdProto : public IRCDProto /* * SVSNLINE - :realname mask */ - void SendSGLineDel(const XLine *x) + void SendSGLineDel(const XLine *x) anope_override { UplinkSocket::Message() << "BR - :" << x->Mask; } /* UNSZLINE */ - void SendSZLineDel(const XLine *x) + void SendSZLineDel(const XLine *x) anope_override { UplinkSocket::Message() << "BD - Z * " << x->GetHost() << " " << Config->OperServ; } /* SZLINE */ - void SendSZLine(User *, const XLine *x) + void SendSZLine(User *, const XLine *x) anope_override { // Calculate the time left before this would expire, capping it at 2 days time_t timeleft = x->Expires - Anope::CurTime; @@ -247,7 +247,7 @@ class UnrealIRCdProto : public IRCDProto /* * SVSNLINE + reason_where_is_space :realname mask with spaces */ - void SendSGLine(User *, const XLine *x) + void SendSGLine(User *, const XLine *x) anope_override { Anope::string edited_reason = x->Reason; edited_reason = edited_reason.replace_all_cs(" ", "_"); @@ -263,7 +263,7 @@ class UnrealIRCdProto : public IRCDProto /* In older Unreal SVSJOIN and SVSNLINE tokens were mixed so SVSJOIN and SVSNLINE are broken when coming from a none TOKEN'd server */ - void SendSVSJoin(const Anope::string &source, const Anope::string &nick, const Anope::string &chan, const Anope::string ¶m) + void SendSVSJoin(const Anope::string &source, const Anope::string &nick, const Anope::string &chan, const Anope::string ¶m) anope_override { if (!param.empty()) UplinkSocket::Message(source) << "BX " << nick << " " << chan << " :" << param; @@ -271,17 +271,17 @@ class UnrealIRCdProto : public IRCDProto UplinkSocket::Message(source) << "BX " << nick << " :" << chan; } - void SendSWhois(const Anope::string &source, const Anope::string &who, const Anope::string &mask) + void SendSWhois(const Anope::string &source, const Anope::string &who, const Anope::string &mask) anope_override { UplinkSocket::Message(source) << "BA " << who << " :" << mask; } - void SendEOB() + void SendEOB() anope_override { UplinkSocket::Message(Config->ServerName) << "ES"; } - bool IsNickValid(const Anope::string &nick) + bool IsNickValid(const Anope::string &nick) anope_override { if (nick.equals_ci("ircd") || nick.equals_ci("irc")) return false; @@ -289,7 +289,7 @@ class UnrealIRCdProto : public IRCDProto return true; } - bool IsChannelValid(const Anope::string &chan) + bool IsChannelValid(const Anope::string &chan) anope_override { if (chan.find(':') != Anope::string::npos || chan[0] != '#') return false; @@ -297,7 +297,7 @@ class UnrealIRCdProto : public IRCDProto return true; } - void SendLogin(User *u) + void SendLogin(User *u) anope_override { if (!u->Account()) return; @@ -309,13 +309,13 @@ class UnrealIRCdProto : public IRCDProto ircdproto->SendMode(ns, u, "+d %d", u->timestamp); } - void SendLogout(User *u) + void SendLogout(User *u) anope_override { BotInfo *ns = findbot(Config->NickServ); ircdproto->SendMode(ns, u, "+d 1"); } - void SendChannel(Channel *c) + void SendChannel(Channel *c) anope_override { /* Unreal does not support updating a channels TS without actually joining a user, * so we will join and part us now @@ -341,7 +341,7 @@ class UnrealExtBan : public ChannelModeList public: UnrealExtBan(ChannelModeName mName, char modeChar) : ChannelModeList(mName, modeChar) { } - bool Matches(User *u, const Entry *e) + bool Matches(User *u, const Entry *e) anope_override { const Anope::string &mask = e->mask; @@ -406,7 +406,7 @@ class ChannelModeFlood : public ChannelModeParam ChannelModeFlood(char modeChar, bool minusNoArg) : ChannelModeParam(CMODE_FLOOD, modeChar, minusNoArg) { } /* Borrowed part of this check from UnrealIRCd */ - bool IsValid(const Anope::string &value) const + bool IsValid(const Anope::string &value) const anope_override { if (value.empty()) return false; @@ -451,7 +451,7 @@ class ChannelModeUnrealSSL : public ChannelMode { } - bool CanSet(User *u) const + bool CanSet(User *u) const anope_override { return false; } @@ -460,7 +460,7 @@ class ChannelModeUnrealSSL : public ChannelMode class Unreal32IRCdMessage : public IRCdMessage { public: - bool OnMode(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnMode(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params.size() < 2) return true; @@ -504,7 +504,7 @@ class Unreal32IRCdMessage : public IRCdMessage ** parv[0] = new nickname ** parv[1] = hopcount */ - bool OnNick(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnNick(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params.size() == 7) { @@ -595,7 +595,7 @@ class Unreal32IRCdMessage : public IRCdMessage return true; } - bool OnServer(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnServer(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { if (params[1].equals_cs("1")) { @@ -619,7 +619,7 @@ class Unreal32IRCdMessage : public IRCdMessage ** parv[2] = topic time ** parv[3] = topic text */ - bool OnTopic(const Anope::string &, const std::vector<Anope::string> ¶ms) + bool OnTopic(const Anope::string &, const std::vector<Anope::string> ¶ms) anope_override { if (params.size() != 4) return true; @@ -636,7 +636,7 @@ class Unreal32IRCdMessage : public IRCdMessage return true; } - bool OnCapab(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnCapab(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { for (unsigned i = 0; i < params.size(); ++i) { @@ -788,7 +788,7 @@ class Unreal32IRCdMessage : public IRCdMessage return true; } - bool OnSJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) + bool OnSJoin(const Anope::string &source, const std::vector<Anope::string> ¶ms) anope_override { Channel *c = findchan(params[1]); time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo<time_t>(params[0]) : 0; @@ -1174,7 +1174,7 @@ class ProtoUnreal : public Module } - void OnUserNickChange(User *u, const Anope::string &) + void OnUserNickChange(User *u, const Anope::string &) anope_override { u->RemoveModeInternal(ModeManager::FindUserModeByName(UMODE_REGISTERED)); } diff --git a/modules/pseudoclients/botserv.cpp b/modules/pseudoclients/botserv.cpp index 7a9234f6f..59edf97cc 100644 --- a/modules/pseudoclients/botserv.cpp +++ b/modules/pseudoclients/botserv.cpp @@ -31,7 +31,7 @@ class BotServCore : public Module } - void OnPrivmsg(User *u, Channel *c, Anope::string &msg) + void OnPrivmsg(User *u, Channel *c, Anope::string &msg) anope_override { if (!u || !c || !c->ci || !c->ci->bi || msg.empty()) return; @@ -100,7 +100,7 @@ class BotServCore : public Module } } - EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) + EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> ¶ms) anope_override { if (this->fantasy_channel != NULL) { @@ -120,7 +120,7 @@ class BotServCore : public Module return EVENT_CONTINUE; } - void OnJoinChannel(User *user, Channel *c) + void OnJoinChannel(User *user, Channel *c) anope_override { if (c->ci && c->ci->bi) { @@ -144,7 +144,7 @@ class BotServCore : public Module } } - void OnLeaveChannel(User *u, Channel *c) + void OnLeaveChannel(User *u, Channel *c) anope_override { /* Channel is persistent, it shouldn't be deleted and the service bot should stay */ if (c->HasFlag(CH_PERSIST) || (c->ci && c->ci->HasFlag(CI_PERSIST))) @@ -170,7 +170,7 @@ class BotServCore : public Module } } - EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) + EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!params.empty() || source.owner->nick != Config->BotServ) return EVENT_CONTINUE; @@ -186,7 +186,7 @@ class BotServCore : public Module return EVENT_CONTINUE; } - void OnPostHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) + void OnPostHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!params.empty() || source.owner->nick != Config->BotServ) return; @@ -199,7 +199,7 @@ class BotServCore : public Module "name with one of the following characters: %s."), Config->ChanServ.c_str(), Config->BSFantasyCharacter.c_str()); } - EventReturn OnChannelModeSet(Channel *c, ChannelModeName Name, const Anope::string ¶m) + EventReturn OnChannelModeSet(Channel *c, ChannelModeName Name, const Anope::string ¶m) anope_override { if (Config->BSSmartJoin && Name == CMODE_BAN && c->ci && c->ci->bi && c->FindUser(c->ci->bi)) { diff --git a/modules/pseudoclients/chanserv.cpp b/modules/pseudoclients/chanserv.cpp index 33ea10a64..b5deaf284 100644 --- a/modules/pseudoclients/chanserv.cpp +++ b/modules/pseudoclients/chanserv.cpp @@ -18,7 +18,7 @@ class ExpireCallback : public CallBack public: ExpireCallback(Module *owner) : CallBack(owner, Config->ExpireTimeout, Anope::CurTime, true) { } - void Tick(time_t) + void Tick(time_t) anope_override { if (!Config->CSExpire || noexpire || readonly) return; @@ -69,7 +69,7 @@ class ChanServCore : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) + EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) anope_override { if (Config->CSOpersOnly && !u->HasMode(UMODE_OPER) && bi->nick == Config->ChanServ) { @@ -80,7 +80,7 @@ class ChanServCore : public Module return EVENT_CONTINUE; } - void OnDelCore(NickCore *nc) + void OnDelCore(NickCore *nc) anope_override { // XXX this is slightly inefficient for (registered_channel_map::const_iterator it = RegisteredChannelList.begin(), it_end = RegisteredChannelList.end(); it != it_end;) @@ -149,7 +149,7 @@ class ChanServCore : public Module } } - EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) + EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!params.empty() || source.owner->nick != Config->ChanServ) return EVENT_CONTINUE; @@ -164,7 +164,7 @@ class ChanServCore : public Module return EVENT_CONTINUE; } - void OnPostHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) + void OnPostHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!params.empty() || source.owner->nick != Config->ChanServ) return; diff --git a/modules/pseudoclients/global.cpp b/modules/pseudoclients/global.cpp index 33fa5cb21..1d3a2b7b1 100644 --- a/modules/pseudoclients/global.cpp +++ b/modules/pseudoclients/global.cpp @@ -27,7 +27,7 @@ class MyGlobalService : public GlobalService public: MyGlobalService(Module *m) : GlobalService(m) { } - void SendGlobal(BotInfo *sender, const Anope::string &source, const Anope::string &message) + void SendGlobal(BotInfo *sender, const Anope::string &source, const Anope::string &message) anope_override { if (Me->GetLinks().empty()) return; @@ -61,25 +61,25 @@ class GlobalCore : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnRestart() + void OnRestart() anope_override { if (Config->GlobalOnCycle) global->SendGlobal(findbot(Config->Global), "", Config->GlobalOnCycleMessage); } - void OnShutdown() + void OnShutdown() anope_override { if (Config->GlobalOnCycle) global->SendGlobal(findbot(Config->Global), "", Config->GlobalOnCycleMessage); } - void OnNewServer(Server *s) + void OnNewServer(Server *s) anope_override { if (Config->GlobalOnCycle && !Config->GlobalOnCycleUP.empty()) s->Notice(findbot(Config->Global), Config->GlobalOnCycleUP); } - EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) + EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!params.empty() || source.owner->nick != Config->Global) return EVENT_CONTINUE; diff --git a/modules/pseudoclients/hostserv.cpp b/modules/pseudoclients/hostserv.cpp index ecf0ecb47..b8933ab11 100644 --- a/modules/pseudoclients/hostserv.cpp +++ b/modules/pseudoclients/hostserv.cpp @@ -31,7 +31,7 @@ class HostServCore : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnNickIdentify(User *u) + void OnNickIdentify(User *u) anope_override { NickAlias *na = findnick(u->nick); if (!na || !na->HasVhost()) @@ -61,12 +61,12 @@ class HostServCore : public Module } } - void OnNickUpdate(User *u) + void OnNickUpdate(User *u) anope_override { this->OnNickIdentify(u); } - EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) + EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!params.empty() || source.owner->nick != Config->HostServ) return EVENT_CONTINUE; diff --git a/modules/pseudoclients/memoserv.cpp b/modules/pseudoclients/memoserv.cpp index 00d48b9d3..32eaa9f3f 100644 --- a/modules/pseudoclients/memoserv.cpp +++ b/modules/pseudoclients/memoserv.cpp @@ -39,7 +39,7 @@ class MyMemoServService : public MemoServService public: MyMemoServService(Module *m) : MemoServService(m) { } - MemoInfo *GetMemoInfo(const Anope::string &target, bool &ischan) + MemoInfo *GetMemoInfo(const Anope::string &target, bool &ischan) anope_override { if (!target.empty() && target[0] == '#') { @@ -59,7 +59,7 @@ class MyMemoServService : public MemoServService return NULL; } - MemoResult Send(const Anope::string &source, const Anope::string &target, const Anope::string &message, bool force) + MemoResult Send(const Anope::string &source, const Anope::string &target, const Anope::string &message, bool force) anope_override { bool ischan; MemoInfo *mi = this->GetMemoInfo(target, ischan); @@ -175,12 +175,12 @@ class MemoServCore : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnNickIdentify(User *u) + void OnNickIdentify(User *u) anope_override { this->mymemoserv.Check(u); } - void OnJoinChannel(User *u, Channel *c) + void OnJoinChannel(User *u, Channel *c) anope_override { if (c->ci && c->ci->AccessFor(u).HasPriv("MEMO") && c->ci->memos.memos.size() > 0) { @@ -191,18 +191,18 @@ class MemoServCore : public Module } } - void OnUserAway(User *u, const Anope::string &message) + void OnUserAway(User *u, const Anope::string &message) anope_override { if (message.empty()) this->mymemoserv.Check(u); } - void OnNickUpdate(User *u) + void OnNickUpdate(User *u) anope_override { this->mymemoserv.Check(u); } - EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) + EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!params.empty() || source.owner->nick != Config->MemoServ) return EVENT_CONTINUE; @@ -215,7 +215,7 @@ class MemoServCore : public Module return EVENT_CONTINUE; } - void OnPostHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) + void OnPostHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!params.empty() || source.owner->nick != Config->MemoServ) return; diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 163fcc6af..8dff653a1 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -57,7 +57,7 @@ class CoreExport NickServCollide : public Timer /** Called when the delay is up * @param t The current time */ - void Tick(time_t t) + void Tick(time_t t) anope_override { if (!u) return; @@ -75,7 +75,7 @@ class MyNickServService : public NickServService public: MyNickServService(Module *m) : NickServService(m) { } - void Validate(User *u) + void Validate(User *u) anope_override { NickAlias *na = findnick(u->nick); if (!na) @@ -143,7 +143,7 @@ class ExpireCallback : public CallBack public: ExpireCallback(Module *owner) : CallBack(owner, Config->ExpireTimeout, Anope::CurTime, true) { } - void Tick(time_t) + void Tick(time_t) anope_override { if (noexpire || readonly) return; @@ -201,7 +201,7 @@ class NickServCore : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnDelNick(NickAlias *na) + void OnDelNick(NickAlias *na) anope_override { User *u = finduser(na->nick); if (u && u->Account() == na->nc) @@ -212,7 +212,7 @@ class NickServCore : public Module } } - void OnDelCore(NickCore *nc) + void OnDelCore(NickCore *nc) anope_override { Log(NickServ, "nick") << "deleting nickname group " << nc->display; @@ -230,12 +230,12 @@ class NickServCore : public Module nc->Users.clear(); } - void OnChangeCoreDisplay(NickCore *nc, const Anope::string &newdisplay) + void OnChangeCoreDisplay(NickCore *nc, const Anope::string &newdisplay) anope_override { Log(LOG_NORMAL, "nick", NickServ) << "Changing " << nc->display << " nickname group display to " << newdisplay; } - void OnNickIdentify(User *u) + void OnNickIdentify(User *u) anope_override { if (!Config->NoNicknameOwnership) { @@ -273,13 +273,13 @@ class NickServCore : public Module } } - void OnNickGroup(User *u, NickAlias *target) + void OnNickGroup(User *u, NickAlias *target) anope_override { if (target->nc->HasFlag(NI_UNCONFIRMED) == false) u->SetMode(NickServ, UMODE_REGISTERED); } - void OnNickUpdate(User *u) + void OnNickUpdate(User *u) anope_override { for (UChannelList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it) { @@ -290,7 +290,7 @@ class NickServCore : public Module } } - void OnUserNickChange(User *u, const Anope::string &oldnick) + void OnUserNickChange(User *u, const Anope::string &oldnick) anope_override { NickAlias *na = findnick(u->nick); /* If the new nick isnt registerd or its registerd and not yours */ @@ -310,13 +310,13 @@ class NickServCore : public Module } } - void OnUserModeSet(User *u, UserModeName Name) + void OnUserModeSet(User *u, UserModeName Name) anope_override { if (Name == UMODE_REGISTERED && !u->IsIdentified()) u->RemoveMode(NickServ, Name); } - EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) + EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!params.empty() || source.owner->nick != Config->NickServ) return EVENT_CONTINUE; @@ -329,7 +329,7 @@ class NickServCore : public Module return EVENT_CONTINUE; } - void OnPostHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) + void OnPostHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!params.empty() || source.owner->nick != Config->NickServ) return; diff --git a/modules/pseudoclients/operserv.cpp b/modules/pseudoclients/operserv.cpp index 813d9f098..aeaa7e3c7 100644 --- a/modules/pseudoclients/operserv.cpp +++ b/modules/pseudoclients/operserv.cpp @@ -20,19 +20,19 @@ class SGLineManager : public XLineManager public: SGLineManager(Module *creator) : XLineManager(creator, "xlinemanager/sgline", 'G') { } - void OnMatch(User *u, XLine *x) + void OnMatch(User *u, XLine *x) anope_override { if (u) u->Kill(Config->OperServ, x->Reason); this->Send(u, x); } - void OnExpire(XLine *x) + void OnExpire(XLine *x) anope_override { Log(OperServ, "expire/akill") << "AKILL on \2" << x->Mask << "\2 has expired"; } - void Send(User *u, XLine *x) + void Send(User *u, XLine *x) anope_override { try { @@ -49,7 +49,7 @@ class SGLineManager : public XLineManager } } - void SendDel(XLine *x) + void SendDel(XLine *x) anope_override { try { @@ -72,7 +72,7 @@ class SQLineManager : public XLineManager public: SQLineManager(Module *creator) : XLineManager(creator, "xlinemanager/sqline", 'Q') { } - void OnMatch(User *u, XLine *x) + void OnMatch(User *u, XLine *x) anope_override { if (u) { @@ -83,17 +83,17 @@ class SQLineManager : public XLineManager this->Send(u, x); } - void OnExpire(XLine *x) + void OnExpire(XLine *x) anope_override { Log(OperServ, "expire/sqline") << "SQLINE on \2" << x->Mask << "\2 has expired"; } - void Send(User *u, XLine *x) + void Send(User *u, XLine *x) anope_override { ircdproto->SendSQLine(u, x); } - void SendDel(XLine *x) + void SendDel(XLine *x) anope_override { ircdproto->SendSQLineDel(x); } @@ -113,7 +113,7 @@ class SNLineManager : public XLineManager public: SNLineManager(Module *creator) : XLineManager(creator, "xlinemanager/snline", 'N') { } - void OnMatch(User *u, XLine *x) + void OnMatch(User *u, XLine *x) anope_override { if (u) { @@ -123,22 +123,22 @@ class SNLineManager : public XLineManager this->Send(u, x); } - void OnExpire(XLine *x) + void OnExpire(XLine *x) anope_override { Log(OperServ, "expire/snline") << "SNLINE on \2" << x->Mask << "\2 has expired"; } - void Send(User *u, XLine *x) + void Send(User *u, XLine *x) anope_override { ircdproto->SendSGLine(u, x); } - void SendDel(XLine *x) + void SendDel(XLine *x) anope_override { ircdproto->SendSGLineDel(x); } - XLine *Check(User *u) + XLine *Check(User *u) anope_override { for (unsigned i = this->GetList().size(); i > 0; --i) { @@ -198,7 +198,7 @@ class OperServCore : public Module XLineManager::UnregisterXLineManager(&snlines); } - EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) + EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) anope_override { if (Config->OSOpersOnly && !u->HasMode(UMODE_OPER) && bi->nick == Config->OperServ) { @@ -210,44 +210,44 @@ class OperServCore : public Module return EVENT_CONTINUE; } - void OnServerQuit(Server *server) + void OnServerQuit(Server *server) anope_override { if (server->HasFlag(SERVER_JUPED)) Log(server, "squit", OperServ) << "Received SQUIT for juped server " << server->GetName(); } - void OnUserModeSet(User *u, UserModeName Name) + void OnUserModeSet(User *u, UserModeName Name) anope_override { if (Name == UMODE_OPER) Log(u, "oper", OperServ) << "is now an IRC operator."; } - void OnUserModeUnset(User *u, UserModeName Name) + void OnUserModeUnset(User *u, UserModeName Name) anope_override { if (Name == UMODE_OPER) Log(u, "oper", OperServ) << "is no longer an IRC operator"; } - void OnUserConnect(dynamic_reference<User> &u, bool &exempt) + void OnUserConnect(dynamic_reference<User> &u, bool &exempt) anope_override { if (u && !exempt) XLineManager::CheckAll(u); } - void OnUserNickChange(User *u, const Anope::string &oldnick) + void OnUserNickChange(User *u, const Anope::string &oldnick) anope_override { if (ircd->sqline && !u->HasMode(UMODE_OPER)) this->sqlines.Check(u); } - EventReturn OnCheckKick(User *u, ChannelInfo *ci, bool &kick) + EventReturn OnCheckKick(User *u, ChannelInfo *ci, bool &kick) anope_override { if (this->sqlines.CheckChannel(ci->c)) kick = true; return EVENT_CONTINUE; } - EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) + EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { if (!params.empty() || source.owner->nick != Config->OperServ) return EVENT_CONTINUE; diff --git a/src/init.cpp b/src/init.cpp index a161f9c6f..5de013898 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -23,6 +23,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <sys/stat.h> +#include <unistd.h> ServerConfig::Uplink *uplink_server; diff --git a/src/logger.cpp b/src/logger.cpp index 508fa7b0c..2df912e18 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -23,6 +23,7 @@ #include "protocol.h" #include <sys/time.h> +#include <unistd.h> static Anope::string GetTimeStamp() { diff --git a/src/socketengines/pipeengine_eventfd.cpp b/src/socketengines/pipeengine_eventfd.cpp index d1051cc28..19433d1c8 100644 --- a/src/socketengines/pipeengine_eventfd.cpp +++ b/src/socketengines/pipeengine_eventfd.cpp @@ -37,7 +37,3 @@ void Pipe::Notify() eventfd_write(this->GetFD(), 1); } -void Pipe::OnNotify() -{ -} - diff --git a/src/socketengines/pipeengine_pipe.cpp b/src/socketengines/pipeengine_pipe.cpp index dc7d6918a..985c1cf95 100644 --- a/src/socketengines/pipeengine_pipe.cpp +++ b/src/socketengines/pipeengine_pipe.cpp @@ -54,6 +54,3 @@ void Pipe::Notify() write(this->WritePipe, &dummy, 1); } -void Pipe::OnNotify() -{ -} diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp index b6dbdc23f..c2c7359d4 100644 --- a/src/socketengines/socketengine_epoll.cpp +++ b/src/socketengines/socketengine_epoll.cpp @@ -66,7 +66,7 @@ void SocketEngine::AddSocket(Socket *s) if (epoll_ctl(EngineHandle, EPOLL_CTL_ADD, ev.data.fd, &ev) == -1) throw SocketException("Unable to add fd " + stringify(ev.data.fd) + " to epoll: " + Anope::LastError()); - Sockets.insert(std::make_pair(ev.data.fd, s)); + Sockets[ev.data.fd] = s; } void SocketEngine::DelSocket(Socket *s) diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp index bac99a9b9..a2188214d 100644 --- a/src/socketengines/socketengine_kqueue.cpp +++ b/src/socketengines/socketengine_kqueue.cpp @@ -75,7 +75,7 @@ void SocketEngine::AddSocket(Socket *s) struct kevent *event = GetChangeEvent(); EV_SET(event, s->GetFD(), EVFILT_READ, EV_ADD, 0, 0, NULL); - Sockets.insert(std::make_pair(s->GetFD(), s)); + Sockets[s->GetFD()] = s; } void SocketEngine::DelSocket(Socket *s) diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp index 8fa666cf3..48a996e31 100644 --- a/src/socketengines/socketengine_poll.cpp +++ b/src/socketengines/socketengine_poll.cpp @@ -75,8 +75,8 @@ void SocketEngine::AddSocket(Socket *s) ev->events = POLLIN; ev->revents = 0; - Sockets.insert(std::make_pair(ev->fd, s)); - socket_positions.insert(std::make_pair(ev->fd, SocketCount)); + Sockets[ev->fd] = s; + socket_positions[ev->fd] = SocketCount; ++SocketCount; } diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp index e3393fdea..a10c3208c 100644 --- a/src/socketengines/socketengine_select.cpp +++ b/src/socketengines/socketengine_select.cpp @@ -52,7 +52,7 @@ void SocketEngine::AddSocket(Socket *s) if (s->GetFD() > MaxFD) MaxFD = s->GetFD(); FD_SET(s->GetFD(), &ReadFDs); - Sockets.insert(std::make_pair(s->GetFD(), s)); + Sockets[s->GetFD()] = s; ++FDCount; } |