From aba87b6bcc2158bc7a070ce4027aee687d554d77 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 6 Apr 2018 21:10:31 +0300 Subject: CLIST_INTERFACE::pfnDeleteItemFromTree => Clist_DeleteItemFromTree --- src/mir_app/src/clc.cpp | 6 +++--- src/mir_app/src/clc.h | 1 - src/mir_app/src/clcitems.cpp | 2 +- src/mir_app/src/clcmsgs.cpp | 2 +- src/mir_app/src/clistcore.cpp | 4 ++-- src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 7 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp index 31d18d02c2..a486029bb9 100644 --- a/src/mir_app/src/clc.cpp +++ b/src/mir_app/src/clc.cpp @@ -429,7 +429,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam break; case INTM_CONTACTDELETED: - cli.pfnDeleteItemFromTree(hwnd, wParam); + Clist_DeleteItemFromTree(hwnd, wParam); SortClcByTimer(hwnd); break; @@ -444,7 +444,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam cli.pfnAddContactToTree(hwnd, dat, wParam, 1, 1); Clist_NotifyNewContact(hwnd, wParam); } - else cli.pfnDeleteItemFromTree(hwnd, wParam); + else Clist_DeleteItemFromTree(hwnd, wParam); dat->bNeedsResort = true; SortClcByTimer(hwnd); @@ -461,7 +461,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam memcpy(iExtraImage, contact->iExtraImage, sizeof(iExtraImage)); flags = contact->flags; } - cli.pfnDeleteItemFromTree(hwnd, wParam); + Clist_DeleteItemFromTree(hwnd, wParam); if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !db_get_b(wParam, "CList", "Hidden", 0)) { NMCLISTCONTROL nm; cli.pfnAddContactToTree(hwnd, dat, wParam, 1, 1); diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h index 5427afd777..9bddc54ad2 100644 --- a/src/mir_app/src/clc.h +++ b/src/mir_app/src/clc.h @@ -64,7 +64,6 @@ void fnFreeContact(ClcContact *p); void fnFreeGroup(ClcGroup *group); void fnAddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline); -void fnDeleteItemFromTree(HWND hwnd, MCONTACT hItem); void fnRebuildEntireList(HWND hwnd, ClcData *dat); int fnGetGroupContentsCount(ClcGroup *group, int visibleOnly); void fnSortCLC(HWND hwnd, ClcData *dat, int useInsertionSort); diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp index 7b03b4c79c..51a90d5fc3 100644 --- a/src/mir_app/src/clcitems.cpp +++ b/src/mir_app/src/clcitems.cpp @@ -298,7 +298,7 @@ ClcGroup* fnRemoveItemFromGroup(HWND hwnd, ClcGroup *group, ClcContact *contact, return group; } -void fnDeleteItemFromTree(HWND hwnd, MCONTACT hItem) +MIR_APP_DLL(void) Clist_DeleteItemFromTree(HWND hwnd, MCONTACT hItem) { ClcData *dat = (ClcData*)GetWindowLongPtr(hwnd, 0); dat->bNeedsResort = true; diff --git a/src/mir_app/src/clcmsgs.cpp b/src/mir_app/src/clcmsgs.cpp index b96d80711d..a05f84dc9e 100644 --- a/src/mir_app/src/clcmsgs.cpp +++ b/src/mir_app/src/clcmsgs.cpp @@ -81,7 +81,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar break; case CLM_DELETEITEM: - cli.pfnDeleteItemFromTree(hwnd, wParam); + Clist_DeleteItemFromTree(hwnd, wParam); cli.pfnSortCLC(hwnd, dat, 1); cli.pfnRecalcScrollBar(hwnd, dat); break; diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index d02bf30d1b..d397005691 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -82,8 +82,8 @@ void InitClistCore() cli.pfnAddInfoItemToGroup = fnAddInfoItemToGroup; cli.pfnAddContactToGroup = fnAddContactToGroup; cli.pfnAddContactToTree = fnAddContactToTree; - cli.pfnDeleteItemFromTree = fnDeleteItemFromTree; - cli.pfnRebuildEntireList = fnRebuildEntireList; + + cli.pfnRebuildEntireList = fnRebuildEntireList; cli.pfnGetGroupContentsCount = fnGetGroupContentsCount; cli.pfnSortCLC = fnSortCLC; diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 21405afe61..0e6f53b6dd 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -573,3 +573,4 @@ Clist_DoSelectionDefaultAction @592 Clist_EnsureVisible @593 Clist_GetGroupCountsText @594 Clist_SaveStateAndRebuildList @595 +Clist_DeleteItemFromTree @596 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 695cefa63e..929ffeae10 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -573,3 +573,4 @@ Clist_DoSelectionDefaultAction @592 Clist_EnsureVisible @593 Clist_GetGroupCountsText @594 Clist_SaveStateAndRebuildList @595 +Clist_DeleteItemFromTree @596 -- cgit v1.2.3