let's avoid identifier 'hLangpack' wherever possible

11 files changed, 17 insertions, 17 deletions

diff --git a/include/m_cluiframes.h b/include/m_cluiframes.h
index 26177c283f..020f5fe688 100644
--- a/include/m_cluiframes.h
+++ b/include/m_cluiframes.h
@@ -221,7 +221,7 @@ typedef struct tagCLISTFrame {
 //contactowner=advanced parameter

 

 __forceinline HGENMENU Menu_AddContextFrameMenuItem(TMO_MenuItem *pmi)

-{	pmi->hLangpack = hLangpack;

+{	pmi->langId = hLangpack;

 	return (HGENMENU)CallService("CList/AddContextFrameMenuItem", 0, (LPARAM)pmi);

 }

 

diff --git a/include/m_core.h b/include/m_core.h
index 5c6ce4dd5a..8aac2587fb 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -172,8 +172,8 @@ typedef struct tagIconItemT
 }

 	IconItemT;

 

-MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char* szSection, IconItem* pIcons, size_t iCount, const char *prefix, int hLangpack);

-MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const wchar_t* szSection, IconItemT* pIcons, size_t iCount, const char *prefix, int hLangpack);

+MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char* szSection, IconItem* pIcons, size_t iCount, const char *prefix, int langId);

+MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const wchar_t* szSection, IconItemT* pIcons, size_t iCount, const char *prefix, int langId);

 

 ///////////////////////////////////////////////////////////////////////////////

 // language packs support

diff --git a/include/m_extraicons.h b/include/m_extraicons.h
index 11ce000a32..e394306d5b 100644
--- a/include/m_extraicons.h
+++ b/include/m_extraicons.h
@@ -101,7 +101,7 @@ struct EXTRAICON_INFO
 	LPARAM onClickParam;

 };

 

-EXTERN_C MIR_APP_DLL(void) KillModuleExtraIcons(int hLangpack);

+EXTERN_C MIR_APP_DLL(void) KillModuleExtraIcons(int langId);

 

 #pragma warning(disable:4505)

 

diff --git a/include/m_fontservice.h b/include/m_fontservice.h
index f126a49f1f..4f6f0f264d 100644
--- a/include/m_fontservice.h
+++ b/include/m_fontservice.h
@@ -236,8 +236,8 @@ EXTERN_C MIR_APP_DLL(int) Effect_GetW(const wchar_t *wszGroup, const wchar_t *sz
 // wparam = lparam = 0

 #define ME_EFFECT_RELOAD      "Effect/Reload"

 

-EXTERN_C MIR_APP_DLL(void) KillModuleFonts(int hLangpack);

-EXTERN_C MIR_APP_DLL(void) KillModuleColours(int hLangpack);

-EXTERN_C MIR_APP_DLL(void) KillModuleEffects(int hLangpack);

+EXTERN_C MIR_APP_DLL(void) KillModuleFonts(int langId);

+EXTERN_C MIR_APP_DLL(void) KillModuleColours(int langId);

+EXTERN_C MIR_APP_DLL(void) KillModuleEffects(int langId);

 

 #endif // _FONT_SERVICE_API_INC

diff --git a/include/m_genmenu.h b/include/m_genmenu.h
index 33a56e2daa..8fa4ef0728 100644
--- a/include/m_genmenu.h
+++ b/include/m_genmenu.h
@@ -46,7 +46,7 @@ struct TMO_MenuItem
 		HICON hIcon;

 		HANDLE hIcolibItem;

 	};

-	int hLangpack;

+	int langId;

 	MUUID uid;

 };

 

@@ -64,7 +64,7 @@ struct CMenuItem : public TMO_MenuItem
 	CMenuItem()

 	{

 		memset(this, 0, sizeof(CMenuItem));

-		this->hLangpack = ::hLangpack;

+		this->langId = ::hLangpack;

 	}

 };

 #endif

@@ -260,7 +260,7 @@ EXTERN_C MIR_APP_DLL(HGENMENU) Menu_GetProtocolRoot(PROTO_INTERFACE *pThis);
 /////////////////////////////////////////////////////////////////////////////////////////

 // kills all menu items & submenus that belong to the hLangpack given

 

-EXTERN_C MIR_APP_DLL(void) KillModuleMenus(int hLangpack);

+EXTERN_C MIR_APP_DLL(void) KillModuleMenus(int langId);

 

 #endif // M_GENMENU_H__

 

diff --git a/include/m_hotkeys.h b/include/m_hotkeys.h
index a68c100e87..016a4864b1 100644
--- a/include/m_hotkeys.h
+++ b/include/m_hotkeys.h
@@ -88,6 +88,6 @@ EXTERN_C MIR_APP_DLL(void) Hotkey_Unsubclass(HWND hwndEdit);
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-EXTERN_C MIR_APP_DLL(void) KillModuleHotkeys(int hLangpack);

+EXTERN_C MIR_APP_DLL(void) KillModuleHotkeys(int langId);

 

 #endif // M_HOTKEYS_H__

diff --git a/include/m_icolib.h b/include/m_icolib.h
index 71cb29fad9..d06160ffcd 100644
--- a/include/m_icolib.h
+++ b/include/m_icolib.h
@@ -117,7 +117,7 @@ MIR_APP_DLL(void)   Window_FreeIcon_IcoLib(HWND hWnd);
 

 ///////////////////////////////////////////////////////////////////////////////

 

-MIR_APP_DLL(void)   KillModuleIcons(int hLangpack);

+MIR_APP_DLL(void)   KillModuleIcons(int langId);

 

 #if defined(__cplusplus)

 }

diff --git a/include/m_options.h b/include/m_options.h
index cdf89a9115..0b2112d1aa 100644
--- a/include/m_options.h
+++ b/include/m_options.h
@@ -66,7 +66,7 @@ struct OPTIONSDIALOGPAGE
 	DLGPROC pfnDlgProc;

 	char *pszTemplate;

 	HINSTANCE hInstance;

-	int hLangpack;

+	int langId;

 	DWORD flags;

 

 	union {

diff --git a/include/m_skin.h b/include/m_skin.h
index 956f693fed..8a62a295e6 100644
--- a/include/m_skin.h
+++ b/include/m_skin.h
@@ -134,7 +134,7 @@ EXTERN_C MIR_APP_DLL(int) Skin_PlaySoundFile(const wchar_t *pwszFileName);
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-EXTERN_C MIR_APP_DLL(void) KillModuleSounds(int hLangpack);

+EXTERN_C MIR_APP_DLL(void) KillModuleSounds(int langId);

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // sent when the icons DLL has been changed in the options dialog, and everyone

diff --git a/include/m_userinfo.h b/include/m_userinfo.h
index 167cbb09f5..8f4ff6ec67 100644
--- a/include/m_userinfo.h
+++ b/include/m_userinfo.h
@@ -77,7 +77,7 @@ All PSN_ WM_NOTIFY messages have PSHNOTIFY.lParam = (LPARAM)hContact
 #define PSM_FORCECHANGED  (WM_USER+100)   //force-send a PSN_INFOCHANGED to all pages

 

 __forceinline INT_PTR UserInfo_AddPage(WPARAM wParam, OPTIONSDIALOGPAGE* odp)

-{	odp->hLangpack = hLangpack;

+{	odp->langId = hLangpack;

 	return CallService("UserInfo/AddPage", wParam, (LPARAM)odp);

 }

 

diff --git a/include/newpluginapi.h b/include/newpluginapi.h
index ab75e18a64..e8bc7b4435 100644
--- a/include/newpluginapi.h
+++ b/include/newpluginapi.h
@@ -52,7 +52,7 @@ __forceinline bool operator!=(const MUUID &p1, const MUUID &p2)
 {	return memcmp(&p1, &p2, sizeof(MUUID)) != 0;

 }

 

-MIR_APP_DLL(int) GetPluginLangId(const MUUID &uuid, int hLangpack);

+MIR_APP_DLL(int) GetPluginLangId(const MUUID &uuid, int langId);

 MIR_APP_DLL(int) IsPluginLoaded(const MUUID &uuid);

 MIR_APP_DLL(int) SetServiceModePlugin(const wchar_t *wszPluginName);

 

@@ -444,7 +444,7 @@ OBJLIST<P> ACCPROTOPLUGIN<P>::g_arInstances(1, PtrKeySortT);
 #endif

 

 EXTERN_C MIR_APP_DLL(HINSTANCE) GetInstByAddress(void* codePtr);

-EXTERN_C MIR_APP_DLL(CMPluginBase*) GetPluginByLangId(int hLangpack);

+EXTERN_C MIR_APP_DLL(CMPluginBase*) GetPluginByLangId(int langId);

 EXTERN_C MIR_APP_DLL(CMPluginBase&) GetPluginByInstance(HINSTANCE hInst);

 

 #endif // M_NEWPLUGINAPI_H__