remove pModule from Ismatch

znc · Nov 23, 2012 · f941ee5 · f941ee5
1 parent 77e4ae5
commit f941ee5
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/modules/autoattach.cpp b/modules/autoattach.cpp
@@ -30,7 +30,7 @@ class CAttachMatch {
 			m_sHostmaskWildcard = "*!*@*";
 	}
 
-	bool IsMatch(const CString& sChan, const CString& sHost, const CString& sMessage, const CModule *pModule) const {
+	bool IsMatch(const CString& sChan, const CString& sHost, const CString& sMessage) const {
 		if (!sHost.WildCmp(m_sHostmaskWildcard))
 			return false;
 		if (!sChan.WildCmp(m_sChannelWildcard))
@@ -190,21 +190,20 @@ class CChanAttach : public CModule {
 		const CString& sChan = Channel.GetName();
 		const CString& sHost = Nick.GetHostMask();
 		const CString& sMessage = Message;
-		const CModule*   pModule = this;
 		VAttachIter it;
 
 		if (!Channel.IsDetached())
 			return;
 
 		// Any negated match?
 		for (it = m_vMatches.begin(); it != m_vMatches.end(); ++it) {
-			if (it->IsNegated() && it->IsMatch(sChan, sHost, sMessage, pModule))
+			if (it->IsNegated() && it->IsMatch(sChan, sHost, sMessage))
 				return;
 		}
 
 		// Now check for a positive match
 		for (it = m_vMatches.begin(); it != m_vMatches.end(); ++it) {
-			if (!it->IsNegated() && it->IsMatch(sChan, sHost, sMessage, pModule)) {
+			if (!it->IsNegated() && it->IsMatch(sChan, sHost, sMessage)) {
 				Channel.JoinUser();
 				return;
 			}