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/FloatingContacts/src/main.cpp | 48 ++++++++++++++++++++---------------
 plugins/FloatingContacts/src/stdafx.h |  4 +--
 2 files changed, 29 insertions(+), 23 deletions(-)

(limited to 'plugins/FloatingContacts')

diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp
index 394eec15ef..c117ee54ab 100644
--- a/plugins/FloatingContacts/src/main.cpp
+++ b/plugins/FloatingContacts/src/main.cpp
@@ -18,6 +18,7 @@ No warranty for any misbehaviour.
 
 #include "../../utils/mir_fonts.h"
 
+/////////////////////////////////////////////////////////////////////////////
 // Globals
 
 // TODO: move to some more approriate place, probably part of Thumbs manager
@@ -66,7 +67,33 @@ CMPlugin g_plugin;
 int &hLangpack(g_plugin.m_hLang);
 CLIST_INTERFACE *pcli;
 
-//Options
+/////////////////////////////////////////////////////////////////////////////
+
+PLUGININFOEX pluginInfoEx =
+{
+	sizeof(PLUGININFOEX),
+	__PLUGIN_NAME,
+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+	__DESCRIPTION,
+	__AUTHOR,
+	__COPYRIGHT,
+	__AUTHORWEB,
+	UNICODE_AWARE,
+	// {53C715A8-EB01-4136-A73C-441868610074}
+	{0x53c715a8, 0xeb01, 0x4136, {0xa7, 0x3c, 0x44, 0x18, 0x68, 0x61, 0x0, 0x74}}
+};
+
+CMPlugin::CMPlugin() :
+	PLUGIN<CMPlugin>(MODULE, pluginInfoEx)
+{}
+
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
+{
+	return &pluginInfoEx;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Options
 
 FCOptions fcOpt = { 0 };
 
@@ -88,25 +115,6 @@ static void InitOptions()
 	fcOpt.bShowIdle = TRUE;
 }
 
-PLUGININFOEX pluginInfoEx =
-{
-	sizeof(PLUGININFOEX),
-	__PLUGIN_NAME,
-	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
-	__DESCRIPTION,
-	__AUTHOR,
-	__COPYRIGHT,
-	__AUTHORWEB,
-	UNICODE_AWARE,
-	// {53C715A8-EB01-4136-A73C-441868610074}
-	{ 0x53c715a8, 0xeb01, 0x4136, { 0xa7, 0x3c, 0x44, 0x18, 0x68, 0x61, 0x0, 0x74 } }
-};
-
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
-{
-	return &pluginInfoEx;
-}
-
 /////////////////////////////////////////////////////////////////////////////
 // Fonts
 
diff --git a/plugins/FloatingContacts/src/stdafx.h b/plugins/FloatingContacts/src/stdafx.h
index 82a8666bb7..532c1d94df 100644
--- a/plugins/FloatingContacts/src/stdafx.h
+++ b/plugins/FloatingContacts/src/stdafx.h
@@ -36,9 +36,7 @@
 
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
-	CMPlugin() :
-		PLUGIN<CMPlugin>(MODULE)
-	{}
+	CMPlugin();
 };
 
 #endif	// #ifndef __STDHDR_H__
-- 
cgit v1.2.3