From 6a8ea9b06515655f35a7e6998813eb69c80b8010 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 6 Apr 2018 18:14:12 +0300 Subject: CLIST_INTERFACE::pfnGetCacheEntry => Clist_GetCacheEntry --- plugins/Clist_modern/src/modern_awaymsg.cpp | 2 +- plugins/Clist_modern/src/modern_cachefuncs.cpp | 2 +- plugins/Clist_modern/src/modern_clc.cpp | 2 +- plugins/Clist_modern/src/modern_clcitems.cpp | 10 +++++----- plugins/Clist_modern/src/modern_clistmod.cpp | 2 +- plugins/Clist_modern/src/modern_clistsettings.cpp | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_modern/src/modern_awaymsg.cpp b/plugins/Clist_modern/src/modern_awaymsg.cpp index 811e95a5de..79d9ea0c99 100644 --- a/plugins/Clist_modern/src/modern_awaymsg.cpp +++ b/plugins/Clist_modern/src/modern_awaymsg.cpp @@ -88,7 +88,7 @@ static void amThreadProc(void *) goto LBL_Exit; } - ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact); + ClcCacheEntry *pdnce = Clist_GetCacheEntry(hContact); HANDLE ACK = nullptr; if (pdnce->ApparentMode != ID_STATUS_OFFLINE) //don't ask if contact is always invisible (should be done with protocol) diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp index 7be75f489f..2cf812b360 100644 --- a/plugins/Clist_modern/src/modern_cachefuncs.cpp +++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp @@ -46,7 +46,7 @@ static BOOL ExecuteOnAllContactsOfGroup(ClcGroup *group, ExecuteOnAllContactsFun // void Cache_GetTimezone(ClcData *dat, MCONTACT hContact) { - ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact); + ClcCacheEntry *pdnce = Clist_GetCacheEntry(hContact); if (dat == nullptr && pcli->hwndContactTree) dat = (ClcData *)GetWindowLongPtr(pcli->hwndContactTree, 0); diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index cbc887b625..9ac6cb147c 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -161,7 +161,7 @@ static int clcHookDbEventAdded(WPARAM hContact, LPARAM lParam) db_event_get(lParam, &dbei); if (dbei.eventType == EVENTTYPE_MESSAGE && !(dbei.flags & DBEF_SENT)) { db_set_dw(hContact, "CList", "mf_lastmsg", dbei.timestamp); - ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact); + ClcCacheEntry *pdnce = Clist_GetCacheEntry(hContact); if (pdnce) pdnce->dwLastMsgTime = dbei.timestamp; } diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index 9dfe3505b6..e7697c0a0b 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -46,7 +46,7 @@ void AddSubcontacts(ClcData *dat, ClcContact *cont, BOOL showOfflineHereGroup) if (hsub == -1) continue; - ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hsub); + ClcCacheEntry *pdnce = Clist_GetCacheEntry(hsub); if (pdnce->szProto == nullptr) continue; @@ -169,7 +169,7 @@ static void _LoadDataToContact(ClcContact *cont, ClcCacheEntry *pdnce, ClcGroup ClcContact* cli_AddContactToGroup(ClcData *dat, ClcGroup *group, MCONTACT hContact) { - ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact); + ClcCacheEntry *pdnce = Clist_GetCacheEntry(hContact); if (pdnce->m_iStatus == ID_STATUS_OFFLINE && dat->bPlaceOfflineToRoot) group = &dat->list; @@ -180,7 +180,7 @@ ClcContact* cli_AddContactToGroup(ClcData *dat, ClcGroup *group, MCONTACT hConta void cli_AddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline) { - ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact); + ClcCacheEntry *pdnce = Clist_GetCacheEntry(hContact); if (dat->IsMetaContactsEnabled && pdnce->m_bIsSub) return; //contact should not be added @@ -344,7 +344,7 @@ ClcCacheEntry* cliCreateCacheItem(MCONTACT hContact) void cliInvalidateDisplayNameCacheEntry(MCONTACT hContact) { if (hContact != INVALID_CONTACT_ID) { - ClcCacheEntry *p = pcli->pfnGetCacheEntry(hContact); + ClcCacheEntry *p = Clist_GetCacheEntry(hContact); if (p) p->m_iStatus = 0; } @@ -400,7 +400,7 @@ int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, ClcData *dat) int dbHidden = db_get_b(hContact, "CList", "Hidden", 0); // default hidden state, always respect it. int filterResult = 1; int searchResult = 0; - ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact); + ClcCacheEntry *pdnce = Clist_GetCacheEntry(hContact); // always hide subcontacts (but show them on embedded contact lists) if (dat != nullptr && dat->IsMetaContactsEnabled && db_mc_isSub(hContact)) diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp index 7d1bf35620..a1cae8871d 100644 --- a/plugins/Clist_modern/src/modern_clistmod.cpp +++ b/plugins/Clist_modern/src/modern_clistmod.cpp @@ -78,7 +78,7 @@ int cli_IconFromStatusMode(const char *szProto, int nStatus, MCONTACT hContact) // substitute params by mostonline contact datas MCONTACT hMostOnlineContact = db_mc_getMostOnline(hActContact); if (hMostOnlineContact) { - ClcCacheEntry *cacheEntry = pcli->pfnGetCacheEntry(hMostOnlineContact); + ClcCacheEntry *cacheEntry = Clist_GetCacheEntry(hMostOnlineContact); if (cacheEntry && cacheEntry->szProto) { szActProto = cacheEntry->szProto; nActStatus = cacheEntry->m_iStatus; diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp index 1dbfe85f35..5d5cc8d7cf 100644 --- a/plugins/Clist_modern/src/modern_clistsettings.cpp +++ b/plugins/Clist_modern/src/modern_clistsettings.cpp @@ -78,7 +78,7 @@ int GetStatusForContact(MCONTACT hContact, char *szProto) int GetContactInfosForSort(MCONTACT hContact, char **Proto, wchar_t **Name, int *Status) { - ClcCacheEntry *cacheEntry = pcli->pfnGetCacheEntry(hContact); + ClcCacheEntry *cacheEntry = Clist_GetCacheEntry(hContact); if (cacheEntry != nullptr) { if (Proto != nullptr) *Proto = cacheEntry->szProto; if (Name != nullptr) *Name = cacheEntry->tszName; @@ -89,7 +89,7 @@ int GetContactInfosForSort(MCONTACT hContact, char **Proto, wchar_t **Name, int int GetContactCachedStatus(MCONTACT hContact) { - return pcli->pfnGetCacheEntry(hContact)->getStatus(); + return Clist_GetCacheEntry(hContact)->getStatus(); } int ContactAdded(WPARAM hContact, LPARAM) @@ -102,7 +102,7 @@ int ContactAdded(WPARAM hContact, LPARAM) int MetaStatusChanged(WPARAM hMeta, LPARAM) { - ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hMeta); + ClcCacheEntry *pdnce = Clist_GetCacheEntry(hMeta); if (pdnce) Clist_Broadcast(INTM_STATUSCHANGED, hMeta, 0); @@ -114,7 +114,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) if (MirandaExiting() || !pcli || !hContact) return 0; - ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact); + ClcCacheEntry *pdnce = Clist_GetCacheEntry(hContact); if (pdnce == nullptr) { TRACE("!!! Very bad pdnce not found."); return 0; -- cgit v1.2.3