From 9b3ac7cb94c179932c8bbce2e70f6b6a1b55f2fe Mon Sep 17 00:00:00 2001 From: prozacx Date: Sat, 23 Apr 2005 08:10:34 +0000 Subject: [PATCH] Changed vChans to a reference in OnNick and OnQuit (oops) git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@165 726aef4b-f618-498e-8847-2d620e286838 --- Modules.cpp | 8 ++++---- Modules.h | 10 +++++----- modules/sample.cpp | 4 ++-- modules/savebuff.cpp | 7 +++++-- modules/watch.cpp | 4 ++-- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Modules.cpp b/Modules.cpp index d18bf6cb..bb44834b 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -149,8 +149,8 @@ void CModule::OnModCommand(const string& sCommand) {} void CModule::OnModNotice(const string& sMessage) {} void CModule::OnModCTCP(const string& sMessage) {} -void CModule::OnQuit(const CNick& Nick, const string& sMessage, const vector vChans) {} -void CModule::OnNick(const CNick& Nick, const string& sNewNick, const vector vChans) {} +void CModule::OnQuit(const CNick& Nick, const string& sMessage, const vector& vChans) {} +void CModule::OnNick(const CNick& Nick, const string& sNewNick, const vector& vChans) {} void CModule::OnKick(const CNick& Nick, const string& sKickedNick, const CChan& Channel, const string& sMessage) {} void CModule::OnJoin(const CNick& Nick, const CChan& Channel) {} void CModule::OnPart(const CNick& Nick, const CChan& Channel) {} @@ -299,13 +299,13 @@ bool CModules::OnUserRaw(string& sLine) { return false; } -void CModules::OnQuit(const CNick& Nick, const string& sMessage, const vector vChans) { +void CModules::OnQuit(const CNick& Nick, const string& sMessage, const vector& vChans) { for (unsigned int a = 0; a < size(); a++) { (*this)[a]->OnQuit(Nick, sMessage, vChans); } } -void CModules::OnNick(const CNick& Nick, const string& sNewNick, const vector vChans) { +void CModules::OnNick(const CNick& Nick, const string& sNewNick, const vector& vChans) { for (unsigned int a = 0; a < size(); a++) { (*this)[a]->OnNick(Nick, sNewNick, vChans); } diff --git a/Modules.h b/Modules.h index 54ac7d83..3e2134e2 100644 --- a/Modules.h +++ b/Modules.h @@ -8,7 +8,7 @@ using std::vector; using std::string; -#define VERSION 0.031 +#define VERSION 0.032 #define MODULEDEFS(CLASS) extern "C" { CModule* Load(void* p, CUser* pUser, const string& sModName); void Unload(CModule* pMod); double GetVersion(); } double GetVersion() { return VERSION; } CModule* Load(void* p, CUser* pUser, const string& sModName) { return new CLASS(p, pUser, sModName); } void Unload(CModule* pMod) { if (pMod) { delete pMod; } } #define MODCONSTRUCTOR(CLASS) CLASS(void *pDLL, CUser* pUser, const string& sModName) : CModule(pDLL, pUser, sModName) @@ -72,8 +72,8 @@ public: virtual void OnModNotice(const string& sMessage); virtual void OnModCTCP(const string& sMessage); - virtual void OnQuit(const CNick& Nick, const string& sMessage, const vector vChans); - virtual void OnNick(const CNick& Nick, const string& sNewNick, const vector vChans); + virtual void OnQuit(const CNick& Nick, const string& sMessage, const vector& vChans); + virtual void OnNick(const CNick& Nick, const string& sNewNick, const vector& vChans); virtual void OnKick(const CNick& Nick, const string& sOpNick, const CChan& Channel, const string& sMessage); virtual void OnJoin(const CNick& Nick, const CChan& Channel); virtual void OnPart(const CNick& Nick, const CChan& Channel); @@ -148,8 +148,8 @@ public: virtual void OnModNotice(const string& sMessage); virtual void OnModCTCP(const string& sMessage); - virtual void OnQuit(const CNick& Nick, const string& sMessage, const vector vChans); - virtual void OnNick(const CNick& Nick, const string& sNewNick, const vector vChans); + virtual void OnQuit(const CNick& Nick, const string& sMessage, const vector& vChans); + virtual void OnNick(const CNick& Nick, const string& sNewNick, const vector& vChans); virtual void OnKick(const CNick& Nick, const string& sOpNick, const CChan& Channel, const string& sMessage); virtual void OnJoin(const CNick& Nick, const CChan& Channel); virtual void OnPart(const CNick& Nick, const CChan& Channel); diff --git a/modules/sample.cpp b/modules/sample.cpp index d324cf51..bb66d7f5 100644 --- a/modules/sample.cpp +++ b/modules/sample.cpp @@ -84,7 +84,7 @@ public: PutModule("[" + OpNick.GetNick() + "] kicked [" + sKickedNick + "] from [" + Channel.GetName() + "] with the msg [" + sMessage + "]"); } - virtual void OnQuit(const CNick& Nick, const string& sMessage, const vector vChans) { + virtual void OnQuit(const CNick& Nick, const string& sMessage, const vector& vChans) { PutModule("* Quits: " + Nick.GetNick() + " (" + Nick.GetIdent() + "!" + Nick.GetHost() + ") (" + sMessage + ")"); } @@ -96,7 +96,7 @@ public: PutModule("* Parts: " + Nick.GetNick() + " (" + Nick.GetIdent() + "!" + Nick.GetHost() + ")"); } - virtual void OnNick(const CNick& OldNick, const string& sNewNick, const vector vChans) { + virtual void OnNick(const CNick& OldNick, const string& sNewNick, const vector& vChans) { PutModule("* " + OldNick.GetNick() + " is now known as " + sNewNick); } diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp index 6016b3f7..07827d36 100644 --- a/modules/savebuff.cpp +++ b/modules/savebuff.cpp @@ -26,6 +26,9 @@ * better solution then plain text. * * $Log$ + * Revision 1.16 2005/04/23 08:10:34 prozacx + * Changed vChans to a reference in OnNick and OnQuit (oops) + * * Revision 1.15 2005/04/23 07:24:58 prozacx * Changed OnNick() and OnQuit() to take a vector of common channels * @@ -292,13 +295,13 @@ public: { ((CChan &)cChannel).AddBuffer( SpoofChanMsg( cChannel.GetName(), cOpNick.GetNickMask() + " MODE " + sModes + " " + sArgs ) ); } - virtual void OnQuit(const CNick& cNick, const string& sMessage, const vector vChans) + virtual void OnQuit(const CNick& cNick, const string& sMessage, const vector& vChans) { for( u_int a = 0; a < vChans.size(); a++ ) vChans[a]->AddBuffer( SpoofChanMsg( vChans[a]->GetName(), cNick.GetNickMask() + " QUIT " + sMessage ) ); } - virtual void OnNick(const CNick& cNick, const string& sNewNick, const vector vChans) + virtual void OnNick(const CNick& cNick, const string& sNewNick, const vector& vChans) { for( u_int a = 0; a < vChans.size(); a++ ) vChans[a]->AddBuffer( SpoofChanMsg( vChans[a]->GetName(), cNick.GetNickMask() + " NICK " + sNewNick ) ); diff --git a/modules/watch.cpp b/modules/watch.cpp index beb49f20..66dd2d77 100644 --- a/modules/watch.cpp +++ b/modules/watch.cpp @@ -190,7 +190,7 @@ public: Process(OpNick, "* " + OpNick.GetNick() + " kicked " + sKickedNick + " from " + Channel.GetName() + " because [" + sMessage + "]", Channel.GetName()); } - virtual void OnQuit(const CNick& Nick, const string& sMessage, const vector vChans) { + virtual void OnQuit(const CNick& Nick, const string& sMessage, const vector& vChans) { Process(Nick, "* Quits: " + Nick.GetNick() + " (" + Nick.GetIdent() + "@" + Nick.GetHost() + ") (" + sMessage + ")", ""); } @@ -202,7 +202,7 @@ public: Process(Nick, "* " + Nick.GetNick() + " (" + Nick.GetIdent() + "@" + Nick.GetHost() + ") parts " + Channel.GetName(), Channel.GetName()); } - virtual void OnNick(const CNick& OldNick, const string& sNewNick, const vector vChans) { + virtual void OnNick(const CNick& OldNick, const string& sNewNick, const vector& vChans) { Process(OldNick, "* " + OldNick.GetNick() + " is now known as " + sNewNick, ""); }