From 1437f279b50b368cb7d4a47ff8c0caec868252e3 Mon Sep 17 00:00:00 2001 From: prozacx Date: Tue, 17 May 2005 17:18:35 +0000 Subject: [PATCH] Changed CChan reference to non-const in all hooks git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@330 726aef4b-f618-498e-8847-2d620e286838 --- Modules.cpp | 48 ++++++++++++++++++++++---------------------- Modules.h | 48 ++++++++++++++++++++++---------------------- modules/modperl.cpp | 22 ++++++++++---------- modules/sample.cpp | 24 +++++++++++----------- modules/savebuff.cpp | 11 ++++++---- modules/watch.cpp | 14 ++++++------- 6 files changed, 85 insertions(+), 82 deletions(-) diff --git a/Modules.cpp b/Modules.cpp index baee7ef0..97c6263d 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -227,12 +227,12 @@ void CModule::OnIRCConnected() {} CModule::EModRet CModule::OnDCCUserSend(const CNick& RemoteNick, unsigned long uLongIP, unsigned short uPort, const CString& sFile, unsigned long uFileSize) { return CONTINUE; } -void CModule::OnChanPermission(const CNick& OpNick, const CNick& Nick, const CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) {} -void CModule::OnOp(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) {} -void CModule::OnDeop(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) {} -void CModule::OnVoice(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) {} -void CModule::OnDevoice(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) {} -void CModule::OnRawMode(const CNick& OpNick, const CChan& Channel, const CString& sModes, const CString& sArgs) {} +void CModule::OnChanPermission(const CNick& OpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) {} +void CModule::OnOp(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) {} +void CModule::OnDeop(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) {} +void CModule::OnVoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) {} +void CModule::OnDevoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) {} +void CModule::OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) {} CModule::EModRet CModule::OnUserRaw(CString& sLine) { return CONTINUE; } CModule::EModRet CModule::OnRaw(CString& sLine) { return CONTINUE; } @@ -244,21 +244,21 @@ void CModule::OnModCTCP(const CString& sMessage) {} void CModule::OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans) {} void CModule::OnNick(const CNick& Nick, const CString& sNewNick, const vector& vChans) {} -void CModule::OnKick(const CNick& Nick, const CString& sKickedNick, const CChan& Channel, const CString& sMessage) {} -void CModule::OnJoin(const CNick& Nick, const CChan& Channel) {} -void CModule::OnPart(const CNick& Nick, const CChan& Channel) {} +void CModule::OnKick(const CNick& Nick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) {} +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::OnPrivCTCP(const CNick& Nick, CString& sMessage) { return CONTINUE; } -CModule::EModRet CModule::OnChanCTCP(const CNick& Nick, const CChan& Channel, CString& sMessage) { return CONTINUE; } +CModule::EModRet CModule::OnChanCTCP(const 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, const CChan& Channel, CString& sMessage) { return CONTINUE; } +CModule::EModRet CModule::OnChanMsg(const 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, const CChan& Channel, CString& sMessage) { return CONTINUE; } +CModule::EModRet CModule::OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage) { return CONTINUE; } void* CModule::GetDLL() { return m_pDLL; } bool CModule::PutIRC(const CString& sLine) { @@ -328,27 +328,27 @@ bool CModules::OnDCCUserSend(const CNick& RemoteNick, unsigned long uLongIP, uns MODHALTCHK(OnDCCUserSend(RemoteNick, uLongIP, uPort, sFile, uFileSize)); } -void CModules::OnChanPermission(const CNick& OpNick, const CNick& Nick, const CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) { +void CModules::OnChanPermission(const CNick& OpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) { MODUNLOADCHK(OnChanPermission(OpNick, Nick, Channel, uMode, bAdded, bNoChange)); } -void CModules::OnOp(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) { +void CModules::OnOp(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnOp(OpNick, Nick, Channel, bNoChange)); } -void CModules::OnDeop(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) { +void CModules::OnDeop(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnDeop(OpNick, Nick, Channel, bNoChange)); } -void CModules::OnVoice(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) { +void CModules::OnVoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnVoice(OpNick, Nick, Channel, bNoChange)); } -void CModules::OnDevoice(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) { +void CModules::OnDevoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnDevoice(OpNick, Nick, Channel, bNoChange)); } -void CModules::OnRawMode(const CNick& OpNick, const CChan& Channel, const CString& sModes, const CString& sArgs) { +void CModules::OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { MODUNLOADCHK(OnRawMode(OpNick, Channel, sModes, sArgs)); } @@ -368,15 +368,15 @@ void CModules::OnNick(const CNick& Nick, const CString& sNewNick, const vector& vChans); virtual void OnNick(const CNick& Nick, const CString& sNewNick, const vector& vChans); - virtual void OnKick(const CNick& Nick, const CString& sOpNick, const CChan& Channel, const CString& sMessage); - virtual void OnJoin(const CNick& Nick, const CChan& Channel); - virtual void OnPart(const CNick& Nick, const CChan& Channel); + virtual void OnKick(const CNick& Nick, const CString& sOpNick, CChan& Channel, const CString& sMessage); + 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 OnPrivCTCP(const CNick& Nick, CString& sMessage); - virtual EModRet OnChanCTCP(const CNick& Nick, const CChan& Channel, CString& sMessage); + virtual EModRet OnChanCTCP(const 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, const CChan& Channel, CString& sMessage); + virtual EModRet OnChanMsg(const 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, const CChan& Channel, CString& sMessage); + virtual EModRet OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage); void * GetDLL(); static double GetVersion() { return VERSION; } @@ -210,12 +210,12 @@ public: virtual bool OnDCCUserSend(const CNick& RemoteNick, unsigned long uLongIP, unsigned short uPort, const CString& sFile, unsigned long uFileSize); - virtual void OnChanPermission(const CNick& OpNick, const CNick& Nick, const CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); - virtual void OnOp(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange); - virtual void OnDeop(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange); - virtual void OnVoice(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange); - virtual void OnDevoice(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange); - virtual void OnRawMode(const CNick& OpNick, const CChan& Channel, const CString& sModes, const CString& sArgs); + virtual void OnChanPermission(const CNick& OpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); + virtual void OnOp(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnDeop(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnVoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnDevoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs); virtual bool OnUserRaw(CString& sLine); virtual bool OnRaw(CString& sLine); @@ -227,21 +227,21 @@ public: virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans); virtual void OnNick(const CNick& Nick, const CString& sNewNick, const vector& vChans); - virtual void OnKick(const CNick& Nick, const CString& sOpNick, const CChan& Channel, const CString& sMessage); - virtual void OnJoin(const CNick& Nick, const CChan& Channel); - virtual void OnPart(const CNick& Nick, const CChan& Channel); + virtual void OnKick(const CNick& Nick, const CString& sOpNick, CChan& Channel, const CString& sMessage); + 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 OnPrivCTCP(const CNick& Nick, CString& sMessage); - virtual bool OnChanCTCP(const CNick& Nick, const CChan& Channel, CString& sMessage); + virtual bool OnChanCTCP(const 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, const CChan& Channel, CString& sMessage); + virtual bool OnChanMsg(const 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, const CChan& Channel, CString& sMessage); + virtual bool OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage); CModule* FindModule(const CString& sModule); bool LoadModule(const CString& sModule, const CString& sArgs, CUser* pUser, CString& sRetMsg); diff --git a/modules/modperl.cpp b/modules/modperl.cpp index ecfff797..83f228b8 100644 --- a/modules/modperl.cpp +++ b/modules/modperl.cpp @@ -193,23 +193,23 @@ public: virtual EModRet OnDCCUserSend(const CNick& RemoteNick, unsigned long uLongIP, unsigned short uPort, const CString& sFile, unsigned long uFileSize); - virtual void OnOp(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) + virtual void OnOp(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { CBFour( "OnOp", NICK( OpNick ), NICK( Nick ), CHAN( Channel ), bNoChange ); } - virtual void OnDeop(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) + virtual void OnDeop(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { CBFour( "OnDeop", NICK( OpNick ), NICK( Nick ), CHAN( Channel ), bNoChange ); } - virtual void OnVoice(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) + virtual void OnVoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { CBFour( "OnVoice", NICK( OpNick ), NICK( Nick ), CHAN( Channel ), bNoChange ); } - virtual void OnDevoice(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) + virtual void OnDevoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { CBFour( "OnDevoice", NICK( OpNick ), NICK( Nick ), CHAN( Channel ), bNoChange ); } - virtual void OnRawMode(const CNick& Nick, const CChan& Channel, const CString& sModes, const CString& sArgs) + virtual void OnRawMode(const CNick& Nick, CChan& Channel, const CString& sModes, const CString& sArgs) { CBFour( "OnRawMode", NICK( Nick ), CHAN( Channel ), sModes, sArgs ); } @@ -246,13 +246,13 @@ public: CallBack( "OnNick", vsArgs ); } - virtual void OnKick(const CNick& Nick, const CString& sOpNick, const CChan& Channel, const CString& sMessage) + virtual void OnKick(const CNick& Nick, const CString& sOpNick, CChan& Channel, const CString& sMessage) { CBFour( "OnKick", NICK( Nick ), sOpNick, CHAN( Channel ), sMessage ); } - virtual void OnJoin(const CNick& Nick, const CChan& Channel) { CBDouble( "OnJoin", NICK( Nick ), CHAN( Channel ) ); } - virtual void OnPart(const CNick& Nick, const CChan& Channel) { CBDouble( "OnPart", NICK( Nick ), CHAN( Channel ) ); } + 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) { @@ -270,7 +270,7 @@ public: { return CBDouble( "OnPrivCTCP", NICK( Nick ), sMessage ); } - virtual EModRet OnChanCTCP(const CNick& Nick, const CChan& Channel, CString& sMessage) + virtual EModRet OnChanCTCP(const CNick& Nick, CChan& Channel, CString& sMessage) { return CBTriple( "OnChanCTCP", NICK( Nick ), CHAN( Channel ), sMessage ); } @@ -283,7 +283,7 @@ public: return CBDouble( "OnPrivMsg", NICK( Nick ), sMessage ); } - virtual EModRet OnChanMsg( const CNick& Nick, const CChan & Channel, CString & sMessage ) + virtual EModRet OnChanMsg( const CNick& Nick, CChan & Channel, CString & sMessage ) { return( CBTriple( "OnChanMsg", NICK( Nick ), CHAN( Channel ), sMessage ) ); } @@ -295,7 +295,7 @@ public: { return CBDouble( "OnPrivNotice", NICK( Nick ), sMessage ); } - virtual EModRet OnChanNotice(const CNick& Nick, const CChan& Channel, CString& sMessage) + virtual EModRet OnChanNotice(const 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 74efb2df..5f74cf31 100644 --- a/modules/sample.cpp +++ b/modules/sample.cpp @@ -50,27 +50,27 @@ public: PutModule("You got disconnected BoyOh."); } - virtual void OnChanPermission(const CNick& OpNick, const CNick& Nick, const CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) { + virtual void OnChanPermission(const CNick& OpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) { PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] set mode [" + Channel.GetName() + ((bAdded) ? "] +" : "] -") + CString::ToString(uMode) + " " + Nick.GetNick()); } - virtual void OnOp(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) { + virtual void OnOp(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] opped [" + Nick.GetNick() + "] on [" + Channel.GetName() + "]"); } - virtual void OnDeop(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) { + virtual void OnDeop(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] deopped [" + Nick.GetNick() + "] on [" + Channel.GetName() + "]"); } - virtual void OnVoice(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) { + virtual void OnVoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] voiced [" + Nick.GetNick() + "] on [" + Channel.GetName() + "]"); } - virtual void OnDevoice(const CNick& OpNick, const CNick& Nick, const CChan& Channel, bool bNoChange) { + virtual void OnDevoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] devoiced [" + Nick.GetNick() + "] on [" + Channel.GetName() + "]"); } - virtual void OnRawMode(const CNick& OpNick, const CChan& Channel, const CString& sModes, const CString& sArgs) { + virtual void OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { PutModule("* " + OpNick.GetNick() + " sets mode: " + sModes + " " + sArgs + " (" + Channel.GetName() + ")"); } @@ -84,7 +84,7 @@ public: return CONTINUE; } - virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, const CChan& Channel, const CString& sMessage) { + virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) { PutModule("[" + OpNick.GetNick() + "] kicked [" + sKickedNick + "] from [" + Channel.GetName() + "] with the msg [" + sMessage + "]"); } @@ -92,11 +92,11 @@ public: PutModule("* Quits: " + Nick.GetNick() + " (" + Nick.GetIdent() + "!" + Nick.GetHost() + ") (" + sMessage + ")"); } - virtual void OnJoin(const CNick& Nick, const CChan& Channel) { + virtual void OnJoin(const CNick& Nick, CChan& Channel) { PutModule("* Joins: " + Nick.GetNick() + " (" + Nick.GetIdent() + "!" + Nick.GetHost() + ")"); } - virtual void OnPart(const CNick& Nick, const CChan& Channel) { + virtual void OnPart(const CNick& Nick, CChan& Channel) { PutModule("* Parts: " + Nick.GetNick() + " (" + Nick.GetIdent() + "!" + Nick.GetHost() + ")"); } @@ -130,7 +130,7 @@ public: return CONTINUE; } - virtual EModRet OnChanCTCP(const CNick& Nick, const CChan& Channel, CString& sMessage) { + virtual EModRet OnChanCTCP(const CNick& Nick, CChan& Channel, CString& sMessage) { PutModule("[" + Nick.GetNick() + "] chanctcp [" + sMessage + "] to [" + Channel.GetName() + "]"); sMessage = "\00311,5 " + sMessage + " \003"; @@ -151,7 +151,7 @@ public: return CONTINUE; } - virtual EModRet OnChanNotice(const CNick& Nick, const CChan& Channel, CString& sMessage) { + virtual EModRet OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage) { PutModule("[" + Nick.GetNick() + "] channotice [" + sMessage + "] to [" + Channel.GetName() + "]"); sMessage = "\00311,5 " + sMessage + " \003"; @@ -172,7 +172,7 @@ public: return CONTINUE; } - virtual EModRet OnChanMsg(const CNick& Nick, const CChan& Channel, CString& sMessage) { + virtual EModRet OnChanMsg(const CNick& Nick, CChan& Channel, CString& sMessage) { if (sMessage == "!ping") { PutIRC("PRIVMSG " + Channel.GetName() + " :PONG?"); } diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp index ac73c34d..cd7db372 100644 --- a/modules/savebuff.cpp +++ b/modules/savebuff.cpp @@ -26,6 +26,9 @@ * better solution then plain text. * * $Log$ + * Revision 1.24 2005/05/17 17:18:35 prozacx + * Changed CChan reference to non-const in all hooks + * * Revision 1.23 2005/05/15 04:46:48 imaginos * when i part, save to file before the chan gets haxed. same with quit * @@ -320,7 +323,7 @@ public: return( sReturn ); } - virtual void OnRawMode(const CNick& cOpNick, const CChan& cChannel, const CString& sModes, const CString& sArgs) + virtual void OnRawMode(const CNick& cOpNick, CChan& cChannel, const CString& sModes, const CString& sArgs) { if ( !cChannel.KeepBuffer() ) return; @@ -348,13 +351,13 @@ public: vChans[a]->AddBuffer( SpoofChanMsg( vChans[a]->GetName(), cNick.GetNickMask() + " NICK " + sNewNick ) ); } } - virtual void OnKick(const CNick& cNick, const CString& sOpNick, const CChan& cChannel, const CString& sMessage) + virtual void OnKick(const CNick& cNick, const CString& sOpNick, CChan& cChannel, const CString& sMessage) { if ( !cChannel.KeepBuffer() ) return; ((CChan &)cChannel).AddBuffer( SpoofChanMsg( cChannel.GetName(), sOpNick + " KICK " + cNick.GetNickMask() + " " + sMessage ) ); } - virtual void OnJoin(const CNick& cNick, const CChan& cChannel) + virtual void OnJoin(const CNick& cNick, CChan& cChannel) { if ( ( cNick.GetNick().CaseCmp( m_pUser->GetNick() ) == 0 ) && ( cChannel.GetBuffer().empty() ) ) { @@ -366,7 +369,7 @@ public: return; ((CChan &)cChannel).AddBuffer( SpoofChanMsg( cChannel.GetName(), cNick.GetNickMask() + " JOIN" ) ); } - virtual void OnPart(const CNick& cNick, const CChan& cChannel) + virtual void OnPart(const CNick& cNick, CChan& cChannel) { if ( !cChannel.KeepBuffer() ) return; diff --git a/modules/watch.cpp b/modules/watch.cpp index 8435fac4..c45f0b38 100644 --- a/modules/watch.cpp +++ b/modules/watch.cpp @@ -164,7 +164,7 @@ public: return "Copy activity from a specific user into a separate window."; } - virtual void OnRawMode(const CNick& OpNick, const CChan& Channel, const CString& sModes, const CString& sArgs) { + virtual void OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { Process(OpNick, "* " + OpNick.GetNick() + " sets mode: " + sModes + " " + sArgs + " on " + Channel.GetName(), Channel.GetName()); } @@ -186,7 +186,7 @@ public: return CONTINUE; } - virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, const CChan& Channel, const CString& sMessage) { + virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) { Process(OpNick, "* " + OpNick.GetNick() + " kicked " + sKickedNick + " from " + Channel.GetName() + " because [" + sMessage + "]", Channel.GetName()); } @@ -194,11 +194,11 @@ public: Process(Nick, "* Quits: " + Nick.GetNick() + " (" + Nick.GetIdent() + "@" + Nick.GetHost() + ") (" + sMessage + ")", ""); } - virtual void OnJoin(const CNick& Nick, const CChan& Channel) { + virtual void OnJoin(const CNick& Nick, CChan& Channel) { Process(Nick, "* " + Nick.GetNick() + " (" + Nick.GetIdent() + "@" + Nick.GetHost() + ") joins " + Channel.GetName(), Channel.GetName()); } - virtual void OnPart(const CNick& Nick, const CChan& Channel) { + virtual void OnPart(const CNick& Nick, CChan& Channel) { Process(Nick, "* " + Nick.GetNick() + " (" + Nick.GetIdent() + "@" + Nick.GetHost() + ") parts " + Channel.GetName(), Channel.GetName()); } @@ -216,7 +216,7 @@ public: return CONTINUE; } - virtual EModRet OnChanCTCP(const CNick& Nick, const CChan& Channel, CString& sMessage) { + virtual EModRet OnChanCTCP(const CNick& Nick, CChan& Channel, CString& sMessage) { Process(Nick, "* CTCP: " + Nick.GetNick() + " [" + sMessage + "] to [" + Channel.GetName() + "]", Channel.GetName()); return CONTINUE; } @@ -226,7 +226,7 @@ public: return CONTINUE; } - virtual EModRet OnChanNotice(const CNick& Nick, const CChan& Channel, CString& sMessage) { + virtual EModRet OnChanNotice(const CNick& Nick, CChan& Channel, CString& sMessage) { Process(Nick, "-" + Nick.GetNick() + ":" + Channel.GetName() + "- " + sMessage, Channel.GetName()); return CONTINUE; } @@ -236,7 +236,7 @@ public: return CONTINUE; } - virtual EModRet OnChanMsg(const CNick& Nick, const CChan& Channel, CString& sMessage) { + virtual EModRet OnChanMsg(const CNick& Nick, CChan& Channel, CString& sMessage) { Process(Nick, "<" + Nick.GetNick() + ":" + Channel.GetName() + "> " + sMessage, Channel.GetName()); return CONTINUE; }