diff options
author | Peter Powell <petpow@saberuk.com> | 2015-07-08 13:01:28 +0100 |
---|---|---|
committer | Peter Powell <petpow@saberuk.com> | 2015-12-31 09:05:02 +0000 |
commit | ec85737434466d13f1c0828d1459c6679f8d2565 (patch) | |
tree | 4ae2253d945451136959f856de0c58497066b285 | |
parent | 551786efeaf4f297f59bab75e38746ced30a545d (diff) |
Add missing override keyword to methods that require it.
-rw-r--r-- | include/modes.h | 2 | ||||
-rw-r--r-- | include/serialize.h | 4 | ||||
-rw-r--r-- | include/sockets.h | 2 | ||||
-rw-r--r-- | include/threadengine.h | 2 | ||||
-rw-r--r-- | modules/botserv/badwords.cpp | 2 | ||||
-rw-r--r-- | modules/chanserv/cs_access.old | 2 | ||||
-rw-r--r-- | modules/chanserv/cs_flags.old | 2 | ||||
-rw-r--r-- | modules/chanserv/cs_xop.old | 2 | ||||
-rw-r--r-- | modules/chanserv/main/level.h | 12 | ||||
-rw-r--r-- | modules/httpd.cpp | 2 | ||||
-rw-r--r-- | modules/nickserv/main/nickserv.cpp | 2 | ||||
-rw-r--r-- | modules/operserv/ignore.cpp | 16 | ||||
-rw-r--r-- | modules/operserv/info.cpp | 16 | ||||
-rw-r--r-- | modules/operserv/sxline.cpp | 6 | ||||
-rw-r--r-- | modules/xmlrpc.cpp | 6 | ||||
-rw-r--r-- | src/modes.cpp | 2 | ||||
-rw-r--r-- | src/uplink.cpp | 2 |
17 files changed, 41 insertions, 41 deletions
diff --git a/include/modes.h b/include/modes.h index bc69f77d0..57610edb7 100644 --- a/include/modes.h +++ b/include/modes.h @@ -216,7 +216,7 @@ class CoreExport ChannelModeVirtual : public T ChannelMode *Wrap(Anope::string ¶m) override; - ChannelMode *Unwrap(ChannelMode *cm, Anope::string ¶m) anope_abstract; + ChannelMode *Unwrap(ChannelMode *cm, Anope::string ¶m) override anope_abstract; }; /* The status a user has on a channel (+v, +h, +o) etc */ diff --git a/include/serialize.h b/include/serialize.h index 40268f82e..1dc4d4e26 100644 --- a/include/serialize.h +++ b/include/serialize.h @@ -475,7 +475,7 @@ class Serialize::Field : public CommonFieldBase<TypeImpl, T> this->ext.Set(s, value); } - void UnsetField(TypeImpl *s) + void UnsetField(TypeImpl *s) override { Event::OnSerialize(&Event::SerializeEvents::OnSerializeUnset, s, this); @@ -598,7 +598,7 @@ class Serialize::ObjectField : public CommonFieldBase<TypeImpl, T> s->AddEdge(value, this); } - void UnsetField(TypeImpl *s) + void UnsetField(TypeImpl *s) override { Event::OnSerialize(&Event::SerializeEvents::OnSerializeUnsetSerializable, s, this); diff --git a/include/sockets.h b/include/sockets.h index 49e9d1fcd..16fac371e 100644 --- a/include/sockets.h +++ b/include/sockets.h @@ -373,7 +373,7 @@ class CoreExport ListenSocket : public virtual Socket /** Process what has come in from the connection * @return false to destroy this socket */ - bool ProcessRead(); + bool ProcessRead() override; /** Called when a connection is accepted * @param fd The FD for the new connection diff --git a/include/threadengine.h b/include/threadengine.h index 12e0108b5..8a61e9e13 100644 --- a/include/threadengine.h +++ b/include/threadengine.h @@ -55,7 +55,7 @@ class CoreExport Thread : public Pipe /** Called when this thread should be joined to */ - void OnNotify(); + void OnNotify() override; /** Called when the thread is run. */ diff --git a/modules/botserv/badwords.cpp b/modules/botserv/badwords.cpp index 0f8e9e7d0..6a092e36b 100644 --- a/modules/botserv/badwords.cpp +++ b/modules/botserv/badwords.cpp @@ -94,7 +94,7 @@ struct BadWordsImpl : BadWords return bw; } - std::vector<BadWord *> GetBadWords(ChanServ::Channel *ci) + std::vector<BadWord *> GetBadWords(ChanServ::Channel *ci) override { return ci->GetRefs<BadWord *>(badword); } diff --git a/modules/chanserv/cs_access.old b/modules/chanserv/cs_access.old index b363e9757..8e35772a6 100644 --- a/modules/chanserv/cs_access.old +++ b/modules/chanserv/cs_access.old @@ -30,7 +30,7 @@ class AccessChanAccess : public ChanAccessImpl return this->GetChannel()->GetLevel(name) != ChanServ::ACCESS_INVALID && this->GetLevel() >= this->GetChannel()->GetLevel(name); } - Anope::string AccessSerialize() + Anope::string AccessSerialize() override { return stringify(this->GetLevel()); } diff --git a/modules/chanserv/cs_flags.old b/modules/chanserv/cs_flags.old index 9a29a491f..8bca8581f 100644 --- a/modules/chanserv/cs_flags.old +++ b/modules/chanserv/cs_flags.old @@ -31,7 +31,7 @@ class FlagsChanAccess : public ChanAccessImpl return it != defaultFlags.end() && GetFlags().find(it->second) != Anope::string::npos; } - Anope::string AccessSerialize() + Anope::string AccessSerialize() override { return GetFlags(); } diff --git a/modules/chanserv/cs_xop.old b/modules/chanserv/cs_xop.old index eae8c73a6..8c133697a 100644 --- a/modules/chanserv/cs_xop.old +++ b/modules/chanserv/cs_xop.old @@ -486,7 +486,7 @@ class CommandCSXOP : public Command return Anope::printf(Language::Translate(source.GetAccount(), _("Modify the list of %s users")), source.command.upper().c_str()); } - void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) override { ChanServ::Channel *ci = ChanServ::Find(params[0]); if (ci == NULL) diff --git a/modules/chanserv/main/level.h b/modules/chanserv/main/level.h index c9ffd0dfb..4521fceef 100644 --- a/modules/chanserv/main/level.h +++ b/modules/chanserv/main/level.h @@ -5,12 +5,12 @@ class LevelImpl : public ChanServ::Level LevelImpl(Serialize::TypeBase *type) : ChanServ::Level(type) { } LevelImpl(Serialize::TypeBase *type, Serialize::ID id) : ChanServ::Level(type, id) { } - ChanServ::Channel *GetChannel(); - void SetChannel(ChanServ::Channel *); + ChanServ::Channel *GetChannel() override; + void SetChannel(ChanServ::Channel *) override; - Anope::string GetName(); - void SetName(const Anope::string &); + Anope::string GetName() override; + void SetName(const Anope::string &) override; - int GetLevel(); - void SetLevel(const int &); + int GetLevel() override; + void SetLevel(const int &) override; }; diff --git a/modules/httpd.cpp b/modules/httpd.cpp index 17f80d376..1627ef133 100644 --- a/modules/httpd.cpp +++ b/modules/httpd.cpp @@ -325,7 +325,7 @@ class MyHTTPProvider : public HTTPProvider, public Timer this->pages.erase(page->GetURL()); } - HTTPPage* FindPage(const Anope::string &pname) + HTTPPage* FindPage(const Anope::string &pname) override { if (this->pages.count(pname) == 0) return NULL; diff --git a/modules/nickserv/main/nickserv.cpp b/modules/nickserv/main/nickserv.cpp index 26f1457cc..f14a71d87 100644 --- a/modules/nickserv/main/nickserv.cpp +++ b/modules/nickserv/main/nickserv.cpp @@ -77,7 +77,7 @@ class NickServHeld : public Timer n->SetS<bool>("HELD", true); } - void Tick(time_t) + void Tick(time_t) override { if (na) na->UnsetS<bool>("HELD"); diff --git a/modules/operserv/ignore.cpp b/modules/operserv/ignore.cpp index d9563cc29..c55e6f3dc 100644 --- a/modules/operserv/ignore.cpp +++ b/modules/operserv/ignore.cpp @@ -18,17 +18,17 @@ class IgnoreImpl : public Ignore IgnoreImpl(Serialize::TypeBase *type) : Ignore(type) { } IgnoreImpl(Serialize::TypeBase *type, Serialize::ID id) : Ignore(type, id) { } - Anope::string GetMask(); - void SetMask(const Anope::string &); + Anope::string GetMask() override; + void SetMask(const Anope::string &) override; - Anope::string GetCreator(); - void SetCreator(const Anope::string &); + Anope::string GetCreator() override; + void SetCreator(const Anope::string &) override; - Anope::string GetReason(); - void SetReason(const Anope::string &); + Anope::string GetReason() override; + void SetReason(const Anope::string &) override; - time_t GetTime(); - void SetTime(const time_t &); + time_t GetTime() override; + void SetTime(const time_t &) override; }; class IgnoreType : public Serialize::Type<IgnoreImpl> diff --git a/modules/operserv/info.cpp b/modules/operserv/info.cpp index 7b292d4b2..c7749c589 100644 --- a/modules/operserv/info.cpp +++ b/modules/operserv/info.cpp @@ -17,17 +17,17 @@ class OperInfoImpl : public OperInfo OperInfoImpl(Serialize::TypeBase *type) : OperInfo(type) { } OperInfoImpl(Serialize::TypeBase *type, Serialize::ID id) : OperInfo(type, id) { } - Serialize::Object *GetTarget(); - void SetTarget(Serialize::Object *); + Serialize::Object *GetTarget() override; + void SetTarget(Serialize::Object *) override; - Anope::string GetInfo(); - void SetInfo(const Anope::string &); + Anope::string GetInfo() override; + void SetInfo(const Anope::string &) override; - Anope::string GetCreator(); - void SetCreator(const Anope::string &); + Anope::string GetCreator() override; + void SetCreator(const Anope::string &) override; - time_t GetCreated(); - void SetCreated(const time_t &); + time_t GetCreated() override; + void SetCreated(const time_t &) override; }; class OperInfoType : public Serialize::Type<OperInfoImpl> diff --git a/modules/operserv/sxline.cpp b/modules/operserv/sxline.cpp index 3465faae7..61c95bc45 100644 --- a/modules/operserv/sxline.cpp +++ b/modules/operserv/sxline.cpp @@ -201,12 +201,12 @@ class CommandOSSXLineBase : public Command this->OnSyntaxError(source, ""); } - virtual bool OnHelp(CommandSource &source, const Anope::string &subcommand) = 0; + virtual bool OnHelp(CommandSource &source, const Anope::string &subcommand) override = 0; }; class CommandOSSNLine : public CommandOSSXLineBase { - XLineManager *xlm() + XLineManager *xlm() override { return this->snlines; } @@ -429,7 +429,7 @@ class CommandOSSNLine : public CommandOSSXLineBase class CommandOSSQLine : public CommandOSSXLineBase { - XLineManager *xlm() + XLineManager *xlm() override { return this->sqlines; } diff --git a/modules/xmlrpc.cpp b/modules/xmlrpc.cpp index 2d1cd2c0e..4dbfa0497 100644 --- a/modules/xmlrpc.cpp +++ b/modules/xmlrpc.cpp @@ -32,12 +32,12 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage public: MyXMLRPCServiceInterface(Module *creator, const Anope::string &sname) : XMLRPCServiceInterface(creator, sname), HTTPPage("/xmlrpc", "text/xml") { } - void Register(XMLRPCEvent *event) + void Register(XMLRPCEvent *event) override { this->events.push_back(event); } - void Unregister(XMLRPCEvent *event) + void Unregister(XMLRPCEvent *event) override { std::deque<XMLRPCEvent *>::iterator it = std::find(this->events.begin(), this->events.end(), event); @@ -174,7 +174,7 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage return true; } - void Reply(XMLRPCRequest &request) + void Reply(XMLRPCRequest &request) override { if (!request.id.empty()) request.reply("id", request.id); diff --git a/src/modes.cpp b/src/modes.cpp index b2c76bdff..cb70d7102 100644 --- a/src/modes.cpp +++ b/src/modes.cpp @@ -296,7 +296,7 @@ void StackerInfo::AddMode(Mode *mode, bool set, const Anope::string ¶m) static class ModePipe : public Pipe { public: - void OnNotify() + void OnNotify() override { ModeManager::ProcessModes(); } diff --git a/src/uplink.cpp b/src/uplink.cpp index de5232152..5b585ce09 100644 --- a/src/uplink.cpp +++ b/src/uplink.cpp @@ -27,7 +27,7 @@ class ReconnectTimer : public Timer public: ReconnectTimer(int wait) : Timer(wait) { } - void Tick(time_t) + void Tick(time_t) override { try { |