mirror of
https://github.com/znc/znc.git
synced 2026-03-28 17:42:41 +01:00
Merge pull request #889 from jpnurmi/c++11
Replace some C++98isms with C++11isms (#816)
This commit is contained in:
@@ -72,7 +72,7 @@ CClient::~CClient() {
|
||||
CClientAuth* pAuth = (CClientAuth*) &(*m_spAuth);
|
||||
pAuth->Invalidate();
|
||||
}
|
||||
if (m_pUser != NULL) {
|
||||
if (m_pUser != nullptr) {
|
||||
m_pUser->AddBytesRead(GetBytesRead());
|
||||
m_pUser->AddBytesWritten(GetBytesWritten());
|
||||
}
|
||||
@@ -576,7 +576,7 @@ const CIRCSock* CClient::GetIRCSock() const {
|
||||
return m_pNetwork->GetIRCSock();
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
CIRCSock* CClient::GetIRCSock() {
|
||||
@@ -584,7 +584,7 @@ CIRCSock* CClient::GetIRCSock() {
|
||||
return m_pNetwork->GetIRCSock();
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void CClient::StatusCTCP(const CString& sLine) {
|
||||
@@ -642,7 +642,7 @@ CString CAuthBase::GetRemoteIP() const {
|
||||
}
|
||||
|
||||
void CAuthBase::Invalidate() {
|
||||
m_pSock = NULL;
|
||||
m_pSock = nullptr;
|
||||
}
|
||||
|
||||
void CAuthBase::AcceptLogin(CUser& User) {
|
||||
@@ -737,7 +737,7 @@ void CClient::ConnectionRefused() {
|
||||
void CClient::Disconnected() {
|
||||
DEBUG(GetSockName() << " == Disconnected()");
|
||||
CIRCNetwork* pNetwork = m_pNetwork;
|
||||
SetNetwork(NULL, true, false);
|
||||
SetNetwork(nullptr, true, false);
|
||||
|
||||
if (m_pUser) {
|
||||
NETWORKMODULECALL(OnClientDisconnect(), m_pUser, pNetwork, this, NOTHING);
|
||||
|
||||
Reference in New Issue
Block a user