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

---
 src/core/stdidle/src/main.cpp    | 18 +++++++++++++++---
 src/core/stdidle/src/options.cpp |  2 +-
 src/core/stdidle/src/stdafx.h    | 30 ++++++++++++++----------------
 3 files changed, 30 insertions(+), 20 deletions(-)

(limited to 'src/core/stdidle')

diff --git a/src/core/stdidle/src/main.cpp b/src/core/stdidle/src/main.cpp
index 0131b4a427..5f7a5bb00e 100644
--- a/src/core/stdidle/src/main.cpp
+++ b/src/core/stdidle/src/main.cpp
@@ -28,7 +28,9 @@ CMPlugin g_plugin;
 CLIST_INTERFACE* pcli;
 int &hLangpack(g_plugin.m_hLang);
 
-PLUGININFOEX pluginInfo = {
+/////////////////////////////////////////////////////////////////////////////////////////
+
+PLUGININFOEX pluginInfoEx = {
 	sizeof(PLUGININFOEX),
 	__PLUGIN_NAME,
 	MIRANDA_VERSION_DWORD,
@@ -41,22 +43,32 @@ PLUGININFOEX pluginInfo = {
 	{ 0x53ac190b, 0xe223, 0x4341, {0x82, 0x5f, 0x70, 0x9d, 0x85, 0x20, 0x21, 0x5b}}
 };
 
+CMPlugin::CMPlugin() :
+	PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)
+{}
+
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
-	return &pluginInfo;
+	return &pluginInfoEx;
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
 extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_IDLE, MIID_LAST };
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
 extern "C" int __declspec(dllexport) Load(void)
 {
-	mir_getLP(&pluginInfo);
+	mir_getLP(&pluginInfoEx);
 	pcli = Clist_GetInterface();
 
 	LoadIdleModule();
 	return 0;
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
 extern "C" int __declspec(dllexport) Unload(void)
 {
 	UnloadIdleModule();
diff --git a/src/core/stdidle/src/options.cpp b/src/core/stdidle/src/options.cpp
index 5da1144b09..8d34a2909a 100644
--- a/src/core/stdidle/src/options.cpp
+++ b/src/core/stdidle/src/options.cpp
@@ -57,7 +57,7 @@ class COptionsDlg : public CPluginDlgBase
 
 public:
 	COptionsDlg() :
-		CPluginDlgBase(g_plugin, IDD_OPT_IDLE, IDLEMOD),
+		CPluginDlgBase(g_plugin, IDD_OPT_IDLE, MODULENAME),
 		edt1sttime(this, IDC_IDLE1STTIME),
 		spinIdle(this, IDC_IDLESPIN),
 		cmbAAStatus(this, IDC_AASTATUS),
diff --git a/src/core/stdidle/src/stdafx.h b/src/core/stdidle/src/stdafx.h
index 5eff95b29b..e313a5d426 100644
--- a/src/core/stdidle/src/stdafx.h
+++ b/src/core/stdidle/src/stdafx.h
@@ -65,30 +65,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../../mir_app/src/resource.h"
 
-#define IDLEMOD "Idle"
+#define MODULENAME "Idle"
 
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
-	CMPlugin() :
-		PLUGIN<CMPlugin>(IDLEMOD)
-	{}
+	CMPlugin();
 };
 
 struct Settings
 {
 	Settings() :
-		bIdleCheck(IDLEMOD, "UserIdleCheck", 0),
-		bIdleMethod(IDLEMOD, "IdleMethod", 0),
-		bIdleOnSaver(IDLEMOD, "IdleOnSaver", 0),
-		bIdleOnFullScr(IDLEMOD, "IdleOnFullScr", 0),
-		bIdleOnLock(IDLEMOD, "IdleOnLock", 0),
-		bIdlePrivate(IDLEMOD, "IdlePrivate", 0),
-		bIdleSoundsOff(IDLEMOD, "IdleSoundsOff", 1),
-		bIdleOnTerminal(IDLEMOD, "IdleOnTerminalDisconnect", 0),
-		bIdleStatusLock(IDLEMOD, "IdleStatusLock", 0),
-		bAAEnable(IDLEMOD, "AAEnable", 0),
-		bAAStatus(IDLEMOD, "AAStatus", 0),
-		iIdleTime1st(IDLEMOD, "IdleTime1st", 10)
+		bIdleCheck(MODULENAME, "UserIdleCheck", 0),
+		bIdleMethod(MODULENAME, "IdleMethod", 0),
+		bIdleOnSaver(MODULENAME, "IdleOnSaver", 0),
+		bIdleOnFullScr(MODULENAME, "IdleOnFullScr", 0),
+		bIdleOnLock(MODULENAME, "IdleOnLock", 0),
+		bIdlePrivate(MODULENAME, "IdlePrivate", 0),
+		bIdleSoundsOff(MODULENAME, "IdleSoundsOff", 1),
+		bIdleOnTerminal(MODULENAME, "IdleOnTerminalDisconnect", 0),
+		bIdleStatusLock(MODULENAME, "IdleStatusLock", 0),
+		bAAEnable(MODULENAME, "AAEnable", 0),
+		bAAStatus(MODULENAME, "AAStatus", 0),
+		iIdleTime1st(MODULENAME, "IdleTime1st", 10)
 	{}
 
 	CMOption<BYTE> bIdleCheck, bIdleMethod, bIdleOnSaver, bIdleOnFullScr, bIdleOnLock;
-- 
cgit v1.2.3