these conversions aren't needed either

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

2 files changed, 9 insertions, 9 deletions

diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp
index 87da26fa8e..5c604e25a8 100644
--- a/plugins/ContactsPlus/src/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
@@ -59,7 +59,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 

 static int HookDBEventAdded(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	HANDLE hDbEvent = (HANDLE)lParam;

 	//process the event

 	DBEVENTINFO dbe = { sizeof(dbe) };

@@ -117,7 +117,7 @@ static bool CheckContactsServiceSupport(const char* szProto)
 

 static int HookPreBuildContactMenu(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	char *szProto = GetContactProto(hContact);

 	int bVisible = FALSE;

 

@@ -156,7 +156,7 @@ static int HookModulesLoaded(WPARAM wParam, LPARAM lParam)
 static int HookContactSettingChanged(WPARAM wParam, LPARAM lParam)

 {

 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;

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

+	char *szProto = GetContactProto(wParam);

 

 	if (strcmpnull(cws->szModule, "CList") && strcmpnull(cws->szModule, szProto)) return 0;

 

@@ -167,13 +167,13 @@ static int HookContactSettingChanged(WPARAM wParam, LPARAM lParam)
 

 static int HookContactDeleted(WPARAM wParam, LPARAM lParam)

 {  // if our contact gets deleted close his window

-	HWND h = WindowList_Find(ghSendWindowList, (MCONTACT)wParam);

+	HWND h = WindowList_Find(ghSendWindowList, wParam);

 

 	if (h)

 		SendMessage(h, WM_CLOSE, 0, 0);

 

 	// since we hack the window list - more windows for one contact, we need to close them all

-	while (h = WindowList_Find(ghRecvWindowList, (MCONTACT)wParam))

+	while (h = WindowList_Find(ghRecvWindowList, wParam))

 		SendMessage(h, WM_CLOSE, 0, 0);

 	return 0;

 }

@@ -181,7 +181,7 @@ static int HookContactDeleted(WPARAM wParam, LPARAM lParam)
 static INT_PTR ServiceSendCommand(WPARAM wParam, LPARAM lParam)

 {

 	//find window for hContact

-	HWND hWnd = WindowList_Find(ghSendWindowList, (MCONTACT)wParam);

+	HWND hWnd = WindowList_Find(ghSendWindowList, wParam);

 	if (!hWnd)

 		CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SEND), NULL, SendDlgProc, wParam);

 	else {

diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp
index a988481b6b..5913a616d2 100644
--- a/plugins/ContactsPlus/src/send.cpp
+++ b/plugins/ContactsPlus/src/send.cpp
@@ -251,9 +251,9 @@ INT_PTR CALLBACK SendDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 		TranslateDialogDefault(hwndDlg);

 		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(hInst, MAKEINTRESOURCE(IDI_CONTACTS)));

 		ResetListOptions(GetDlgItem(hwndDlg, IDC_LIST));

-		SetAllContactChecks(GetDlgItem(hwndDlg, IDC_LIST), (MCONTACT)lParam);

-		WindowList_Add(ghSendWindowList, hwndDlg, (MCONTACT)lParam);

-		wndData = new TSendContactsData((MCONTACT)lParam);

+		SetAllContactChecks(GetDlgItem(hwndDlg, IDC_LIST), lParam);

+		WindowList_Add(ghSendWindowList, hwndDlg, lParam);

+		wndData = new TSendContactsData(lParam);

 		SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)wndData);

 		// new dlg init 

 		wndData->hIcons[0] = InitMButton(hwndDlg, IDC_ADD, MAKEINTRESOURCEA(IDI_ADDCONTACT), LPGEN("Add Contact Permanently to List"));