From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 08:04:30 +0000 Subject: - HANDLE hContact => HCONTACT - GCF_* prefix was added to chat constants to avoid name conflicts git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SMS/src/receive.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/SMS/src/receive.cpp') diff --git a/plugins/SMS/src/receive.cpp b/plugins/SMS/src/receive.cpp index 43cab8af13..e6f647adc6 100644 --- a/plugins/SMS/src/receive.cpp +++ b/plugins/SMS/src/receive.cpp @@ -45,7 +45,6 @@ int handleAckSMS(WPARAM wParam,LPARAM lParam) { LPSTR lpszMessageUTF; SIZE_T dwBuffLen,dwMessageXMLEncodedSize,dwMessageXMLDecodedSize; - HANDLE hContact; DBEVENTINFO dbei = { sizeof(dbei) }; dwBuffLen=(dwDataSize+MAX_PATH); @@ -61,7 +60,7 @@ int handleAckSMS(WPARAM wParam,LPARAM lParam) dwPhoneSize=CopyNumberA(szPhone,lpszPhone,dwPhoneSize); dwPhoneSize=MultiByteToWideChar(CP_UTF8,0,szPhone,dwPhoneSize,tszPhone,MAX_PHONE_LEN); - hContact=HContactFromPhone(tszPhone,dwPhoneSize); + HCONTACT hContact=HContactFromPhone(tszPhone,dwPhoneSize); dbei.szModule=GetModuleName(hContact); dbei.timestamp=time(NULL); @@ -89,7 +88,7 @@ int handleAckSMS(WPARAM wParam,LPARAM lParam) { dwPhoneSize=CopyNumberA(szPhone,lpszPhone,dwPhoneSize); dwPhoneSize=MultiByteToWideChar(CP_UTF8,0,szPhone,dwPhoneSize,tszPhone,MAX_PHONE_LEN); - HANDLE hContact=HContactFromPhone(tszPhone,dwPhoneSize); + HCONTACT hContact=HContactFromPhone(tszPhone,dwPhoneSize); DBEVENTINFO dbei={0}; dbei.cbSize=sizeof(dbei); @@ -212,7 +211,8 @@ int handleNewMessage(WPARAM wParam, LPARAM lParam) { char szServiceFunction[MAX_PATH], *pszServiceFunctionName; TCHAR szToolTip[MAX_PATH]; - HANDLE hContact = (HANDLE)wParam, hDbEvent = (HANDLE)lParam; + HCONTACT hContact = (HCONTACT)wParam; + HANDLE hDbEvent = (HANDLE)lParam; DBEVENTINFO dbei = { sizeof(dbei) }; if ((dbei.cbBlob = db_event_getBlobSize(hDbEvent)) != -1) { -- cgit v1.2.3