From 49d71a9b55119a9a7787454481359f688f9f6623 Mon Sep 17 00:00:00 2001 From: prozacx Date: Mon, 26 Sep 2005 08:23:30 +0000 Subject: [PATCH] Removed const from CNick in priv/chan hooks git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@537 726aef4b-f618-498e-8847-2d620e286838 --- IRCSock.cpp | 111 +++++++++++++++++++---------------------- IRCSock.h | 12 ++--- Modules.cpp | 24 ++++----- Modules.h | 24 ++++----- modules/autoattach.cpp | 4 +- modules/away.cpp | 5 +- modules/modperl.cpp | 12 ++--- modules/sample.cpp | 12 ++--- modules/schat.cpp | 5 +- modules/watch.cpp | 12 ++--- 10 files changed, 109 insertions(+), 112 deletions(-) diff --git a/IRCSock.cpp b/IRCSock.cpp index 468ef248..3ea2a178 100644 --- a/IRCSock.cpp +++ b/IRCSock.cpp @@ -358,10 +358,7 @@ void CIRCSock::ReadLine(const CString& sData) { } } } else { //if (CUtils::wildcmp(":*!*@* * *", sLine.c_str())) { - CString sNickMask = sLine.Token(0); - sNickMask.LeftChomp(); - - CString sNick = sNickMask.Token(0, false, "!"); + CNick Nick(sLine.Token(0).LeftChomp_n()); CString sCmd = sLine.Token(1); CString sRest = sLine.Token(2, true); @@ -379,7 +376,7 @@ void CIRCSock::ReadLine(const CString& sData) { for (unsigned int a = 0; a < vChans.size(); a++) { CChan* pChan = vChans[a]; - if (pChan->ChangeNick(sNick, sNewNick)) { + if (pChan->ChangeNick(Nick.GetNick(), sNewNick)) { vFoundChans.push_back(pChan); if (!pChan->IsDetached()) { @@ -388,13 +385,14 @@ void CIRCSock::ReadLine(const CString& sData) { } } - if (sNick.CaseCmp(GetNick()) == 0) { + // Todo: use nick compare function here + if (Nick.GetNick().CaseCmp(GetNick()) == 0) { SetNick(sNewNick); - } else if (sNick.CaseCmp(m_pUser->GetNick()) == 0) { + } else if (Nick.GetNick().CaseCmp(m_pUser->GetNick()) == 0) { KeepNick(true); } - VOIDMODULECALL(OnNick(sNickMask, sNewNick, vFoundChans)); + VOIDMODULECALL(OnNick(Nick, sNewNick, vFoundChans)); if (!bIsVisible) { return; @@ -408,7 +406,6 @@ void CIRCSock::ReadLine(const CString& sData) { } // :nick!ident@host.com QUIT :message - CNick Nick(sNickMask); vector vFoundChans; const vector& vChans = m_pUser->GetChans(); @@ -416,7 +413,7 @@ void CIRCSock::ReadLine(const CString& sData) { for (unsigned int a = 0; a < vChans.size(); a++) { CChan* pChan = vChans[a]; - if (pChan->RemNick(sNick)) { + if (pChan->RemNick(Nick.GetNick())) { vFoundChans.push_back(pChan); if (!pChan->IsDetached()) { @@ -440,14 +437,15 @@ void CIRCSock::ReadLine(const CString& sData) { sChan.LeftChomp(); } - if (sNick.CaseCmp(GetNick()) == 0) { + // Todo: use nick compare function + if (Nick.GetNick().CaseCmp(GetNick()) == 0) { m_pUser->AddChan(sChan, false); } CChan* pChan = m_pUser->FindChan(sChan); if (pChan) { - pChan->AddNick(sNickMask); - VOIDMODULECALL(OnJoin(sNickMask, *pChan)); + pChan->AddNick(Nick.GetNickMask()); + VOIDMODULECALL(OnJoin(Nick.GetNickMask(), *pChan)); if (pChan->IsDetached()) { return; @@ -461,11 +459,12 @@ void CIRCSock::ReadLine(const CString& sData) { CChan* pChan = m_pUser->FindChan(sChan); if (pChan) { - pChan->RemNick(sNick); - VOIDMODULECALL(OnPart(sNickMask, *pChan)); + pChan->RemNick(Nick.GetNick()); + VOIDMODULECALL(OnPart(Nick.GetNickMask(), *pChan)); } - if (sNick.CaseCmp(GetNick()) == 0) { + // Todo: use nick compare function + if (Nick.GetNick().CaseCmp(GetNick()) == 0) { m_pUser->DelChan(sChan); } @@ -478,7 +477,7 @@ void CIRCSock::ReadLine(const CString& sData) { CChan* pChan = m_pUser->FindChan(sChan); if (pChan) { - pChan->ModeChange(sModes, sNick); + pChan->ModeChange(sModes, Nick.GetNick()); if (pChan->IsDetached()) { return; @@ -495,7 +494,7 @@ void CIRCSock::ReadLine(const CString& sData) { if (pChan) { pChan->RemNick(sKickedNick); - VOIDMODULECALL(OnKick(sNickMask, sKickedNick, *pChan, sMsg)); + VOIDMODULECALL(OnKick(Nick.GetNickMask(), sKickedNick, *pChan, sMsg)); } if (GetNick().CaseCmp(sKickedNick) == 0) { @@ -514,9 +513,6 @@ void CIRCSock::ReadLine(const CString& sData) { } } else if (sCmd.CaseCmp("NOTICE") == 0) { // :nick!ident@host.com NOTICE #chan :Message - - CNick Nick(sNickMask); - CString sTarget = sRest.Token(0); CString sMsg = sRest.Token(1, true); sMsg.LeftChomp(); @@ -526,33 +522,32 @@ void CIRCSock::ReadLine(const CString& sData) { sMsg.RightChomp(); if (sTarget.CaseCmp(GetNick()) == 0) { - if (OnCTCPReply(sNickMask, sMsg)) { + if (OnCTCPReply(Nick.GetNickMask(), sMsg)) { return; } } - PutUser(":" + sNickMask + " NOTICE " + sTarget + " :\001" + sMsg + "\001"); + PutUser(":" + Nick.GetNickMask() + " NOTICE " + sTarget + " :\001" + sMsg + "\001"); return; } else { if (sTarget.CaseCmp(GetNick()) == 0) { - if (OnPrivNotice(sNickMask, sMsg)) { + if (OnPrivNotice(Nick, sMsg)) { return; } } else { - if (OnChanNotice(sNickMask, sTarget, sMsg)) { + if (OnChanNotice(Nick, sTarget, sMsg)) { return; } } } - PutUser(":" + sNickMask + " NOTICE " + sTarget + " :" + sMsg); + PutUser(":" + Nick.GetNickMask() + " NOTICE " + sTarget + " :" + sMsg); return; } else if (sCmd.CaseCmp("TOPIC") == 0) { // :nick!ident@host.com TOPIC #chan :This is a topic CChan* pChan = m_pUser->FindChan(sLine.Token(2)); if (pChan) { - CNick Nick(sNickMask); CString sTopic = sLine.Token(3, true); sTopic.LeftChomp(); pChan->SetTopicOwner(Nick.GetNick()); @@ -561,8 +556,6 @@ void CIRCSock::ReadLine(const CString& sData) { } } else if (sCmd.CaseCmp("PRIVMSG") == 0) { // :nick!ident@host.com PRIVMSG #chan :Message - - CNick Nick(sNickMask); CString sTarget = sRest.Token(0); CString sMsg = sRest.Token(1, true); @@ -575,29 +568,29 @@ void CIRCSock::ReadLine(const CString& sData) { sMsg.RightChomp(); if (sTarget.CaseCmp(GetNick()) == 0) { - if (OnPrivCTCP(sNickMask, sMsg)) { + if (OnPrivCTCP(Nick, sMsg)) { return; } } else { - if (OnChanCTCP(sNickMask, sTarget, sMsg)) { + if (OnChanCTCP(Nick, sTarget, sMsg)) { return; } } - PutUser(":" + sNickMask + " PRIVMSG " + sTarget + " :\001" + sMsg + "\001"); + PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + sTarget + " :\001" + sMsg + "\001"); return; } else { if (sTarget.CaseCmp(GetNick()) == 0) { - if (OnPrivMsg(sNickMask, sMsg)) { + if (OnPrivMsg(Nick, sMsg)) { return; } } else { - if (OnChanMsg(sNickMask, sTarget, sMsg)) { + if (OnChanMsg(Nick, sTarget, sMsg)) { return; } } - PutUser(":" + sNickMask + " PRIVMSG " + sTarget + " :" + sMsg); + PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + sTarget + " :" + sMsg); return; } } @@ -623,8 +616,8 @@ bool CIRCSock::OnCTCPReply(const CString& sNickMask, CString& sMessage) { return false; } -bool CIRCSock::OnPrivCTCP(const CString& sNickMask, CString& sMessage) { - MODULECALL(OnPrivCTCP(sNickMask, sMessage)); +bool CIRCSock::OnPrivCTCP(CNick& Nick, CString& sMessage) { + MODULECALL(OnPrivCTCP(Nick, sMessage)); if (strncasecmp(sMessage.c_str(), "DCC ", 4) == 0 && m_pUser && m_pUser->BounceDCCs()) { // DCC CHAT chat 2453612361 44592 @@ -636,27 +629,25 @@ bool CIRCSock::OnPrivCTCP(const CString& sNickMask, CString& sMessage) { if (sType.CaseCmp("CHAT") == 0) { if (m_pUserSock) { - CNick FromNick(sNickMask); + CNick FromNick(Nick.GetNickMask()); unsigned short uBNCPort = CDCCBounce::DCCRequest(FromNick.GetNick(), uLongIP, uPort, "", true, m_pUser, GetLocalIP(), CUtils::GetIP(uLongIP)); if (uBNCPort) { - PutUser(":" + sNickMask + " PRIVMSG " + GetNick() + " :\001DCC CHAT chat " + CString::ToString(CUtils::GetLongIP(GetLocalIP())) + " " + CString::ToString(uBNCPort) + "\001"); + PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + GetNick() + " :\001DCC CHAT chat " + CString::ToString(CUtils::GetLongIP(GetLocalIP())) + " " + CString::ToString(uBNCPort) + "\001"); } } } else if (sType.CaseCmp("SEND") == 0) { // DCC SEND readme.txt 403120438 5550 1104 - CNick FromNick(sNickMask); - - unsigned short uBNCPort = CDCCBounce::DCCRequest(FromNick.GetNick(), uLongIP, uPort, sFile, false, m_pUser, GetLocalIP(), CUtils::GetIP(uLongIP)); + unsigned short uBNCPort = CDCCBounce::DCCRequest(Nick.GetNick(), uLongIP, uPort, sFile, false, m_pUser, GetLocalIP(), CUtils::GetIP(uLongIP)); if (uBNCPort) { - PutUser(":" + sNickMask + " PRIVMSG " + GetNick() + " :\001DCC SEND " + sFile + " " + CString::ToString(CUtils::GetLongIP(GetLocalIP())) + " " + CString::ToString(uBNCPort) + " " + CString::ToString(uFileSize) + "\001"); + PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + GetNick() + " :\001DCC SEND " + sFile + " " + CString::ToString(CUtils::GetLongIP(GetLocalIP())) + " " + CString::ToString(uBNCPort) + " " + CString::ToString(uFileSize) + "\001"); } } else if (sType.CaseCmp("RESUME") == 0) { // Need to lookup the connection by port, filter the port, and forward to the user CDCCBounce* pSock = (CDCCBounce*) CZNC::Get().GetManager().FindSockByLocalPort(atoi(sMessage.Token(3).c_str())); if ((pSock) && (strncasecmp(pSock->GetSockName().c_str(), "DCC::", 5) == 0)) { - PutUser(":" + sNickMask + " PRIVMSG " + GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString::ToString(pSock->GetUserPort()) + " " + sMessage.Token(4) + "\001"); + PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString::ToString(pSock->GetUserPort()) + " " + sMessage.Token(4) + "\001"); } } else if (sType.CaseCmp("ACCEPT") == 0) { // Need to lookup the connection by port, filter the port, and forward to the user @@ -667,7 +658,7 @@ bool CIRCSock::OnPrivCTCP(const CString& sNickMask, CString& sMessage) { if ((pSock) && (strncasecmp(pSock->GetSockName().c_str(), "DCC::", 5) == 0)) { if (pSock->GetUserPort() == atoi(sMessage.Token(3).c_str())) { - PutUser(":" + sNickMask + " PRIVMSG " + GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString::ToString(pSock->GetLocalPort()) + " " + sMessage.Token(4) + "\001"); + PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString::ToString(pSock->GetLocalPort()) + " " + sMessage.Token(4) + "\001"); } } } @@ -689,7 +680,7 @@ bool CIRCSock::OnPrivCTCP(const CString& sNickMask, CString& sMessage) { } if (!sReply.empty()) { - PutServ("NOTICE " + CNick(sNickMask).GetNick() + " :\001" + sQuery + " " + sReply + "\001"); + PutServ("NOTICE " + Nick.GetNick() + " :\001" + sQuery + " " + sReply + "\001"); return true; } } @@ -697,32 +688,32 @@ bool CIRCSock::OnPrivCTCP(const CString& sNickMask, CString& sMessage) { return false; } -bool CIRCSock::OnPrivNotice(const CString& sNickMask, CString& sMessage) { - MODULECALL(OnPrivNotice(sNickMask, sMessage)); +bool CIRCSock::OnPrivNotice(CNick& Nick, CString& sMessage) { + MODULECALL(OnPrivNotice(Nick, sMessage)); if (!m_pUserSock) { // If the user is detached, add to the buffer - m_QueryBuffer.AddLine(":" + sNickMask + " NOTICE ", " :" + sMessage); + m_QueryBuffer.AddLine(":" + Nick.GetNickMask() + " NOTICE ", " :" + sMessage); } return false; } -bool CIRCSock::OnPrivMsg(const CString& sNickMask, CString& sMessage) { - MODULECALL(OnPrivMsg(sNickMask, sMessage)); +bool CIRCSock::OnPrivMsg(CNick& Nick, CString& sMessage) { + MODULECALL(OnPrivMsg(Nick, sMessage)); if (!m_pUserSock) { // If the user is detached, add to the buffer - m_QueryBuffer.AddLine(":" + sNickMask + " PRIVMSG ", " :" + sMessage); + m_QueryBuffer.AddLine(":" + Nick.GetNickMask() + " PRIVMSG ", " :" + sMessage); } return false; } -bool CIRCSock::OnChanCTCP(const CString& sNickMask, const CString& sChan, CString& sMessage) { +bool CIRCSock::OnChanCTCP(CNick& Nick, const CString& sChan, CString& sMessage) { CChan* pChan = m_pUser->FindChan(sChan); if (pChan) { - MODULECALL(OnChanCTCP(sNickMask, *pChan, sMessage)); + MODULECALL(OnChanCTCP(Nick, *pChan, sMessage)); if (pChan->IsDetached()) { return true; @@ -732,26 +723,26 @@ bool CIRCSock::OnChanCTCP(const CString& sNickMask, const CString& sChan, CStrin return false; } -bool CIRCSock::OnChanNotice(const CString& sNickMask, const CString& sChan, CString& sMessage) { +bool CIRCSock::OnChanNotice(CNick& Nick, const CString& sChan, CString& sMessage) { CChan* pChan = m_pUser->FindChan(sChan); if (pChan) { - MODULECALL(OnChanNotice(sNickMask, *pChan, sMessage)); + MODULECALL(OnChanNotice(Nick, *pChan, sMessage)); if ((pChan->KeepBuffer()) || (!m_pUserSock)) { - pChan->AddBuffer(":" + sNickMask + " NOTICE " + sChan + " :" + sMessage); + pChan->AddBuffer(":" + Nick.GetNickMask() + " NOTICE " + sChan + " :" + sMessage); } } return ((pChan) && (pChan->IsDetached())); } -bool CIRCSock::OnChanMsg(const CString& sNickMask, const CString& sChan, CString& sMessage) { +bool CIRCSock::OnChanMsg(CNick& Nick, const CString& sChan, CString& sMessage) { CChan* pChan = m_pUser->FindChan(sChan); if (pChan) { - MODULECALL(OnChanMsg(sNickMask, *pChan, sMessage)); + MODULECALL(OnChanMsg(Nick, *pChan, sMessage)); if ((pChan->KeepBuffer()) || (!m_pUserSock)) { - pChan->AddBuffer(":" + sNickMask + " PRIVMSG " + sChan + " :" + sMessage); + pChan->AddBuffer(":" + Nick.GetNickMask() + " PRIVMSG " + sChan + " :" + sMessage); } } diff --git a/IRCSock.h b/IRCSock.h index fb79f187..83a3f658 100644 --- a/IRCSock.h +++ b/IRCSock.h @@ -26,12 +26,12 @@ public: // Message Handlers bool OnCTCPReply(const CString& sNickMask, CString& sMessage); - bool OnPrivCTCP(const CString& sNickMask, CString& sMessage); - bool OnChanCTCP(const CString& sNickMask, const CString& sChan, CString& sMessage); - bool OnPrivMsg(const CString& sNickMask, CString& sMessage); - bool OnChanMsg(const CString& sNickMask, const CString& sChan, CString& sMessage); - bool OnPrivNotice(const CString& sNickMask, CString& sMessage); - bool OnChanNotice(const CString& sNickMask, const CString& sChan, CString& sMessage); + bool OnPrivCTCP(CNick& Nick, CString& sMessage); + bool OnChanCTCP(CNick& Nick, const CString& sChan, CString& sMessage); + bool OnPrivMsg(CNick& Nick, CString& sMessage); + bool OnChanMsg(CNick& Nick, const CString& sChan, CString& sMessage); + bool OnPrivNotice(CNick& Nick, CString& sMessage); + bool OnChanNotice(CNick& Nick, const CString& sChan, CString& sMessage); // !Message Handlers virtual void ReadLine(const CString& sData); diff --git a/Modules.cpp b/Modules.cpp index d10c4b9a..4e9e0bdd 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -464,14 +464,14 @@ void CModule::OnPart(const CNick& Nick, CChan& Channel) {} CModule::EModRet CModule::OnUserCTCPReply(const CNick& Nick, CString& sMessage) { return CONTINUE; } CModule::EModRet CModule::OnCTCPReply(const CNick& Nick, CString& sMessage) { return CONTINUE; } CModule::EModRet CModule::OnUserCTCP(const CString& sTarget, CString& sMessage) { return CONTINUE; } -CModule::EModRet CModule::OnPrivCTCP(const CNick& Nick, CString& sMessage) { return CONTINUE; } -CModule::EModRet CModule::OnChanCTCP(const CNick& Nick, CChan& Channel, CString& sMessage) { return CONTINUE; } +CModule::EModRet CModule::OnPrivCTCP(CNick& Nick, CString& sMessage) { return CONTINUE; } +CModule::EModRet CModule::OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) { return CONTINUE; } CModule::EModRet CModule::OnUserMsg(const CString& sTarget, CString& sMessage) { return CONTINUE; } -CModule::EModRet CModule::OnPrivMsg(const CNick& Nick, CString& sMessage) { return CONTINUE; } -CModule::EModRet CModule::OnChanMsg(const CNick& Nick, CChan& Channel, CString& sMessage) { return CONTINUE; } +CModule::EModRet CModule::OnPrivMsg(CNick& Nick, CString& sMessage) { return CONTINUE; } +CModule::EModRet CModule::OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) { return CONTINUE; } CModule::EModRet CModule::OnUserNotice(const CString& sTarget, CString& sMessage) { return CONTINUE; } -CModule::EModRet CModule::OnPrivNotice(const CNick& Nick, CString& sMessage) { return CONTINUE; } -CModule::EModRet CModule::OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage) { return CONTINUE; } +CModule::EModRet CModule::OnPrivNotice(CNick& Nick, CString& sMessage) { return CONTINUE; } +CModule::EModRet CModule::OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) { return CONTINUE; } void* CModule::GetDLL() { return m_pDLL; } bool CModule::PutIRC(const CString& sLine) { @@ -610,11 +610,11 @@ bool CModules::OnCTCPReply(const CNick& Nick, CString& sMessage) { MODHALTCHK(OnCTCPReply(Nick, sMessage)); } -bool CModules::OnPrivCTCP(const CNick& Nick, CString& sMessage) { +bool CModules::OnPrivCTCP(CNick& Nick, CString& sMessage) { MODHALTCHK(OnPrivCTCP(Nick, sMessage)); } -bool CModules::OnChanCTCP(const CNick& Nick, CChan& Channel, CString& sMessage) { +bool CModules::OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) { MODHALTCHK(OnChanCTCP(Nick, Channel, sMessage)); } @@ -622,11 +622,11 @@ bool CModules::OnUserMsg(const CString& sTarget, CString& sMessage) { MODHALTCHK(OnUserMsg(sTarget, sMessage)); } -bool CModules::OnPrivMsg(const CNick& Nick, CString& sMessage) { +bool CModules::OnPrivMsg(CNick& Nick, CString& sMessage) { MODHALTCHK(OnPrivMsg(Nick, sMessage)); } -bool CModules::OnChanMsg(const CNick& Nick, CChan& Channel, CString& sMessage) { +bool CModules::OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) { MODHALTCHK(OnChanMsg(Nick, Channel, sMessage)); } @@ -634,11 +634,11 @@ bool CModules::OnUserNotice(const CString& sTarget, CString& sMessage) { MODHALTCHK(OnUserNotice(sTarget, sMessage)); } -bool CModules::OnPrivNotice(const CNick& Nick, CString& sMessage) { +bool CModules::OnPrivNotice(CNick& Nick, CString& sMessage) { MODHALTCHK(OnPrivNotice(Nick, sMessage)); } -bool CModules::OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage) { +bool CModules::OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) { MODHALTCHK(OnChanNotice(Nick, Channel, sMessage)); } diff --git a/Modules.h b/Modules.h index 130c593e..2dd453f6 100644 --- a/Modules.h +++ b/Modules.h @@ -228,14 +228,14 @@ public: virtual EModRet OnUserCTCPReply(const CNick& Nick, CString& sMessage); virtual EModRet OnCTCPReply(const CNick& Nick, CString& sMessage); virtual EModRet OnUserCTCP(const CString& sTarget, CString& sMessage); - virtual EModRet OnPrivCTCP(const CNick& Nick, CString& sMessage); - virtual EModRet OnChanCTCP(const CNick& Nick, CChan& Channel, CString& sMessage); + virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage); + virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage); virtual EModRet OnUserMsg(const CString& sTarget, CString& sMessage); - virtual EModRet OnPrivMsg(const CNick& Nick, CString& sMessage); - virtual EModRet OnChanMsg(const CNick& Nick, CChan& Channel, CString& sMessage); + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage); + virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage); virtual EModRet OnUserNotice(const CString& sTarget, CString& sMessage); - virtual EModRet OnPrivNotice(const CNick& Nick, CString& sMessage); - virtual EModRet OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage); + virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage); + virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage); void * GetDLL(); static double GetCoreVersion() { return VERSION; } @@ -350,14 +350,14 @@ public: virtual bool OnUserCTCPReply(const CNick& Nick, CString& sMessage); virtual bool OnCTCPReply(const CNick& Nick, CString& sMessage); virtual bool OnUserCTCP(const CString& sTarget, CString& sMessage); - virtual bool OnPrivCTCP(const CNick& Nick, CString& sMessage); - virtual bool OnChanCTCP(const CNick& Nick, CChan& Channel, CString& sMessage); + virtual bool OnPrivCTCP(CNick& Nick, CString& sMessage); + virtual bool OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage); virtual bool OnUserMsg(const CString& sTarget, CString& sMessage); - virtual bool OnPrivMsg(const CNick& Nick, CString& sMessage); - virtual bool OnChanMsg(const CNick& Nick, CChan& Channel, CString& sMessage); + virtual bool OnPrivMsg(CNick& Nick, CString& sMessage); + virtual bool OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage); virtual bool OnUserNotice(const CString& sTarget, CString& sMessage); - virtual bool OnPrivNotice(const CNick& Nick, CString& sMessage); - virtual bool OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage); + virtual bool OnPrivNotice(CNick& Nick, CString& sMessage); + virtual bool OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage); CModule* FindModule(const CString& sModule) const; bool LoadModule(const CString& sModule, const CString& sArgs, CUser* pUser, CString& sRetMsg, bool bFake = false); diff --git a/modules/autoattach.cpp b/modules/autoattach.cpp index 07a097b3..b5148002 100644 --- a/modules/autoattach.cpp +++ b/modules/autoattach.cpp @@ -34,12 +34,12 @@ public: } } - virtual EModRet OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) { TryAttach(Channel); return CONTINUE; } - virtual EModRet OnChanMsg(const CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) { TryAttach(Channel); return CONTINUE; } diff --git a/modules/away.cpp b/modules/away.cpp index 5f0ebc0a..70cc2554 100644 --- a/modules/away.cpp +++ b/modules/away.cpp @@ -18,6 +18,9 @@ * * * $Log$ + * Revision 1.18 2005/09/26 08:23:30 prozacx + * Removed const from CNick in priv/chan hooks + * * Revision 1.17 2005/09/06 22:43:02 prozacx * Added REQUIRESSL * @@ -356,7 +359,7 @@ public: m_sReason = ""; } - virtual EModRet OnPrivMsg(const CNick& Nick, CString& sMessage) + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) { if ( m_bIsAway ) AddMessage( time( NULL ), Nick, sMessage ); diff --git a/modules/modperl.cpp b/modules/modperl.cpp index 45e63733..fc23d69c 100644 --- a/modules/modperl.cpp +++ b/modules/modperl.cpp @@ -369,11 +369,11 @@ public: { return CBDouble( "OnUserCTCP", sTarget, sMessage ); } - virtual EModRet OnPrivCTCP(const CNick& Nick, CString& sMessage) + virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) { return CBDouble( "OnPrivCTCP", NICK( Nick ), sMessage ); } - virtual EModRet OnChanCTCP(const CNick& Nick, CChan& Channel, CString& sMessage) + virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) { return CBTriple( "OnChanCTCP", NICK( Nick ), CHAN( Channel ), sMessage ); } @@ -381,12 +381,12 @@ public: { return CBDouble( "OnUserMsg", sTarget, sMessage ); } - virtual EModRet OnPrivMsg(const CNick& Nick, CString& sMessage) + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) { return CBDouble( "OnPrivMsg", NICK( Nick ), sMessage ); } - virtual EModRet OnChanMsg( const CNick& Nick, CChan & Channel, CString & sMessage ) + virtual EModRet OnChanMsg( CNick& Nick, CChan & Channel, CString & sMessage ) { return( CBTriple( "OnChanMsg", NICK( Nick ), CHAN( Channel ), sMessage ) ); } @@ -394,11 +394,11 @@ public: { return CBDouble( "OnUserNotice", sTarget, sMessage ); } - virtual EModRet OnPrivNotice(const CNick& Nick, CString& sMessage) + virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) { return CBDouble( "OnPrivNotice", NICK( Nick ), sMessage ); } - virtual EModRet OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage) + virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) { return( CBTriple( "OnChanNotice", NICK( Nick ), CHAN( Channel ), sMessage ) ); } diff --git a/modules/sample.cpp b/modules/sample.cpp index 8ae76b7c..35671f49 100644 --- a/modules/sample.cpp +++ b/modules/sample.cpp @@ -125,14 +125,14 @@ public: return CONTINUE; } - virtual EModRet OnPrivCTCP(const CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) { PutModule("[" + Nick.GetNick() + "] privctcp [" + sMessage + "]"); sMessage = "\002" + sMessage + "\002"; return CONTINUE; } - virtual EModRet OnChanCTCP(const CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) { PutModule("[" + Nick.GetNick() + "] chanctcp [" + sMessage + "] to [" + Channel.GetName() + "]"); sMessage = "\00311,5 " + sMessage + " \003"; @@ -146,14 +146,14 @@ public: return CONTINUE; } - virtual EModRet OnPrivNotice(const CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) { PutModule("[" + Nick.GetNick() + "] privnotice [" + sMessage + "]"); sMessage = "\002" + sMessage + "\002"; return CONTINUE; } - virtual EModRet OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) { PutModule("[" + Nick.GetNick() + "] channotice [" + sMessage + "] to [" + Channel.GetName() + "]"); sMessage = "\00311,5 " + sMessage + " \003"; @@ -167,14 +167,14 @@ public: return CONTINUE; } - virtual EModRet OnPrivMsg(const CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) { PutModule("[" + Nick.GetNick() + "] privmsg [" + sMessage + "]"); sMessage = "\002" + sMessage + "\002"; return CONTINUE; } - virtual EModRet OnChanMsg(const CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) { if (sMessage == "!ping") { PutIRC("PRIVMSG " + Channel.GetName() + " :PONG?"); } diff --git a/modules/schat.cpp b/modules/schat.cpp index f5c49699..7dd41c69 100644 --- a/modules/schat.cpp +++ b/modules/schat.cpp @@ -21,6 +21,9 @@ using std::pair; * Author: imaginos * * $Log$ + * Revision 1.20 2005/09/26 08:23:30 prozacx + * Removed const from CNick in priv/chan hooks + * * Revision 1.19 2005/09/20 04:37:28 prozacx * Added include for znc.h * @@ -440,7 +443,7 @@ public: PutModule( "Unknown command [" + sCom + "] [" + sArgs + "]" ); } - virtual EModRet OnPrivCTCP( const CNick& Nick, CString& sMessage ) + virtual EModRet OnPrivCTCP( CNick& Nick, CString& sMessage ) { if ( strncasecmp( sMessage.c_str(), "DCC SCHAT ", 10 ) == 0 ) { diff --git a/modules/watch.cpp b/modules/watch.cpp index 6882fe0d..04700640 100644 --- a/modules/watch.cpp +++ b/modules/watch.cpp @@ -207,32 +207,32 @@ public: return CONTINUE; } - virtual EModRet OnPrivCTCP(const CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) { Process(Nick, "* CTCP: " + Nick.GetNick() + " [" + sMessage + "]", "priv"); return CONTINUE; } - virtual EModRet OnChanCTCP(const CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) { Process(Nick, "* CTCP: " + Nick.GetNick() + " [" + sMessage + "] to [" + Channel.GetName() + "]", Channel.GetName()); return CONTINUE; } - virtual EModRet OnPrivNotice(const CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) { Process(Nick, "-" + Nick.GetNick() + "- " + sMessage, "priv"); return CONTINUE; } - virtual EModRet OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) { Process(Nick, "-" + Nick.GetNick() + ":" + Channel.GetName() + "- " + sMessage, Channel.GetName()); return CONTINUE; } - virtual EModRet OnPrivMsg(const CNick& Nick, CString& sMessage) { + virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) { Process(Nick, "<" + Nick.GetNick() + "> " + sMessage, "priv"); return CONTINUE; } - virtual EModRet OnChanMsg(const CNick& Nick, CChan& Channel, CString& sMessage) { + virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) { Process(Nick, "<" + Nick.GetNick() + ":" + Channel.GetName() + "> " + sMessage, Channel.GetName()); return CONTINUE; }