minor code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@5083 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

11 files changed, 51 insertions, 52 deletions

diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp
index 9ea40c9512..3c3c0de534 100644
--- a/protocols/IRCG/src/clist.cpp
+++ b/protocols/IRCG/src/clist.cpp
@@ -78,9 +78,9 @@ BOOL CIrcProto::CList_AddDCCChat(const CMString& name, const CMString& hostmask,
 		cle.ptszTooltip = szNick;

 		cle.lParam = (LPARAM)pdci;

 

-		if ( CallService( MS_CLIST_GETEVENT, (WPARAM)hContact, 0))

-			CallService( MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM)"dccchat");

-		CallService( MS_CLIST_ADDEVENT,(WPARAM) hContact,(LPARAM) &cle);

+		if ( CallService(MS_CLIST_GETEVENT, (WPARAM)hContact, 0))

+			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM)"dccchat");

+		CallService(MS_CLIST_ADDEVENT,(WPARAM) hContact,(LPARAM) &cle);

 	}

 	return TRUE;

 }

@@ -102,9 +102,9 @@ HANDLE CIrcProto::CList_AddContact(CONTACT * user, bool InList, bool SetOnline)
 	}

 	

 	// here we create a new one since no one is to be found

-	hContact = (HANDLE) CallService( MS_DB_CONTACT_ADD, 0, 0);

+	hContact = (HANDLE)CallService(MS_DB_CONTACT_ADD, 0, 0);

 	if ( hContact ) {

-		CallService( MS_PROTO_ADDTOCONTACT, (WPARAM) hContact, (LPARAM)m_szModuleName );

+		CallService(MS_PROTO_ADDTOCONTACT, (WPARAM) hContact, (LPARAM)m_szModuleName );

 

 		if ( InList )

 			db_unset(hContact, "CList", "NotOnList");

diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index 095a327f86..f5d73cfe71 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -706,12 +706,12 @@ bool CIrcProto::OnIrc_PRIVMSG(const CIrcMessage* pmsg)
 

 			struct CONTACT user = { (TCHAR*)pmsg->prefix.sNick.c_str(), (TCHAR*)pmsg->prefix.sUser.c_str(), (TCHAR*)pmsg->prefix.sHost.c_str(), false, false, false};

 

-			if ( CallService( MS_IGNORE_ISIGNORED, NULL, IGNOREEVENT_MESSAGE )) 

-				if ( !CList_FindContact( &user ))

+			if ( CallService(MS_IGNORE_ISIGNORED, NULL, IGNOREEVENT_MESSAGE)) 

+				if ( !CList_FindContact(&user))

 					return true;

 

 			if (( m_ignore && IsIgnored( pmsg->prefix.sNick, pmsg->prefix.sUser, pmsg->prefix.sHost, 'q' ))) {

-				HANDLE hContact = CList_FindContact( &user );

+				HANDLE hContact = CList_FindContact(&user);

 				if ( !hContact || ( hContact && db_get_b( hContact,"CList", "Hidden", 0) == 1 ))

 					return true;

 			}

@@ -1142,8 +1142,8 @@ bool CIrcProto::IsCTCP(const CIrcMessage* pmsg)
 				}

 				else {

 					struct CONTACT user = { (TCHAR*)pmsg->prefix.sNick.c_str(), (TCHAR*)pmsg->prefix.sUser.c_str(), (TCHAR*)pmsg->prefix.sHost.c_str(), false, false, false};

-					if ( CallService( MS_IGNORE_ISIGNORED, NULL, IGNOREEVENT_FILE )) 

-						if ( !CList_FindContact( &user ))

+					if ( CallService(MS_IGNORE_ISIGNORED, NULL, IGNOREEVENT_FILE))

+						if ( !CList_FindContact(&user))

 							return true;

 

 					HANDLE hContact = CList_AddContact( &user, false, true );

@@ -1914,7 +1914,7 @@ bool CIrcProto::OnIrc_ERROR(const CIrcMessage* pmsg)
 		msn.tszInfo = ( TCHAR* )S.c_str();

 		msn.dwInfoFlags = NIIF_ERROR | NIIF_INTERN_UNICODE;

 		msn.uTimeout = 15000;

-		CallService( MS_CLIST_SYSTRAY_NOTIFY, 0, ( LPARAM )&msn );

+		CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)&msn);

 	}

 	ShowMessage( pmsg );

 	return true;	

diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp
index 2f87cb1409..156932e8b8 100644
--- a/protocols/IRCG/src/input.cpp
+++ b/protocols/IRCG/src/input.cpp
@@ -668,7 +668,7 @@ BOOL CIrcProto::DoHardcodedCommand( CMString text, TCHAR* window, HANDLE hContac
 						TCHAR* p = ( TCHAR* )temp.c_str();

 						pp[0] = p;

 						pp[1] = NULL;

-						CallService( MS_FILE_SENDSPECIFICFILES, (WPARAM)hContact, (LPARAM)pp );

+						CallService(MS_FILE_SENDSPECIFICFILES, (WPARAM)hContact, (LPARAM)pp);

 				}	}

 			}

 			else {

diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp
index 0ebc2d4da0..7314d726cf 100644
--- a/protocols/IRCG/src/irclib.cpp
+++ b/protocols/IRCG/src/irclib.cpp
@@ -194,7 +194,7 @@ bool CIrcProto::Connect(const CIrcSessionInfo& info)
 	ncon.cbSize = sizeof(ncon);

 	ncon.szHost = info.sServer.c_str();

 	ncon.wPort = info.iPort;

-	con = (HANDLE) CallService( MS_NETLIB_OPENCONNECTION, (WPARAM) hNetlib, (LPARAM) & ncon);

+	con = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)hNetlib, (LPARAM)&ncon);

 	if (con == NULL) {

 		TCHAR szTemp[300];

 		mir_sntprintf(szTemp, SIZEOF(szTemp), _T("\0035%s \002%s\002 (%S: %u)."),

@@ -373,7 +373,7 @@ void CIrcProto::DoReceive()
 		nb.pfnNewConnectionV2 = DoIdent;

 		nb.pExtra = this;

 		nb.wPort = m_info.iIdentServerPort;

-		hBindPort = (HANDLE)CallService( MS_NETLIB_BINDPORT, (WPARAM)hNetlib,(LPARAM) &nb);

+		hBindPort = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)hNetlib, (LPARAM)&nb);

 		if ( !hBindPort || nb.wPort != m_info.iIdentServerPort ) {

 			DoNetlibLog("Error: unable to bind local port %u", m_info.iIdentServerPort);

 			KillIdent();

@@ -920,7 +920,7 @@ int CDccSession::SetupConnection()
 		nb.pfnNewConnectionV2 = DoIncomingDcc; // this is the (helper) function to be called once an incoming connection is made. The 'real' function that is called is IncomingConnection()

 		nb.pExtra = (void *)this; 

 		nb.wPort = 0;

-		hBindPort = (HANDLE)CallService( MS_NETLIB_BINDPORT, (WPARAM)m_proto->hNetlibDCC,(LPARAM) &nb);

+		hBindPort = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)m_proto->hNetlibDCC, (LPARAM)&nb);

 

 		if ( hBindPort == NULL ) {

 			delete this; // dcc objects destroy themselves when the connection has been closed or failed for some reasson.

@@ -938,10 +938,9 @@ int CDccSession::SetupConnection()
 		ncon.cbSize = sizeof(ncon);

 		ncon.szHost = ConvertIntegerToIP(di->dwAdr); 

 		ncon.wPort = (WORD) di->iPort;

-		con = (HANDLE) CallService( MS_NETLIB_OPENCONNECTION, (WPARAM)m_proto->hNetlibDCC, (LPARAM) & ncon);

+		con = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)m_proto->hNetlibDCC, (LPARAM)&ncon);

 	}

 

-

 	// If a remote computer initiates a filetransfer this is used to connect to that computer (the user has chosen to accept but it is possible the file exists/needs to be resumed etc still)

 	if ( di->iType == DCC_SEND && !di->bSender ) {

 

@@ -999,7 +998,7 @@ int CDccSession::SetupConnection()
 			nb.pfnNewConnectionV2 = DoIncomingDcc; // this is the (helper) function to be called once an incoming connection is made. The 'real' function that is called is IncomingConnection()

 			nb.pExtra = (void *)this; 

 			nb.wPort = 0;

-			hBindPort = (HANDLE)CallService( MS_NETLIB_BINDPORT, (WPARAM)m_proto->hNetlibDCC,(LPARAM) &nb);

+			hBindPort = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)m_proto->hNetlibDCC, (LPARAM)&nb);

 

 			if ( hBindPort == NULL ) {

 				m_proto->DoEvent(GC_EVENT_INFORMATION, 0, m_proto->m_info.sNick.c_str(), LPGENT("DCC ERROR: Unable to bind local port for passive filetransfer"), NULL, NULL, NULL, true, false); 

@@ -1036,7 +1035,7 @@ int CDccSession::SetupConnection()
 		ncon.szHost = ConvertIntegerToIP(di->dwAdr);

 		ncon.wPort = (WORD) di->iPort;

 

-		con = (HANDLE) CallService( MS_NETLIB_OPENCONNECTION, (WPARAM)m_proto->hNetlibDCC, (LPARAM) & ncon);

+		con = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)m_proto->hNetlibDCC, (LPARAM)&ncon);

 	}

 

 	// if for some reason the plugin has failed to connect to the remote computer the object is destroyed.

@@ -1136,7 +1135,7 @@ void CDccSession::DoSendFile()
 			tLastActivity = time(0);

 

 			// create a packet receiver to handle receiving ack's from the remote computer.

-			HANDLE hPackrcver = (HANDLE)CallService( MS_NETLIB_CREATEPACKETRECVER, (WPARAM)con, (LPARAM)sizeof(DWORD));

+			HANDLE hPackrcver = (HANDLE)CallService(MS_NETLIB_CREATEPACKETRECVER, (WPARAM)con, sizeof(DWORD));

 			NETLIBPACKETRECVER npr;

 			npr.cbSize = sizeof(NETLIBPACKETRECVER);

 			npr.dwTimeout = 60*1000;

@@ -1166,7 +1165,7 @@ void CDccSession::DoSendFile()
 					DWORD dwPacket = NULL;

 

 					do {					

-						dwRead = CallService( MS_NETLIB_GETMOREPACKETS, (WPARAM)hPackrcver, (LPARAM)&npr);

+						dwRead = CallService(MS_NETLIB_GETMOREPACKETS, (WPARAM)hPackrcver, (LPARAM)&npr);

 						npr.bytesUsed = sizeof(DWORD);          

 

 						if ( dwRead <= 0)

@@ -1187,7 +1186,7 @@ void CDccSession::DoSendFile()
 					DWORD dwPacket = 0;

 

 					do {					

-						dwRead = CallService( MS_NETLIB_GETMOREPACKETS, (WPARAM)hPackrcver, (LPARAM)&npr);

+						dwRead = CallService(MS_NETLIB_GETMOREPACKETS, (WPARAM)hPackrcver, (LPARAM)&npr);

 						npr.bytesUsed = sizeof(DWORD);          

 						if ( dwRead <= 0)

 							break; // connection closed, or a timeout occurred.

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index fb1c5eba4e..8c9981234e 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -75,7 +75,7 @@ CIrcProto::CIrcProto(const char* szModuleName, const TCHAR* tszUserName) :
 

 	char text[ MAX_PATH ];

 	mir_snprintf( text, sizeof( text ), "%s/Status", m_szModuleName);

-	CallService( MS_DB_SETSETTINGRESIDENT, TRUE, ( LPARAM )text );

+	CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)text);

 

 	CList_SetAllOffline(true);

 

@@ -206,7 +206,7 @@ int CIrcProto::OnModulesLoaded( WPARAM, LPARAM )
 	nlu.szSettingsModule = m_szModuleName;

 	mir_sntprintf( name, SIZEOF(name), TranslateT("%s server connection"), m_tszUserName);

 	nlu.ptszDescriptiveName = name;

-	hNetlib=(HANDLE)CallService( MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);

+	hNetlib = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);

 

 	nlu.flags = NUF_OUTGOING|NUF_INCOMING|NUF_HTTPCONNS|NUF_TCHAR;

 	char szTemp2[256];

@@ -214,15 +214,15 @@ int CIrcProto::OnModulesLoaded( WPARAM, LPARAM )
 	nlu.szSettingsModule = szTemp2;

 	mir_sntprintf( name, SIZEOF(name), TranslateT("%s client-to-client connections"), m_tszUserName);

 	nlu.ptszDescriptiveName = name;

-	hNetlibDCC=(HANDLE)CallService( MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);

+	hNetlibDCC = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);

 

 	//add as a known module in DB Editor ++

-	CallService( "DBEditorpp/RegisterSingleModule",(WPARAM)m_szModuleName,0);

+	CallService("DBEditorpp/RegisterSingleModule", (WPARAM)m_szModuleName, 0);

 	mir_snprintf(szTemp3, sizeof(szTemp3), "%s DCC", m_szModuleName);

-	CallService( "DBEditorpp/RegisterSingleModule",(WPARAM)szTemp3,0);

+	CallService("DBEditorpp/RegisterSingleModule", (WPARAM)szTemp3, 0);

 

 	if ( ServiceExists("MBot/GetFcnTable")) {

-		CallService( MS_MBOT_REGISTERIRC, 0, (LPARAM)m_szModuleName);

+		CallService(MS_MBOT_REGISTERIRC, 0, (LPARAM)m_szModuleName);

 		m_bMbotInstalled = TRUE;

 	}

 

@@ -262,7 +262,7 @@ int CIrcProto::OnModulesLoaded( WPARAM, LPARAM )
 	}

 	else {

 		if ( IDYES == MessageBox(0,TranslateT("The IRC protocol depends on another plugin called \'Chat\'\n\nDo you want to download it from the Miranda NG web site now?"),TranslateT("Information"),MB_YESNO|MB_ICONINFORMATION ))

-			CallService( MS_UTILS_OPENURL, 1, (LPARAM) "http://miranda-ng.org/");

+			CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://miranda-ng.org/");

 	}

 

 	TCHAR szTemp[MAX_PATH];

@@ -913,7 +913,7 @@ int CIrcProto::SetStatusInternal( int iNewStatus, bool bIsInternal )
 		msn.tszInfo = TranslateT( "Connection can not be established! You have not completed all necessary fields (Nickname, User ID and m_name)." );

 		msn.dwInfoFlags = NIIF_ERROR | NIIF_INTERN_UNICODE;

 		msn.uTimeout = 15000;

-		CallService( MS_CLIST_SYSTRAY_NOTIFY, 0,(LPARAM) &msn);

+		CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)&msn);

 		return 0;

 	}

 

diff --git a/protocols/IRCG/src/main.cpp b/protocols/IRCG/src/main.cpp
index f6265a1c2b..88e3fe181b 100644
--- a/protocols/IRCG/src/main.cpp
+++ b/protocols/IRCG/src/main.cpp
@@ -102,7 +102,7 @@ extern "C" int __declspec(dllexport) Load(  )
 	pd.type = PROTOTYPE_PROTOCOL;

 	pd.fnInit = ( pfnInitProto )ircProtoInit;

 	pd.fnUninit = ( pfnUninitProto )ircProtoUninit;

-	CallService( MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd );

+	CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);

 	return 0;

 }

 

diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 8a0b478598..3d200f4811 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -170,7 +170,7 @@ void RereadServers()
 	DBCONTACTENUMSETTINGS dbces;

 	dbces.pfnEnumProc = sttServerEnum;

 	dbces.szModule = SERVERSMODULE;

-	CallService( MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbces );

+	CallService(MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbces);

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -729,7 +729,7 @@ void CConnectPrefsDlg::OnApply()
 		m_port.GetTextA( m_proto->m_portStart, SIZEOF(m_proto->m_portStart));

 		m_port2.GetTextA( m_proto->m_portEnd, SIZEOF(m_proto->m_portEnd));

 		m_pass.GetTextA( m_proto->m_password, SIZEOF(m_proto->m_password));

-		CallService( MS_DB_CRYPT_ENCODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);

+		CallService(MS_DB_CRYPT_ENCODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);

 	}

 	else m_proto->m_serverName[0] = m_proto->m_portStart[0] = m_proto->m_portEnd[0] = m_proto->m_password[0] = 0;

 

@@ -800,7 +800,7 @@ void CConnectPrefsDlg::OnApply()
 

 	if ( m_serverlistModified ) {

 		m_serverlistModified = false;

-		CallService( MS_DB_MODULE_DELETE, 0, (LPARAM)SERVERSMODULE );

+		CallService(MS_DB_MODULE_DELETE, 0, (LPARAM)SERVERSMODULE);

 

 		int j = m_serverCombo.GetCount();

 		if (j != CB_ERR && j != 0) {

@@ -823,7 +823,7 @@ void CConnectPrefsDlg::OnApply()
 

 	m_proto->WriteSettings( ConnectSettings, SIZEOF( ConnectSettings ));

 

-	CallService( MS_DB_CRYPT_DECODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);

+	CallService(MS_DB_CRYPT_DECODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -1098,7 +1098,7 @@ void COtherPrefsDlg::OnInitDialog()
 

 void COtherPrefsDlg::OnUrl( CCtrlButton* )

 {

-	CallService( MS_UTILS_OPENURL,0,(LPARAM) "http://members.chello.se/matrix/index.html" );

+	CallService(MS_UTILS_OPENURL, 0, (LPARAM)"http://members.chello.se/matrix/index.html");

 }

 

 void COtherPrefsDlg::OnPerformCombo( CCtrlData* )

@@ -1724,12 +1724,12 @@ void CIrcProto::InitPrefs(void)
 

 	OtherSettings[0].defStr = _T(STR_QUITMESSAGE);

 

-	ReadSettings( ConnectSettings, SIZEOF( ConnectSettings ));

-	ReadSettings( CtcpSettings, SIZEOF( CtcpSettings ));

-	ReadSettings( OtherSettings, SIZEOF( OtherSettings ));

-	ReadSettings( IgnoreSettings, SIZEOF( IgnoreSettings ));

+	ReadSettings(ConnectSettings, SIZEOF( ConnectSettings ));

+	ReadSettings(CtcpSettings, SIZEOF( CtcpSettings ));

+	ReadSettings(OtherSettings, SIZEOF( OtherSettings ));

+	ReadSettings(IgnoreSettings, SIZEOF( IgnoreSettings ));

 

-	CallService( MS_DB_CRYPT_DECODESTRING, 499, (LPARAM)m_password);

+	CallService(MS_DB_CRYPT_DECODESTRING, 499, (LPARAM)m_password);

 

 	int x = getDword( "SizeOfListBottom", -1 );

 	if ( x != -1 ) {

@@ -1832,7 +1832,7 @@ struct CDlgAccMgrUI : public CProtoDlgBase<CIrcProto>
 		m_port.GetTextA( m_proto->m_portStart, SIZEOF(m_proto->m_portStart));

 		m_port2.GetTextA( m_proto->m_portEnd, SIZEOF(m_proto->m_portEnd));

 		m_pass.GetTextA( m_proto->m_password, SIZEOF(m_proto->m_password));

-		CallService( MS_DB_CRYPT_ENCODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);

+		CallService(MS_DB_CRYPT_ENCODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);

 

 		m_nick.GetText( m_proto->m_nick, SIZEOF(m_proto->m_nick));

 		removeSpaces(m_proto->m_nick);

@@ -1843,7 +1843,7 @@ struct CDlgAccMgrUI : public CProtoDlgBase<CIrcProto>
 		removeSpaces(m_proto->m_userID);

 		m_name.GetText( m_proto->m_name, SIZEOF(m_proto->m_name));

 		m_proto->WriteSettings( ConnectSettings, SIZEOF( ConnectSettings ));

-		CallService( MS_DB_CRYPT_DECODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);

+		CallService(MS_DB_CRYPT_DECODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);

 	}

 

 	void OnChangeCombo( CCtrlCombo* )

diff --git a/protocols/IRCG/src/scripting.cpp b/protocols/IRCG/src/scripting.cpp
index 26c6bc2a55..6c67887397 100644
--- a/protocols/IRCG/src/scripting.cpp
+++ b/protocols/IRCG/src/scripting.cpp
@@ -136,7 +136,7 @@ INT_PTR __cdecl CIrcProto::Scripting_InsertGuiOut( WPARAM, LPARAM lParam )
 

 BOOL CIrcProto::Scripting_TriggerMSPRawIn( char** pszRaw )

 {

-	int iVal = CallService( MS_MBOT_IRC_RAW_IN, (WPARAM)m_szModuleName, (LPARAM)pszRaw);

+	int iVal = CallService(MS_MBOT_IRC_RAW_IN, (WPARAM)m_szModuleName, (LPARAM)pszRaw);

 	if ( iVal == 0 )

 		return TRUE;

 

@@ -145,7 +145,7 @@ BOOL CIrcProto::Scripting_TriggerMSPRawIn( char** pszRaw )
 

 BOOL CIrcProto::Scripting_TriggerMSPRawOut(char ** pszRaw)

 {

-	int iVal =  CallService( MS_MBOT_IRC_RAW_OUT, (WPARAM)m_szModuleName, (LPARAM)pszRaw);

+	int iVal = CallService(MS_MBOT_IRC_RAW_OUT, (WPARAM)m_szModuleName, (LPARAM)pszRaw);

 	if ( iVal == 0 )

 		return TRUE;

 

@@ -161,7 +161,7 @@ BOOL CIrcProto::Scripting_TriggerMSPGuiIn(WPARAM * wparam, GCEVENT * gce)
 	if (gce->time == 0)

 		gce->time = time(0);

 

-	int iVal =  CallService( MS_MBOT_IRC_GUI_IN, (WPARAM)&wgi, (LPARAM)gce);

+	int iVal = CallService(MS_MBOT_IRC_GUI_IN, (WPARAM)&wgi, (LPARAM)gce);

 	if ( iVal == 0 ) {

 		*wparam = wgi.wParam;

 		return TRUE;

@@ -172,7 +172,7 @@ BOOL CIrcProto::Scripting_TriggerMSPGuiIn(WPARAM * wparam, GCEVENT * gce)
 

 BOOL CIrcProto::Scripting_TriggerMSPGuiOut(GCHOOK* gch)

 {

-	int iVal =  CallService( MS_MBOT_IRC_GUI_OUT, (WPARAM)m_szModuleName, (LPARAM)gch);

+	int iVal = CallService(MS_MBOT_IRC_GUI_OUT, (WPARAM)m_szModuleName, (LPARAM)gch);

 	if ( iVal == 0 )

 		return TRUE;

 

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index f0d49fc8a1..3bf3f885b0 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -805,7 +805,7 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam,LPARAM lParam)
 							acs.handleType = HANDLE_SEARCHRESULT;

 							acs.szProto = m_szModuleName;

 							acs.psr = &psr;

-							CallService( MS_ADDCONTACT_SHOW, 0, (LPARAM)&acs);

+							CallService(MS_ADDCONTACT_SHOW, 0, (LPARAM)&acs);

 						}

 						break;

 					case 31:	//slap

@@ -1232,5 +1232,5 @@ void CIrcProto::DoNetlibLog( const char* fmt, ... )
 	mir_vsnprintf( str, 32000, fmt, vararg );

 	va_end( vararg );

 

-	CallService( MS_NETLIB_LOG, (WPARAM)hNetlib, ( LPARAM )str );

+	CallService(MS_NETLIB_LOG, (WPARAM)hNetlib, (LPARAM)str);

 }

diff --git a/protocols/IRCG/src/tools.cpp b/protocols/IRCG/src/tools.cpp
index a656313cc2..b93d4ea498 100644
--- a/protocols/IRCG/src/tools.cpp
+++ b/protocols/IRCG/src/tools.cpp
@@ -801,7 +801,7 @@ void CIrcProto::CreateProtoService( const char* serviceName, IrcServiceFunc pFun
 void CIrcProto::FindLocalIP(HANDLE con) // inspiration from jabber

 {

 	// Determine local IP

-	int socket = CallService( MS_NETLIB_GETSOCKET, (WPARAM) con, 0);

+	int socket = CallService(MS_NETLIB_GETSOCKET, (WPARAM) con, 0);

 	if ( socket != INVALID_SOCKET ) {

 		struct sockaddr_in saddr;

 		int len = sizeof(saddr);

diff --git a/protocols/IRCG/src/windows.cpp b/protocols/IRCG/src/windows.cpp
index 6d145c999a..12765cd207 100644
--- a/protocols/IRCG/src/windows.cpp
+++ b/protocols/IRCG/src/windows.cpp
@@ -644,9 +644,9 @@ void CQuickDlg::OnOk( CCtrlButton* )
 		m_proto->setString("ServerName",m_proto->m_serverName);

 		m_proto->setString("PortStart",m_proto->m_portStart);

 		m_proto->setString("PortEnd",m_proto->m_portEnd);

-		CallService( MS_DB_CRYPT_ENCODESTRING, 499, (LPARAM)m_proto->m_password);

+		CallService(MS_DB_CRYPT_ENCODESTRING, 499, (LPARAM)m_proto->m_password);

 		m_proto->setString("Password",m_proto->m_password);

-		CallService( MS_DB_CRYPT_DECODESTRING, 499, (LPARAM)m_proto->m_password);

+		CallService(MS_DB_CRYPT_DECODESTRING, 499, (LPARAM)m_proto->m_password);

 		m_proto->setString("Network",m_proto->m_network);

 		m_proto->setByte("UseSSL",m_proto->m_iSSL);

 	}