these conversions aren't needed either

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

5 files changed, 21 insertions, 21 deletions

diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp
index 46d70533f1..19fdc8e55d 100644
--- a/plugins/WebView/src/webview.cpp
+++ b/plugins/WebView/src/webview.cpp
@@ -176,7 +176,7 @@ void InitialiseGlobals(void)
 /*****************************************************************************/

 int Doubleclick(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	char *szProto = GetContactProto(hContact);

 	if ( lstrcmpA(MODULENAME, szProto))

 		return 0;

@@ -371,7 +371,7 @@ int ModulesLoaded(WPARAM, LPARAM)
 /*****************************************************************************/

 INT_PTR DataWndMenuCommand(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	HWND hwndDlg = WindowList_Find(hWindowList, hContact);

 	if (hwndDlg != NULL) {

 		DestroyWindow(hwndDlg);

@@ -455,7 +455,7 @@ int OnTopMenuCommand(WPARAM wParam, LPARAM lParam, MCONTACT singlecontact)
 /*****************************************************************************/

 INT_PTR WebsiteMenuCommand(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	ptrT url( db_get_tsa(hContact, MODULENAME, "URL"));

 	if (url)

 		CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)url);

@@ -474,14 +474,14 @@ int UpdateMenuCommand(WPARAM wParam, LPARAM lParam, MCONTACT singlecontact)
 /*****************************************************************************/

 int ContactMenuItemUpdateData(WPARAM wParam, LPARAM lParam)

 {

-	UpdateMenuCommand(wParam, lParam, (MCONTACT)wParam);

+	UpdateMenuCommand(wParam, lParam, wParam);

 	return 0;

 }

 

 /*****************************************************************************/

 INT_PTR CntOptionsMenuCommand(WPARAM wParam, LPARAM)

 {

-	HWND hwndDlg = WindowList_Find(hWindowList, (MCONTACT)wParam);

+	HWND hwndDlg = WindowList_Find(hWindowList, wParam);

 	if (hwndDlg) {

 		DestroyWindow(hwndDlg);

 		return 0;

diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp
index 946856a3ab..2c363a0c30 100644
--- a/plugins/WebView/src/webview_alerts.cpp
+++ b/plugins/WebView/src/webview_alerts.cpp
@@ -44,7 +44,7 @@ int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 				if ( db_get_b(NULL, MODULENAME, LCLK_WEB_PGE_KEY, 0)) {

 					CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)url);

 					PUDeletePopup(hWnd);

-					db_set_w((MCONTACT)wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

+					db_set_w(wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

 				}

 				// dismiss

 				if ( db_get_b(NULL, MODULENAME, LCLK_DISMISS_KEY, 1))

@@ -65,7 +65,7 @@ int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 				if ( db_get_b(NULL, MODULENAME, RCLK_WEB_PGE_KEY, 1)) {

 					CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)url);

 					PUDeletePopup(hWnd);

-					db_set_w((MCONTACT)wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

+					db_set_w(wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

 				}

 				// dismiss

 				if ( db_get_b(NULL, MODULENAME, RCLK_DISMISS_KEY, 0))

@@ -115,13 +115,13 @@ int WPopupAlert(WPARAM wParam, LPARAM lParam)
 

 	if( ((HANDLE)wParam) != NULL) {

 		DBVARIANT dbv;

-		db_get_ts((MCONTACT)wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv);

+		db_get_ts(wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv);

 		lstrcpyn(ppd.lptzContactName, dbv.ptszVal, SIZEOF(ppd.lptzContactName));

 		db_free(&dbv);

 	}

 	else lstrcpy(ppd.lptzContactName, _A2T(MODULENAME));

 

-	ppd.lchContact = (MCONTACT)wParam;

+	ppd.lchContact = wParam;

 	ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE));

 

 	TCHAR *displaytext = (TCHAR*)lParam;

@@ -158,7 +158,7 @@ int PopupAlert(WPARAM wParam, LPARAM lParam)
 	POPUPDATA ppd = { 0 };

 	if (((HANDLE)wParam) != NULL) {

 		DBVARIANT dbv;

-		if ( !db_get_s((MCONTACT)wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv)) {

+		if ( !db_get_s(wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv)) {

 			lstrcpynA(ppd.lptzContactName, dbv.pszVal, SIZEOF(ppd.lptzContactName));

 			db_free(&dbv);

 		}

@@ -166,7 +166,7 @@ int PopupAlert(WPARAM wParam, LPARAM lParam)
 	if (ppd.lptzContactName[0] == 0)

 		strncpy_s(ppd.lptzContactName, SIZEOF(ppd.lptzContactName), MODULENAME, _TRUNCATE);

 

-	ppd.lchContact = (MCONTACT)wParam;

+	ppd.lchContact = wParam;

 	ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE));

 

 	char *displaytext = (char*)lParam;

@@ -205,7 +205,7 @@ int OSDAlert(WPARAM wParam, LPARAM lParam)
 

 	if (((HANDLE)wParam) != NULL) {

 		DBVARIANT dbv;

-		if ( !db_get_s((MCONTACT)wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv)) {

+		if ( !db_get_s(wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv)) {

 			strncpy_s(contactname, SIZEOF(contactname), dbv.pszVal, _TRUNCATE);

 			db_free(&dbv);

 		}

@@ -225,7 +225,7 @@ int OSDAlert(WPARAM wParam, LPARAM lParam)
 /*****************************************************************************/

 int ErrorMsgs(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	TCHAR newdisplaytext[2000], *displaytext = (TCHAR*)lParam;

 

 	if ( db_get_b(NULL, MODULENAME, SUPPRESS_ERR_KEY, 0))

@@ -814,7 +814,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 /*****************************************************************************/

 int DataWndAlertCommand(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if ( WindowList_Find(hWindowList, hContact))

 		return 0;

 

diff --git a/plugins/WebView/src/webview_datawnd.cpp b/plugins/WebView/src/webview_datawnd.cpp
index 1f13631e52..e9d7ae144c 100644
--- a/plugins/WebView/src/webview_datawnd.cpp
+++ b/plugins/WebView/src/webview_datawnd.cpp
@@ -155,7 +155,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

 		{

-			MCONTACT hContact2 = (MCONTACT)lParam;

+			MCONTACT hContact2 = lParam;

 

 			SetWindowLong(hwndDlg, GWLP_USERDATA, (LONG) hContact2);

 			WindowList_Add(hWindowList, hwndDlg, hContact2);

@@ -339,7 +339,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		case IDC_OPEN_URL:

 			GetDlgItemText(hwndDlg, IDC_OPEN_URL, url, SIZEOF(url));

 			CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)url);  

-			db_set_w((MCONTACT)wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

+			db_set_w(wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

 			break;

 

 		case IDC_UPDATE_BUTTON:

diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp
index 168ac8c2b4..14f776003b 100644
--- a/plugins/WebView/src/webview_opts.cpp
+++ b/plugins/WebView/src/webview_opts.cpp
@@ -285,7 +285,7 @@ INT_PTR CALLBACK DlgProcAlertOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 	case WM_INITDIALOG:

 		test = 0;

 		TranslateDialogDefault(hwndDlg);

-		hContact = (MCONTACT)lParam;

+		hContact = lParam;

 

 		SetWindowLong(hwndDlg, GWLP_USERDATA, (LONG) hContact);

 

diff --git a/plugins/WebView/src/webview_services.cpp b/plugins/WebView/src/webview_services.cpp
index 94b28249d2..7c73059b64 100644
--- a/plugins/WebView/src/webview_services.cpp
+++ b/plugins/WebView/src/webview_services.cpp
@@ -32,7 +32,7 @@ static char szInvalidChars[] = { '\\', '/', ':', '*', '?', '\"', '<', '>', '|' }
 int DBSettingChanged(WPARAM wParam, LPARAM lParam)

 {

 	// We can't upload changes to NULL contact

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (hContact == NULL)

 		return 0;

 

@@ -111,7 +111,7 @@ int DBSettingChanged(WPARAM wParam, LPARAM lParam)
 /*****************************************************************************/

 int SiteDeleted(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (lstrcmpA(GetContactProto(hContact), MODULENAME))

 		return 0;

 

@@ -167,7 +167,7 @@ INT_PTR PingWebsiteMenuCommand(WPARAM wParam, LPARAM lParam)
 		return 0;

 	}

 

-	ptrT url( db_get_tsa((MCONTACT)wParam, MODULENAME, "URL"));

+	ptrT url( db_get_tsa(wParam, MODULENAME, "URL"));

 	if (url == NULL)

 		return 0;

 

@@ -188,7 +188,7 @@ INT_PTR PingWebsiteMenuCommand(WPARAM wParam, LPARAM lParam)
 /*****************************************************************************/

 INT_PTR StpPrcssMenuCommand(WPARAM wParam, LPARAM)

 {

-	db_set_b((MCONTACT)wParam, MODULENAME, STOP_KEY, 1);  

+	db_set_b(wParam, MODULENAME, STOP_KEY, 1);  

 	return 0;

 }