diff options
| author | Adam <adam@sigterm.info> | 2015-12-31 10:41:37 -0600 |
|---|---|---|
| committer | Adam <adam@sigterm.info> | 2015-12-31 10:41:37 -0600 |
| commit | 17b7508058162a722120dd7a9d95c20b979af2e9 (patch) | |
| tree | 4ae2253d945451136959f856de0c58497066b285 /modules | |
| parent | 551786efeaf4f297f59bab75e38746ced30a545d (diff) | |
| parent | ec85737434466d13f1c0828d1459c6679f8d2565 (diff) | |
Merge pull request #140 from SaberUK/master+warnings
Add missing override keyword to methods that require it.
Diffstat (limited to 'modules')
| -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 |
11 files changed, 34 insertions, 34 deletions
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); |
