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
---
 protocols/IcqOscarJ/src/UI/askauthentication.cpp | 4 ++--
 protocols/IcqOscarJ/src/UI/userinfotab.cpp       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'protocols/IcqOscarJ/src/UI')

diff --git a/protocols/IcqOscarJ/src/UI/askauthentication.cpp b/protocols/IcqOscarJ/src/UI/askauthentication.cpp
index 818d5ce6de..76e290f704 100644
--- a/protocols/IcqOscarJ/src/UI/askauthentication.cpp
+++ b/protocols/IcqOscarJ/src/UI/askauthentication.cpp
@@ -32,7 +32,7 @@
 struct AskAuthParam
 {
 	CIcqProto* ppro;
-	HANDLE hContact;
+	HCONTACT hContact;
 };
 
 static INT_PTR CALLBACK AskAuthProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -90,7 +90,7 @@ static INT_PTR CALLBACK AskAuthProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 
 INT_PTR CIcqProto::RequestAuthorization(WPARAM wParam, LPARAM lParam)
 {
-	AskAuthParam param = { this, (HANDLE)wParam };
+	AskAuthParam param = { this, (HCONTACT)wParam };
 	DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_ASKAUTH), NULL, AskAuthProc, (LPARAM)&param);
 	return 0;
 }
diff --git a/protocols/IcqOscarJ/src/UI/userinfotab.cpp b/protocols/IcqOscarJ/src/UI/userinfotab.cpp
index 04c785fc87..1c0bcb67f4 100644
--- a/protocols/IcqOscarJ/src/UI/userinfotab.cpp
+++ b/protocols/IcqOscarJ/src/UI/userinfotab.cpp
@@ -41,7 +41,7 @@ extern const char *nameXStatus[];
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-static void SetValue(CIcqProto* ppro, HWND hwndDlg, int idCtrl, HANDLE hContact, char* szModule, char* szSetting, int special)
+static void SetValue(CIcqProto* ppro, HWND hwndDlg, int idCtrl, HCONTACT hContact, char* szModule, char* szSetting, int special)
 {
 	DBVARIANT dbv = {0};
 	char str[MAX_PATH];
@@ -221,7 +221,7 @@ static INT_PTR CALLBACK IcqDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 						break;
 
 					char* szProto;
-					HANDLE hContact = (HANDLE)((LPPSHNOTIFY)lParam)->lParam;
+					HCONTACT hContact = (HCONTACT)((LPPSHNOTIFY)lParam)->lParam;
 
 					if (hContact == NULL)
 						szProto = ppro->m_szModuleName;
@@ -284,7 +284,7 @@ static INT_PTR CALLBACK IcqDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 
 int CIcqProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam)
 {
-	if ((!IsICQContact((HANDLE)lParam)) && lParam)
+	if ((!IsICQContact((HCONTACT)lParam)) && lParam)
 		return 0;
 
 	OPTIONSDIALOGPAGE odp = { sizeof(odp) };
-- 
cgit v1.2.3