these conversions aren't needed either

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

4 files changed, 12 insertions, 12 deletions

diff --git a/plugins/MirOTR/MirOTR/src/dbfilter.cpp b/plugins/MirOTR/MirOTR/src/dbfilter.cpp
index 787164e6f0..333a49be06 100644
--- a/plugins/MirOTR/MirOTR/src/dbfilter.cpp
+++ b/plugins/MirOTR/MirOTR/src/dbfilter.cpp
@@ -45,7 +45,7 @@ VOID CALLBACK DeleteTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTi
 // add prefix to sent messages

 int OnDatabaseEventPreAdd(WPARAM wParam, LPARAM lParam) {

 	if (!options.prefix_messages || !lParam) return 0;

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	DBEVENTINFO *dbei = (DBEVENTINFO *)lParam;

 	if ((dbei->eventType != EVENTTYPE_MESSAGE) || !(dbei->flags & DBEF_SENT) || (dbei->flags & DBEF_OTR_PREFIXED))

 		return 0;

@@ -191,7 +191,7 @@ int OnDatabaseEventPreAdd(WPARAM wParam, LPARAM lParam) {
 	info.pBlob = (PBYTE)mir_alloc(info.cbBlob);

 	if (!db_event_get((HANDLE)lParam, &info)) {

 		if(info.eventType == EVENTTYPE_MESSAGE) {

-			MCONTACT hContact = (MCONTACT)wParam, hSub;

+			MCONTACT hContact = wParam, hSub;

 			if(options.bHaveMetaContacts && (hSub = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0)) != 0)

 				hContact = hSub;

 

@@ -296,7 +296,7 @@ int StatusModeChange(WPARAM wParam, LPARAM lParam) {
 int OnContactSettingChanged(WPARAM wParam, LPARAM lParam) {

 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *)lParam;

 	if (!lParam || strcmp(cws->szSetting, "Status") != 0) return 0;

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	int status=0;

 	switch (cws->value.type){

 		case DBVT_WORD:

diff --git a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp
index 35ecb94435..9a8bb85475 100644
--- a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp
+++ b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp
@@ -49,7 +49,7 @@ static INT_PTR AddMirOTRMenuItem(WPARAM, LPARAM lParam)
 

 static INT_PTR BuildMirOTRMenu(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 

 	ListParam param = { 0 };

 	param.MenuObjectHandle = hMirOTRMenuObject;

diff --git a/plugins/MirOTR/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/MirOTR/src/svcs_menu.cpp
index 12fbb966dc..2874d5f81a 100644
--- a/plugins/MirOTR/MirOTR/src/svcs_menu.cpp
+++ b/plugins/MirOTR/MirOTR/src/svcs_menu.cpp
@@ -24,7 +24,7 @@ int StartOTR(MCONTACT hContact) {
 }

 

 INT_PTR SVC_StartOTR(WPARAM wParam, LPARAM lParam) {

-	MCONTACT hContact = (MCONTACT)wParam, hSub;

+	MCONTACT hContact = wParam, hSub;

 	if(options.bHaveMetaContacts && (hSub = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0)) != 0) {

 		hContact = hSub;

 	}

@@ -47,7 +47,7 @@ INT_PTR SVC_StartOTR(WPARAM wParam, LPARAM lParam) {
 }

 

 INT_PTR SVC_RefreshOTR(WPARAM wParam, LPARAM lParam) {

-	MCONTACT hContact = (MCONTACT)wParam, hSub;

+	MCONTACT hContact = wParam, hSub;

 	if(options.bHaveMetaContacts && (hSub = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0)) != 0) {

 		hContact = hSub;

 	}

@@ -89,7 +89,7 @@ int otr_disconnect_contact(MCONTACT hContact)
 

 INT_PTR SVC_StopOTR(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	

 	// prevent this filter from acting on injeceted messages for metas, when they are passed though the subcontact's proto send chain

 	if (otr_disconnect_contact(hContact)) return 0;

@@ -104,11 +104,11 @@ INT_PTR SVC_StopOTR(WPARAM wParam, LPARAM lParam)
 }

 

 INT_PTR SVC_VerifyOTR(WPARAM wParam, LPARAM lParam) {

-	MCONTACT hContact = (MCONTACT)wParam, hSub;

+	MCONTACT hContact = wParam, hSub;

 	if(options.bHaveMetaContacts && (hSub = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0)) != 0)

 		hContact = hSub;

 

-	ConnContext *context = otrl_context_find_miranda(otr_user_state, (MCONTACT)wParam);

+	ConnContext *context = otrl_context_find_miranda(otr_user_state, wParam);

 	if (!context) return 1;

 	//VerifyContextDialog(context);	

 	SMPInitDialog(context);

@@ -116,7 +116,7 @@ INT_PTR SVC_VerifyOTR(WPARAM wParam, LPARAM lParam) {
 }

 

 INT_PTR SVC_ToggleHTMLOTR(WPARAM wParam, LPARAM lParam) {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (db_get_b(hContact, MODULENAME, "HTMLConv", 0))

 		db_set_b(hContact, MODULENAME, "HTMLConv", 0);

 	else

@@ -154,7 +154,7 @@ void InitMenu()
 

 int SVC_PrebuildContactMenu(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.flags = CMIM_FLAGS | CMIF_NOTOFFLINE | CMIF_TCHAR;

diff --git a/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp b/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp
index bebbe8ddbc..a24bc5dec5 100644
--- a/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp
+++ b/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp
@@ -5,7 +5,7 @@ BBButton OTRButton;
 

 int SVC_IconPressed(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	StatusIconClickData *sicd = (StatusIconClickData *)lParam;

 	if(sicd->cbSize < (int)sizeof(StatusIconClickData))

 		return 0;