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/clistsettings.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/src/modules/clist/clistsettings.cpp b/src/modules/clist/clistsettings.cpp
index 89ee1d5f75..bf11aa6e95 100644
--- a/src/modules/clist/clistsettings.cpp
+++ b/src/modules/clist/clistsettings.cpp
@@ -54,7 +54,7 @@ void FreeDisplayNameCache(void)
 
 // default handlers for the cache item creation and destruction
 
-ClcCacheEntry* fnCreateCacheItem(HANDLE hContact)
+ClcCacheEntry* fnCreateCacheItem(HCONTACT hContact)
 {
 	ClcCacheEntry* p = (ClcCacheEntry*)mir_calloc(sizeof(ClcCacheEntry));
 	if (p == NULL)
@@ -86,14 +86,14 @@ void fnFreeCacheItem(ClcCacheEntry *p)
 	p->bIsHidden = -1;
 }
 
-ClcCacheEntry* fnGetCacheEntry(HANDLE hContact)
+ClcCacheEntry* fnGetCacheEntry(HCONTACT hContact)
 {
 	ClcCacheEntry *p;
 	int idx;
 	if (!List_GetIndex(clistCache, &hContact, &idx)) {
 		if ((p = cli.pfnCreateCacheItem(hContact)) != NULL) {
 			List_Insert(clistCache, p, idx);
-			cli.pfnInvalidateDisplayNameCacheEntry(p);
+			cli.pfnInvalidateDisplayNameCacheEntry((HCONTACT)p);
 		}
 	}
 	else p = (ClcCacheEntry*)clistCache->items[idx];
@@ -102,7 +102,7 @@ ClcCacheEntry* fnGetCacheEntry(HANDLE hContact)
 	return p;
 }
 
-void fnInvalidateDisplayNameCacheEntry(HANDLE hContact)
+void fnInvalidateDisplayNameCacheEntry(HCONTACT hContact)
 {
 	if (hContact == INVALID_HANDLE_VALUE) {
 		FreeDisplayNameCache();
@@ -116,7 +116,7 @@ void fnInvalidateDisplayNameCacheEntry(HANDLE hContact)
 	}
 }
 
-TCHAR* fnGetContactDisplayName(HANDLE hContact, int mode)
+TCHAR* fnGetContactDisplayName(HCONTACT hContact, int mode)
 {
 	ClcCacheEntry *cacheEntry = NULL;
 
@@ -160,7 +160,7 @@ INT_PTR GetContactDisplayName(WPARAM wParam, LPARAM lParam)
 {
 	static char retVal[200];
 	ClcCacheEntry *cacheEntry = NULL;
-	HANDLE hContact = (HANDLE)wParam;
+	HCONTACT hContact = (HCONTACT)wParam;
 
 	if (lParam & GCDNF_UNICODE)
 		return (INT_PTR)cli.pfnGetContactDisplayName(hContact, lParam & ~GCDNF_UNICODE);
@@ -209,13 +209,13 @@ INT_PTR GetContactDisplayName(WPARAM wParam, LPARAM lParam)
 
 INT_PTR InvalidateDisplayName(WPARAM wParam, LPARAM)
 {
-	cli.pfnInvalidateDisplayNameCacheEntry((HANDLE)wParam);
+	cli.pfnInvalidateDisplayNameCacheEntry((HCONTACT)wParam);
 	return 0;
 }
 
 int ContactAdded(WPARAM wParam, LPARAM)
 {
-	cli.pfnChangeContactIcon((HANDLE)wParam, cli.pfnIconFromStatusMode(GetContactProto((HANDLE)wParam), ID_STATUS_OFFLINE, NULL), 1);
+	cli.pfnChangeContactIcon((HCONTACT)wParam, cli.pfnIconFromStatusMode(GetContactProto((HCONTACT)wParam), ID_STATUS_OFFLINE, NULL), 1);
 	cli.pfnSortContacts();
 	return 0;
 }
@@ -230,7 +230,7 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 {
 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *) lParam;
 	DBVARIANT dbv;
-	HANDLE hContact = (HANDLE)wParam;
+	HCONTACT hContact = (HCONTACT)wParam;
 
 	// Early exit
 	if (hContact == NULL)
@@ -270,7 +270,7 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 	if (!strcmp(cws->szModule, "CList")) {
 		if (!strcmp(cws->szSetting, "Hidden")) {
 			if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0) {
-				char *szProto = GetContactProto((HANDLE)wParam);
+				char *szProto = GetContactProto((HCONTACT)wParam);
 				cli.pfnChangeContactIcon(hContact, cli.pfnIconFromStatusMode(szProto, szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), hContact), 1);
 			}
 			else
-- 
cgit v1.2.3