diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp index 25673e33..4c55786f 100644 --- a/modules/adminlog.cpp +++ b/modules/adminlog.cpp @@ -35,7 +35,7 @@ public: closelog(); } - virtual bool OnLoad(const CString & sArgs, CString & sMessage) { + virtual bool OnLoad(const CString & sArgs, CString & sMessage) override { CString sTarget = GetNV("target"); if (sTarget.Equals("syslog")) m_eLogMode = LOG_TO_SYSLOG; @@ -52,15 +52,15 @@ public: return true; } - virtual void OnIRCConnected() { + virtual void OnIRCConnected() override { Log("[" + GetUser()->GetUserName() + "/" + GetNetwork()->GetName() + "] connected to IRC: " + GetNetwork()->GetCurrentServer()->GetName()); } - virtual void OnIRCDisconnected() { + virtual void OnIRCDisconnected() override { Log("[" + GetUser()->GetUserName() + "/" + GetNetwork()->GetName() + "] disconnected from IRC"); } - virtual EModRet OnRaw(CString& sLine) { + virtual EModRet OnRaw(CString& sLine) override { if (sLine.Equals("ERROR ", false, 6)) { //ERROR :Closing Link: nick[24.24.24.24] (Excess Flood) //ERROR :Closing Link: nick[24.24.24.24] Killer (Local kill by Killer (reason)) @@ -73,15 +73,15 @@ public: return CONTINUE; } - virtual void OnClientLogin() { + virtual void OnClientLogin() override { Log("[" + GetUser()->GetUserName() + "] connected to ZNC from " + GetClient()->GetRemoteIP()); } - virtual void OnClientDisconnect() { + virtual void OnClientDisconnect() override { Log("[" + GetUser()->GetUserName() + "] disconnected from ZNC from " + GetClient()->GetRemoteIP()); } - virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) { + virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) override { Log("[" + sUsername + "] failed to login from " + sRemoteIP, LOG_WARNING); } @@ -107,7 +107,7 @@ public: } } - virtual void OnModCommand(const CString& sCommand) { + virtual void OnModCommand(const CString& sCommand) override { if (!GetUser()->IsAdmin()) { PutModule("Access denied"); } else { diff --git a/modules/alias.cpp b/modules/alias.cpp index f2388e76..7f837dc2 100644 --- a/modules/alias.cpp +++ b/modules/alias.cpp @@ -299,7 +299,7 @@ public: AddCommand("Info", static_cast(&CAliasMod::InfoCommand), "", "Reports the actions performed by an alias."); } - virtual EModRet OnUserRaw(CString& sLine) + virtual EModRet OnUserRaw(CString& sLine) override { CAlias current_alias; diff --git a/modules/autoattach.cpp b/modules/autoattach.cpp index 003fa823..c81f7ac0 100644 --- a/modules/autoattach.cpp +++ b/modules/autoattach.cpp @@ -162,7 +162,7 @@ public: virtual ~CChanAttach() { } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { VCString vsChans; sArgs.Split(" ", vsChans, false); @@ -217,17 +217,17 @@ public: } } - virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override { TryAttach(Nick, Channel, sMessage); return CONTINUE; } - virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override { TryAttach(Nick, Channel, sMessage); return CONTINUE; } - virtual EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) override { TryAttach(Nick, Channel, sMessage); return CONTINUE; } diff --git a/modules/autocycle.cpp b/modules/autocycle.cpp index 717141ff..571bf551 100644 --- a/modules/autocycle.cpp +++ b/modules/autocycle.cpp @@ -31,7 +31,7 @@ public: virtual ~CAutoCycleMod() {} - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { VCString vsChans; sArgs.Split(" ", vsChans, false); @@ -96,16 +96,16 @@ public: } } - virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) { + virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override { AutoCycle(Channel); } - virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) { + virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) override { for (unsigned int i = 0; i < vChans.size(); i++) AutoCycle(*vChans[i]); } - virtual void OnKick(const CNick& Nick, const CString& sOpNick, CChan& Channel, const CString& sMessage) { + virtual void OnKick(const CNick& Nick, const CString& sOpNick, CChan& Channel, const CString& sMessage) override { AutoCycle(Channel); } diff --git a/modules/autoop.cpp b/modules/autoop.cpp index a5a7da6c..3a63bc73 100644 --- a/modules/autoop.cpp +++ b/modules/autoop.cpp @@ -37,7 +37,7 @@ public: private: protected: - virtual void RunJob(); + virtual void RunJob() override; CAutoOpMod* m_pParent; }; @@ -160,7 +160,7 @@ public: AddCommand("DelUser", static_cast(&CAutoOpMod::OnDelUserCommand), "", "Removes a user"); } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { AddTimer(new CAutoOpTimer(this)); // Load the users @@ -185,14 +185,14 @@ public: m_msUsers.clear(); } - virtual void OnJoin(const CNick& Nick, CChan& Channel) { + virtual void OnJoin(const CNick& Nick, CChan& Channel) override { // If we have ops in this chan if (Channel.HasPerm(CChan::Op)) { CheckAutoOp(Nick, Channel); } } - virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) { + virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) override { MCString::iterator it = m_msQueue.find(Nick.GetNick().AsLower()); if (it != m_msQueue.end()) { @@ -200,7 +200,7 @@ public: } } - virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector& vChans) { + virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector& vChans) override { // Update the queue with nick changes MCString::iterator it = m_msQueue.find(OldNick.GetNick().AsLower()); @@ -210,7 +210,7 @@ public: } } - virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override { if (!sMessage.Token(0).Equals("!ZNCAO")) { return CONTINUE; } @@ -226,7 +226,7 @@ public: return HALTCORE; } - virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { + virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override { if (Nick.GetNick() == GetNetwork()->GetIRCNick().GetNick()) { const map& msNicks = Channel.GetNicks(); @@ -238,7 +238,7 @@ public: } } - void OnModCommand(const CString& sLine) { + void OnModCommand(const CString& sLine) override { CString sCommand = sLine.Token(0).AsUpper(); if (sCommand.Equals("TIMERS")) { // for testing purposes - hidden from help diff --git a/modules/autoreply.cpp b/modules/autoreply.cpp index 5c6fb60e..35d35459 100644 --- a/modules/autoreply.cpp +++ b/modules/autoreply.cpp @@ -29,7 +29,7 @@ public: virtual ~CAutoReplyMod() {} - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { if (!sArgs.empty()) { SetReply(sArgs); } @@ -68,7 +68,7 @@ public: PutIRC("NOTICE " + sNick + " :" + GetReply()); } - virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override { Handle(Nick.GetNick()); return CONTINUE; } diff --git a/modules/autovoice.cpp b/modules/autovoice.cpp index 8f62197a..84ff7f6f 100644 --- a/modules/autovoice.cpp +++ b/modules/autovoice.cpp @@ -124,7 +124,7 @@ public: AddCommand("DelUser", static_cast(&CAutoVoiceMod::OnDelUserCommand), "", "Removes a user"); } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { // Load the chans from the command line unsigned int a = 0; VCString vsChans; @@ -159,7 +159,7 @@ public: m_msUsers.clear(); } - virtual void OnJoin(const CNick& Nick, CChan& Channel) { + virtual void OnJoin(const CNick& Nick, CChan& Channel) override { // If we have ops in this chan if (Channel.HasPerm(CChan::Op) || Channel.HasPerm(CChan::HalfOp)) { for (map::iterator it = m_msUsers.begin(); it != m_msUsers.end(); ++it) { diff --git a/modules/awaynick.cpp b/modules/awaynick.cpp index e7e4a451..40f7617d 100644 --- a/modules/awaynick.cpp +++ b/modules/awaynick.cpp @@ -20,7 +20,7 @@ class CAwayNickMod : public CModule { public: MODCONSTRUCTOR(CAwayNickMod) {} - virtual bool OnLoad(const CString&, CString& sMessage) { + virtual bool OnLoad(const CString&, CString& sMessage) override { sMessage = "retired module - see http://wiki.znc.in/awaynick"; return false; } diff --git a/modules/awaystore.cpp b/modules/awaystore.cpp index 776abd3c..52832490 100644 --- a/modules/awaystore.cpp +++ b/modules/awaystore.cpp @@ -46,7 +46,7 @@ public: virtual ~CAwayJob() {} protected: - virtual void RunJob(); + virtual void RunJob() override; }; class CAway : public CModule @@ -233,7 +233,7 @@ public: SaveBufferToDisk(); } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { CString sMyArgs = sArgs; size_t uIndex = 0; @@ -273,7 +273,7 @@ public: return true; } - virtual void OnIRCConnected() + virtual void OnIRCConnected() override { if (m_bIsAway) Away(true); // reset away if we are reconnected @@ -329,11 +329,11 @@ public: } } - virtual void OnClientLogin() + virtual void OnClientLogin() override { Back(true); } - virtual void OnClientDisconnect() + virtual void OnClientDisconnect() override { Away(); } @@ -390,14 +390,14 @@ public: m_sReason = ""; } - virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override { if (m_bIsAway) AddMessage(time(NULL), Nick, sMessage); return(CONTINUE); } - virtual EModRet OnPrivAction(CNick& Nick, CString& sMessage) + virtual EModRet OnPrivAction(CNick& Nick, CString& sMessage) override { if (m_bIsAway) { AddMessage(time(NULL), Nick, "* " + sMessage); @@ -405,7 +405,7 @@ public: return(CONTINUE); } - virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) + virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override { Ping(); if (m_bIsAway) @@ -414,7 +414,7 @@ public: return(CONTINUE); } - virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) + virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override { Ping(); if (m_bIsAway) @@ -423,7 +423,7 @@ public: return(CONTINUE); } - virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) + virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) override { Ping(); if (m_bIsAway) diff --git a/modules/block_motd.cpp b/modules/block_motd.cpp index dde37998..40961302 100644 --- a/modules/block_motd.cpp +++ b/modules/block_motd.cpp @@ -24,7 +24,7 @@ public: virtual ~CBlockMotd() { } - virtual EModRet OnRaw(CString &sLine) { + virtual EModRet OnRaw(CString &sLine) override { const CString sCmd = sLine.Token(1); if (sCmd == "375" /* begin of MOTD */ diff --git a/modules/blockuser.cpp b/modules/blockuser.cpp index b28fa4d1..d1a6d471 100644 --- a/modules/blockuser.cpp +++ b/modules/blockuser.cpp @@ -32,7 +32,7 @@ public: virtual ~CBlockUser() {} - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { VCString vArgs; VCString::iterator it; MCString::iterator it2; @@ -56,7 +56,7 @@ public: return true; } - virtual EModRet OnLoginAttempt(std::shared_ptr Auth) { + virtual EModRet OnLoginAttempt(std::shared_ptr Auth) override { if (IsBlocked(Auth->GetUsername())) { Auth->RefuseLogin(MESSAGE); return HALT; @@ -65,7 +65,7 @@ public: return CONTINUE; } - void OnModCommand(const CString& sCommand) { + void OnModCommand(const CString& sCommand) override { if (!GetUser()->IsAdmin()) { PutModule("Access denied"); } else { @@ -121,7 +121,7 @@ public: PutModule("This user is not blocked"); } - bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { if (sPageName == "webadmin/user" && WebSock.GetSession()->IsAdmin()) { CString sAction = Tmpl["WebadminAction"]; if (sAction == "display") { diff --git a/modules/bouncedcc.cpp b/modules/bouncedcc.cpp index e1c6ed6c..dc1efa45 100644 --- a/modules/bouncedcc.cpp +++ b/modules/bouncedcc.cpp @@ -34,15 +34,15 @@ public: static unsigned short DCCRequest(const CString& sNick, unsigned long uLongIP, unsigned short uPort, const CString& sFileName, bool bIsChat, CBounceDCCMod* pMod, const CString& sRemoteIP); void ReadLine(const CString& sData); - virtual void ReadData(const char* data, size_t len); - virtual void ReadPaused(); - virtual void Timeout(); - virtual void ConnectionRefused(); - virtual void ReachedMaxBuffer(); - virtual void SockError(int iErrno, const CString& sDescription); - virtual void Connected(); - virtual void Disconnected(); - virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort); + virtual void ReadData(const char* data, size_t len) override; + virtual void ReadPaused() override; + virtual void Timeout() override; + virtual void ConnectionRefused() override; + virtual void ReachedMaxBuffer() override; + virtual void SockError(int iErrno, const CString& sDescription) override; + virtual void Connected() override; + virtual void Disconnected() override; + virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) override; void Shutdown(); void PutServ(const CString& sLine); void PutPeer(const CString& sLine); @@ -158,7 +158,7 @@ public: return GetNV("UseClientIP").ToBool(); } - virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override { if (sMessage.Equals("DCC ", false, 4)) { CString sType = sMessage.Token(1, false, " ", false, "\"", "\"", true); CString sFile = sMessage.Token(2, false, " ", false, "\"", "\"", false); @@ -212,7 +212,7 @@ public: return CONTINUE; } - virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override { CIRCNetwork* pNetwork = GetNetwork(); if (sMessage.Equals("DCC ", false, 4) && pNetwork->IsUserAttached()) { // DCC CHAT chat 2453612361 44592 diff --git a/modules/buffextras.cpp b/modules/buffextras.cpp index 91a31bfc..0a8c69cc 100644 --- a/modules/buffextras.cpp +++ b/modules/buffextras.cpp @@ -33,16 +33,16 @@ public: Channel.AddBuffer(":" + GetModNick() + "!" + GetModName() + "@znc.in PRIVMSG " + _NAMEDFMT(Channel.GetName()) + " :{text}", sMessage); } - virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { + virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override { const CString sNickMask = pOpNick ? pOpNick->GetNickMask() : "Server"; AddBuffer(Channel, sNickMask + " set mode: " + sModes + " " + sArgs); } - virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) { + virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override { AddBuffer(Channel, OpNick.GetNickMask() + " kicked " + sKickedNick + " Reason: [" + sMessage + "]"); } - virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) { + virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) override { vector::const_iterator it; CString sMsg = Nick.GetNickMask() + " quit with message: [" + sMessage + "]"; for (it = vChans.begin(); it != vChans.end(); ++it) { @@ -50,15 +50,15 @@ public: } } - virtual void OnJoin(const CNick& Nick, CChan& Channel) { + virtual void OnJoin(const CNick& Nick, CChan& Channel) override { AddBuffer(Channel, Nick.GetNickMask() + " joined"); } - virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) { + virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override { AddBuffer(Channel, Nick.GetNickMask() + " parted with message: [" + sMessage + "]"); } - virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector& vChans) { + virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector& vChans) override { vector::const_iterator it; CString sMsg = OldNick.GetNickMask() + " is now known as " + sNewNick; for (it = vChans.begin(); it != vChans.end(); ++it) { @@ -66,7 +66,7 @@ public: } } - virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) { + virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override { AddBuffer(Channel, Nick.GetNickMask() + " changed the topic to: " + sTopic); return CONTINUE; diff --git a/modules/cert.cpp b/modules/cert.cpp index b2c8aead..0bcb6ad8 100644 --- a/modules/cert.cpp +++ b/modules/cert.cpp @@ -59,7 +59,7 @@ public: return (CFile::Exists(PemFile())); } - virtual EModRet OnIRCConnecting(CIRCSock *pIRCSock) { + virtual EModRet OnIRCConnecting(CIRCSock *pIRCSock) override { if (HasPemFile()) { pIRCSock->SetPemLocation(PemFile()); } @@ -67,9 +67,9 @@ public: return CONTINUE; } - virtual CString GetWebMenuTitle() { return "Certificate"; } + virtual CString GetWebMenuTitle() override { return "Certificate"; } - virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { if (sPageName == "index") { Tmpl["Cert"] = CString(HasPemFile()); return true; diff --git a/modules/certauth.cpp b/modules/certauth.cpp index 5f43edd5..2623f2b6 100644 --- a/modules/certauth.cpp +++ b/modules/certauth.cpp @@ -39,7 +39,7 @@ public: virtual ~CSSLClientCertMod() {} - virtual bool OnBoot() { + virtual bool OnBoot() override { const vector& vListeners = CZNC::Get().GetListeners(); vector::const_iterator it; @@ -65,11 +65,11 @@ public: return true; } - virtual void OnPostRehash() { + virtual void OnPostRehash() override { OnBoot(); } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { OnBoot(); return true; @@ -101,7 +101,7 @@ public: return pair.second; } - virtual EModRet OnLoginAttempt(std::shared_ptr Auth) { + virtual EModRet OnLoginAttempt(std::shared_ptr Auth) override { const CString sUser = Auth->GetUsername(); Csock *pSock = Auth->GetSocket(); CUser *pUser = CZNC::Get().FindUser(sUser); @@ -236,9 +236,9 @@ public: } } - virtual CString GetWebMenuTitle() { return "certauth"; } + virtual CString GetWebMenuTitle() override { return "certauth"; } - virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { CUser *pUser = WebSock.GetSession()->GetUser(); if (sPageName == "index") { diff --git a/modules/chansaver.cpp b/modules/chansaver.cpp index d0975aef..be6f351b 100644 --- a/modules/chansaver.cpp +++ b/modules/chansaver.cpp @@ -62,13 +62,13 @@ public: } } - virtual void OnJoin(const CNick& Nick, CChan& Channel) { + virtual void OnJoin(const CNick& Nick, CChan& Channel) override { if (!Channel.InConfig() && GetNetwork()->GetIRCNick().NickEquals(Nick.GetNick())) { Channel.SetInConfig(true); } } - virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) { + virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override { if (Channel.InConfig() && GetNetwork()->GetIRCNick().NickEquals(Nick.GetNick())) { Channel.SetInConfig(false); } diff --git a/modules/clearbufferonmsg.cpp b/modules/clearbufferonmsg.cpp index d3cdca84..29a51418 100644 --- a/modules/clearbufferonmsg.cpp +++ b/modules/clearbufferonmsg.cpp @@ -48,32 +48,32 @@ public: } } - virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override { ClearAllBuffers(); return CONTINUE; } - virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override { ClearAllBuffers(); return CONTINUE; } - virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) override { ClearAllBuffers(); return CONTINUE; } - virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override { ClearAllBuffers(); return CONTINUE; } - virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) { + virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) override { ClearAllBuffers(); return CONTINUE; } - virtual EModRet OnUserTopic(CString& sChannel, CString& sTopic) { + virtual EModRet OnUserTopic(CString& sChannel, CString& sTopic) override { ClearAllBuffers(); return CONTINUE; } diff --git a/modules/clientnotify.cpp b/modules/clientnotify.cpp index 25b78374..c3277a2b 100644 --- a/modules/clientnotify.cpp +++ b/modules/clientnotify.cpp @@ -51,7 +51,7 @@ public: AddCommand("Show", static_cast(&CClientNotifyMod::OnShowCommand), "", "Show the current settings"); } - bool OnLoad(const CString& sArgs, CString& sMessage) { + bool OnLoad(const CString& sArgs, CString& sMessage) override { m_sMethod = GetNV("method"); if(m_sMethod != "notice" && m_sMethod != "message" && m_sMethod != "off") { @@ -66,7 +66,7 @@ public: return true; } - void OnClientLogin() { + void OnClientLogin() override { CString sRemoteIP = GetClient()->GetRemoteIP(); if(!m_bNewOnly || m_sClientsSeen.find(sRemoteIP) == m_sClientsSeen.end()) { SendNotification("Another client authenticated as your user. " @@ -78,7 +78,7 @@ public: } } - void OnClientDisconnect() { + void OnClientDisconnect() override { if(m_bOnDisconnect) { SendNotification("A client disconnected from your user. " "Use the 'ListClients' command to see the " + diff --git a/modules/crypt.cpp b/modules/crypt.cpp index e65100cd..44210942 100644 --- a/modules/crypt.cpp +++ b/modules/crypt.cpp @@ -53,7 +53,7 @@ public: virtual ~CCryptMod() {} - virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override { sTarget.TrimLeft(NickPrefix()); if (sMessage.Left(2) == "``") { @@ -84,12 +84,12 @@ public: return CONTINUE; } - virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override { FilterIncoming(Nick.GetNick(), Nick, sMessage); return CONTINUE; } - virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override { FilterIncoming(Channel.GetName(), Nick, sMessage); return CONTINUE; } diff --git a/modules/ctcpflood.cpp b/modules/ctcpflood.cpp index a8feecd3..d93142e8 100644 --- a/modules/ctcpflood.cpp +++ b/modules/ctcpflood.cpp @@ -84,11 +84,11 @@ public: return HALT; } - EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) { + EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override { return Message(Nick, sMessage); } - EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) { + EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override { return Message(Nick, sMessage); } diff --git a/modules/cyrusauth.cpp b/modules/cyrusauth.cpp index 0171c3f8..66b7fa01 100644 --- a/modules/cyrusauth.cpp +++ b/modules/cyrusauth.cpp @@ -43,7 +43,7 @@ public: sasl_done(); } - void OnModCommand(const CString& sCommand) { + void OnModCommand(const CString& sCommand) override { if (GetUser()->IsAdmin()) { HandleCommand(sCommand); } else { @@ -51,7 +51,7 @@ public: } } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { VCString vsArgs; VCString::const_iterator it; sArgs.Split(" ", vsArgs, false); @@ -87,7 +87,7 @@ public: return true; } - virtual EModRet OnLoginAttempt(std::shared_ptr Auth) { + virtual EModRet OnLoginAttempt(std::shared_ptr Auth) override { const CString& sUsername = Auth->GetUsername(); const CString& sPassword = Auth->GetPassword(); CUser *pUser(CZNC::Get().FindUser(sUsername)); diff --git a/modules/dcc.cpp b/modules/dcc.cpp index 166d6cb7..415cc8ae 100644 --- a/modules/dcc.cpp +++ b/modules/dcc.cpp @@ -28,14 +28,14 @@ public: CDCCSock(CDCCMod* pMod, const CString& sRemoteNick, const CString& sRemoteIP, unsigned short uRemotePort, const CString& sLocalFile, unsigned long uFileSize); virtual ~CDCCSock(); - virtual void ReadData(const char* data, size_t len); - virtual void ConnectionRefused(); - virtual void SockError(int iErrno, const CString& sDescription); - virtual void Timeout(); - virtual void Connected(); - virtual void Disconnected(); + virtual void ReadData(const char* data, size_t len) override; + virtual void ConnectionRefused() override; + virtual void SockError(int iErrno, const CString& sDescription) override; + virtual void Timeout() override; + virtual void Connected() override; + virtual void Disconnected() override; void SendPacket(); - virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort); + virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) override; CFile* OpenFile(bool bWrite = true); bool Seek(unsigned long int uPos); @@ -86,7 +86,7 @@ public: virtual ~CDCCMod() {} #ifndef MOD_DCC_ALLOW_EVERYONE - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { if (!GetUser()->IsAdmin()) { sMessage = "You must be admin to use the DCC module"; return false; @@ -219,7 +219,7 @@ public: } } - virtual void OnModCTCP(const CString& sMessage) { + virtual void OnModCTCP(const CString& sMessage) override { if (sMessage.Equals("DCC RESUME ", false, 11)) { CString sFile = sMessage.Token(2); unsigned short uResumePort = sMessage.Token(3).ToUShort(); diff --git a/modules/disconkick.cpp b/modules/disconkick.cpp index fca267bd..805bc85a 100644 --- a/modules/disconkick.cpp +++ b/modules/disconkick.cpp @@ -23,7 +23,7 @@ class CKickClientOnIRCDisconnect: public CModule { public: MODCONSTRUCTOR(CKickClientOnIRCDisconnect) {} - void OnIRCDisconnected() + void OnIRCDisconnected() override { const vector& vChans = GetNetwork()->GetChans(); diff --git a/modules/fail2ban.cpp b/modules/fail2ban.cpp index 5f340848..795727e0 100644 --- a/modules/fail2ban.cpp +++ b/modules/fail2ban.cpp @@ -21,7 +21,7 @@ public: MODCONSTRUCTOR(CFailToBanMod) {} virtual ~CFailToBanMod() {} - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { CString sTimeout = sArgs.Token(0); CString sAttempts = sArgs.Token(1); unsigned int timeout = sTimeout.ToUInt(); @@ -46,7 +46,7 @@ public: return true; } - virtual void OnPostRehash() { + virtual void OnPostRehash() override { m_Cache.Clear(); } @@ -54,13 +54,13 @@ public: m_Cache.AddItem(sHost, count, m_Cache.GetTTL()); } - virtual void OnModCommand(const CString& sCommand) { + virtual void OnModCommand(const CString& sCommand) override { PutModule("This module can only be configured through its arguments."); PutModule("The module argument is the number of minutes an IP"); PutModule("is blocked after a failed login."); } - virtual void OnClientConnect(CZNCSock* pClient, const CString& sHost, unsigned short uPort) { + virtual void OnClientConnect(CZNCSock* pClient, const CString& sHost, unsigned short uPort) override { unsigned int *pCount = m_Cache.GetItem(sHost); if (sHost.empty() || pCount == NULL || *pCount < m_uiAllowedFailed) { return; @@ -73,7 +73,7 @@ public: pClient->Close(Csock::CLT_AFTERWRITE); } - virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) { + virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) override { unsigned int *pCount = m_Cache.GetItem(sRemoteIP); if (pCount) Add(sRemoteIP, *pCount + 1); @@ -81,7 +81,7 @@ public: Add(sRemoteIP, 1); } - virtual EModRet OnLoginAttempt(std::shared_ptr Auth) { + virtual EModRet OnLoginAttempt(std::shared_ptr Auth) override { // e.g. webadmin ends up here const CString& sRemoteIP = Auth->GetRemoteIP(); diff --git a/modules/flooddetach.cpp b/modules/flooddetach.cpp index 7522c615..ecf3e556 100644 --- a/modules/flooddetach.cpp +++ b/modules/flooddetach.cpp @@ -45,7 +45,7 @@ public: SetArgs(CString(m_iThresholdMsgs) + " " + CString(m_iThresholdSecs)); } - bool OnLoad(const CString& sArgs, CString& sMessage) { + bool OnLoad(const CString& sArgs, CString& sMessage) override { m_iThresholdMsgs = sArgs.Token(0).ToUInt(); m_iThresholdSecs = sArgs.Token(1).ToUInt(); @@ -64,7 +64,7 @@ public: return true; } - void OnIRCDisconnected() { + void OnIRCDisconnected() override { m_chans.clear(); } @@ -152,23 +152,23 @@ public: } } - EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) { + EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override { Message(Channel); return CONTINUE; } // This also catches OnChanAction() - EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) { + EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override { Message(Channel); return CONTINUE; } - EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) { + EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override { Message(Channel); return CONTINUE; } - EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) { + EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override { Message(Channel); return CONTINUE; } diff --git a/modules/identfile.cpp b/modules/identfile.cpp index 4d2342c7..d4cb79a3 100644 --- a/modules/identfile.cpp +++ b/modules/identfile.cpp @@ -73,7 +73,7 @@ public: } } - void OnModCommand(const CString& sCommand) { + void OnModCommand(const CString& sCommand) override { if (GetUser()->IsAdmin()) { HandleCommand(sCommand); } else { @@ -147,7 +147,7 @@ public: } } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { m_pISpoofLockFile = NULL; m_pIRCSock = NULL; @@ -162,7 +162,7 @@ public: return true; } - virtual EModRet OnIRCConnecting(CIRCSock *pIRCSock) { + virtual EModRet OnIRCConnecting(CIRCSock *pIRCSock) override { if (m_pISpoofLockFile != NULL) { DEBUG("Aborting connection, ident spoof lock file exists"); PutModule("Aborting connection, another user or network is currently connecting and using the ident spoof file"); @@ -179,19 +179,19 @@ public: return CONTINUE; } - virtual void OnIRCConnected() { + virtual void OnIRCConnected() override { if (m_pIRCSock == GetNetwork()->GetIRCSock()) { ReleaseISpoof(); } } - virtual void OnIRCConnectionError(CIRCSock *pIRCSock) { + virtual void OnIRCConnectionError(CIRCSock *pIRCSock) override { if (m_pIRCSock == pIRCSock) { ReleaseISpoof(); } } - virtual void OnIRCDisconnected() { + virtual void OnIRCDisconnected() override { if (m_pIRCSock == GetNetwork()->GetIRCSock()) { ReleaseISpoof(); } diff --git a/modules/imapauth.cpp b/modules/imapauth.cpp index 729fbf60..5aa21fb4 100644 --- a/modules/imapauth.cpp +++ b/modules/imapauth.cpp @@ -36,7 +36,7 @@ public: } } - virtual void ReadLine(const CString& sLine); + virtual void ReadLine(const CString& sLine) override; private: protected: CIMAPAuthMod* m_pIMAPMod; @@ -57,11 +57,11 @@ public: virtual ~CIMAPAuthMod() {} - virtual bool OnBoot() { + virtual bool OnBoot() override { return true; } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { if (sArgs.Trim_n().empty()) { return true; // use defaults } @@ -84,7 +84,7 @@ public: return true; } - virtual EModRet OnLoginAttempt(std::shared_ptr Auth) { + virtual EModRet OnLoginAttempt(std::shared_ptr Auth) override { CUser* pUser = CZNC::Get().FindUser(Auth->GetUsername()); if (!pUser) { // @todo Will want to do some sort of && !m_bAllowCreate in the future @@ -104,7 +104,7 @@ public: return HALT; } - virtual void OnModCommand(const CString& sLine) { + virtual void OnModCommand(const CString& sLine) override { } void CacheLogin(const CString& sLogin) { diff --git a/modules/keepnick.cpp b/modules/keepnick.cpp index 7d467a75..265f0952 100644 --- a/modules/keepnick.cpp +++ b/modules/keepnick.cpp @@ -43,7 +43,7 @@ public: ~CKeepNickMod() {} - bool OnLoad(const CString& sArgs, CString& sMessage) { + bool OnLoad(const CString& sArgs, CString& sMessage) override { m_pTimer = NULL; // Check if we need to start the timer @@ -80,7 +80,7 @@ public: return sConfNick; } - void OnNick(const CNick& Nick, const CString& sNewNick, const vector& vChans) { + void OnNick(const CNick& Nick, const CString& sNewNick, const vector& vChans) override { if (sNewNick == GetNetwork()->GetIRCSock()->GetNick()) { // We are changing our own nick if (Nick.NickEquals(GetNick())) { @@ -102,19 +102,19 @@ public: } } - void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) { + void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) override { // If someone with the nick we want quits, be fast and get the nick if (Nick.NickEquals(GetNick())) { KeepNick(); } } - void OnIRCDisconnected() { + void OnIRCDisconnected() override { // No way we can do something if we aren't connected to IRC. Disable(); } - void OnIRCConnected() { + void OnIRCConnected() override { if (!GetNetwork()->GetIRCSock()->GetNick().Equals(GetNick())) { // We don't have the nick we want, try to get it Enable(); @@ -138,7 +138,7 @@ public: m_pTimer = NULL; } - virtual EModRet OnUserRaw(CString& sLine) { + virtual EModRet OnUserRaw(CString& sLine) override { // We dont care if we are not connected to IRC if (!GetNetwork()->IsIRCConnected()) return CONTINUE; @@ -164,7 +164,7 @@ public: return CONTINUE; } - virtual EModRet OnRaw(CString& sLine) { + virtual EModRet OnRaw(CString& sLine) override { // Are we trying to get our primary nick and we caused this error? // :irc.server.net 433 mynick badnick :Nickname is already in use. if (m_pTimer && sLine.Token(1) == "433" && sLine.Token(3).Equals(GetNick())) diff --git a/modules/kickrejoin.cpp b/modules/kickrejoin.cpp index 4f1e709b..905e2e5b 100644 --- a/modules/kickrejoin.cpp +++ b/modules/kickrejoin.cpp @@ -34,7 +34,7 @@ public: virtual ~CRejoinJob() {} protected: - virtual void RunJob() { + virtual void RunJob() override { CIRCNetwork* pNetwork = GetModule()->GetNetwork(); CChan* pChan = pNetwork->FindChan(GetName().Token(1, true)); @@ -57,7 +57,7 @@ public: } virtual ~CRejoinMod() {} - virtual bool OnLoad(const CString& sArgs, CString& sErrorMsg) { + virtual bool OnLoad(const CString& sArgs, CString& sErrorMsg) override { if (sArgs.empty()) { CString sDelay = GetNV("delay"); @@ -104,7 +104,7 @@ public: PutModule("Rejoin delay disabled"); } - virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& pChan, const CString& sMessage) { + virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& pChan, const CString& sMessage) override { if (GetNetwork()->GetCurNick().Equals(sKickedNick)) { if (!delay) { PutIRC("JOIN " + pChan.GetName() + " " + pChan.GetKey()); diff --git a/modules/lastseen.cpp b/modules/lastseen.cpp index 52066789..68816b1d 100644 --- a/modules/lastseen.cpp +++ b/modules/lastseen.cpp @@ -77,25 +77,25 @@ public: // Event stuff: - virtual void OnClientLogin() { + virtual void OnClientLogin() override { SetTime(GetUser()); } - virtual void OnClientDisconnect() { + virtual void OnClientDisconnect() override { SetTime(GetUser()); } - virtual EModRet OnDeleteUser(CUser& User) { + virtual EModRet OnDeleteUser(CUser& User) override { DelNV(User.GetUserName()); return CONTINUE; } // Web stuff: - virtual bool WebRequiresAdmin() { return true; } - virtual CString GetWebMenuTitle() { return "Last Seen"; } + virtual bool WebRequiresAdmin() override { return true; } + virtual CString GetWebMenuTitle() override { return "Last Seen"; } - virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { if (sPageName == "index") { CModules& GModules = CZNC::Get().GetModules(); Tmpl["WebAdminLoaded"] = CString(GModules.FindModule("webadmin") != NULL); @@ -122,7 +122,7 @@ public: return false; } - virtual bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + virtual bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { if (sPageName == "webadmin/user" && WebSock.GetSession()->IsAdmin()) { CUser* pUser = CZNC::Get().FindUser(Tmpl["Username"]); if (pUser) { diff --git a/modules/listsockets.cpp b/modules/listsockets.cpp index 10575cd9..1a8f2b10 100644 --- a/modules/listsockets.cpp +++ b/modules/listsockets.cpp @@ -69,7 +69,7 @@ public: AddCommand("List", static_cast(&CListSockets::OnListCommand), "[-n]", "Show the list of active sockets. Pass -n to show IP addresses"); } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { #ifndef MOD_LISTSOCKETS_ALLOW_EVERYONE if (!GetUser()->IsAdmin()) { @@ -99,10 +99,10 @@ public: return ret; } - virtual bool WebRequiresAdmin() { return true; } - virtual CString GetWebMenuTitle() { return "List sockets"; } + virtual bool WebRequiresAdmin() override { return true; } + virtual CString GetWebMenuTitle() override { return "List sockets"; } - virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { if (sPageName == "index") { if (CZNC::Get().GetManager().empty()) { return false; diff --git a/modules/log.cpp b/modules/log.cpp index e6b3055a..578a4660 100644 --- a/modules/log.cpp +++ b/modules/log.cpp @@ -76,33 +76,33 @@ public: void PutLog(const CString& sLine, const CNick& Nick); CString GetServer(); - virtual bool OnLoad(const CString& sArgs, CString& sMessage); - virtual void OnIRCConnected(); - virtual void OnIRCDisconnected(); - virtual EModRet OnBroadcast(CString& sMessage); + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override; + virtual void OnIRCConnected() override; + virtual void OnIRCDisconnected() override; + virtual EModRet OnBroadcast(CString& sMessage) override; - virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); - virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage); - virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans); - virtual void OnJoin(const CNick& Nick, CChan& Channel); - virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage); - virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector& vChans); - virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic); + virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override; + virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override; + virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) override; + virtual void OnJoin(const CNick& Nick, CChan& Channel) override; + virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override; + virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector& vChans) override; + virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override; /* notices */ - virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage); - virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage); - virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage); + virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override; + virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override; + virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override; /* actions */ - virtual EModRet OnUserAction(CString& sTarget, CString& sMessage); - virtual EModRet OnPrivAction(CNick& Nick, CString& sMessage); - virtual EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage); + virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) override; + virtual EModRet OnPrivAction(CNick& Nick, CString& sMessage) override; + virtual EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) override; /* msgs */ - virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage); - virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage); - virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage); + virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override; + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override; + virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override; private: CString m_sLogPath; diff --git a/modules/missingmotd.cpp b/modules/missingmotd.cpp index dd105165..623687ad 100644 --- a/modules/missingmotd.cpp +++ b/modules/missingmotd.cpp @@ -20,7 +20,7 @@ class CMissingMotd : public CModule { public: MODCONSTRUCTOR(CMissingMotd) {} - virtual void OnClientLogin() { + virtual void OnClientLogin() override { PutUser(":irc.znc.in 422 :MOTD File is missing"); } }; diff --git a/modules/modperl.cpp b/modules/modperl.cpp index cea5efa2..eb1d6881 100644 --- a/modules/modperl.cpp +++ b/modules/modperl.cpp @@ -59,7 +59,7 @@ public: #define PUSH_STR(s) XPUSHs(PString(s).GetSV()) #define PUSH_PTR(type, p) XPUSHs(SWIG_NewInstanceObj(const_cast(p), SWIG_TypeQuery(#type), SWIG_SHADOW)) - bool OnLoad(const CString& sArgsi, CString& sMessage) { + bool OnLoad(const CString& sArgsi, CString& sMessage) override { CString sModPath, sTmp; if (!CModules::FindModPath("modperl/startup.pl", sModPath, sTmp)) { sMessage = "startup.pl not found."; @@ -99,7 +99,7 @@ public: } virtual EModRet OnModuleLoading(const CString& sModName, const CString& sArgs, - CModInfo::EModuleType eType, bool& bSuccess, CString& sRetMsg) { + CModInfo::EModuleType eType, bool& bSuccess, CString& sRetMsg) override { EModRet result = HALT; PSTART; PUSH_STR(sModName); @@ -133,7 +133,7 @@ public: return result; } - virtual EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg) { + virtual EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg) override { CPerlModule* pMod = AsPerlModule(pModule); if (pMod) { EModRet result = HALT; @@ -166,7 +166,7 @@ public: } virtual EModRet OnGetModInfo(CModInfo& ModInfo, const CString& sModule, - bool& bSuccess, CString& sRetMsg) { + bool& bSuccess, CString& sRetMsg) override { PSTART; PUSH_STR(sModule); PUSH_PTR(CModInfo*, &ModInfo); @@ -208,7 +208,7 @@ public: return result; } - virtual void OnGetAvailableMods(set& ssMods, CModInfo::EModuleType eType) { + virtual void OnGetAvailableMods(set& ssMods, CModInfo::EModuleType eType) override { unsigned int a = 0; CDir Dir; diff --git a/modules/modperl/module.h b/modules/modperl/module.h index a881386d..2e2ce7b8 100644 --- a/modules/modperl/module.h +++ b/modules/modperl/module.h @@ -38,73 +38,73 @@ public: return sv_2mortal(newSVsv(m_perlObj)); } - virtual bool OnBoot(); - virtual bool WebRequiresLogin(); - virtual bool WebRequiresAdmin(); - virtual CString GetWebMenuTitle(); - virtual bool OnWebPreRequest(CWebSock& WebSock, const CString& sPageName); - virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl); - virtual VWebSubPages& GetSubPages(); - virtual void OnPreRehash(); - virtual void OnPostRehash(); - virtual void OnIRCDisconnected(); - virtual void OnIRCConnected(); - virtual EModRet OnIRCConnecting(CIRCSock *pIRCSock); - virtual void OnIRCConnectionError(CIRCSock *pIRCSock); - virtual EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName); - virtual EModRet OnBroadcast(CString& sMessage); - virtual void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); - virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange); - virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); - virtual EModRet OnRaw(CString& sLine); - virtual EModRet OnStatusCommand(CString& sCommand); - virtual void OnModCommand(const CString& sCommand); - virtual void OnModNotice(const CString& sMessage); - virtual void OnModCTCP(const CString& sMessage); - virtual void OnQuit(const CNick& Nick, const CString& sMessage, const std::vector& vChans); - virtual void OnNick(const CNick& Nick, const CString& sNewNick, const std::vector& vChans); - virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage); - virtual EModRet OnJoining(CChan& Channel); - virtual void OnJoin(const CNick& Nick, CChan& Channel); - virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage); - virtual EModRet OnChanBufferStarting(CChan& Chan, CClient& Client); - virtual EModRet OnChanBufferEnding(CChan& Chan, CClient& Client); - virtual EModRet OnChanBufferPlayLine(CChan& Chan, CClient& Client, CString& sLine); - virtual EModRet OnPrivBufferPlayLine(CClient& Client, CString& sLine); - virtual void OnClientLogin(); - virtual void OnClientDisconnect(); - virtual EModRet OnUserRaw(CString& sLine); - virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage); - virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage); - virtual EModRet OnUserAction(CString& sTarget, CString& sMessage); - virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage); - virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage); - virtual EModRet OnUserJoin(CString& sChannel, CString& sKey); - virtual EModRet OnUserPart(CString& sChannel, CString& sMessage); - virtual EModRet OnUserTopic(CString& sChannel, CString& sTopic); - virtual EModRet OnUserTopicRequest(CString& sChannel); - virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage); - virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage); - virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage); - virtual EModRet OnPrivAction(CNick& Nick, CString& sMessage); - virtual EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage); - virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage); - virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage); - virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage); - virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage); - virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic); - virtual bool OnServerCapAvailable(const CString& sCap); - virtual void OnServerCapResult(const CString& sCap, bool bSuccess); - virtual EModRet OnTimerAutoJoin(CChan& Channel); - virtual bool OnEmbeddedWebRequest(CWebSock&, const CString&, CTemplate&); - virtual EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet); - virtual EModRet OnDeleteNetwork(CIRCNetwork& Network); - virtual EModRet OnSendToClient(CString& sLine, CClient& Client); - virtual EModRet OnSendToIRC(CString& sLine); + virtual bool OnBoot() override; + virtual bool WebRequiresLogin() override; + virtual bool WebRequiresAdmin() override; + virtual CString GetWebMenuTitle() override; + virtual bool OnWebPreRequest(CWebSock& WebSock, const CString& sPageName) override; + virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override; + virtual VWebSubPages& GetSubPages() override; + virtual void OnPreRehash() override; + virtual void OnPostRehash() override; + virtual void OnIRCDisconnected() override; + virtual void OnIRCConnected() override; + virtual EModRet OnIRCConnecting(CIRCSock *pIRCSock) override; + virtual void OnIRCConnectionError(CIRCSock *pIRCSock) override; + virtual EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) override; + virtual EModRet OnBroadcast(CString& sMessage) override; + virtual void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) override; + virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override; + virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override; + virtual void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override; + virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override; + virtual void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) override; + virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override; + virtual EModRet OnRaw(CString& sLine) override; + virtual EModRet OnStatusCommand(CString& sCommand) override; + virtual void OnModCommand(const CString& sCommand) override; + virtual void OnModNotice(const CString& sMessage) override; + virtual void OnModCTCP(const CString& sMessage) override; + virtual void OnQuit(const CNick& Nick, const CString& sMessage, const std::vector& vChans) override; + virtual void OnNick(const CNick& Nick, const CString& sNewNick, const std::vector& vChans) override; + virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override; + virtual EModRet OnJoining(CChan& Channel) override; + virtual void OnJoin(const CNick& Nick, CChan& Channel) override; + virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override; + virtual EModRet OnChanBufferStarting(CChan& Chan, CClient& Client) override; + virtual EModRet OnChanBufferEnding(CChan& Chan, CClient& Client) override; + virtual EModRet OnChanBufferPlayLine(CChan& Chan, CClient& Client, CString& sLine) override; + virtual EModRet OnPrivBufferPlayLine(CClient& Client, CString& sLine) override; + virtual void OnClientLogin() override; + virtual void OnClientDisconnect() override; + virtual EModRet OnUserRaw(CString& sLine) override; + virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) override; + virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override; + virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) override; + virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override; + virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override; + virtual EModRet OnUserJoin(CString& sChannel, CString& sKey) override; + virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) override; + virtual EModRet OnUserTopic(CString& sChannel, CString& sTopic) override; + virtual EModRet OnUserTopicRequest(CString& sChannel) override; + virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) override; + virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override; + virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override; + virtual EModRet OnPrivAction(CNick& Nick, CString& sMessage) override; + virtual EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) override; + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override; + virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override; + virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override; + virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override; + virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override; + virtual bool OnServerCapAvailable(const CString& sCap) override; + virtual void OnServerCapResult(const CString& sCap, bool bSuccess) override; + virtual EModRet OnTimerAutoJoin(CChan& Channel) override; + virtual bool OnEmbeddedWebRequest(CWebSock&, const CString&, CTemplate&) override; + virtual EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet) override; + virtual EModRet OnDeleteNetwork(CIRCNetwork& Network) override; + virtual EModRet OnSendToClient(CString& sLine, CClient& Client) override; + virtual EModRet OnSendToIRC(CString& sLine) override; }; static inline CPerlModule* AsPerlModule(CModule* p) { @@ -124,7 +124,7 @@ public: : CTimer (pModule, uInterval, uCycles, sLabel, sDescription), m_perlObj(newSVsv(perlObj)) { pModule->AddTimer(this); } - virtual void RunJob(); + virtual void RunJob() override; SV* GetPerlObj() { return sv_2mortal(newSVsv(m_perlObj)); } @@ -144,13 +144,13 @@ public: return sv_2mortal(newSVsv(m_perlObj)); } ~CPerlSocket(); - virtual void Connected(); - virtual void Disconnected(); - virtual void Timeout(); - virtual void ConnectionRefused(); - virtual void ReadData(const char *data, size_t len); - virtual void ReadLine(const CString& sLine); - virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort); + virtual void Connected() override; + virtual void Disconnected() override; + virtual void Timeout() override; + virtual void ConnectionRefused() override; + virtual void ReadData(const char *data, size_t len) override; + virtual void ReadLine(const CString& sLine) override; + virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) override; }; inline CPerlSocket* CreatePerlSocket(CPerlModule* pModule, SV* perlObj) { diff --git a/modules/modpython.cpp b/modules/modpython.cpp index 82908ab9..3a9cac55 100644 --- a/modules/modpython.cpp +++ b/modules/modpython.cpp @@ -87,7 +87,7 @@ public: m_PyZNCModule = NULL; } - bool OnLoad(const CString& sArgsi, CString& sMessage) { + bool OnLoad(const CString& sArgsi, CString& sMessage) override { CString sModPath, sTmp; #ifdef __CYGWIN__ CString sDllPath = "modpython/_znc_core.dll"; @@ -144,7 +144,7 @@ public: } virtual EModRet OnModuleLoading(const CString& sModName, const CString& sArgs, - CModInfo::EModuleType eType, bool& bSuccess, CString& sRetMsg) { + CModInfo::EModuleType eType, bool& bSuccess, CString& sRetMsg) override { PyObject* pyFunc = PyObject_GetAttrString(m_PyZNCModule, "load_module"); if (!pyFunc) { sRetMsg = GetPyExceptionStr(); @@ -194,7 +194,7 @@ public: return HALT; } - virtual EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg) { + virtual EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg) override { CPyModule* pMod = AsPyModule(pModule); if (pMod) { CString sModName = pMod->GetModName(); @@ -228,7 +228,7 @@ public: } virtual EModRet OnGetModInfo(CModInfo& ModInfo, const CString& sModule, - bool& bSuccess, CString& sRetMsg) { + bool& bSuccess, CString& sRetMsg) override { PyObject* pyFunc = PyObject_GetAttrString(m_PyZNCModule, "get_mod_info"); if (!pyFunc) { sRetMsg = GetPyExceptionStr(); @@ -309,7 +309,7 @@ public: } } - virtual void OnGetAvailableMods(set& ssMods, CModInfo::EModuleType eType) { + virtual void OnGetAvailableMods(set& ssMods, CModInfo::EModuleType eType) override { CDir Dir; CModules::ModDirList dirs = CModules::GetModDirs(); diff --git a/modules/modpython/module.h b/modules/modpython/module.h index 3a8dd46a..92b9ced8 100644 --- a/modules/modpython/module.h +++ b/modules/modpython/module.h @@ -54,90 +54,90 @@ public: return m_pModPython; } - virtual bool OnBoot(); - virtual bool WebRequiresLogin(); - virtual bool WebRequiresAdmin(); - virtual CString GetWebMenuTitle(); - virtual bool OnWebPreRequest(CWebSock& WebSock, const CString& sPageName); - virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl); - virtual VWebSubPages& GetSubPages(); - virtual void OnPreRehash(); - virtual void OnPostRehash(); - virtual void OnIRCDisconnected(); - virtual void OnIRCConnected(); - virtual EModRet OnIRCConnecting(CIRCSock *pIRCSock); - virtual void OnIRCConnectionError(CIRCSock *pIRCSock); - virtual EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName); - virtual EModRet OnBroadcast(CString& sMessage); - virtual void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); - virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange); - virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); - virtual EModRet OnRaw(CString& sLine); - virtual EModRet OnStatusCommand(CString& sCommand); - virtual void OnModCommand(const CString& sCommand); - virtual void OnModNotice(const CString& sMessage); - virtual void OnModCTCP(const CString& sMessage); - virtual void OnQuit(const CNick& Nick, const CString& sMessage, const std::vector& vChans); - virtual void OnNick(const CNick& Nick, const CString& sNewNick, const std::vector& vChans); - virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage); - virtual EModRet OnJoining(CChan& Channel); - virtual void OnJoin(const CNick& Nick, CChan& Channel); - virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage); - virtual EModRet OnChanBufferStarting(CChan& Chan, CClient& Client); - virtual EModRet OnChanBufferEnding(CChan& Chan, CClient& Client); - virtual EModRet OnChanBufferPlayLine(CChan& Chan, CClient& Client, CString& sLine); - virtual EModRet OnPrivBufferPlayLine(CClient& Client, CString& sLine); - virtual void OnClientLogin(); - virtual void OnClientDisconnect(); - virtual EModRet OnUserRaw(CString& sLine); - virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage); - virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage); - virtual EModRet OnUserAction(CString& sTarget, CString& sMessage); - virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage); - virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage); - virtual EModRet OnUserJoin(CString& sChannel, CString& sKey); - virtual EModRet OnUserPart(CString& sChannel, CString& sMessage); - virtual EModRet OnUserTopic(CString& sChannel, CString& sTopic); - virtual EModRet OnUserTopicRequest(CString& sChannel); - virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage); - virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage); - virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage); - virtual EModRet OnPrivAction(CNick& Nick, CString& sMessage); - virtual EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage); - virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage); - virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage); - virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage); - virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage); - virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic); - virtual bool OnServerCapAvailable(const CString& sCap); - virtual void OnServerCapResult(const CString& sCap, bool bSuccess); - virtual EModRet OnTimerAutoJoin(CChan& Channel); - virtual bool OnEmbeddedWebRequest(CWebSock&, const CString&, CTemplate&); - virtual EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet); - virtual EModRet OnDeleteNetwork(CIRCNetwork& Network); - virtual EModRet OnSendToClient(CString& sLine, CClient& Client); - virtual EModRet OnSendToIRC(CString& sLine); + virtual bool OnBoot() override; + virtual bool WebRequiresLogin() override; + virtual bool WebRequiresAdmin() override; + virtual CString GetWebMenuTitle() override; + virtual bool OnWebPreRequest(CWebSock& WebSock, const CString& sPageName) override; + virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override; + virtual VWebSubPages& GetSubPages() override; + virtual void OnPreRehash() override; + virtual void OnPostRehash() override; + virtual void OnIRCDisconnected() override; + virtual void OnIRCConnected() override; + virtual EModRet OnIRCConnecting(CIRCSock *pIRCSock) override; + virtual void OnIRCConnectionError(CIRCSock *pIRCSock) override; + virtual EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) override; + virtual EModRet OnBroadcast(CString& sMessage) override; + virtual void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) override; + virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override; + virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override; + virtual void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override; + virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override; + virtual void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) override; + virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override; + virtual EModRet OnRaw(CString& sLine) override; + virtual EModRet OnStatusCommand(CString& sCommand) override; + virtual void OnModCommand(const CString& sCommand) override; + virtual void OnModNotice(const CString& sMessage) override; + virtual void OnModCTCP(const CString& sMessage) override; + virtual void OnQuit(const CNick& Nick, const CString& sMessage, const std::vector& vChans) override; + virtual void OnNick(const CNick& Nick, const CString& sNewNick, const std::vector& vChans) override; + virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override; + virtual EModRet OnJoining(CChan& Channel) override; + virtual void OnJoin(const CNick& Nick, CChan& Channel) override; + virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override; + virtual EModRet OnChanBufferStarting(CChan& Chan, CClient& Client) override; + virtual EModRet OnChanBufferEnding(CChan& Chan, CClient& Client) override; + virtual EModRet OnChanBufferPlayLine(CChan& Chan, CClient& Client, CString& sLine) override; + virtual EModRet OnPrivBufferPlayLine(CClient& Client, CString& sLine) override; + virtual void OnClientLogin() override; + virtual void OnClientDisconnect() override; + virtual EModRet OnUserRaw(CString& sLine) override; + virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) override; + virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override; + virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) override; + virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override; + virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override; + virtual EModRet OnUserJoin(CString& sChannel, CString& sKey) override; + virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) override; + virtual EModRet OnUserTopic(CString& sChannel, CString& sTopic) override; + virtual EModRet OnUserTopicRequest(CString& sChannel) override; + virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) override; + virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override; + virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override; + virtual EModRet OnPrivAction(CNick& Nick, CString& sMessage) override; + virtual EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) override; + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override; + virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override; + virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override; + virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override; + virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override; + virtual bool OnServerCapAvailable(const CString& sCap) override; + virtual void OnServerCapResult(const CString& sCap, bool bSuccess) override; + virtual EModRet OnTimerAutoJoin(CChan& Channel) override; + virtual bool OnEmbeddedWebRequest(CWebSock&, const CString&, CTemplate&) override; + virtual EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet) override; + virtual EModRet OnDeleteNetwork(CIRCNetwork& Network) override; + virtual EModRet OnSendToClient(CString& sLine, CClient& Client) override; + virtual EModRet OnSendToIRC(CString& sLine) override; // Global Modules - virtual EModRet OnAddUser(CUser& User, CString& sErrorRet); - virtual EModRet OnDeleteUser(CUser& User); - virtual void OnClientConnect(CZNCSock* pSock, const CString& sHost, unsigned short uPort); - virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP); - virtual EModRet OnUnknownUserRaw(CClient* pClient, CString& sLine); - virtual bool IsClientCapSupported(CClient* pClient, const CString& sCap, bool bState); - virtual void OnClientCapRequest(CClient* pClient, const CString& sCap, bool bState); + virtual EModRet OnAddUser(CUser& User, CString& sErrorRet) override; + virtual EModRet OnDeleteUser(CUser& User) override; + virtual void OnClientConnect(CZNCSock* pSock, const CString& sHost, unsigned short uPort) override; + virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) override; + virtual EModRet OnUnknownUserRaw(CClient* pClient, CString& sLine) override; + virtual bool IsClientCapSupported(CClient* pClient, const CString& sCap, bool bState) override; + virtual void OnClientCapRequest(CClient* pClient, const CString& sCap, bool bState) override; virtual EModRet OnModuleLoading(const CString& sModName, const CString& sArgs, - CModInfo::EModuleType eType, bool& bSuccess, CString& sRetMsg); - virtual EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg); + CModInfo::EModuleType eType, bool& bSuccess, CString& sRetMsg) override; + virtual EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg) override; virtual EModRet OnGetModInfo(CModInfo& ModInfo, const CString& sModule, - bool& bSuccess, CString& sRetMsg); - virtual void OnGetAvailableMods(std::set& ssMods, CModInfo::EModuleType eType); - virtual void OnClientCapLs(CClient* pClient, SCString& ssCaps); - virtual EModRet OnLoginAttempt(std::shared_ptr Auth); + bool& bSuccess, CString& sRetMsg) override; + virtual void OnGetAvailableMods(std::set& ssMods, CModInfo::EModuleType eType) override; + virtual void OnClientCapLs(CClient* pClient, SCString& ssCaps) override; + virtual EModRet OnLoginAttempt(std::shared_ptr Auth) override; }; static inline CPyModule* AsPyModule(CModule* p) { @@ -158,7 +158,7 @@ public: pModule->AddTimer(this); m_pModPython = pModule->GetModPython(); } - virtual void RunJob(); + virtual void RunJob() override; PyObject* GetPyObj() { return m_pyObj; } PyObject* GetNewPyObj() { Py_INCREF(m_pyObj); @@ -186,13 +186,13 @@ public: return m_pyObj; } ~CPySocket(); - virtual void Connected(); - virtual void Disconnected(); - virtual void Timeout(); - virtual void ConnectionRefused(); - virtual void ReadData(const char *data, size_t len); - virtual void ReadLine(const CString& sLine); - virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort); + virtual void Connected() override; + virtual void Disconnected() override; + virtual void Timeout() override; + virtual void ConnectionRefused() override; + virtual void ReadData(const char *data, size_t len) override; + virtual void ReadLine(const CString& sLine) override; + virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) override; }; inline CPySocket* CreatePySocket(CPyModule* pModule, PyObject* pyObj) { diff --git a/modules/modtcl.cpp b/modules/modtcl.cpp index 9938add8..39589c50 100644 --- a/modules/modtcl.cpp +++ b/modules/modtcl.cpp @@ -43,7 +43,7 @@ public: CModTclTimer(CModule* pModule, unsigned int uInterval, unsigned int uCycles, const CString& sLabel, const CString& sDescription) : CTimer(pModule, uInterval, uCycles, sLabel, sDescription), m_pParent(NULL) {} virtual ~CModTclTimer() {} protected: - virtual void RunJob(); + virtual void RunJob() override; CModTcl* m_pParent; }; @@ -53,7 +53,7 @@ public: CModTclStartTimer(CModule* pModule, unsigned int uInterval, unsigned int uCycles, const CString& sLabel, const CString& sDescription) : CTimer(pModule, uInterval, uCycles, sLabel, sDescription), m_pParent(NULL) {} virtual ~CModTclStartTimer() {} protected: - virtual void RunJob(); + virtual void RunJob() override; CModTcl* m_pParent; }; @@ -70,7 +70,7 @@ public: } } - virtual bool OnLoad(const CString& sArgs, CString& sErrorMsg) { + virtual bool OnLoad(const CString& sArgs, CString& sErrorMsg) override { #ifndef MOD_MODTCL_ALLOW_EVERYONE if (!GetUser()->IsAdmin()) { sErrorMsg = "You must be admin to use the modtcl module"; @@ -124,7 +124,7 @@ public: AddTimer(new CModTclTimer(this, 1, 0, "ModTclUpdate", "Timer for modtcl to process pending events and idle callbacks.")); } - virtual void OnModCommand(const CString& sCommand) { + virtual void OnModCommand(const CString& sCommand) override { CString sResult; VCString vsResult; CString sCmd = sCommand; @@ -161,29 +161,29 @@ public: return sLine; } - virtual void OnPreRehash() { + virtual void OnPreRehash() override { if (interp) Tcl_Eval(interp,"Binds::ProcessEvnt prerehash"); } - virtual void OnPostRehash() { + virtual void OnPostRehash() override { if (interp) { Tcl_Eval(interp,"rehash"); Tcl_Eval(interp,"Binds::ProcessEvnt rehash"); } } - virtual void OnIRCConnected() { + virtual void OnIRCConnected() override { if (interp) Tcl_Eval(interp, "Binds::ProcessEvnt init-server"); } - virtual void OnIRCDisconnected() { + virtual void OnIRCDisconnected() override { if (interp) Tcl_Eval(interp, "Binds::ProcessEvnt disconnect-server"); } - virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override { CString sMes = TclEscape(sMessage); CString sNick = TclEscape(CString(Nick.GetNick())); CString sHost = TclEscape(CString(Nick.GetIdent() + "@" + Nick.GetHost())); @@ -197,7 +197,7 @@ public: return CONTINUE; } - virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override { CString sMes = TclEscape(sMessage); CString sNick = TclEscape(CString(Nick.GetNick())); CString sHost = TclEscape(CString(Nick.GetIdent() + "@" + Nick.GetHost())); @@ -210,7 +210,7 @@ public: return CONTINUE; } - virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector& vChans) { + virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector& vChans) override { CString sOldNick = TclEscape(CString(OldNick.GetNick())); CString sNewNickTmp = TclEscape(sNewNick); CString sHost = TclEscape(CString(OldNick.GetIdent() + "@" + OldNick.GetHost())); @@ -227,7 +227,7 @@ public: } } - virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) { + virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override { CString sOpNick = TclEscape(CString(OpNick.GetNick())); CString sNick = TclEscape(sKickedNick); CString sOpHost = TclEscape(CString(OpNick.GetIdent() + "@" + OpNick.GetHost())); diff --git a/modules/modules_online.cpp b/modules/modules_online.cpp index 0da3da41..a1be1cef 100644 --- a/modules/modules_online.cpp +++ b/modules/modules_online.cpp @@ -37,7 +37,7 @@ public: return false; } - virtual EModRet OnUserRaw(CString& sLine) { + virtual EModRet OnUserRaw(CString& sLine) override { //Handle ISON if (sLine.Token(0).Equals("ison")) { VCString vsNicks; @@ -83,7 +83,7 @@ public: return CONTINUE; } - virtual EModRet OnRaw(CString& sLine) { + virtual EModRet OnRaw(CString& sLine) override { //Handle 303 reply if m_Requests is not empty if (sLine.Token(1) == "303" && !m_ISONRequests.empty()) { VCString::iterator it = m_ISONRequests.begin(); diff --git a/modules/nickserv.cpp b/modules/nickserv.cpp index 3bef3583..2bbc38bf 100644 --- a/modules/nickserv.cpp +++ b/modules/nickserv.cpp @@ -129,7 +129,7 @@ public: virtual ~CNickServ() {} - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { if (!sArgs.empty() && sArgs != "") { SetNV("Password", sArgs); SetArgs(""); @@ -175,12 +175,12 @@ public: } } - virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override { HandleMessage(Nick, sMessage); return CONTINUE; } - virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override { HandleMessage(Nick, sMessage); return CONTINUE; } diff --git a/modules/notes.cpp b/modules/notes.cpp index 53221719..dff5ac98 100644 --- a/modules/notes.cpp +++ b/modules/notes.cpp @@ -85,20 +85,20 @@ public: virtual ~CNotesMod() {} - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { bShowNotesOnLogin = !sArgs.Equals("-disableNotesOnLogin"); return true; } - virtual CString GetWebMenuTitle() { return "Notes"; } + virtual CString GetWebMenuTitle() override { return "Notes"; } - virtual void OnClientLogin() { + virtual void OnClientLogin() override { if (bShowNotesOnLogin) { ListNotes(true); } } - virtual EModRet OnUserRaw(CString& sLine) { + virtual EModRet OnUserRaw(CString& sLine) override { if (sLine.Left(1) != "#") { return CONTINUE; } @@ -189,7 +189,7 @@ public: } } - virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { if (sPageName == "index") { for (MCString::iterator it = BeginNV(); it != EndNV(); ++it) { CTemplate& Row = Tmpl.AddRow("NotesLoop"); diff --git a/modules/notify_connect.cpp b/modules/notify_connect.cpp index df928b00..98e03f84 100644 --- a/modules/notify_connect.cpp +++ b/modules/notify_connect.cpp @@ -21,11 +21,11 @@ class CNotifyConnectMod : public CModule { public: MODCONSTRUCTOR(CNotifyConnectMod) {} - virtual void OnClientLogin() { + virtual void OnClientLogin() override { SendAdmins(GetUser()->GetUserName() + " attached (from " + GetClient()->GetRemoteIP() + ")"); } - virtual void OnClientDisconnect() { + virtual void OnClientDisconnect() override { SendAdmins(GetUser()->GetUserName() + " detached (from " + GetClient()->GetRemoteIP() + ")"); } diff --git a/modules/partyline.cpp b/modules/partyline.cpp index 87232dd0..61b11c25 100644 --- a/modules/partyline.cpp +++ b/modules/partyline.cpp @@ -102,14 +102,14 @@ public: } } - virtual bool OnBoot() { + virtual bool OnBoot() override { // The config is now read completely, so all Users are set up Load(); return true; } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { const map& msUsers = CZNC::Get().GetUserMap(); for (map::const_iterator it = msUsers.begin(); it != msUsers.end(); ++it) { @@ -175,7 +175,7 @@ public: DelNV("topic:" + pChannel->GetName()); } - virtual EModRet OnDeleteUser(CUser& User) { + virtual EModRet OnDeleteUser(CUser& User) override { // Loop through each chan for (set::iterator it = m_ssChannels.begin(); it != m_ssChannels.end();) { CPartylineChannel *pChan = *it; @@ -188,7 +188,7 @@ public: return CONTINUE; } - virtual EModRet OnRaw(CString& sLine) { + virtual EModRet OnRaw(CString& sLine) override { if (sLine.Token(1) == "005") { CString::size_type uPos = sLine.AsUpper().find("CHANTYPES="); if (uPos != CString::npos) { @@ -205,11 +205,11 @@ public: return CONTINUE; } - virtual void OnIRCDisconnected() { + virtual void OnIRCDisconnected() override { m_spInjectedPrefixes.erase(GetNetwork()); } - virtual void OnClientLogin() { + virtual void OnClientLogin() override { CUser* pUser = GetUser(); CClient* pClient = GetClient(); CIRCNetwork* pNetwork = GetNetwork(); @@ -254,7 +254,7 @@ public: } } - virtual void OnClientDisconnect() { + virtual void OnClientDisconnect() override { CUser* pUser = GetUser(); if (!pUser->IsUserAttached() && !pUser->IsBeingDeleted()) { for (set::iterator it = m_ssChannels.begin(); it != m_ssChannels.end(); ++it) { @@ -267,7 +267,7 @@ public: } } - virtual EModRet OnUserRaw(CString& sLine) { + virtual EModRet OnUserRaw(CString& sLine) override { if (sLine.Equals("WHO " CHAN_PREFIX_1, false, 5)) { return HALT; } else if (sLine.Equals("MODE " CHAN_PREFIX_1, false, 6)) { @@ -310,7 +310,7 @@ public: return CONTINUE; } - virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) { + virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) override { if (sChannel.Left(1) != CHAN_PREFIX_1) { return CONTINUE; } @@ -385,7 +385,7 @@ public: } } - virtual EModRet OnUserJoin(CString& sChannel, CString& sKey) { + virtual EModRet OnUserJoin(CString& sChannel, CString& sKey) override { if (sChannel.Left(1) != CHAN_PREFIX_1) { return CONTINUE; } @@ -495,23 +495,23 @@ public: return HALT; } - virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override { return HandleMessage("PRIVMSG", sTarget, sMessage); } - virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override { return HandleMessage("NOTICE", sTarget, sMessage); } - virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) override { return HandleMessage("PRIVMSG", sTarget, "\001ACTION " + sMessage + "\001"); } - virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override { return HandleMessage("PRIVMSG", sTarget, "\001" + sMessage + "\001"); } - virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) override { return HandleMessage("NOTICE", sTarget, "\001" + sMessage + "\001"); } diff --git a/modules/perform.cpp b/modules/perform.cpp index 54fd5611..a9ad01ec 100644 --- a/modules/perform.cpp +++ b/modules/perform.cpp @@ -121,21 +121,21 @@ public: return sPerf; } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { GetNV("Perform").Split("\n", m_vPerform, false); return true; } - virtual void OnIRCConnected() { + virtual void OnIRCConnected() override { for (VCString::const_iterator it = m_vPerform.begin(); it != m_vPerform.end(); ++it) { PutIRC(ExpandString(*it)); } } - virtual CString GetWebMenuTitle() { return "Perform"; } + virtual CString GetWebMenuTitle() override { return "Perform"; } - virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { if (sPageName != "index") { // only accept requests to index return false; diff --git a/modules/q.cpp b/modules/q.cpp index 44004dac..4e54340a 100644 --- a/modules/q.cpp +++ b/modules/q.cpp @@ -30,7 +30,7 @@ public: MODCONSTRUCTOR(CQModule) {} virtual ~CQModule() {} - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { if (!sArgs.empty()) { SetUsername(sArgs.Token(0)); SetPassword(sArgs.Token(1)); @@ -82,7 +82,7 @@ public: return true; } - virtual void OnIRCDisconnected() { + virtual void OnIRCDisconnected() override { m_bCloaked = false; m_bAuthed = false; m_bRequestedWhoami = false; @@ -90,13 +90,13 @@ public: m_bCatchResponse = false; } - virtual void OnIRCConnected() { + virtual void OnIRCConnected() override { if (m_bUseCloakedHost) Cloak(); WhoAmI(); } - virtual void OnModCommand(const CString& sLine) { + virtual void OnModCommand(const CString& sLine) override { CString sCommand = sLine.Token(0).AsLower(); if (sCommand == "help") { @@ -252,7 +252,7 @@ public: } } - virtual EModRet OnRaw(CString& sLine) { + virtual EModRet OnRaw(CString& sLine) override { // use OnRaw because OnUserMode is not defined (yet?) if (sLine.Token(1) == "396" && sLine.Token(3).find("users.quakenet.org") != CString::npos) { m_bCloaked = true; @@ -266,37 +266,37 @@ public: return CONTINUE; } - virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override { return HandleMessage(Nick, sMessage); } - virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override { return HandleMessage(Nick, sMessage); } - virtual EModRet OnJoining(CChan& Channel) { + virtual EModRet OnJoining(CChan& Channel) override { if (m_bJoinAfterCloaked && !m_bCloaked) return HALT; return CONTINUE; } - virtual void OnJoin(const CNick& Nick, CChan& Channel) { + virtual void OnJoin(const CNick& Nick, CChan& Channel) override { if (m_bRequestPerms && IsSelf(Nick)) HandleNeed(Channel, "ov"); } - virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { + virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override { if (m_bRequestPerms && IsSelf(Nick) && (!pOpNick || !IsSelf(*pOpNick))) HandleNeed(Channel, "o"); } - virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { + virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override { if (m_bRequestPerms && IsSelf(Nick) && (!pOpNick || !IsSelf(*pOpNick))) HandleNeed(Channel, "v"); } - virtual EModRet OnInvite(const CNick& Nick, const CString& sChan) { + virtual EModRet OnInvite(const CNick& Nick, const CString& sChan) override { if (!Nick.NickEquals("Q") || !Nick.GetHost().Equals("CServe.quakenet.org")) return CONTINUE; if (m_bJoinOnInvite) @@ -304,9 +304,9 @@ public: return CONTINUE; } - virtual CString GetWebMenuTitle() { return "Q"; } + virtual CString GetWebMenuTitle() override { return "Q"; } - virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { if (sPageName == "index") { bool bSubmitted = (WebSock.GetParam("submitted").ToInt() != 0); diff --git a/modules/raw.cpp b/modules/raw.cpp index 90a37999..3eb42d40 100644 --- a/modules/raw.cpp +++ b/modules/raw.cpp @@ -21,16 +21,16 @@ public: MODCONSTRUCTOR(CRawMod) {} virtual ~CRawMod() {} - virtual EModRet OnRaw(CString& sLine) { + virtual EModRet OnRaw(CString& sLine) override { PutModule("IRC -> [" + sLine + "]"); return CONTINUE; } - virtual void OnModCommand(const CString& sCommand) { + virtual void OnModCommand(const CString& sCommand) override { PutIRC(sCommand); } - virtual EModRet OnUserRaw(CString& sLine) { + virtual EModRet OnUserRaw(CString& sLine) override { PutModule("YOU -> [" + sLine + "]"); return CONTINUE; } diff --git a/modules/route_replies.cpp b/modules/route_replies.cpp index 0c89304f..cfdb20da 100644 --- a/modules/route_replies.cpp +++ b/modules/route_replies.cpp @@ -198,7 +198,7 @@ public: virtual ~CRouteTimeout() {} protected: - virtual void RunJob(); + virtual void RunJob() override; }; struct queued_req { @@ -236,7 +236,7 @@ public: } } - virtual void OnIRCConnected() + virtual void OnIRCConnected() override { m_pDoing = NULL; m_pReplies = NULL; @@ -246,12 +246,12 @@ public: RemTimer("RouteTimeout"); } - virtual void OnIRCDisconnected() + virtual void OnIRCDisconnected() override { OnIRCConnected(); // Let's keep it in one place } - virtual void OnClientDisconnect() + virtual void OnClientDisconnect() override { requestQueue::iterator it; @@ -271,7 +271,7 @@ public: SendRequest(); } - virtual EModRet OnRaw(CString& sLine) + virtual EModRet OnRaw(CString& sLine) override { CString sCmd = sLine.Token(1).AsUpper(); size_t i = 0; @@ -307,7 +307,7 @@ public: return CONTINUE; } - virtual EModRet OnUserRaw(CString& sLine) + virtual EModRet OnUserRaw(CString& sLine) override { CString sCmd = sLine.Token(0).AsUpper(); diff --git a/modules/sample.cpp b/modules/sample.cpp index 94a1800b..aedc8b3f 100644 --- a/modules/sample.cpp +++ b/modules/sample.cpp @@ -32,7 +32,7 @@ public: } } - virtual void runThread() { + virtual void runThread() override { // Cannot safely use GetModule() in here, because this runs in its // own thread and such an access would require synchronisation // between this thread and the main thread! @@ -45,7 +45,7 @@ public: } } - virtual void runMain() { + virtual void runMain() override { GetModule()->PutModule("Sample job done"); } }; @@ -58,7 +58,7 @@ public: private: protected: - virtual void RunJob() { + virtual void RunJob() override { GetModule()->PutModule("TEST!!!!"); } }; @@ -67,7 +67,7 @@ class CSampleMod : public CModule { public: MODCONSTRUCTOR(CSampleMod) {} - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { PutModule("I'm being loaded with the arguments: [" + sArgs + "]"); //AddTimer(new CSampleTimer(this, 300, 0, "Sample", "Sample timer for sample things.")); //AddTimer(new CSampleTimer(this, 5, 20, "Another", "Another sample timer.")); @@ -80,86 +80,86 @@ public: PutModule("I'm being unloaded!"); } - virtual bool OnBoot() { + virtual bool OnBoot() override { // This is called when the app starts up (only modules that are loaded in the config will get this event) return true; } - virtual void OnIRCConnected() { + virtual void OnIRCConnected() override { PutModule("You got connected BoyOh."); } - virtual void OnIRCDisconnected() { + virtual void OnIRCDisconnected() override { PutModule("You got disconnected BoyOh."); } - virtual EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) { + virtual EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) override { sRealName += " - ZNC"; return CONTINUE; } - virtual EModRet OnBroadcast(CString& sMessage) { + virtual EModRet OnBroadcast(CString& sMessage) override { PutModule("------ [" + sMessage + "]"); sMessage = "======== [" + sMessage + "] ========"; return CONTINUE; } - virtual void OnChanPermission(const CNick& OpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) { + virtual void OnChanPermission(const CNick& OpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) override { PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] set mode [" + Channel.GetName() + ((bAdded) ? "] +" : "] -") + CString(uMode) + " " + Nick.GetNick()); } - virtual void OnOp(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { + virtual void OnOp(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override { PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] opped [" + Nick.GetNick() + "] on [" + Channel.GetName() + "]"); } - virtual void OnDeop(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { + virtual void OnDeop(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override { PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] deopped [" + Nick.GetNick() + "] on [" + Channel.GetName() + "]"); } - virtual void OnVoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { + virtual void OnVoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override { PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] voiced [" + Nick.GetNick() + "] on [" + Channel.GetName() + "]"); } - virtual void OnDevoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { + virtual void OnDevoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override { PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] devoiced [" + Nick.GetNick() + "] on [" + Channel.GetName() + "]"); } - virtual void OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { + virtual void OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override { PutModule("* " + OpNick.GetNick() + " sets mode: " + sModes + " " + sArgs + " (" + Channel.GetName() + ")"); } - virtual EModRet OnRaw(CString& sLine) { + virtual EModRet OnRaw(CString& sLine) override { // PutModule("OnRaw() [" + sLine + "]"); return CONTINUE; } - virtual EModRet OnUserRaw(CString& sLine) { + virtual EModRet OnUserRaw(CString& sLine) override { // PutModule("UserRaw() [" + sLine + "]"); return CONTINUE; } - virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) { + virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override { PutModule("[" + OpNick.GetNick() + "] kicked [" + sKickedNick + "] from [" + Channel.GetName() + "] with the msg [" + sMessage + "]"); } - virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) { + virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) override { PutModule("* Quits: " + Nick.GetNick() + " (" + Nick.GetIdent() + "!" + Nick.GetHost() + ") (" + sMessage + ")"); } - virtual EModRet OnTimerAutoJoin(CChan& Channel) { + virtual EModRet OnTimerAutoJoin(CChan& Channel) override { PutModule("Attempting to join " + Channel.GetName()); return CONTINUE; } - virtual void OnJoin(const CNick& Nick, CChan& Channel) { + virtual void OnJoin(const CNick& Nick, CChan& Channel) override { PutModule("* Joins: " + Nick.GetNick() + " (" + Nick.GetIdent() + "!" + Nick.GetHost() + ")"); } - virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) { + virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override { PutModule("* Parts: " + Nick.GetNick() + " (" + Nick.GetIdent() + "!" + Nick.GetHost() + ")"); } - virtual EModRet OnInvite(const CNick& Nick, const CString& sChan) { + virtual EModRet OnInvite(const CNick& Nick, const CString& sChan) override { if (sChan.Equals("#test")) { PutModule(Nick.GetNick() + " invited us to " + sChan + ", ignoring invites to " + sChan); return HALT; @@ -169,91 +169,91 @@ public: return CONTINUE; } - virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector& vChans) { + virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector& vChans) override { PutModule("* " + OldNick.GetNick() + " is now known as " + sNewNick); } - virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) override { PutModule("[" + sTarget + "] userctcpreply [" + sMessage + "]"); sMessage = "\037" + sMessage + "\037"; return CONTINUE; } - virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) { + virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) override { PutModule("[" + Nick.GetNick() + "] ctcpreply [" + sMessage + "]"); return CONTINUE; } - virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override { PutModule("[" + sTarget + "] userctcp [" + sMessage + "]"); return CONTINUE; } - virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override { PutModule("[" + Nick.GetNick() + "] privctcp [" + sMessage + "]"); sMessage = "\002" + sMessage + "\002"; return CONTINUE; } - virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override { PutModule("[" + Nick.GetNick() + "] chanctcp [" + sMessage + "] to [" + Channel.GetName() + "]"); sMessage = "\00311,5 " + sMessage + " \003"; return CONTINUE; } - virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override { PutModule("[" + sTarget + "] usernotice [" + sMessage + "]"); sMessage = "\037" + sMessage + "\037"; return CONTINUE; } - virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override { PutModule("[" + Nick.GetNick() + "] privnotice [" + sMessage + "]"); sMessage = "\002" + sMessage + "\002"; return CONTINUE; } - virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override { PutModule("[" + Nick.GetNick() + "] channotice [" + sMessage + "] to [" + Channel.GetName() + "]"); sMessage = "\00311,5 " + sMessage + " \003"; return CONTINUE; } - virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) { + virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override { PutModule("* " + Nick.GetNick() + " changes topic on " + Channel.GetName() + " to '" + sTopic + "'"); return CONTINUE; } - virtual EModRet OnUserTopic(CString& sTarget, CString& sTopic) { + virtual EModRet OnUserTopic(CString& sTarget, CString& sTopic) override { PutModule("* " + GetClient()->GetNick() + " changed topic on " + sTarget + " to '" + sTopic + "'"); return CONTINUE; } - virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) { + virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override { PutModule("[" + sTarget + "] usermsg [" + sMessage + "]"); sMessage = "Sample: \0034" + sMessage + "\003"; return CONTINUE; } - virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override { PutModule("[" + Nick.GetNick() + "] privmsg [" + sMessage + "]"); sMessage = "\002" + sMessage + "\002"; return CONTINUE; } - virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override { if (sMessage == "!ping") { PutIRC("PRIVMSG " + Channel.GetName() + " :PONG?"); } @@ -265,13 +265,13 @@ public: return CONTINUE; } - virtual void OnModCommand(const CString& sCommand) { + virtual void OnModCommand(const CString& sCommand) override { if (sCommand.Equals("TIMERS")) { ListTimers(); } } - virtual EModRet OnStatusCommand(CString& sCommand) { + virtual EModRet OnStatusCommand(CString& sCommand) override { if (sCommand.Equals("SAMPLE")) { PutModule("Hi, I'm your friendly sample module."); return HALT; diff --git a/modules/sasl.cpp b/modules/sasl.cpp index 55a769f9..bc1a7966 100644 --- a/modules/sasl.cpp +++ b/modules/sasl.cpp @@ -474,11 +474,11 @@ public: } } - virtual bool OnServerCapAvailable(const CString& sCap) { + virtual bool OnServerCapAvailable(const CString& sCap) override { return sCap.Equals("sasl"); } - virtual void OnServerCapResult(const CString& sCap, bool bSuccess) { + virtual void OnServerCapResult(const CString& sCap, bool bSuccess) override { if (sCap.Equals("sasl")) { if (bSuccess) { GetMechanismsString().Split(" ", m_Mechanisms); @@ -498,7 +498,7 @@ public: } } - virtual EModRet OnRaw(CString &sLine) { + virtual EModRet OnRaw(CString &sLine) override { if (sLine.Token(0).Equals("AUTHENTICATE")) { Authenticate(sLine.Token(1, true)); } else if (sLine.Token(1).Equals("903")) { @@ -532,14 +532,14 @@ public: return HALT; } - virtual void OnIRCConnected() { + virtual void OnIRCConnected() override { /* Just incase something slipped through, perhaps the server doesn't * respond to our CAP negotiation. */ CheckRequireAuth(); } - virtual void OnIRCDisconnected() { + virtual void OnIRCDisconnected() override { m_bAuthenticated = false; } private: diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp index 67ae11d4..eab8d284 100644 --- a/modules/savebuff.cpp +++ b/modules/savebuff.cpp @@ -49,7 +49,7 @@ public: virtual ~CSaveBuffJob() {} protected: - virtual void RunJob(); + virtual void RunJob() override; }; class CSaveBuff : public CModule @@ -73,7 +73,7 @@ public: } } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { if( sArgs == CRYPT_ASK_PASS ) { @@ -94,7 +94,7 @@ public: return( !m_bBootError ); } - virtual void OnIRCConnected() + virtual void OnIRCConnected() override { // dropped this into here because there seems to have been a changed where the module is loaded before the channels. // this is a good trigger to tell it to backfill the channels @@ -219,7 +219,7 @@ public: m_sPassword = CBlowfish::MD5(sArgs); } - void OnModCommand(const CString& sCmdLine) + void OnModCommand(const CString& sCmdLine) override { CString sCommand = sCmdLine.Token(0); CString sArgs = sCmdLine.Token(1, true); @@ -303,11 +303,11 @@ public: chan.AddBuffer(sLine); } - virtual void OnRawMode(const CNick& cOpNick, CChan& cChannel, const CString& sModes, const CString& sArgs) + virtual void OnRawMode(const CNick& cOpNick, CChan& cChannel, const CString& sModes, const CString& sArgs) override { AddBuffer(cChannel, SpoofChanMsg(cChannel.GetName(), cOpNick.GetNickMask() + " MODE " + sModes + " " + sArgs)); } - virtual void OnQuit(const CNick& cNick, const CString& sMessage, const vector& vChans) + virtual void OnQuit(const CNick& cNick, const CString& sMessage, const vector& vChans) override { for (size_t a = 0; a < vChans.size(); a++) { @@ -317,18 +317,18 @@ public: SaveBufferToDisk(); // need to force a save here to see this! } - virtual void OnNick(const CNick& cNick, const CString& sNewNick, const vector& vChans) + virtual void OnNick(const CNick& cNick, const CString& sNewNick, const vector& vChans) override { for (size_t a = 0; a < vChans.size(); a++) { AddBuffer(*vChans[a], SpoofChanMsg(vChans[a]->GetName(), cNick.GetNickMask() + " NICK " + sNewNick)); } } - virtual void OnKick(const CNick& cNick, const CString& sOpNick, CChan& cChannel, const CString& sMessage) + virtual void OnKick(const CNick& cNick, const CString& sOpNick, CChan& cChannel, const CString& sMessage) override { AddBuffer(cChannel, SpoofChanMsg(cChannel.GetName(), sOpNick + " KICK " + cNick.GetNickMask() + " " + sMessage)); } - virtual void OnJoin(const CNick& cNick, CChan& cChannel) + virtual void OnJoin(const CNick& cNick, CChan& cChannel) override { if (cNick.NickEquals(GetUser()->GetNick()) && cChannel.GetBuffer().empty()) { @@ -338,7 +338,7 @@ public: } AddBuffer(cChannel, SpoofChanMsg(cChannel.GetName(), cNick.GetNickMask() + " JOIN")); } - virtual void OnPart(const CNick& cNick, CChan& cChannel) + virtual void OnPart(const CNick& cNick, CChan& cChannel) override { AddBuffer(cChannel, SpoofChanMsg(cChannel.GetName(), cNick.GetNickMask() + " PART")); if (cNick.NickEquals(GetUser()->GetNick())) diff --git a/modules/schat.cpp b/modules/schat.cpp index 8fe67a57..4bfa90d1 100644 --- a/modules/schat.cpp +++ b/modules/schat.cpp @@ -47,7 +47,7 @@ public: } protected: - virtual void RunJob(); + virtual void RunJob() override; CString m_sNick; }; @@ -59,27 +59,27 @@ public: u_short iPort, int iTimeout = 60); ~CSChatSock() {} - virtual Csock *GetSockObj(const CS_STRING & sHostname, u_short iPort) + virtual Csock *GetSockObj(const CS_STRING & sHostname, u_short iPort) override { CSChatSock *p = new CSChatSock(m_pModule, m_sChatNick, sHostname, iPort); return(p); } - virtual bool ConnectionFrom(const CS_STRING & sHost, u_short iPort) + virtual bool ConnectionFrom(const CS_STRING & sHost, u_short iPort) override { Close(); // close the listener after the first connection return(true); } - virtual void Connected(); - virtual void Timeout(); + virtual void Connected() override; + virtual void Timeout() override; const CString & GetChatNick() const { return(m_sChatNick); } void PutQuery(const CString& sText); - virtual void ReadLine(const CS_STRING & sLine); - virtual void Disconnected(); + virtual void ReadLine(const CS_STRING & sLine) override; + virtual void Disconnected() override; virtual void AddLine(const CString & sLine) { @@ -116,7 +116,7 @@ public: MODCONSTRUCTOR(CSChat) {} virtual ~CSChat() {} - virtual bool OnLoad(const CString & sArgs, CString & sMessage) + virtual bool OnLoad(const CString & sArgs, CString & sMessage) override { m_sPemFile = sArgs; @@ -132,7 +132,7 @@ public: return true; } - virtual void OnClientLogin() + virtual void OnClientLogin() override { set::const_iterator it; for (it = BeginSockets(); it != EndSockets(); ++it) { @@ -145,7 +145,7 @@ public: } } - virtual EModRet OnUserRaw(CString & sLine) + virtual EModRet OnUserRaw(CString & sLine) override { if (sLine.Equals("schat ", false, 6)) { OnModCommand("chat " + sLine.substr(6)); @@ -160,7 +160,7 @@ public: return(CONTINUE); } - virtual void OnModCommand(const CString& sCommand) + virtual void OnModCommand(const CString& sCommand) override { CString sCom = sCommand.Token(0); CString sArgs = sCommand.Token(1, true); @@ -319,7 +319,7 @@ public: PutModule("Unknown command [" + sCom + "] [" + sArgs + "]"); } - virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) + virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override { if (sMessage.Equals("DCC SCHAT ", false, 10)) { // chat ip port @@ -357,7 +357,7 @@ public: RemTimer("Remove " + sNick); // delete any associated timer to this nick } - virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) + virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override { if (sTarget.Left(3) == "(s)") { CString sSockName = GetModName().AsUpper() + "::" + sTarget; diff --git a/modules/send_raw.cpp b/modules/send_raw.cpp index 428360c0..fb83def7 100644 --- a/modules/send_raw.cpp +++ b/modules/send_raw.cpp @@ -63,7 +63,7 @@ class CSendRaw_Mod: public CModule { public: virtual ~CSendRaw_Mod() {} - virtual bool OnLoad(const CString& sArgs, CString& sErrorMsg) { + virtual bool OnLoad(const CString& sArgs, CString& sErrorMsg) override { if (!GetUser()->IsAdmin()) { sErrorMsg = "You must have admin privileges to load this module"; return false; @@ -72,10 +72,10 @@ public: return true; } - virtual CString GetWebMenuTitle() { return "Send Raw"; } - virtual bool WebRequiresAdmin() { return true; } + virtual CString GetWebMenuTitle() override { return "Send Raw"; } + virtual bool WebRequiresAdmin() override { return true; } - virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { if (sPageName == "index") { if (WebSock.IsPost()) { CUser *pUser = CZNC::Get().FindUser(WebSock.GetParam("network").Token(0, false, "/")); diff --git a/modules/shell.cpp b/modules/shell.cpp index 382576aa..96ecbd07 100644 --- a/modules/shell.cpp +++ b/modules/shell.cpp @@ -44,8 +44,8 @@ public: SetWSock(open("/dev/null", O_WRONLY)); } // These next two function's bodies are at the bottom of the file since they reference CShellMod - virtual void ReadLine(const CString& sData); - virtual void Disconnected(); + virtual void ReadLine(const CString& sData) override; + virtual void Disconnected() override; CShellMod* m_pParent; @@ -67,7 +67,7 @@ public: } } - virtual bool OnLoad(const CString& sArgs, CString& sMessage) + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { #ifndef MOD_SHELL_ALLOW_EVERYONE if (!GetUser()->IsAdmin()) { @@ -79,7 +79,7 @@ public: return true; } - virtual void OnModCommand(const CString& sLine) { + virtual void OnModCommand(const CString& sLine) override { CString sCommand = sLine.Token(0); if (sCommand.Equals("cd")) { CString sArg = sLine.Token(1, true); diff --git a/modules/simple_away.cpp b/modules/simple_away.cpp index fc62d361..2a45e807 100644 --- a/modules/simple_away.cpp +++ b/modules/simple_away.cpp @@ -31,7 +31,7 @@ public: virtual ~CSimpleAwayJob() {} protected: - virtual void RunJob(); + virtual void RunJob() override; }; class CSimpleAway : public CModule { @@ -57,7 +57,7 @@ public: virtual ~CSimpleAway() {} - virtual bool OnLoad(const CString& sArgs, CString& sMessage) { + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override { CString sReasonArg; // Load AwayWait @@ -91,18 +91,18 @@ public: return true; } - virtual void OnIRCConnected() { + virtual void OnIRCConnected() override { if (GetNetwork()->IsUserAttached()) SetBack(); else SetAway(false); } - virtual void OnClientLogin() { + virtual void OnClientLogin() override { SetBack(); } - virtual void OnClientDisconnect() { + virtual void OnClientDisconnect() override { /* There might still be other clients */ if (!GetNetwork()->IsUserAttached()) SetAway(); @@ -140,7 +140,7 @@ public: PutModule("Timer disabled"); } - virtual EModRet OnUserRaw(CString &sLine) { + virtual EModRet OnUserRaw(CString &sLine) override { if (!sLine.Token(0).Equals("AWAY")) return CONTINUE; diff --git a/modules/stickychan.cpp b/modules/stickychan.cpp index 45071ec6..f354a587 100644 --- a/modules/stickychan.cpp +++ b/modules/stickychan.cpp @@ -32,9 +32,9 @@ public: { } - virtual bool OnLoad(const CString& sArgs, CString& sMessage); + virtual bool OnLoad(const CString& sArgs, CString& sMessage) override; - virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) + virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) override { for (MCString::iterator it = BeginNV(); it != EndNV(); ++it) { @@ -116,9 +116,9 @@ public: } } - virtual CString GetWebMenuTitle() { return "Sticky Chans"; } + virtual CString GetWebMenuTitle() override { return "Sticky Chans"; } - virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { if (sPageName == "index") { bool bSubmitted = (WebSock.GetParam("submitted").ToInt() != 0); @@ -154,7 +154,7 @@ public: return false; } - virtual bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + virtual bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { if (sPageName == "webadmin/channel") { CString sChan = Tmpl["ChanName"]; bool bStick = FindNV(sChan) != EndNV(); diff --git a/modules/watch.cpp b/modules/watch.cpp index 25bbd09e..a06ad24c 100644 --- a/modules/watch.cpp +++ b/modules/watch.cpp @@ -177,12 +177,12 @@ public: virtual ~CWatcherMod() {} - virtual void OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { + virtual void OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override { Process(OpNick, "* " + OpNick.GetNick() + " sets mode: " + sModes + " " + sArgs + " on " + Channel.GetName(), Channel.GetName()); } - virtual void OnClientLogin() { + virtual void OnClientLogin() override { MCString msParams; msParams["target"] = GetNetwork()->GetCurNick(); @@ -193,67 +193,67 @@ public: m_Buffer.Clear(); } - virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) { + virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override { Process(OpNick, "* " + OpNick.GetNick() + " kicked " + sKickedNick + " from " + Channel.GetName() + " because [" + sMessage + "]", Channel.GetName()); } - virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) { + virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) override { Process(Nick, "* Quits: " + Nick.GetNick() + " (" + Nick.GetIdent() + "@" + Nick.GetHost() + ") " "(" + sMessage + ")", ""); } - virtual void OnJoin(const CNick& Nick, CChan& Channel) { + virtual void OnJoin(const CNick& Nick, CChan& Channel) override { Process(Nick, "* " + Nick.GetNick() + " (" + Nick.GetIdent() + "@" + Nick.GetHost() + ") joins " + Channel.GetName(), Channel.GetName()); } - virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) { + virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override { Process(Nick, "* " + Nick.GetNick() + " (" + Nick.GetIdent() + "@" + Nick.GetHost() + ") parts " + Channel.GetName() + "(" + sMessage + ")", Channel.GetName()); } - virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector& vChans) { + virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector& vChans) override { Process(OldNick, "* " + OldNick.GetNick() + " is now known as " + sNewNick, ""); } - virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) { + virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) override { Process(Nick, "* CTCP: " + Nick.GetNick() + " reply [" + sMessage + "]", "priv"); return CONTINUE; } - virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override { Process(Nick, "* CTCP: " + Nick.GetNick() + " [" + sMessage + "]", "priv"); return CONTINUE; } - virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override { Process(Nick, "* CTCP: " + Nick.GetNick() + " [" + sMessage + "] to " "[" + Channel.GetName() + "]", Channel.GetName()); return CONTINUE; } - virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override { Process(Nick, "-" + Nick.GetNick() + "- " + sMessage, "priv"); return CONTINUE; } - virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override { Process(Nick, "-" + Nick.GetNick() + ":" + Channel.GetName() + "- " + sMessage, Channel.GetName()); return CONTINUE; } - virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override { Process(Nick, "<" + Nick.GetNick() + "> " + sMessage, "priv"); return CONTINUE; } - virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override { Process(Nick, "<" + Nick.GetNick() + ":" + Channel.GetName() + "> " + sMessage, Channel.GetName()); return CONTINUE; } - virtual void OnModCommand(const CString& sCommand) { + virtual void OnModCommand(const CString& sCommand) override { CString sCmdName = sCommand.Token(0); if (sCmdName.Equals("ADD") || sCmdName.Equals("WATCH")) { Watch(sCommand.Token(1), sCommand.Token(2), sCommand.Token(3, true)); diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp index dc331570..5bbf3141 100644 --- a/modules/webadmin.cpp +++ b/modules/webadmin.cpp @@ -85,7 +85,7 @@ public: virtual ~CWebAdminMod() { } - virtual bool OnLoad(const CString& sArgStr, CString& sMessage) { + virtual bool OnLoad(const CString& sArgStr, CString& sMessage) override { if (sArgStr.empty() || CModInfo::GlobalModule != GetType()) return true; @@ -400,8 +400,8 @@ public: return pNetwork; } - virtual CString GetWebMenuTitle() { return "webadmin"; } - virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { + virtual CString GetWebMenuTitle() override { return "webadmin"; } + virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override { std::shared_ptr spSession = WebSock.GetSession(); if (sPageName == "settings") {