From 371db973914f270432e914922b735e01279c5db8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 12 Feb 2014 14:12:44 +0000 Subject: another bunch of useless conversions died git-svn-id: http://svn.miranda-ng.org/main/trunk@8109 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_chat.cpp | 6 +++--- protocols/MSN/src/msn_commands.cpp | 4 ++-- protocols/MSN/src/msn_contact.cpp | 2 +- protocols/MSN/src/msn_links.cpp | 6 +++--- protocols/MSN/src/msn_lists.cpp | 2 +- protocols/MSN/src/msn_mail.cpp | 4 ++-- protocols/MSN/src/msn_menu.cpp | 2 +- protocols/MSN/src/msn_misc.cpp | 6 +++--- protocols/MSN/src/msn_proto.cpp | 2 +- protocols/MSN/src/msn_svcs.cpp | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) (limited to 'protocols/MSN/src') diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp index 1ffd87f65d..e3bb6a54d0 100644 --- a/protocols/MSN/src/msn_chat.cpp +++ b/protocols/MSN/src/msn_chat.cpp @@ -362,7 +362,7 @@ int CMsnProto::MSN_GCEventHook(WPARAM, LPARAM lParam) { char *email = mir_t2a(gch->ptszUID); MCONTACT hContact = MSN_HContactFromEmail(email); - CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0); + CallService(MS_MSG_SENDMESSAGE, hContact, 0); mir_free(email); break; } @@ -390,11 +390,11 @@ int CMsnProto::MSN_GCEventHook(WPARAM, LPARAM lParam) switch(gch->dwData) { case 10: - CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)hContact, 0); + CallService(MS_USERINFO_SHOWDIALOG, hContact, 0); break; case 20: - CallService(MS_HISTORY_SHOWCONTACTHISTORY, (WPARAM)hContact, 0); + CallService(MS_HISTORY_SHOWCONTACTHISTORY, hContact, 0); break; case 110: diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp index c8b7e9029c..692a0df790 100644 --- a/protocols/MSN/src/msn_commands.cpp +++ b/protocols/MSN/src/msn_commands.cpp @@ -491,7 +491,7 @@ void CMsnProto::MSN_ReceiveMessage(ThreadData* info, char* cmdString, char* para if (tTypingUser != NULL && info->mChatID[0] == 0 && _stricmp(email, MyOptions.szEmail)) { MCONTACT hContact = MSN_HContactFromEmail(tTypingUser, tTypingUser); - CallService(MS_PROTO_CONTACTISTYPING, (WPARAM)hContact, 7); + CallService(MS_PROTO_CONTACTISTYPING, hContact, 7); } } else if (!_strnicmp(tContentType, "text/x-msnmsgr-datacast", 23)) { @@ -1099,7 +1099,7 @@ LBL_InvalidCommand: // open up srmm dialog when quit while 1 person left MCONTACT hContact = info->getContactHandle(); - if (hContact) CallServiceSync(MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0); + if (hContact) CallServiceSync(MS_MSG_SENDMESSAGE, hContact, 0); } } } diff --git a/protocols/MSN/src/msn_contact.cpp b/protocols/MSN/src/msn_contact.cpp index bb7bd6c559..fc3bef21a1 100644 --- a/protocols/MSN/src/msn_contact.cpp +++ b/protocols/MSN/src/msn_contact.cpp @@ -35,7 +35,7 @@ MCONTACT CMsnProto::MSN_HContactFromEmail(const char* wlid, const char* msnNick, if (hContact == NULL && addIfNeeded) { hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0); - CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)m_szModuleName); + CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)m_szModuleName); setString(hContact, "e-mail", szEmail); setStringUtf(hContact, "Nick", msnNick ? msnNick : wlid); if (temporary) diff --git a/protocols/MSN/src/msn_links.cpp b/protocols/MSN/src/msn_links.cpp index e058d9194b..4c3adb0a1b 100644 --- a/protocols/MSN/src/msn_links.cpp +++ b/protocols/MSN/src/msn_links.cpp @@ -125,7 +125,7 @@ static INT_PTR ServiceParseMsnimLink(WPARAM, LPARAM lParam) if (hContact != NULL) { - CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0); + CallService(MS_MSG_SENDMESSAGE, hContact, 0); return 0; } } @@ -137,7 +137,7 @@ static INT_PTR ServiceParseMsnimLink(WPARAM, LPARAM lParam) if (hContact != NULL) { - CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0); + CallService(MS_MSG_SENDMESSAGE, hContact, 0); return 0; } } @@ -149,7 +149,7 @@ static INT_PTR ServiceParseMsnimLink(WPARAM, LPARAM lParam) if (hContact != NULL) { - CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0); + CallService(MS_MSG_SENDMESSAGE, hContact, 0); return 0; } } diff --git a/protocols/MSN/src/msn_lists.cpp b/protocols/MSN/src/msn_lists.cpp index b091510004..2e2b181113 100644 --- a/protocols/MSN/src/msn_lists.cpp +++ b/protocols/MSN/src/msn_lists.cpp @@ -251,7 +251,7 @@ void CMsnProto::Lists_Populate(void) else Lists_Add(0, NETID_UNKNOWN, szEmail, hContact); } - else CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0); + else CallService(MS_DB_CONTACT_DELETE, hContact, 0); hContact = hNext; } } diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp index f3c84f36af..407375bf17 100644 --- a/protocols/MSN/src/msn_mail.cpp +++ b/protocols/MSN/src/msn_mail.cpp @@ -296,7 +296,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) MCONTACT hContact = MSN_HContactFromEmail(MyOptions.szEmail); if (hContact) { - CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1); + CallService(MS_CLIST_REMOVEEVENT, hContact, (LPARAM) 1); displayEmailCount(hContact); if (ShowPopup && !getByte("DisableHotmailTray", 1)) @@ -313,7 +313,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) mir_snprintf(buf, SIZEOF(buf), "%s%s", m_szModuleName, MS_GOTO_INBOX); cle.pszService = buf; - CallService(MS_CLIST_ADDEVENT, (WPARAM)hContact, (LPARAM)&cle); + CallService(MS_CLIST_ADDEVENT, hContact, (LPARAM)&cle); } } diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index c4abdbdcaa..3646f6dc37 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -50,7 +50,7 @@ INT_PTR CMsnProto::MsnBlockCommand(WPARAM hContact, LPARAM) INT_PTR CMsnProto::MsnGotoInbox(WPARAM, LPARAM) { MCONTACT hContact = MSN_HContactFromEmail(MyOptions.szEmail); - if (hContact) CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1); + if (hContact) CallService(MS_CLIST_REMOVEEVENT, hContact, (LPARAM) 1); MsnInvokeMyURL(true, "http://mail.live.com?rru=inbox"); return 0; diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp index f3c74618e2..18a652801f 100644 --- a/protocols/MSN/src/msn_misc.cpp +++ b/protocols/MSN/src/msn_misc.cpp @@ -835,7 +835,7 @@ LRESULT CALLBACK NullWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara if (tData != NULL) { if (tData->flags & MSN_HOTMAIL_POPUP) { MCONTACT hContact = tData->proto->MSN_HContactFromEmail(tData->proto->MyOptions.szEmail, NULL); - if (hContact) CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1); + if (hContact) CallService(MS_CLIST_REMOVEEVENT, hContact, (LPARAM) 1); if (tData->flags & MSN_ALLOW_ENTER) tData->proto->MsnInvokeMyURL(true, tData->url); } @@ -849,7 +849,7 @@ LRESULT CALLBACK NullWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara if (tData != NULL && tData->flags & MSN_HOTMAIL_POPUP) { MCONTACT hContact = tData->proto->MSN_HContactFromEmail(tData->proto->MyOptions.szEmail, NULL); if (hContact) - CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1); + CallService(MS_CLIST_REMOVEEVENT, hContact, (LPARAM) 1); } PUDeletePopup(hWnd); break; @@ -1222,7 +1222,7 @@ bool MSN_MsgWndExist(MCONTACT hContact) bool res = CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&msgWinInData, (LPARAM)&msgWinData) != 0; res = res || msgWinData.hwndWindow; if (res) { - msgWinInData.hContact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0); + msgWinInData.hContact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, hContact, 0); if (msgWinInData.hContact != NULL) { res = CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&msgWinInData, (LPARAM)&msgWinData) != 0; res |= (msgWinData.hwndWindow == NULL); diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 1c21cb445e..292bfaf8c0 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -399,7 +399,7 @@ int CMsnProto::AuthDeny(HANDLE hDbEvent, const TCHAR* szReason) if (msc->hContact) CallService(MS_DB_CONTACT_DELETE, (WPARAM)msc->hContact, 0); msc->hContact = NULL; MCONTACT hContact = MSN_HContactFromEmail(email); - if (hContact) CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0); + if (hContact) CallService(MS_DB_CONTACT_DELETE, hContact, 0); } return 0; diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp index 9d1be8b0a5..9c6c61b915 100644 --- a/protocols/MSN/src/msn_svcs.cpp +++ b/protocols/MSN/src/msn_svcs.cpp @@ -391,7 +391,7 @@ int CMsnProto::OnContactDeleted(WPARAM hContact, LPARAM lParam) else { char szEmail[MSN_MAX_EMAIL_LEN]; if (MSN_IsMeByContact(hContact, szEmail)) - CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1); + CallService(MS_CLIST_REMOVEEVENT, hContact, (LPARAM) 1); if (szEmail[0]) { -- cgit v1.2.3