g_hInstance incapulated into PLUGIN<>, no need in the separate variable

5 files changed, 23 insertions, 25 deletions

diff --git a/plugins/NewsAggregator/Src/Authentication.cpp b/plugins/NewsAggregator/Src/Authentication.cpp
index e656206e9f..c2dc409947 100644
--- a/plugins/NewsAggregator/Src/Authentication.cpp
+++ b/plugins/NewsAggregator/Src/Authentication.cpp
@@ -43,7 +43,7 @@ void CreateAuthString(char *auth, MCONTACT hContact, CFeedEditor *pDlg)
 }

 

 CAuthRequest::CAuthRequest(CFeedEditor *pDlg, MCONTACT hContact)

-	: CSuper(g_hInstance, IDD_AUTHENTICATION),

+	: CSuper(g_plugin.getInst(), IDD_AUTHENTICATION),

 	m_feedname(this, IDC_FEEDNAME), m_username(this, IDC_FEEDUSERNAME),

 	m_password(this, IDC_FEEDPASSWORD), m_ok(this, IDOK)

 {

diff --git a/plugins/NewsAggregator/Src/Icons.cpp b/plugins/NewsAggregator/Src/Icons.cpp
index 206238b4bd..7171000a30 100644
--- a/plugins/NewsAggregator/Src/Icons.cpp
+++ b/plugins/NewsAggregator/Src/Icons.cpp
@@ -33,7 +33,7 @@ static IconItem iconList[] =
 

 void InitIcons()

 {

-	Icon_Register(g_hInstance, LPGEN("News Aggregator"), iconList, _countof(iconList), MODULE);

+	Icon_Register(g_plugin.getInst(), LPGEN("News Aggregator"), iconList, _countof(iconList), MODULE);

 }

 

 HICON LoadIconEx(const char *name, bool big)

diff --git a/plugins/NewsAggregator/Src/NewsAggregator.cpp b/plugins/NewsAggregator/Src/NewsAggregator.cpp
index 66f0af69b8..548621b96f 100644
--- a/plugins/NewsAggregator/Src/NewsAggregator.cpp
+++ b/plugins/NewsAggregator/Src/NewsAggregator.cpp
@@ -19,8 +19,6 @@ Boston, MA 02111-1307, USA.
 

 #include "stdafx.h"

 

-HINSTANCE g_hInstance = nullptr;

-

 int hLangpack;

 HANDLE hPrebuildMenuHook = nullptr;

 CDlgBase *pAddFeedDialog = nullptr, *pImportDialog = nullptr, *pExportDialog = nullptr;

@@ -51,6 +49,12 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 

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

 

+CMPlugin g_plugin;

+

+extern "C" _pfnCrtInit _pRawDllMain = &CMPlugin::RawDllMain;

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

 extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST };

 

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

@@ -105,18 +109,3 @@ extern "C" __declspec(dllexport) int Unload(void)
 	CloseHandle(hUpdateMutex);

 	return 0;

 }

-

-/////////////////////////////////////////////////////////////////////////////////////////

-

-struct CMPlugin : public PLUGIN<CMPlugin>

-{

-	CMPlugin() :

-		PLUGIN<CMPlugin>(MODULE)

-	{

-		RegisterProtocol(PROTOTYPE_VIRTUAL);

-		SetUniqueId("URL");

-	}

-}

-	g_plugin;

-

-extern "C" _pfnCrtInit _pRawDllMain = &CMPlugin::RawDllMain;

diff --git a/plugins/NewsAggregator/Src/Options.cpp b/plugins/NewsAggregator/Src/Options.cpp
index 4d96fb10e3..ca050741fa 100644
--- a/plugins/NewsAggregator/Src/Options.cpp
+++ b/plugins/NewsAggregator/Src/Options.cpp
@@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA.
 #include "stdafx.h"

 

 CExportFeed::CExportFeed()

-	: CSuper(g_hInstance, IDD_FEEDEXPORT),

+	: CSuper(g_plugin.getInst(), IDD_FEEDEXPORT),

 	m_feedslist(this, IDC_FEEDSLIST), m_feedsexportlist(this, IDC_FEEDSEXPORTLIST),

 	m_addfeed(this, IDC_ADDFEED), m_removefeed(this, IDC_REMOVEFEED), 

 	m_addallfeeds(this, IDC_ADDALLFEEDS), m_removeallfeeds(this, IDC_REMOVEALLFEEDS),

@@ -251,7 +251,7 @@ void CExportFeed::OnClose()
 }

 

 CImportFeed::CImportFeed(CCtrlListView *m_feeds)

-	: CSuper(g_hInstance, IDD_FEEDIMPORT),

+	: CSuper(g_plugin.getInst(), IDD_FEEDIMPORT),

 	m_importfile(this, IDC_IMPORTFILEPATH), m_browsefile(this, IDC_BROWSEIMPORTFILE),

 	m_feedslist(this, IDC_FEEDSLIST), m_feedsimportlist(this, IDC_FEEDSIMPORTLIST),

 	m_addfeed(this, IDC_ADDFEED), m_removefeed(this, IDC_REMOVEFEED),

@@ -661,7 +661,7 @@ void CImportFeed::OnClose()
 }

 

 CFeedEditor::CFeedEditor(int iItem, CCtrlListView *m_feeds, MCONTACT Contact)

-	: CSuper(g_hInstance, IDD_ADDFEED),

+	: CSuper(g_plugin.getInst(), IDD_ADDFEED),

 	m_feedtitle(this, IDC_FEEDTITLE), m_feedurl(this, IDC_FEEDURL),

 	m_checktime(this, IDC_CHECKTIME), m_checktimespin(this, IDC_TIMEOUT_VALUE_SPIN),

 	m_checkfeed(this, IDC_DISCOVERY), m_useauth(this, IDC_USEAUTH),

@@ -893,7 +893,7 @@ void COptionsMain::UpdateList()
 }

 

 COptionsMain::COptionsMain()

-	: CPluginDlgBase(g_hInstance, IDD_OPTIONS, MODULE),

+	: CPluginDlgBase(g_plugin.getInst(), IDD_OPTIONS, MODULE),

 	m_feeds(this, IDC_FEEDLIST),

 	m_add(this, IDC_ADD),

 	m_change(this, IDC_CHANGE),

@@ -1064,7 +1064,7 @@ void COptionsMain::OnFeedListDoubleClick(CCtrlBase*)
 int OptInit(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { 0 };

-	odp.hInstance = g_hInstance;

+	odp.hInstance = g_plugin.getInst();

 	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;

 	odp.szGroup.w = LPGENW("Network");

 	odp.szTitle.w = LPGENW("News Aggregator");

diff --git a/plugins/NewsAggregator/Src/stdafx.h b/plugins/NewsAggregator/Src/stdafx.h
index 60c5bcf593..f0f8cd793e 100644
--- a/plugins/NewsAggregator/Src/stdafx.h
+++ b/plugins/NewsAggregator/Src/stdafx.h
@@ -60,7 +60,6 @@ Boston, MA 02111-1307, USA.
 #define DEFAULT_AVATARS_FOLDER "NewsAggregator"

 #define DEFAULT_UPDATE_TIME 60

 

-extern HINSTANCE g_hInstance;

 extern CDlgBase *pAddFeedDialog, *pImportDialog, *pExportDialog;

 extern HNETLIBUSER hNetlibUser;

 extern UINT_PTR timerId;

@@ -70,6 +69,16 @@ extern bool ThreadRunning;
 extern bool UpdateListFlag;

 extern wchar_t tszRoot[MAX_PATH];

 

+struct CMPlugin : public PLUGIN<CMPlugin>

+{

+	CMPlugin() :

+		PLUGIN<CMPlugin>(MODULE)

+	{

+		RegisterProtocol(PROTOTYPE_VIRTUAL);

+		SetUniqueId("URL");

+	}

+};

+

 //============  STRUCT USED TO MAKE AN UPDATE LIST  ============

 

 struct NEWSCONTACTLIST {