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/FacebookRM/src/chat.cpp | 6 +++--- protocols/FacebookRM/src/contacts.cpp | 6 +++--- protocols/FacebookRM/src/json.cpp | 6 +++--- protocols/FacebookRM/src/messages.cpp | 2 +- protocols/FacebookRM/src/proto.cpp | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'protocols/FacebookRM') diff --git a/protocols/FacebookRM/src/chat.cpp b/protocols/FacebookRM/src/chat.cpp index e2a553cbcc..93be3281a1 100644 --- a/protocols/FacebookRM/src/chat.cpp +++ b/protocols/FacebookRM/src/chat.cpp @@ -86,7 +86,7 @@ int FacebookProto::OnGCEvent(WPARAM wParam,LPARAM lParam) char* sn = mir_t2a(hook->ptszUID); MCONTACT hContact = ContactIDToHContact(sn); mir_free(sn); - CallService(MS_MSG_SENDMESSAGET, (WPARAM)hContact, 0); + CallService(MS_MSG_SENDMESSAGET, hContact, 0); break; } @@ -118,11 +118,11 @@ int FacebookProto::OnGCEvent(WPARAM wParam,LPARAM lParam) switch (hook->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/FacebookRM/src/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp index 84f30411a0..d641a775af 100644 --- a/protocols/FacebookRM/src/contacts.cpp +++ b/protocols/FacebookRM/src/contacts.cpp @@ -153,7 +153,7 @@ MCONTACT FacebookProto::AddToContactList(facebook_user* fbu, ContactType type, b hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0); if(hContact) { - if(CallService(MS_PROTO_ADDTOCONTACT,(WPARAM)hContact,(LPARAM)m_szModuleName) == 0) + if(CallService(MS_PROTO_ADDTOCONTACT,hContact,(LPARAM)m_szModuleName) == 0) { setString(hContact, FACEBOOK_KEY_ID, fbu->user_id.c_str()); @@ -180,12 +180,12 @@ MCONTACT FacebookProto::AddToContactList(facebook_user* fbu, ContactType type, b setByte(hContact, FACEBOOK_KEY_CONTACT_TYPE, type); if (getByte(FACEBOOK_KEY_DISABLE_STATUS_NOTIFY, 0)) - CallService(MS_IGNORE_IGNORE, (WPARAM)hContact, (LPARAM)IGNOREEVENT_USERONLINE); + CallService(MS_IGNORE_IGNORE, hContact, (LPARAM)IGNOREEVENT_USERONLINE); return hContact; } - CallService(MS_DB_CONTACT_DELETE,(WPARAM)hContact,0); + CallService(MS_DB_CONTACT_DELETE,hContact,0); } return 0; diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp index 8add178e11..ebb3864744 100644 --- a/protocols/FacebookRM/src/json.cpp +++ b/protocols/FacebookRM/src/json.cpp @@ -444,7 +444,7 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa _tcsftime(ttime, SIZEOF(ttime), _T("%X"), utils::conversion::fbtime_to_timeinfo(json_as_float(time))); mir_sntprintf(tstr, SIZEOF(tstr), TranslateT("Message read: %s"), ttime); - CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)hContact, (LPARAM)tstr); + CallService(MS_MSG_SETSTATUSTEXT, hContact, (LPARAM)tstr); } } } else if (t == "deliver") { @@ -634,9 +634,9 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa JSONNODE *st = json_get(it, "st"); if (json_as_int(st) == 1) - CallService(MS_PROTO_CONTACTISTYPING, (WPARAM)hContact, (LPARAM)60); + CallService(MS_PROTO_CONTACTISTYPING, hContact, (LPARAM)60); else - CallService(MS_PROTO_CONTACTISTYPING, (WPARAM)hContact, (LPARAM)PROTOTYPE_CONTACTTYPING_OFF); + CallService(MS_PROTO_CONTACTISTYPING, hContact, (LPARAM)PROTOTYPE_CONTACTTYPING_OFF); } else if (t == "privacy_changed") { // settings changed diff --git a/protocols/FacebookRM/src/messages.cpp b/protocols/FacebookRM/src/messages.cpp index fd09bfa507..83fd36df27 100644 --- a/protocols/FacebookRM/src/messages.cpp +++ b/protocols/FacebookRM/src/messages.cpp @@ -25,7 +25,7 @@ along with this program. If not, see . int FacebookProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre) { ForkThread(&FacebookProto::ReadMessageWorker, (void*)hContact); - CallService(MS_PROTO_CONTACTISTYPING, (WPARAM)hContact, (LPARAM)PROTOTYPE_CONTACTTYPING_OFF); + CallService(MS_PROTO_CONTACTISTYPING, hContact, (LPARAM)PROTOTYPE_CONTACTTYPING_OFF); return Proto_RecvMessage(hContact, pre); } diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index 7346774879..520d13719a 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -278,7 +278,7 @@ MCONTACT FacebookProto::AddToList(int flags, PROTOSEARCHRESULT* psr) int FacebookProto::AuthRequest(MCONTACT hContact,const PROTOCHAR *message) { - return RequestFriendship((WPARAM)hContact, NULL); + return RequestFriendship(hContact, NULL); } int FacebookProto::Authorize(HANDLE hDbEvent) @@ -290,7 +290,7 @@ int FacebookProto::Authorize(HANDLE hDbEvent) if (hContact == INVALID_CONTACT_ID) return 1; - return ApproveFriendship((WPARAM)hContact, NULL); + return ApproveFriendship(hContact, NULL); } int FacebookProto::AuthDeny(HANDLE hDbEvent, const PROTOCHAR *reason) @@ -305,7 +305,7 @@ int FacebookProto::AuthDeny(HANDLE hDbEvent, const PROTOCHAR *reason) // TODO: hide from facebook requests list if (db_get_b(hContact, "CList", "NotOnList", 0)) - CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0); + CallService(MS_DB_CONTACT_DELETE, hContact, 0); return 0; } -- cgit v1.2.3