From 769b537b5e1a99fc53aa7296fd2b21dc77a4071c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 16 Aug 2015 20:33:13 +0000
Subject: name conflicts solved

git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/NewEventNotify/src/main.cpp     | 9 ++++-----
 plugins/NewEventNotify/src/menuitem.cpp | 6 +++---
 plugins/NewEventNotify/src/options.cpp  | 2 +-
 plugins/NewEventNotify/src/stdafx.h     | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'plugins/NewEventNotify/src')

diff --git a/plugins/NewEventNotify/src/main.cpp b/plugins/NewEventNotify/src/main.cpp
index 1a67cb7d77..b81570c9f6 100644
--- a/plugins/NewEventNotify/src/main.cpp
+++ b/plugins/NewEventNotify/src/main.cpp
@@ -31,7 +31,7 @@ extern PLUGIN_DATA* PopupList[20];
 //---Some global variables for the plugin
 
 CLIST_INTERFACE *pcli;
-HINSTANCE hInst;
+HINSTANCE g_hInst;
 PLUGIN_OPTIONS pluginOptions;
 int hLangpack;
 PLUGININFOEX pluginInfo = {
@@ -123,7 +123,7 @@ int HookedInit(WPARAM, LPARAM)
 //---Called when an options dialog has to be created
 int HookedOptions(WPARAM wParam, LPARAM)
 {
-	OptionsAdd(hInst, wParam);
+	OptionsAdd(g_hInst, wParam);
 	return 0;
 }
 
@@ -144,8 +144,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	mir_getCLI();
 
 	OptionsInit(&pluginOptions);
-	pluginOptions.hInst = hInst;
-
+	pluginOptions.hInst = g_hInst;
 	return 0;
 }
 
@@ -156,7 +155,7 @@ extern "C" __declspec(dllexport) int Unload(void)
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
 {
-	hInst = hinstDLL;
+	g_hInst = hinstDLL;
 	return TRUE;
 }
 
diff --git a/plugins/NewEventNotify/src/menuitem.cpp b/plugins/NewEventNotify/src/menuitem.cpp
index 19b4347ea1..d02ea6d2b6 100644
--- a/plugins/NewEventNotify/src/menuitem.cpp
+++ b/plugins/NewEventNotify/src/menuitem.cpp
@@ -40,9 +40,9 @@ static INT_PTR MenuitemNotifyCmd(WPARAM, LPARAM)
 int MenuitemUpdate(BOOL bStatus)
 {
 	if (bStatus)
-		Menu_ModifyItem(hMenuitemNotify, _T(MENUITEM_DISABLE), LoadIcon(hInst, MAKEINTRESOURCE(IDI_ENABLED)));
+		Menu_ModifyItem(hMenuitemNotify, _T(MENUITEM_DISABLE), LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_ENABLED)));
 	else
-		Menu_ModifyItem(hMenuitemNotify, _T(MENUITEM_ENABLE), LoadIcon(hInst, MAKEINTRESOURCE(IDI_DISABLED)));
+		Menu_ModifyItem(hMenuitemNotify, _T(MENUITEM_ENABLE), LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_DISABLED)));
 	return 0;
 }
 
@@ -53,7 +53,7 @@ int MenuitemInit(BOOL bStatus)
 	CMenuItem mi;
 	mi.root = Menu_CreateRoot(MO_MAIN, LPGENT("Popups"), 0);
 	mi.position = 1;
-	mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ENABLED));
+	mi.hIcolibItem = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_ENABLED));
 	mi.pszService = MS_NEN_MENUNOTIFY;
 	mi.flags = 0;
 	hMenuitemNotify = Menu_AddMainMenuItem(&mi);
diff --git a/plugins/NewEventNotify/src/options.cpp b/plugins/NewEventNotify/src/options.cpp
index c944c10ab2..395c77ec40 100644
--- a/plugins/NewEventNotify/src/options.cpp
+++ b/plugins/NewEventNotify/src/options.cpp
@@ -288,7 +288,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, L
 
 int OptionsAdd(HINSTANCE hInst, WPARAM addInfo)
 {
-	if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {
+	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
 		OPTIONSDIALOGPAGE odp = { 0 };
 		odp.hInstance = hInst;
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
diff --git a/plugins/NewEventNotify/src/stdafx.h b/plugins/NewEventNotify/src/stdafx.h
index 9b1e1dcd74..49b4ef9852 100644
--- a/plugins/NewEventNotify/src/stdafx.h
+++ b/plugins/NewEventNotify/src/stdafx.h
@@ -223,4 +223,4 @@ int MenuitemUpdate(BOOL bStatus);
 int NumberPopupData(MCONTACT hContact, int eventType);
 int CheckMsgWnd(MCONTACT hContact);
 
-extern HINSTANCE hInst;
+extern HINSTANCE g_hInst;
-- 
cgit v1.2.3