From c78ecdf579c0bf0a75ed0f9641ffef8d89c17ec8 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 25 Jan 2019 02:52:11 +0000 Subject: Replace the override macro with the override keyword. --- src/modules/m_delayjoin.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/modules/m_delayjoin.cpp') diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index 8b06f060a..8afb27c92 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -35,7 +35,7 @@ class DelayJoinMode : public ModeHandler ranktoset = ranktounset = OP_VALUE; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE; + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override; void RevealUser(User* user, Channel* chan); }; @@ -59,7 +59,7 @@ class JoinHook : public ClientProtocol::EventHook { } - ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) CXX11_OVERRIDE + ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) override { const ClientProtocol::Events::Join& join = static_cast(ev); const Membership* const memb = join.GetMember(); @@ -86,15 +86,15 @@ class ModuleDelayJoin : public Module { } - Version GetVersion() CXX11_OVERRIDE; - ModResult OnNamesListItem(User* issuer, Membership*, std::string& prefixes, std::string& nick) CXX11_OVERRIDE; - void OnUserJoin(Membership*, bool, bool, CUList&) CXX11_OVERRIDE; + Version GetVersion() override; + ModResult OnNamesListItem(User* issuer, Membership*, std::string& prefixes, std::string& nick) override; + void OnUserJoin(Membership*, bool, bool, CUList&) override; void CleanUser(User* user); - void OnUserPart(Membership*, std::string &partmessage, CUList&) CXX11_OVERRIDE; - void OnUserKick(User* source, Membership*, const std::string &reason, CUList&) CXX11_OVERRIDE; - void OnBuildNeighborList(User* source, IncludeChanList& include, std::map& exception) CXX11_OVERRIDE; - void OnUserMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE; - ModResult OnRawMode(User* user, Channel* channel, ModeHandler* mh, const std::string& param, bool adding) CXX11_OVERRIDE; + void OnUserPart(Membership*, std::string &partmessage, CUList&) override; + void OnUserKick(User* source, Membership*, const std::string &reason, CUList&) override; + void OnBuildNeighborList(User* source, IncludeChanList& include, std::map& exception) override; + void OnUserMessage(User* user, const MessageTarget& target, const MessageDetails& details) override; + ModResult OnRawMode(User* user, Channel* channel, ModeHandler* mh, const std::string& param, bool adding) override; }; ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) -- cgit v1.3.1-10-gc9f91