these conversions aren't needed either

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

3 files changed, 14 insertions, 14 deletions

diff --git a/src/modules/protocols/protoaccs.cpp b/src/modules/protocols/protoaccs.cpp
index 2a0e2c4699..94a96366e4 100644
--- a/src/modules/protocols/protoaccs.cpp
+++ b/src/modules/protocols/protoaccs.cpp
@@ -199,7 +199,7 @@ void WriteDbAccounts()
 /////////////////////////////////////////////////////////////////////////////////////////

 static int OnContactDeleted(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (hContact) {

 		PROTOACCOUNT* pa = Proto_GetAccount(hContact);

 		if (Proto_IsAccountEnabled(pa) && pa->ppro)

@@ -210,7 +210,7 @@ static int OnContactDeleted(WPARAM wParam, LPARAM lParam)
 

 static int OnDbSettingsChanged(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (hContact) {

 		PROTOACCOUNT* pa = Proto_GetAccount(hContact);

 		if (Proto_IsAccountEnabled(pa) && pa->ppro)

@@ -317,7 +317,7 @@ static INT_PTR stub11(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)
 

 static INT_PTR stub12(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)

 {

-	return (INT_PTR)ppi->GetCaps(wParam, (MCONTACT)lParam);

+	return (INT_PTR)ppi->GetCaps(wParam, lParam);

 }

 

 static INT_PTR stub13(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM)

diff --git a/src/modules/protocols/protochains.cpp b/src/modules/protocols/protochains.cpp
index bf13ecd7d1..16bf1cb4db 100644
--- a/src/modules/protocols/protochains.cpp
+++ b/src/modules/protocols/protochains.cpp
@@ -175,13 +175,13 @@ PROTOACCOUNT* __fastcall Proto_GetAccount(MCONTACT hContact)
 

 static INT_PTR Proto_GetContactBaseProto(WPARAM wParam, LPARAM)

 {

-	PROTOACCOUNT *pa = Proto_GetAccount((MCONTACT)wParam);

+	PROTOACCOUNT *pa = Proto_GetAccount(wParam);

 	return (INT_PTR)(Proto_IsAccountEnabled(pa) ? pa->szModuleName : NULL);

 }

 

 static INT_PTR Proto_GetContactBaseAccount(WPARAM wParam, LPARAM)

 {

-	PROTOACCOUNT *pa = Proto_GetAccount((MCONTACT)wParam);

+	PROTOACCOUNT *pa = Proto_GetAccount(wParam);

 	return (INT_PTR)(pa ? pa->szModuleName : NULL);

 }

 

@@ -210,14 +210,14 @@ static INT_PTR Proto_AddToContact(WPARAM wParam, LPARAM lParam)
 	if (pd == NULL) {

 		PROTOACCOUNT *pa = Proto_GetAccount(szProto);

 		if (pa) {

-			db_set_s((MCONTACT)wParam, "Protocol", "p", szProto);

+			db_set_s(wParam, "Protocol", "p", szProto);

 			return 0;

 		}

 		return 1;

 	}

 

 	if (pd->type == PROTOTYPE_PROTOCOL || pd->type == PROTOTYPE_VIRTUAL)

-		db_set_s((MCONTACT)wParam, "Protocol", "p", szProto);

+		db_set_s(wParam, "Protocol", "p", szProto);

 

 	return 0;

 }

@@ -228,7 +228,7 @@ static INT_PTR Proto_RemoveFromContact(WPARAM wParam, LPARAM lParam)
 	case 0:

 		return 1;

 	case -1:

-		db_unset((MCONTACT)wParam, "Protocol", "p");

+		db_unset(wParam, "Protocol", "p");

 	}

 

 	return 0;

diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp
index 03ff01a69c..dfbbd9950f 100644
--- a/src/modules/protocols/protocols.cpp
+++ b/src/modules/protocols/protocols.cpp
@@ -214,11 +214,11 @@ static int Proto_ValidTypingContact(MCONTACT hContact, char *szProto)
 static INT_PTR Proto_SelfIsTyping(WPARAM wParam, LPARAM lParam)

 {

 	if (lParam == PROTOTYPE_SELFTYPING_OFF || lParam == PROTOTYPE_SELFTYPING_ON) {

-		char *szProto = GetContactProto((MCONTACT)wParam);

+		char *szProto = GetContactProto(wParam);

 		if (!szProto)

 			return 0;

 

-		if (Proto_ValidTypingContact((MCONTACT)wParam, szProto))

+		if (Proto_ValidTypingContact(wParam, szProto))

 			CallProtoServiceInt(NULL,szProto, PSS_USERISTYPING, wParam, lParam);

 	}

 

@@ -228,7 +228,7 @@ static INT_PTR Proto_SelfIsTyping(WPARAM wParam, LPARAM lParam)
 static INT_PTR Proto_ContactIsTyping(WPARAM wParam, LPARAM lParam)

 {

 	int type = (int)lParam;

-	char *szProto = GetContactProto((MCONTACT)wParam);

+	char *szProto = GetContactProto(wParam);

 	if (!szProto)

 		return 0;

 

@@ -238,7 +238,7 @@ static INT_PTR Proto_ContactIsTyping(WPARAM wParam, LPARAM lParam)
 	if (type < PROTOTYPE_CONTACTTYPING_OFF)

 		return 0;

 

-	if (Proto_ValidTypingContact((MCONTACT)wParam, szProto))

+	if (Proto_ValidTypingContact(wParam, szProto))

 		NotifyEventHooks(hTypeEvent, wParam, lParam);

 

 	return 0;

@@ -442,7 +442,7 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 				else

 					return (INT_PTR)ppi->FileResume((HANDLE)wParam, &pfr->action, (const PROTOCHAR**)&pfr->szFilename);

 			}

-			case 12: return (INT_PTR)ppi->GetCaps(wParam, (MCONTACT)lParam);

+			case 12: return (INT_PTR)ppi->GetCaps(wParam, lParam);

 			case 13: return (INT_PTR)Proto_GetIcon(ppi, wParam);

 			case 14: return (INT_PTR)ppi->GetInfo(hContact, wParam);

 			case 15:

@@ -490,7 +490,7 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 					return (INT_PTR)ppi->SetAwayMsg(wParam, StrConvT((char*)lParam));

 				else

 					return (INT_PTR)ppi->SetAwayMsg(wParam, (TCHAR*)lParam);

-			case 34: return (INT_PTR)ppi->UserIsTyping((MCONTACT)wParam, lParam);

+			case 34: return (INT_PTR)ppi->UserIsTyping(wParam, lParam);

 			case 35: lstrcpynA((char*)lParam, ppi->m_szModuleName, wParam); return 0;

 			case 36: return ppi->m_iStatus;