iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

modules: use override keyword

Browse Source 
Resolves #736
This commit is contained in:
J-P Nurmi
2014-11-05 07:48:24 +01:00
parent f7270e8b2e
commit f9318d02cf
57 changed files with 509 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
modules/modpython/module.h
View File

@@ -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<CChan*>& vChans);
virtual void OnNick(const CNick& Nick, const CString& sNewNick, const std::vector<CChan*>& 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<CChan*>& vChans) override;
virtual void OnNick(const CNick& Nick, const CString& sNewNick, const std::vector<CChan*>& 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<CModInfo>& ssMods, CModInfo::EModuleType eType);
virtual void OnClientCapLs(CClient* pClient, SCString& ssCaps);
virtual EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth);
bool& bSuccess, CString& sRetMsg) override;
virtual void OnGetAvailableMods(std::set<CModInfo>& ssMods, CModInfo::EModuleType eType) override;
virtual void OnClientCapLs(CClient* pClient, SCString& ssCaps) override;
virtual EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> 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) {