Add override (#816)

Changes applied by 'clang-modernize -add-override [...]'
This commit is contained in:
J-P Nurmi
2015-02-25 09:24:00 +01:00
parent 70c0ffb10b
commit ef9939e1ec
13 changed files with 41 additions and 41 deletions
+9 -9
View File
@@ -80,9 +80,9 @@ public:
CClientAuth(const CClientAuth&) = delete;
CClientAuth& operator=(const CClientAuth&) = delete;
void Invalidate() { m_pClient = nullptr; CAuthBase::Invalidate(); }
void AcceptedLogin(CUser& User);
void RefusedLogin(const CString& sReason);
void Invalidate() override { m_pClient = nullptr; CAuthBase::Invalidate(); }
void AcceptedLogin(CUser& User) override;
void RefusedLogin(const CString& sReason) override;
private:
protected:
CClient* m_pClient;
@@ -152,15 +152,15 @@ public:
bool IsCapEnabled(const CString& sCap) const { return 1 == m_ssAcceptedCaps.count(sCap); }
virtual void ReadLine(const CString& sData);
virtual void ReadLine(const CString& sData) override;
bool SendMotd();
void HelpUser(const CString& sFilter = "");
void AuthUser();
virtual void Connected();
virtual void Timeout();
virtual void Disconnected();
virtual void ConnectionRefused();
virtual void ReachedMaxBuffer();
virtual void Connected() override;
virtual void Timeout() override;
virtual void Disconnected() override;
virtual void ConnectionRefused() override;
virtual void ReachedMaxBuffer() override;
void SetNick(const CString& s);
void SetAway(bool bAway) { m_bAway = bAway; }
+3 -3
View File
@@ -30,9 +30,9 @@ public:
virtual ~CHTTPSock();
// Csocket derived members
virtual void ReadData(const char* data, size_t len);
virtual void ReadLine(const CString& sData);
virtual void Connected();
virtual void ReadData(const char* data, size_t len) override;
virtual void ReadLine(const CString& sData) override;
virtual void Connected() override;
virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) = 0;
// !Csocket derived members
+7 -7
View File
@@ -59,13 +59,13 @@ public:
bool OnServerCapAvailable(const CString& sCap);
// !Message Handlers
virtual void ReadLine(const CString& sData);
virtual void Connected();
virtual void Disconnected();
virtual void ConnectionRefused();
virtual void SockError(int iErrno, const CString& sDescription);
virtual void Timeout();
virtual void ReachedMaxBuffer();
virtual void ReadLine(const CString& sData) override;
virtual void Connected() override;
virtual void Disconnected() override;
virtual void ConnectionRefused() override;
virtual void SockError(int iErrno, const CString& sDescription) override;
virtual void Timeout() override;
virtual void ReachedMaxBuffer() override;
void PutIRC(const CString& sLine);
void PutIRCQuick(const CString& sLine); //!< Should be used for PONG only
+5 -5
View File
@@ -80,9 +80,9 @@ public:
CRealListener(CListener& listener) : CZNCSock(), m_Listener(listener) {}
virtual ~CRealListener();
virtual bool ConnectionFrom(const CString& sHost, unsigned short uPort);
virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort);
virtual void SockError(int iErrno, const CString& sDescription);
virtual bool ConnectionFrom(const CString& sHost, unsigned short uPort) override;
virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
virtual void SockError(int iErrno, const CString& sDescription) override;
private:
CListener& m_Listener;
@@ -92,8 +92,8 @@ class CIncomingConnection : public CZNCSock {
public:
CIncomingConnection(const CString& sHostname, unsigned short uPort, CListener::EAcceptType eAcceptType, const CString& sURIPrefix);
virtual ~CIncomingConnection() {}
virtual void ReadLine(const CString& sData);
virtual void ReachedMaxBuffer();
virtual void ReadLine(const CString& sData) override;
virtual void ReachedMaxBuffer() override;
private:
CListener::EAcceptType m_eAcceptType;
+1 -1
View File
@@ -174,7 +174,7 @@ public:
void SetFPCallback(FPTimer_t p) { m_pFBCallback = p; }
protected:
virtual void RunJob() {
virtual void RunJob() override {
if (m_pFBCallback) {
m_pFBCallback(m_pModule, this);
}
+5 -5
View File
@@ -161,8 +161,8 @@ private:
int iRes;
addrinfo* aiResult;
void runThread();
void runMain();
void runThread() override;
void runMain() override;
};
void StartTDNSThread(TDNSTask* task, bool bBind);
void SetTDNSThreadFinished(TDNSTask* task, bool bBind, addrinfo* aiResult);
@@ -204,11 +204,11 @@ public:
using Csock::Listen;
//! This defaults to closing the socket, feel free to override
virtual void ReachedMaxBuffer();
virtual void SockError(int iErrno, const CString& sDescription);
virtual void ReachedMaxBuffer() override;
virtual void SockError(int iErrno, const CString& sDescription) override;
//! This limits the global connections from this IP to defeat DoS attacks, feel free to override. The ACL used is provided by the main interface @see CZNC::AllowConnectionFrom
virtual bool ConnectionFrom(const CString& sHost, unsigned short uPort);
virtual bool ConnectionFrom(const CString& sHost, unsigned short uPort) override;
//! Ease of use Connect, assigns to the manager and is subsequently tracked
bool Connect(const CString& sHostname, unsigned short uPort, bool bSSL = false, unsigned int uTimeout = 60);
+2 -2
View File
@@ -36,7 +36,7 @@ public:
CZNCTagHandler(CWebSock& pWebSock);
virtual ~CZNCTagHandler() {}
virtual bool HandleTag(CTemplate& Tmpl, const CString& sName, const CString& sArgs, CString& sOutput);
virtual bool HandleTag(CTemplate& Tmpl, const CString& sName, const CString& sArgs, CString& sOutput) override;
private:
CWebSock& m_WebSock;
};
@@ -137,7 +137,7 @@ public:
std::shared_ptr<CWebSession> GetSession();
virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort);
virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
static CString GetSkinPath(const CString& sSkinName);
void GetAvailSkins(VCString& vRet) const;
CString GetSkinName();