code cleaning

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

1 files changed, 74 insertions, 94 deletions

diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp
index 6c2a92de29..f95dc36351 100644
--- a/protocols/IRCG/src/clist.cpp
+++ b/protocols/IRCG/src/clist.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "irc.h"

 

-BOOL CIrcProto::CList_AddDCCChat(const CMString& name, const CMString& hostmask, unsigned long adr, int port) 

+BOOL CIrcProto::CList_AddDCCChat(const CMString& name, const CMString& hostmask, unsigned long adr, int port)

 {

 	HANDLE hContact;

 	HANDLE hc;

@@ -30,57 +30,54 @@ BOOL CIrcProto::CList_AddDCCChat(const CMString& name, const CMString& hostmask,
 	char szService[256];

 	bool bFlag = false;

 

-	CONTACT usertemp = { (TCHAR*)name.c_str(), NULL, NULL, false, false, true};

-	hc = CList_FindContact( &usertemp );

-	if ( hc && db_get_b( hc, "CList", "NotOnList", 0) == 0

-		&& db_get_b(hc,"CList", "Hidden", 0) == 0)

-	{

+	CONTACT usertemp = { (TCHAR*)name.c_str(), NULL, NULL, false, false, true };

+	hc = CList_FindContact(&usertemp);

+	if (hc && db_get_b(hc, "CList", "NotOnList", 0) == 0 && db_get_b(hc, "CList", "Hidden", 0) == 0)

 		bFlag = true;

-	}

 

 	CMString contactname = name; contactname += _T(DCCSTRING);

 

-	CONTACT user = { (TCHAR*)contactname.c_str(), NULL, NULL, false, false, true};

+	CONTACT user = { (TCHAR*)contactname.c_str(), NULL, NULL, false, false, true };

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

 	setByte(hContact, "DCC", 1);

 

 	DCCINFO* pdci = new DCCINFO;

 	pdci->sHostmask = hostmask;

 	pdci->hContact = hContact;

-	pdci->dwAdr = (DWORD) adr;

+	pdci->dwAdr = (DWORD)adr;

 	pdci->iPort = port;

 	pdci->iType = DCC_CHAT;

 	pdci->bSender = false;

 	pdci->sContactName = name;

 

-	if ( m_DCCChatAccept == 3 || m_DCCChatAccept == 2 && bFlag ) {

-		CDccSession* dcc = new CDccSession( this, pdci );

+	if (m_DCCChatAccept == 3 || m_DCCChatAccept == 2 && bFlag) {

+		CDccSession* dcc = new CDccSession(this, pdci);

 

 		CDccSession* olddcc = FindDCCSession(hContact);

-		if ( olddcc )

+		if (olddcc)

 			olddcc->Disconnect();

 

 		AddDCCSession(hContact, dcc);

 		dcc->Connect();

-		if (getByte( "MirVerAutoRequest", 1))

-		  PostIrcMessage( _T("/PRIVMSG %s \001VERSION\001"), name.c_str());

+		if (getByte("MirVerAutoRequest", 1))

+			PostIrcMessage(_T("/PRIVMSG %s \001VERSION\001"), name.c_str());

 	}

 	else {

-		CLISTEVENT cle = {0};

+		CLISTEVENT cle = { 0 };

 		cle.cbSize = sizeof(cle);

 		cle.hContact = (HANDLE)hContact;

-		cle.hDbEvent = (HANDLE)"dccchat";	

+		cle.hDbEvent = (HANDLE)"dccchat";

 		cle.flags = CLEF_TCHAR;

 		cle.hIcon = LoadIconEx(IDI_DCC);

-		mir_snprintf(szService, sizeof(szService),"%s/DblClickEvent", m_szModuleName);

+		mir_snprintf(szService, sizeof(szService), "%s/DblClickEvent", m_szModuleName);

 		cle.pszService = szService;

 		mir_sntprintf(szNick, SIZEOF(szNick), TranslateT("CTCP chat request from %s"), name.c_str());

 		cle.ptszTooltip = szNick;

 		cle.lParam = (LPARAM)pdci;

 

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

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

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

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

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

 	}

 	return TRUE;

 }

@@ -89,33 +86,33 @@ HANDLE CIrcProto::CList_AddContact(CONTACT * user, bool InList, bool SetOnline)
 {

 	if (user->name == NULL)

 		return 0;

-	

+

 	HANDLE hContact = CList_FindContact(user);

-	if ( hContact ) {

-		if ( InList )

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

+	if (hContact) {

+		if (InList)

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

 		setTString(hContact, "Nick", user->name);

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

-		if (SetOnline && getWord(hContact, "Status", ID_STATUS_OFFLINE)== ID_STATUS_OFFLINE)

+		if (SetOnline && getWord(hContact, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE)

 			setWord(hContact, "Status", ID_STATUS_ONLINE);

 		return hContact;

 	}

-	

+

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

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

-	if ( hContact ) {

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

+	if (hContact) {

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

 

-		if ( InList )

+		if (InList)

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

 		else

 			db_set_b(hContact, "CList", "NotOnList", 1);

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

 		setTString(hContact, "Nick", user->name);

 		setTString(hContact, "Default", user->name);

-		setWord(hContact, "Status", SetOnline ? ID_STATUS_ONLINE:ID_STATUS_OFFLINE);

-		if ( !InList && getByte( "MirVerAutoRequestTemp", 0))

-			PostIrcMessage( _T("/PRIVMSG %s \001VERSION\001"), user->name);

+		setWord(hContact, "Status", SetOnline ? ID_STATUS_ONLINE : ID_STATUS_OFFLINE);

+		if (!InList && getByte("MirVerAutoRequestTemp", 0))

+			PostIrcMessage(_T("/PRIVMSG %s \001VERSION\001"), user->name);

 		return hContact;

 	}

 	return false;

@@ -123,17 +120,18 @@ HANDLE CIrcProto::CList_AddContact(CONTACT * user, bool InList, bool SetOnline)
 

 HANDLE CIrcProto::CList_SetOffline(struct CONTACT * user)

 {

-	DBVARIANT dbv;

 	HANDLE hContact = CList_FindContact(user);

-	if ( hContact ) {

-		if ( !getTString( hContact, "Default", &dbv )) {

+	if (hContact) {

+		DBVARIANT dbv;

+		if (!getTString(hContact, "Default", &dbv)) {

 			setString(hContact, "User", "");

 			setString(hContact, "Host", "");

 			setTString(hContact, "Nick", dbv.ptszVal);

 			setWord(hContact, "Status", ID_STATUS_OFFLINE);

 			db_free(&dbv);

 			return hContact;

-	}	}

+		}

+	}

 

 	return 0;

 }

@@ -145,92 +143,74 @@ bool CIrcProto::CList_SetAllOffline(BYTE ChatsToo)
 	DisconnectAllDCCSessions(false);

 

 	for (HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

-		if ( isChatRoom(hContact))

+		if (isChatRoom(hContact))

 			continue;

 

-		if ( getByte(hContact, "DCC", 0 ) != 0 ) {

-			if ( ChatsToo )

+		if (getByte(hContact, "DCC", 0) != 0) {

+			if (ChatsToo)

 				setWord(hContact, "Status", ID_STATUS_OFFLINE);

 		}

-		else if ( !getTString( hContact, "Default", &dbv )) {

-			setTString( hContact, "Nick", dbv.ptszVal);

-			setWord( hContact, "Status", ID_STATUS_OFFLINE );

-			db_free( &dbv );

+		else if (!getTString(hContact, "Default", &dbv)) {

+			setTString(hContact, "Nick", dbv.ptszVal);

+			setWord(hContact, "Status", ID_STATUS_OFFLINE);

+			db_free(&dbv);

 		}

-		db_unset( hContact, m_szModuleName, "IP" );

-		setString( hContact, "User", "" );

-		setString( hContact, "Host", "" );

+		db_unset(hContact, m_szModuleName, "IP");

+		setString(hContact, "User", "");

+		setString(hContact, "Host", "");

 	}

 	return true;

 }

 

-HANDLE CIrcProto::CList_FindContact (CONTACT* user) 

+HANDLE CIrcProto::CList_FindContact(CONTACT* user)

 {

-	if ( !user || !user->name )

+	if (!user || !user->name)

 		return 0;

-	

-	TCHAR* lowercasename = mir_tstrdup( user->name );

+

+	TCHAR* lowercasename = mir_tstrdup(user->name);

 	CharLower(lowercasename);

-	

-	DBVARIANT dbv1;

-	DBVARIANT dbv2;	

-	DBVARIANT dbv3;	

-	DBVARIANT dbv4;	

-	DBVARIANT dbv5;	

 

 	for (HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

-		if ( isChatRoom(hContact))

+		if (isChatRoom(hContact))

 			continue;

 

 		HANDLE hContact_temp = NULL;

-		TCHAR* DBDefault = NULL;

-		TCHAR* DBNick = NULL;

-		TCHAR* DBWildcard = NULL;

-		TCHAR* DBUser = NULL;

-		TCHAR* DBHost = NULL;

-		if ( !getTString(hContact, "Default",   &dbv1)) DBDefault = dbv1.ptszVal;

-		if ( !getTString(hContact, "Nick",      &dbv2)) DBNick = dbv2.ptszVal;

-		if ( !getTString(hContact, "UWildcard", &dbv3)) DBWildcard = dbv3.ptszVal;

-		if ( !getTString(hContact, "UUser",     &dbv4)) DBUser = dbv4.ptszVal;

-		if ( !getTString(hContact, "UHost",     &dbv5)) DBHost = dbv5.ptszVal;

-				

-		if ( DBWildcard )

-			CharLower( DBWildcard );

-		if ( IsChannel( user->name )) {

-			if ( DBDefault && !lstrcmpi( DBDefault, user->name ))

+		ptrT DBNick(getTStringA(hContact, "Nick"));

+		ptrT DBUser(getTStringA(hContact, "UUser"));

+		ptrT DBHost(getTStringA(hContact, "UHost"));

+		ptrT DBDefault(getTStringA(hContact, "Default"));

+		ptrT DBWildcard(getTStringA(hContact, "UWildcard"));

+

+		if (DBWildcard)

+			CharLower(DBWildcard);

+		if (IsChannel(user->name)) {

+			if (DBDefault && !lstrcmpi(DBDefault, user->name))

 				hContact_temp = (HANDLE)-1;

 		}

-		else if ( user->ExactNick && DBNick && !lstrcmpi( DBNick, user->name ))

+		else if (user->ExactNick && DBNick && !lstrcmpi(DBNick, user->name))

 			hContact_temp = hContact;

-				

-		else if ( user->ExactOnly && DBDefault && !lstrcmpi( DBDefault, user->name ))

+

+		else if (user->ExactOnly && DBDefault && !lstrcmpi(DBDefault, user->name))

 			hContact_temp = hContact;

-			

-		else if ( user->ExactWCOnly ) {

-			if ( DBWildcard && !lstrcmpi( DBWildcard, lowercasename ) 

-				|| ( DBWildcard && !lstrcmpi( DBNick, lowercasename ) && !WCCmp( DBWildcard, lowercasename ))

-				|| ( !DBWildcard && !lstrcmpi(DBNick, lowercasename)))

-			{

+

+		else if (user->ExactWCOnly) {

+			if (DBWildcard && !lstrcmpi(DBWildcard, lowercasename)

+				|| (DBWildcard && !lstrcmpi(DBNick, lowercasename) && !WCCmp(DBWildcard, lowercasename))

+				|| (!DBWildcard && !lstrcmpi(DBNick, lowercasename))) {

 				hContact_temp = hContact;

 			}

 		}

-		else if ( _tcschr(user->name, ' ' ) == 0 ) {

-			if (( DBDefault && !lstrcmpi(DBDefault, user->name) || DBNick && !lstrcmpi(DBNick, user->name) || 

-					DBWildcard && WCCmp( DBWildcard, lowercasename ))

-				&& ( WCCmp(DBUser, user->user) && WCCmp(DBHost, user->host)))

-			{

+		else if (_tcschr(user->name, ' ') == 0) {

+			if ((DBDefault && !lstrcmpi(DBDefault, user->name) || DBNick && !lstrcmpi(DBNick, user->name) ||

+				DBWildcard && WCCmp(DBWildcard, lowercasename))

+				&& (WCCmp(DBUser, user->user) && WCCmp(DBHost, user->host))) {

 				hContact_temp = hContact;

-		}	}

-

-		if ( DBDefault )   db_free(&dbv1);

-		if ( DBNick )      db_free(&dbv2);

-		if ( DBWildcard )  db_free(&dbv3);

-		if ( DBUser )      db_free(&dbv4);

-		if ( DBHost )      db_free(&dbv5);

+			}

+		}

 

-		if ( hContact_temp != NULL ) {

+		if (hContact_temp != NULL) {

 			mir_free(lowercasename);

-			if ( hContact_temp != (HANDLE)-1 )

+			if (hContact_temp != (HANDLE)-1)

 				return hContact_temp;

 			return 0;

 		}