From 8e6a28579846d35bc36966dfb50e2eb7f662471a Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 4 Apr 2018 22:13:32 +0300
Subject: CLIST_INTERFACE::pfnReloadExtraIcons => ExtraIcon_Reload()

CLIST_INTERFACE::pfnSetAllExtraIcons => ExtraIcon_SetAll()
---
 plugins/Clist_modern/src/modern_clui.cpp | 6 +++---
 plugins/Clist_nicer/src/clcitems.cpp     | 2 +-
 plugins/Clist_nicer/src/clui.cpp         | 6 +++---
 plugins/UserInfoEx/src/psp_options.cpp   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 04c4ecf386..8ae724f4fb 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -419,7 +419,7 @@ HRESULT CLUI::CreateCLC()
 	CallService(MS_SKINENG_REGISTERPAINTSUB, (WPARAM)Frame.hWnd, (LPARAM)CLCPaint::PaintCallbackProc);
 	CallService(MS_CLIST_FRAMES_SETFRAMEOPTIONS, MAKEWPARAM(FO_TBTIPNAME, hFrameContactTree), (LPARAM)Translate("My Contacts"));
 
-	pcli->pfnReloadExtraIcons();
+	ExtraIcon_Reload();
 
 	nLastRequiredHeight = 0;
 	if (g_CluiData.current_viewmode[0] == '\0') {
@@ -1209,8 +1209,8 @@ int CLUI_IconsChanged(WPARAM, LPARAM)
 		return 0;
 
 	DrawMenuBar(pcli->hwndContactList);
-	pcli->pfnReloadExtraIcons();
-	pcli->pfnSetAllExtraIcons(0);
+	ExtraIcon_Reload();
+	ExtraIcon_SetAll();
 	// need to update tray cause it use combined icons
 	pcli->pfnTrayIconIconsChanged();  // TODO: remove as soon as core will include icolib
 	ske_RedrawCompleteWindow();
diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index 45eb501421..5a8ff6e979 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -128,7 +128,7 @@ ClcContact* AddContactToGroup(struct ClcData *dat, ClcGroup *group, MCONTACT hCo
 
 		LoadAvatarForContact(p);
 		// notify other plugins to re-supply their extra images (icq for xstatus, mBirthday etc...)
-		pcli->pfnSetAllExtraIcons(hContact);
+		ExtraIcon_SetAll(hContact);
 	}
 
 	RTL_DetectAndSet(p, p->hContact);
diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 340b5e8863..1eed90914d 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -175,7 +175,7 @@ static HWND PreCreateCLC(HWND parent)
 // create internal frames, including the last frame (actual CLC control)
 static int CreateCLC()
 {
-	pcli->pfnReloadExtraIcons();
+	ExtraIcon_Reload();
 	pcli->pfnSetHideOffline(oldhideoffline);
 	disableautoupd = 0;
 	{
@@ -333,8 +333,8 @@ void ConfigureFrame()
 void IcoLibReloadIcons()
 {
 	CacheClientIcons();
-	pcli->pfnReloadExtraIcons();
-	pcli->pfnSetAllExtraIcons(NULL);
+	ExtraIcon_Reload();
+	ExtraIcon_SetAll();
 
 	Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);
 	SendMessage(g_hwndViewModeFrame, WM_USER + 100, 0, 0);
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp
index 64f0140126..057bc4c325 100644
--- a/plugins/UserInfoEx/src/psp_options.cpp
+++ b/plugins/UserInfoEx/src/psp_options.cpp
@@ -341,7 +341,7 @@ static INT_PTR CALLBACK DlgProc_CommonOpts(HWND hDlg, UINT uMsg, WPARAM wParam,
 			FlagsClistChange |= SvcGenderEnableExtraIcons(0 != IsDlgButtonChecked(hDlg, CHECK_OPT_GENDER), true);
 
 			if (FlagsClistChange)
-				pcli->pfnSetAllExtraIcons(NULL);
+				ExtraIcon_SetAll();
 			if (FlagsMsgWndChange)
 				UpdateStatusIcons();
 
-- 
cgit v1.2.3