adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 17:33:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove some unneedef #ifdef's

Browse Source 
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
This commit is contained in:
psychon
2008-05-10 15:09:46 +00:00
parent 7e34dd3bfa
commit ff7a6c231a
3 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client.cpp
-14
View File
@@ -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) {
IRCSock.cpp
-4
View File
@@ -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];
znc.cpp
-2
View File
@@ -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);
}
}