From 37a022d37e79dbe9892f376ef7c3b6b8878c4aff Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 18 May 2018 20:40:44 +0300 Subject: hLangpack variable began migration inside CMPluginBase it remains existing for now, but as reference to g_plugin.m_hLang --- src/mir_core/src/icons.cpp | 4 ++-- src/mir_core/src/miranda.cpp | 1 - src/mir_core/src/modules.cpp | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/mir_core') diff --git a/src/mir_core/src/icons.cpp b/src/mir_core/src/icons.cpp index 5488fd645d..df3f14af9b 100644 --- a/src/mir_core/src/icons.cpp +++ b/src/mir_core/src/icons.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h" -MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char *szSection, IconItem *pIcons, size_t iCount, char *prefix, int _hLang) +MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char *szSection, IconItem *pIcons, size_t iCount, const char *prefix, int _hLang) { wchar_t szFile[MAX_PATH]; GetModuleFileName(hInst, szFile, MAX_PATH); @@ -48,7 +48,7 @@ MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char *szSection, IconIte } } -MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const wchar_t *szSection, IconItemT *pIcons, size_t iCount, char *prefix, int _hLang) +MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const wchar_t *szSection, IconItemT *pIcons, size_t iCount, const char *prefix, int _hLang) { wchar_t szFile[MAX_PATH]; GetModuleFileName(hInst, szFile, MAX_PATH); diff --git a/src/mir_core/src/miranda.cpp b/src/mir_core/src/miranda.cpp index fda0f29a80..e4f0b50fe8 100644 --- a/src/mir_core/src/miranda.cpp +++ b/src/mir_core/src/miranda.cpp @@ -40,7 +40,6 @@ void InitMetaContacts(); void InitTimeZones(); void InitWinver(); -int hLangpack = 0; HINSTANCE g_hInst = nullptr; HCURSOR g_hCursorNS, g_hCursorWE; diff --git a/src/mir_core/src/modules.cpp b/src/mir_core/src/modules.cpp index 086e584de9..6af89cbab2 100644 --- a/src/mir_core/src/modules.cpp +++ b/src/mir_core/src/modules.cpp @@ -702,6 +702,8 @@ struct CMPlugin : public CMPluginBase {} } g_plugin; +int &hLangpack(g_plugin.m_hLang); + LIST pluginListAddr(10, HandleKeySortT); MIR_CORE_DLL(void) RegisterModule(CMPluginBase *pPlugin) -- cgit v1.2.3