From 8a74e7495ce5ad39de4f5c25121a84d35df90c36 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 20 May 2018 15:08:48 +0300
Subject: CMPlugin to receive a reference to PLUGININFOEX

---
 plugins/IEView/src/ieview_main.cpp | 26 ++++++++++++++++++--------
 plugins/IEView/src/stdafx.h        |  4 +---
 2 files changed, 19 insertions(+), 11 deletions(-)

(limited to 'plugins/IEView')

diff --git a/plugins/IEView/src/ieview_main.cpp b/plugins/IEView/src/ieview_main.cpp
index 0cb1d34bbf..b9f3733c8a 100644
--- a/plugins/IEView/src/ieview_main.cpp
+++ b/plugins/IEView/src/ieview_main.cpp
@@ -26,6 +26,16 @@ char *workingDirUtf8;
 CMPlugin g_plugin;
 int &hLangpack(g_plugin.m_hLang);
 
+IconItem iconList[] =
+{
+	{ LPGEN("RTL On"), "RTL_ON", IDI_RTL_ON },
+	{ LPGEN("RTL Off"), "RTL_OFF", IDI_RTL_OFF },
+	{ LPGEN("Group On"), "GROUP_ON", IDI_GROUP_ON },
+	{ LPGEN("Group Off"), "GROUP_OFF", IDI_GROUP_OFF }
+};
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
 PLUGININFOEX pluginInfoEx = {
 	sizeof(PLUGININFOEX),
 	__PLUGIN_NAME,
@@ -39,25 +49,23 @@ PLUGININFOEX pluginInfoEx = {
 	{ 0x0495171b, 0x7137, 0x4ded, { 0x97, 0xf8, 0xce, 0x6f, 0xed, 0x67, 0xd6, 0x91 } }
 };
 
+CMPlugin::CMPlugin() :
+	PLUGIN<CMPlugin>(ieviewModuleName, pluginInfoEx)
+{}
+
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
 	return &pluginInfoEx;
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
 static int ModulesLoaded(WPARAM, LPARAM)
 {
 	Options::init();
 	return 0;
 }
 
-IconItem iconList[] =
-{
-	{ LPGEN("RTL On"), "RTL_ON", IDI_RTL_ON },
-	{ LPGEN("RTL Off"), "RTL_OFF", IDI_RTL_OFF },
-	{ LPGEN("Group On"), "GROUP_ON", IDI_GROUP_ON },
-	{ LPGEN("Group Off"), "GROUP_OFF", IDI_GROUP_OFF }
-};
-
 extern "C" int __declspec(dllexport) Load(void)
 {
 	int wdsize = GetCurrentDirectory(0, nullptr);
@@ -82,6 +90,8 @@ extern "C" int __declspec(dllexport) Load(void)
 	return 0;
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
 extern "C" int __declspec(dllexport) Unload(void)
 {
 	Options::uninit();
diff --git a/plugins/IEView/src/stdafx.h b/plugins/IEView/src/stdafx.h
index e80200df80..68fa4d7c95 100644
--- a/plugins/IEView/src/stdafx.h
+++ b/plugins/IEView/src/stdafx.h
@@ -76,9 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
-	CMPlugin() :
-		PLUGIN<CMPlugin>(ieviewModuleName)
-	{}
+	CMPlugin();
 };
 
 extern IEView *debugView;
-- 
cgit v1.2.3