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
---
 src/modules/clist/clui.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/modules/clist/clui.cpp')

diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp
index 559e9b2b13..ce1996d89e 100644
--- a/src/modules/clist/clui.cpp
+++ b/src/modules/clist/clui.cpp
@@ -134,7 +134,7 @@ static INT_PTR CALLBACK AskForConfirmationDlgProc(HWND hWnd, UINT msg, WPARAM wP
 			TCHAR szFinal[256];
 
 			GetDlgItemText(hWnd, IDC_TOPLINE, szFormat, SIZEOF(szFormat));
-			mir_sntprintf(szFinal, SIZEOF(szFinal), szFormat, cli.pfnGetContactDisplayName((HANDLE)lParam, 0));
+			mir_sntprintf(szFinal, SIZEOF(szFinal), szFormat, cli.pfnGetContactDisplayName((HCONTACT)lParam, 0));
 			SetDlgItemText(hWnd, IDC_TOPLINE, szFinal);
 		}
 		SetFocus( GetDlgItem(hWnd, IDNO));
@@ -185,7 +185,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam)
 	// Delete contact
 	case IDYES:
 		{
-			char *szProto = GetContactProto((HANDLE)wParam);
+			char *szProto = GetContactProto((HCONTACT)wParam);
 			if (szProto != NULL) {
 				// Check if protocol uses server side lists
 				DWORD caps;
@@ -197,7 +197,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam)
 					status = CallProtoServiceInt(NULL,szProto, PS_GETSTATUS, 0, 0);
 					if (status == ID_STATUS_OFFLINE || (status >= ID_STATUS_CONNECTING && status < ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES)) {
 						// Set a flag so we remember to delete the contact when the protocol goes online the next time
-						db_set_b((HANDLE)wParam, "CList", "Delete", 1);
+						db_set_b((HCONTACT)wParam, "CList", "Delete", 1);
 						MessageBox(NULL,
 							TranslateT("This contact is on an instant messaging system which stores its contact list on a central server. The contact will be removed from the server and from your contact list when you next connect to that network."),
 							TranslateT("Delete contact"), MB_ICONINFORMATION | MB_OK);
@@ -212,7 +212,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam)
 
 	// Archive contact
 	case IDC_HIDE:
-		db_set_b((HANDLE)wParam, "CList", "Hidden", 1);
+		db_set_b((HCONTACT)wParam, "CList", "Hidden", 1);
 		break;
 	}
 
@@ -815,7 +815,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 
 			case CLN_NEWCONTACT:
 				if (nmc != NULL)
-					cli.pfnSetAllExtraIcons(nmc->hItem);
+					cli.pfnSetAllExtraIcons((HCONTACT)nmc->hItem);
 				return TRUE;
 
 			case CLN_LISTREBUILT:
@@ -869,7 +869,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 					if (hItem) {
 						if (hitFlags & CLCHT_ONITEMEXTRA) {
 							if (!IsHContactGroup(hItem) && !IsHContactInfo(hItem))
-								if ( cli.pfnGetCacheEntry(nmc->hItem))
+								if (cli.pfnGetCacheEntry((HCONTACT)nmc->hItem))
 									NotifyEventHooks(hEventExtraClick, (WPARAM)nmc->hItem, nmc->iColumn+1);
 						}
 						break;
-- 
cgit v1.2.3