From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/UserInfoEx/src/ctrl_contact.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/UserInfoEx/src/ctrl_contact.cpp')

diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp
index 1efda63861..12286d6f71 100644
--- a/plugins/UserInfoEx/src/ctrl_contact.cpp
+++ b/plugins/UserInfoEx/src/ctrl_contact.cpp
@@ -690,7 +690,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 				cbi.dwID = 0;
 
 				if (DialogBoxParam(ghInst, MAKEINTRESOURCE(dlgID), GetParent(hwnd), dlgProc, (LPARAM)&cbi) == IDOK) {
-					HANDLE hContact = NULL;
+					HCONTACT hContact = NULL;
 							
 					SendMessage(hDlgDetails, PSM_GETCONTACT, NULL, (LPARAM)&hContact);
 					if (hContact) cbi.wFlags |= CTRLF_HASCUSTOM;
@@ -748,7 +748,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 				}
 
 				if (DialogBoxParam(ghInst, MAKEINTRESOURCE(dlgID), GetParent(hwnd), dlgProc, (LPARAM)&cbi) == IDOK) {
-					HANDLE hContact;
+					HCONTACT hContact;
 
 					SendMessage(hDlgDetails, PSM_GETCONTACT, NULL, (LPARAM)&hContact);
 					if (hContact) cbi.wFlags |= CTRLF_HASCUSTOM;
@@ -826,7 +826,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 				{
 					TCHAR szVal[MAXDATASIZE] = { 0 };
 					int ccVal;
-					HANDLE hContact;
+					HCONTACT hContact;
 					HWND hDlgDetails = GetParent(GetParent(hwnd));
 							
 					EnableWindow(cbex->hBtnDel, GetWindowTextLength(cbex->hEdit) > 0);
@@ -1124,7 +1124,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 		**/
 	case CBEXM_ENABLEITEM:
 		if (cbex->iSelectedItem >= 0 && cbex->iSelectedItem < cbex->numItems) {
-			HANDLE hContact;
+			HCONTACT hContact;
 			BYTE bEnabled;
 				
 			PSGetContact(GetParent(hwnd), hContact);
@@ -1277,7 +1277,7 @@ int CtrlContactAddItemFromDB(
 				HWND hCtrl,
 				LPCSTR szIcon,
 				LPTSTR szItem,
-				HANDLE hContact,
+				HCONTACT hContact,
 				LPCSTR pszModule,
 				LPCSTR pszProto,
 				LPCSTR szSettingVal)
@@ -1330,7 +1330,7 @@ int CtrlContactAddMyItemsFromDB(
 				HWND hCtrl,
 				LPCSTR szIcon,
 				WORD wForcedFlags,
-				HANDLE hContact,
+				HCONTACT hContact,
 				LPCSTR pszModule,
 				LPCSTR pszProto,
 				LPCSTR szFormatCat,
@@ -1406,7 +1406,7 @@ int CtrlContactAddMyItemsFromDB(
  **/
 int CtrlContactWriteItemToDB(
 				HWND hCtrl,
-				HANDLE hContact,
+				HCONTACT hContact,
 				LPCSTR pszModule,
 				LPCSTR pszProto,
 				LPCSTR pszSetting)
@@ -1448,7 +1448,7 @@ int CtrlContactWriteItemToDB(
 int CtrlContactWriteMyItemsToDB(
 				HWND hCtrl,
 				int iFirstItem,
-				HANDLE hContact,
+				HCONTACT hContact,
 				LPCSTR pszModule,
 				LPCSTR pszProto,
 				LPCSTR szFormatCat,
-- 
cgit v1.2.3