From 6e3c9f53d588b9cb88f6b68ff1b4b5bec3593312 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 12 Apr 2019 19:17:53 +0300
Subject: wiping custom icolib functions: Import

---
 plugins/Import/src/main.cpp   | 2 +-
 plugins/Import/src/stdafx.h   | 1 -
 plugins/Import/src/utils.cpp  | 9 ---------
 plugins/Import/src/wizard.cpp | 2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'plugins/Import/src')

diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp
index 7c48eab1ff..046d463f39 100644
--- a/plugins/Import/src/main.cpp
+++ b/plugins/Import/src/main.cpp
@@ -62,7 +62,7 @@ static int ModulesLoaded(WPARAM, LPARAM)
 	// menu item
 	CMenuItem mi(&g_plugin);
 	SET_UID(mi, 0x20ffaf55, 0xafa0, 0x4da3, 0xa9, 0x46, 0x20, 0x51, 0xa0, 0x24, 0xb, 0x41);
-	mi.hIcolibItem = GetIconHandle(IDI_IMPORT);
+	mi.hIcolibItem = g_plugin.getIconHandle(IDI_IMPORT);
 	mi.name.a = LPGEN("&Import...");
 	mi.position = 500050000;
 	mi.pszService = MS_IMPORT_SERVICE;
diff --git a/plugins/Import/src/stdafx.h b/plugins/Import/src/stdafx.h
index 415eed700a..85e8f728d3 100644
--- a/plugins/Import/src/stdafx.h
+++ b/plugins/Import/src/stdafx.h
@@ -201,7 +201,6 @@ extern bool g_bServiceMode, g_bSendQuit;
 extern int g_iImportOptions;
 extern MCONTACT g_hImportContact;
 
-HANDLE GetIconHandle(int iIconId);
 void   RegisterIcons(void);
 
 void RegisterMContacts();
diff --git a/plugins/Import/src/utils.cpp b/plugins/Import/src/utils.cpp
index efff680e92..51965cacef 100644
--- a/plugins/Import/src/utils.cpp
+++ b/plugins/Import/src/utils.cpp
@@ -187,15 +187,6 @@ static IconItem iconList[] =
 	{ LPGEN("Import..."), "import_main", IDI_IMPORT }
 };
 
-HANDLE GetIconHandle(int iIconId)
-{
-	for (auto &it : iconList)
-		if (it.defIconID == iIconId)
-			return it.hIcolib;
-
-	return nullptr;
-}
-
 void RegisterIcons()
 {
 	g_plugin.registerIcon("Import", iconList);
diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp
index 15669a0b35..2767a2ffc2 100644
--- a/plugins/Import/src/wizard.cpp
+++ b/plugins/Import/src/wizard.cpp
@@ -120,7 +120,7 @@ public:
 	{
 		Utils_RestoreWindowPosition(m_hwnd, 0, IMPORT_MODULE, "wiz");
 
-		Window_SetIcon_IcoLib(m_hwnd, GetIconHandle(IDI_IMPORT));
+		Window_SetIcon_IcoLib(m_hwnd, g_plugin.getIconHandle(IDI_IMPORT));
 		g_hwndWizard = m_hwnd;
 
 		if (m_pFirstPage)
-- 
cgit v1.2.3