From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 20:47:51 +0000 Subject: HCONTACT is not needed anymore git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_mw/src/clcidents.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/Clist_mw/src/clcidents.cpp') diff --git a/plugins/Clist_mw/src/clcidents.cpp b/plugins/Clist_mw/src/clcidents.cpp index 20c361e321..967e13abd3 100644 --- a/plugins/Clist_mw/src/clcidents.cpp +++ b/plugins/Clist_mw/src/clcidents.cpp @@ -80,7 +80,7 @@ int GetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex) return -1; } -ClcCacheEntry *GetCLCFullCacheEntry(struct ClcData *dat,HCONTACT hContact) +ClcCacheEntry *GetCLCFullCacheEntry(struct ClcData *dat,MCONTACT hContact) { if (hContact == 0) return NULL; @@ -107,11 +107,11 @@ ClcCacheEntry *GetCLCFullCacheEntry(struct ClcData *dat,HCONTACT hContact) return (pdnce); } -void ClearClcContactCache(struct ClcData *dat,HCONTACT hContact) +void ClearClcContactCache(struct ClcData *dat,MCONTACT hContact) { ClcCacheEntry *cacheEntry; - if (hContact == (HCONTACT)INVALID_HANDLE_VALUE) { + if (hContact == INVALID_CONTACT_ID) { int i,tick; tick = GetTickCount(); @@ -133,7 +133,7 @@ void ClearClcContactCache(struct ClcData *dat,HCONTACT hContact) } } -void SetClcContactCacheItem(struct ClcData *dat, HCONTACT hContact, void *contact) +void SetClcContactCacheItem(struct ClcData *dat, MCONTACT hContact, void *contact) { ClcCacheEntry *cacheEntry; if ( !IsHContactGroup(hContact) && !IsHContactInfo(hContact)) { @@ -153,7 +153,7 @@ int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **c if (isVisible == NULL && hItem != NULL && subgroup == NULL && !IsHContactGroup(hItem) && !IsHContactInfo(hItem)) { //try use cache - ClcCacheEntry *cacheEntry = GetCLCFullCacheEntry(dat, (HCONTACT)hItem); + ClcCacheEntry *cacheEntry = GetCLCFullCacheEntry(dat, (MCONTACT)hItem); if (cacheEntry != NULL) { if (cacheEntry->ClcContact == NULL) { int *isv = {0}; @@ -216,7 +216,7 @@ int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **c if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT && group->cl.items[group->scanIndex]->SubAllocated>0) for (i = 1; i<=group->cl.items[group->scanIndex]->SubAllocated; i++) - if (IsHContactContact(hItem) && group->cl.items[group->scanIndex]->subcontacts[i-1].hContact == (HCONTACT)hItem) { + if (IsHContactContact(hItem) && group->cl.items[group->scanIndex]->subcontacts[i-1].hContact == (MCONTACT)hItem) { if (contact) *contact = &group->cl.items[group->scanIndex]->subcontacts[i-1]; if (subgroup) *subgroup = group; return 1; -- cgit v1.2.3