From f719c8b921c7a46b76453476204224d40c682914 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 11 Jul 2018 21:32:58 +0300
Subject: int hLangpack/m_hLang removed and replaced with HPLUGIN

---
 plugins/SmileyAdd/src/dlgboxsubclass.cpp | 2 +-
 plugins/SmileyAdd/src/main.cpp           | 2 +-
 plugins/SmileyAdd/src/options.cpp        | 3 +--
 plugins/SmileyAdd/src/services.cpp       | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'plugins/SmileyAdd')

diff --git a/plugins/SmileyAdd/src/dlgboxsubclass.cpp b/plugins/SmileyAdd/src/dlgboxsubclass.cpp
index f8adf3d796..1a786ddae2 100644
--- a/plugins/SmileyAdd/src/dlgboxsubclass.cpp
+++ b/plugins/SmileyAdd/src/dlgboxsubclass.cpp
@@ -120,7 +120,7 @@ int SmileyButtonCreate(WPARAM, LPARAM)
 	bbd.hIcon = IcoLib_GetIconHandle("SmileyAdd_ButtonSmiley");
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON;
 	bbd.pszHotkey = desc.pszName;
-	Srmm_AddButton(&bbd, g_plugin.m_hLang);
+	Srmm_AddButton(&bbd, &g_plugin);
 	return 0;
 }
 
diff --git a/plugins/SmileyAdd/src/main.cpp b/plugins/SmileyAdd/src/main.cpp
index 409e5bb81a..7745910a4f 100644
--- a/plugins/SmileyAdd/src/main.cpp
+++ b/plugins/SmileyAdd/src/main.cpp
@@ -54,7 +54,7 @@ static IconItem iconList[] =
 
 static int ModulesLoaded(WPARAM, LPARAM)
 {
-	CMenuItem mi(g_plugin);
+	CMenuItem mi(&g_plugin);
 	SET_UID(mi, 0x5ba238de, 0xe16b, 0x4928, 0xa0, 0x70, 0xff, 0x43, 0xf6, 0x1f, 0x16, 0xd4);
 	mi.position = 2000070050;
 	mi.hIcolibItem = iconList[0].hIcolib;
diff --git a/plugins/SmileyAdd/src/options.cpp b/plugins/SmileyAdd/src/options.cpp
index 7c1e1ebe69..e2c18a576f 100644
--- a/plugins/SmileyAdd/src/options.cpp
+++ b/plugins/SmileyAdd/src/options.cpp
@@ -629,9 +629,8 @@ static INT_PTR CALLBACK DlgProcSmileysOptions(HWND hwndDlg, UINT msg, WPARAM wPa
 
 int SmileysOptionsInitialize(WPARAM addInfo, LPARAM)
 {
-	OPTIONSDIALOGPAGE odp = { 0 };
+	OPTIONSDIALOGPAGE odp = {};
 	odp.position = 910000000;
-	odp.hInstance = g_plugin.getInst();
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SMILEYS);
 	odp.szTitle.a = LPGEN("Smileys");
 	odp.szGroup.a = LPGEN("Customize");
diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp
index ae9db94aed..21ca56813b 100644
--- a/plugins/SmileyAdd/src/services.cpp
+++ b/plugins/SmileyAdd/src/services.cpp
@@ -287,7 +287,7 @@ int RebuildContactMenu(WPARAM wParam, LPARAM)
 		CMStringW cat;
 		opt.ReadContactCategory(wParam, cat);
 
-		CMenuItem mi(g_plugin);
+		CMenuItem mi(&g_plugin);
 		mi.root = hContactMenuItem;
 		mi.flags = CMIF_UNICODE | CMIF_SYSTEM;
 		mi.pszService = MS_SMILEYADD_CUSTOMCATMENU;
-- 
cgit v1.2.3