From 6d27d1c021577bbf7010486079f0dc0f0f0f3bb7 Mon Sep 17 00:00:00 2001 From: prozacx Date: Mon, 26 Sep 2005 23:09:05 +0000 Subject: [PATCH] Removed const from args in a bunch of hooks git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@538 726aef4b-f618-498e-8847-2d620e286838 --- IRCSock.cpp | 6 +++--- IRCSock.h | 2 +- Modules.cpp | 28 ++++++++++++++-------------- Modules.h | 20 ++++++++++---------- UserSock.cpp | 14 +++++++------- modules/away.cpp | 5 ++++- modules/modperl.cpp | 8 ++++---- modules/sample.cpp | 10 +++++----- modules/schat.cpp | 5 ++++- modules/watch.cpp | 2 +- 10 files changed, 53 insertions(+), 47 deletions(-) diff --git a/IRCSock.cpp b/IRCSock.cpp index 3ea2a178..505b16ac 100644 --- a/IRCSock.cpp +++ b/IRCSock.cpp @@ -522,7 +522,7 @@ void CIRCSock::ReadLine(const CString& sData) { sMsg.RightChomp(); if (sTarget.CaseCmp(GetNick()) == 0) { - if (OnCTCPReply(Nick.GetNickMask(), sMsg)) { + if (OnCTCPReply(Nick, sMsg)) { return; } } @@ -610,8 +610,8 @@ void CIRCSock::KeepNick(bool bForce) { } } -bool CIRCSock::OnCTCPReply(const CString& sNickMask, CString& sMessage) { - MODULECALL(OnCTCPReply(sNickMask, sMessage)); +bool CIRCSock::OnCTCPReply(CNick& Nick, CString& sMessage) { + MODULECALL(OnCTCPReply(Nick, sMessage)); return false; } diff --git a/IRCSock.h b/IRCSock.h index 83a3f658..29b68f34 100644 --- a/IRCSock.h +++ b/IRCSock.h @@ -25,7 +25,7 @@ public: } EChanModeArgs; // Message Handlers - bool OnCTCPReply(const CString& sNickMask, CString& sMessage); + bool OnCTCPReply(CNick& Nick, CString& sMessage); bool OnPrivCTCP(CNick& Nick, CString& sMessage); bool OnChanCTCP(CNick& Nick, const CString& sChan, CString& sMessage); bool OnPrivMsg(CNick& Nick, CString& sMessage); diff --git a/Modules.cpp b/Modules.cpp index 4e9e0bdd..703c1d44 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -461,15 +461,15 @@ void CModule::OnKick(const CNick& Nick, const CString& sKickedNick, CChan& Chann void CModule::OnJoin(const CNick& Nick, CChan& Channel) {} 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::OnUserCTCPReply(CString& sTarget, CString& sMessage) { return CONTINUE; } +CModule::EModRet CModule::OnCTCPReply(CNick& Nick, CString& sMessage) { return CONTINUE; } +CModule::EModRet CModule::OnUserCTCP(CString& sTarget, 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::OnUserMsg(CString& sTarget, 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::OnUserNotice(CString& sTarget, 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; } @@ -598,18 +598,18 @@ void CModules::OnPart(const CNick& Nick, CChan& Channel) { MODUNLOADCHK(OnPart(Nick, Channel)); } -bool CModules::OnUserCTCP(const CString& sTarget, CString& sMessage) { - MODHALTCHK(OnUserCTCP(sTarget, sMessage)); +bool CModules::OnUserCTCPReply(CString& sTarget, CString& sMessage) { + MODHALTCHK(OnUserCTCPReply(sTarget, sMessage)); } -bool CModules::OnUserCTCPReply(const CNick& Nick, CString& sMessage) { - MODHALTCHK(OnUserCTCPReply(Nick, sMessage)); -} - -bool CModules::OnCTCPReply(const CNick& Nick, CString& sMessage) { +bool CModules::OnCTCPReply(CNick& Nick, CString& sMessage) { MODHALTCHK(OnCTCPReply(Nick, sMessage)); } +bool CModules::OnUserCTCP(CString& sTarget, CString& sMessage) { + MODHALTCHK(OnUserCTCP(sTarget, sMessage)); +} + bool CModules::OnPrivCTCP(CNick& Nick, CString& sMessage) { MODHALTCHK(OnPrivCTCP(Nick, sMessage)); } @@ -618,7 +618,7 @@ bool CModules::OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) { MODHALTCHK(OnChanCTCP(Nick, Channel, sMessage)); } -bool CModules::OnUserMsg(const CString& sTarget, CString& sMessage) { +bool CModules::OnUserMsg(CString& sTarget, CString& sMessage) { MODHALTCHK(OnUserMsg(sTarget, sMessage)); } @@ -630,7 +630,7 @@ bool CModules::OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) { MODHALTCHK(OnChanMsg(Nick, Channel, sMessage)); } -bool CModules::OnUserNotice(const CString& sTarget, CString& sMessage) { +bool CModules::OnUserNotice(CString& sTarget, CString& sMessage) { MODHALTCHK(OnUserNotice(sTarget, sMessage)); } diff --git a/Modules.h b/Modules.h index 2dd453f6..12b5cc77 100644 --- a/Modules.h +++ b/Modules.h @@ -225,15 +225,15 @@ public: virtual void OnJoin(const CNick& Nick, CChan& Channel); virtual void OnPart(const CNick& Nick, CChan& Channel); - 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 OnUserCTCPReply(CString& sTarget, CString& sMessage); + virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage); + virtual EModRet OnUserCTCP(CString& sTarget, 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 OnUserMsg(CString& sTarget, 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 OnUserNotice(CString& sTarget, CString& sMessage); virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage); virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage); @@ -347,15 +347,15 @@ public: virtual void OnJoin(const CNick& Nick, CChan& Channel); virtual void OnPart(const CNick& Nick, CChan& Channel); - 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 OnUserCTCPReply(CString& sTarget, CString& sMessage); + virtual bool OnCTCPReply(CNick& Nick, CString& sMessage); + virtual bool OnUserCTCP(CString& sTarget, 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 OnUserMsg(CString& sTarget, 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 OnUserNotice(CString& sTarget, CString& sMessage); virtual bool OnPrivNotice(CNick& Nick, CString& sMessage); virtual bool OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage); diff --git a/UserSock.cpp b/UserSock.cpp index bd8a28ed..1a62ab1c 100644 --- a/UserSock.cpp +++ b/UserSock.cpp @@ -185,10 +185,6 @@ void CUserSock::ReadLine(const CString& sData) { CChan* pChan = m_pUser->FindChan(sTarget); - if ((pChan) && (pChan->KeepBuffer())) { - pChan->AddBuffer(":" + GetNickMask() + " NOTICE " + sTarget + " :" + sMsg); - } - #ifdef _MODULES if (sMsg.WildCmp("\001*\001")) { CString sCTCP = sMsg; @@ -203,6 +199,10 @@ void CUserSock::ReadLine(const CString& sData) { } #endif + if ((pChan) && (pChan->KeepBuffer())) { + pChan->AddBuffer(":" + GetNickMask() + " NOTICE " + sTarget + " :" + sMsg); + } + PutIRC("NOTICE " + sTarget + " :" + sMsg); return; } else if (sCommand.CaseCmp("PRIVMSG") == 0) { @@ -360,13 +360,13 @@ void CUserSock::ReadLine(const CString& sData) { CChan* pChan = m_pUser->FindChan(sTarget); +#ifdef _MODULES + MODULECALLRET(OnUserMsg(sTarget, sMsg)); +#endif if ((pChan) && (pChan->KeepBuffer())) { pChan->AddBuffer(":" + GetNickMask() + " PRIVMSG " + sTarget + " :" + sMsg); } -#ifdef _MODULES - MODULECALLRET(OnUserMsg(sTarget, sMsg)); -#endif PutIRC("PRIVMSG " + sTarget + " :" + sMsg); return; } diff --git a/modules/away.cpp b/modules/away.cpp index 70cc2554..b435d8c0 100644 --- a/modules/away.cpp +++ b/modules/away.cpp @@ -18,6 +18,9 @@ * * * $Log$ + * Revision 1.19 2005/09/26 23:09:05 prozacx + * Removed const from args in a bunch of hooks + * * Revision 1.18 2005/09/26 08:23:30 prozacx * Removed const from CNick in priv/chan hooks * @@ -374,7 +377,7 @@ public: return( CONTINUE ); } - virtual EModRet OnUserMsg(const CString& sTarget, CString& sMessage) + virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) { Ping(); if( m_bIsAway ) diff --git a/modules/modperl.cpp b/modules/modperl.cpp index fc23d69c..5415ff95 100644 --- a/modules/modperl.cpp +++ b/modules/modperl.cpp @@ -357,11 +357,11 @@ public: virtual void OnJoin(const CNick& Nick, CChan& Channel) { CBDouble( "OnJoin", NICK( Nick ), CHAN( Channel ) ); } virtual void OnPart(const CNick& Nick, CChan& Channel) { CBDouble( "OnPart", NICK( Nick ), CHAN( Channel ) ); } - virtual EModRet OnUserCTCPReply(const CNick& Nick, CString& sMessage) + virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) { - return CBDouble( "OnUserCTCPReply", NICK( Nick ), sMessage ); + return CBDouble( "OnUserCTCPReply", sTarget, sMessage ); } - virtual EModRet OnCTCPReply(const CNick& Nick, CString& sMessage) + virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) { return CBDouble( "OnCTCPReply", NICK( Nick ), sMessage ); } @@ -377,7 +377,7 @@ public: { return CBTriple( "OnChanCTCP", NICK( Nick ), CHAN( Channel ), sMessage ); } - virtual EModRet OnUserMsg(const CString& sTarget, CString& sMessage) + virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) { return CBDouble( "OnUserMsg", sTarget, sMessage ); } diff --git a/modules/sample.cpp b/modules/sample.cpp index 35671f49..eda35417 100644 --- a/modules/sample.cpp +++ b/modules/sample.cpp @@ -106,20 +106,20 @@ public: PutModule("* " + OldNick.GetNick() + " is now known as " + sNewNick); } - virtual EModRet OnUserCTCPReply(const CNick& Nick, CString& sMessage) { - PutModule("[" + Nick.GetNick() + "] userctcpreply [" + sMessage + "]"); + virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) { + PutModule("[" + sTarget + "] userctcpreply [" + sMessage + "]"); sMessage = "\037" + sMessage + "\037"; return CONTINUE; } - virtual EModRet OnCTCPReply(const CNick& Nick, CString& sMessage) { + virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) { PutModule("[" + Nick.GetNick() + "] ctcpreply [" + sMessage + "]"); return CONTINUE; } - virtual EModRet OnUserCTCP(const CString& sTarget, CString& sMessage) { + virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) { PutModule("[" + sTarget + "] userctcp [" + sMessage + "]"); return CONTINUE; @@ -160,7 +160,7 @@ public: return CONTINUE; } - virtual EModRet OnUserMsg(const CString& sTarget, CString& sMessage) { + virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) { PutModule("[" + sTarget + "] usermsg [" + sMessage + "]"); sMessage = "\0034" + sMessage + "\003"; diff --git a/modules/schat.cpp b/modules/schat.cpp index 7dd41c69..4c52996f 100644 --- a/modules/schat.cpp +++ b/modules/schat.cpp @@ -21,6 +21,9 @@ using std::pair; * Author: imaginos * * $Log$ + * Revision 1.21 2005/09/26 23:09:05 prozacx + * Removed const from args in a bunch of hooks + * * Revision 1.20 2005/09/26 08:23:30 prozacx * Removed const from CNick in priv/chan hooks * @@ -477,7 +480,7 @@ public: m_pManager->Connect( CUtils::GetIP( iIP ), iPort, sSockName, 60, true, m_pUser->GetLocalIP(), p ); RemTimer( "Remove " + sNick ); // delete any associated timer to this nick } - virtual EModRet OnUserMsg( const CString& sTarget, CString& sMessage ) + virtual EModRet OnUserMsg( CString& sTarget, CString& sMessage ) { if ( strncmp( sTarget.c_str(), "(s)", 3 ) == 0 ) { diff --git a/modules/watch.cpp b/modules/watch.cpp index 04700640..fb03748a 100644 --- a/modules/watch.cpp +++ b/modules/watch.cpp @@ -202,7 +202,7 @@ public: Process(OldNick, "* " + OldNick.GetNick() + " is now known as " + sNewNick, ""); } - virtual EModRet OnCTCPReply(const CNick& Nick, CString& sMessage) { + virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) { Process(Nick, "* CTCP: " + Nick.GetNick() + " reply [" + sMessage + "]", "priv"); return CONTINUE; }