From 0fd99700af65c76e2dbedabb010040a3e9f3b675 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 6 Apr 2018 20:11:32 +0300 Subject: CLIST_INTERFACE::pfnClcStatusToPf2 => Clist_ClcStatusToPf2 --- src/core/stdclist/src/clcpaint.cpp | 2 +- src/mir_app/src/clc.h | 1 - src/mir_app/src/clcutils.cpp | 4 ++-- src/mir_app/src/clistcore.cpp | 1 - src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 6 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp index e95fca2fa7..03a927d63d 100644 --- a/src/core/stdclist/src/clcpaint.cpp +++ b/src/core/stdclist/src/clcpaint.cpp @@ -153,7 +153,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint) dat->rowHeight = minHeight; int grey; - if (dat->greyoutFlags & pcli->pfnClcStatusToPf2(status) || style & WS_DISABLED) + if (dat->greyoutFlags & Clist_ClcStatusToPf2(status) || style & WS_DISABLED) grey = 1; else if (GetFocus() != hwnd && dat->greyoutFlags & GREYF_UNFOCUS) grey = 1; diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h index 66d574496c..79c4213627 100644 --- a/src/mir_app/src/clc.h +++ b/src/mir_app/src/clc.h @@ -88,7 +88,6 @@ void fnDeleteFromContactList(HWND hwnd, struct ClcData *dat); void fnBeginRenameSelection(HWND hwnd, struct ClcData *dat); void fnCalcEipPosition(struct ClcData *dat, ClcContact *contact, ClcGroup *group, POINT *result); int fnGetDropTargetInformation(HWND hwnd, struct ClcData *dat, POINT pt); -int fnClcStatusToPf2(int status); void fnGetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour); void fnLoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst); diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp index 02fe60392c..155b3c7588 100644 --- a/src/mir_app/src/clcutils.cpp +++ b/src/mir_app/src/clcutils.cpp @@ -613,7 +613,7 @@ int fnGetDropTargetInformation(HWND hwnd, ClcData *dat, POINT pt) return DROPTARGET_ONCONTACT; } -int fnClcStatusToPf2(int status) +MIR_APP_DLL(int) Clist_ClcStatusToPf2(int status) { switch(status) { case ID_STATUS_ONLINE: return PF2_ONLINE; @@ -632,7 +632,7 @@ int fnClcStatusToPf2(int status) MIR_APP_DLL(int) Clist_IsHiddenMode(ClcData *dat, int status) { - return dat->offlineModes & cli.pfnClcStatusToPf2(status); + return dat->offlineModes & Clist_ClcStatusToPf2(status); } MIR_APP_DLL(void) Clist_HideInfoTip(ClcData *dat) diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index a54dc5bf21..42648aea79 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -105,7 +105,6 @@ void InitClistCore() cli.pfnBeginRenameSelection = fnBeginRenameSelection; cli.pfnCalcEipPosition = fnCalcEipPosition; cli.pfnGetDropTargetInformation = fnGetDropTargetInformation; - cli.pfnClcStatusToPf2 = fnClcStatusToPf2; cli.pfnIsVisibleContact = fnIsVisibleContact; cli.pfnGetDefaultFontSetting = fnGetDefaultFontSetting; diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 5044329303..2c91557298 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -565,3 +565,4 @@ Clist_GetDefaultExStyle @584 Clist_NotifyNewContact @585 Clist_HideInfoTip @586 Clist_IsHiddenMode @587 +Clist_ClcStatusToPf2 @588 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 204cefa262..9b43a20b1f 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -565,3 +565,4 @@ Clist_GetDefaultExStyle @584 Clist_NotifyNewContact @585 Clist_HideInfoTip @586 Clist_IsHiddenMode @587 +Clist_ClcStatusToPf2 @588 -- cgit v1.2.3