From ff7a6c231a745d0d416a31864f535a1a7d94585c Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Sat, 10 May 2008 15:09:46 +0000
Subject: [PATCH] Remove some unneedef #ifdef's

MODULECALL doesn't need to be wrapped in #ifdef _MODULES, since main.h
already does this.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1049 726aef4b-f618-498e-8847-2d620e286838
---
 Client.cpp  | 14 --------------
 IRCSock.cpp |  4 ----
 znc.cpp     |  2 --
 3 files changed, 20 deletions(-)

diff --git a/Client.cpp b/Client.cpp
index 850ec7b5..f147ccbb 100644
--- a/Client.cpp
+++ b/Client.cpp
@@ -170,9 +170,7 @@ void CClient::ReadLine(const CString& sData) {
 
 			for (unsigned int a = 0; a < vChans.size(); a++) {
 				CString sChannel = vChans[a];
-#ifdef _MODULES
 				MODULECALL(OnUserJoin(sChannel, sKey), m_pUser, this, continue);
-#endif
 
 				CChan* pChan = m_pUser->FindChan(sChannel);
 
@@ -204,9 +202,7 @@ void CClient::ReadLine(const CString& sData) {
 			sMessage.LeftChomp();
 		}
 
-#ifdef _MODULES
 		MODULECALL(OnUserPart(sChan, sMessage), m_pUser, this, return);
-#endif
 
 		if (m_pUser) {
 			CChan* pChan = m_pUser->FindChan(sChan);
@@ -393,10 +389,8 @@ void CClient::ReadLine(const CString& sData) {
 							if (m_pUser) {
 								m_pUser->GetFile(GetNick(), CUtils::GetIP(uLongIP), uPort, sLocalFile, uFileSize);
 							}
-#ifdef _MODULES
 						} else {
 							MODULECALL(OnDCCUserSend(sTarget, uLongIP, uPort, sFile, uFileSize), m_pUser, this, return);
-#endif
 						}
 					} else {
 						unsigned short uBNCPort = CDCCBounce::DCCRequest(sTarget, uLongIP, uPort, sFile, false, m_pUser, (m_pIRCSock) ? m_pIRCSock->GetLocalIP() : GetLocalIP(), "");
@@ -498,9 +492,7 @@ void CClient::ReadLine(const CString& sData) {
 		}
 
 		if ((m_pUser) && (sTarget.CaseCmp(CString(m_pUser->GetStatusPrefix() + "status")) == 0)) {
-#ifdef _MODULES
 			MODULECALL(OnStatusCommand(sMsg), m_pUser, this, return);
-#endif
 			UserCommand(sMsg);
 			return;
 		}
@@ -534,9 +526,7 @@ void CClient::ReadLine(const CString& sData) {
 			return;
 		}
 
-#ifdef _MODULES
 		MODULECALL(OnUserMsg(sTarget, sMsg), m_pUser, this, return);
-#endif
 
 		if (!m_pIRCSock) {
 			PutStatus("Your message to [" + sTarget + "] got lost, "
@@ -1863,9 +1853,7 @@ void CClient::AcceptLogin(CUser& User) {
 
 	SendMotd();
 
-#ifdef _MODULES
 	MODULECALL(OnUserAttached(), m_pUser, this, );
-#endif
 }
 
 void CClient::Connected() {
@@ -1884,9 +1872,7 @@ void CClient::Disconnected() {
 
 	m_pIRCSock = NULL;
 
-#ifdef _MODULES
 	MODULECALL(OnUserDetached(), m_pUser, this, );
-#endif
 }
 
 void CClient::IRCConnected(CIRCSock* pIRCSock) {
diff --git a/IRCSock.cpp b/IRCSock.cpp
index d4b001bd..9dd2106e 100644
--- a/IRCSock.cpp
+++ b/IRCSock.cpp
@@ -75,9 +75,7 @@ void CIRCSock::ReadLine(const CString& sData) {
 
 	DEBUG_ONLY(cout << "(" << m_pUser->GetUserName() << ") IRC -> ZNC [" << sLine << "]" << endl);
 
-#ifdef _MODULES
 	MODULECALL(OnRaw(sLine), m_pUser, NULL, return);
-#endif
 
 	if (strncasecmp(sLine.c_str(), "PING ", 5) == 0) {
 		PutIRC("PONG " + sLine.substr(5));
@@ -569,9 +567,7 @@ void CIRCSock::ReadLine(const CString& sData) {
 //					CString sArgs = sModes.Token(1, true); Usermode changes got no params
 					bool bAdd = true;
 /* no module call defined (yet?)
-#ifdef _MODULES
 					MODULECALL(OnRawUserMode(*pOpNick, *this, sModeArg, sArgs), m_pUser, NULL, );
-#endif
 */
 					for (unsigned int a = 0; a < sModeArg.size(); a++) {
 						const unsigned char& uMode = sModeArg[a];
diff --git a/znc.cpp b/znc.cpp
index bb779e6b..e9066c87 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -1575,9 +1575,7 @@ void CZNC::Broadcast(const CString& sMessage, CUser* pUser) {
 	for (map<CString,CUser*>::iterator a = m_msUsers.begin(); a != m_msUsers.end(); a++) {
 		if (a->second != pUser) {
 			CString sMsg = sMessage;
-#ifdef _MODULES
 			MODULECALL(OnBroadcast(sMsg), a->second, NULL, continue);
-#endif
 			a->second->PutStatusNotice("*** " + sMsg);
 		}
 	}