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/CyrTranslit/src/TransliterationProtocol.cpp |  6 +++---
 plugins/CyrTranslit/src/TransliterationProtocol.h   |  2 +-
 plugins/CyrTranslit/src/main.cpp                    | 11 +++++++----
 plugins/CyrTranslit/src/stdafx.h                    |  4 +---
 4 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'plugins/CyrTranslit')

diff --git a/plugins/CyrTranslit/src/TransliterationProtocol.cpp b/plugins/CyrTranslit/src/TransliterationProtocol.cpp
index 53382af667..516d2257d3 100644
--- a/plugins/CyrTranslit/src/TransliterationProtocol.cpp
+++ b/plugins/CyrTranslit/src/TransliterationProtocol.cpp
@@ -22,15 +22,15 @@
 namespace CyrTranslit
 {
 
-char *TransliterationProtocol::MODULE_NAME = "ProtoCyrTranslitByIKR";
+char *TransliterationProtocol::MODULENAME = "ProtoCyrTranslitByIKR";
 
 //------------------------------------------------------------------------------
 
 void TransliterationProtocol::initialize()
 {
-	Proto_RegisterModule(PROTOTYPE_TRANSLATION, MODULE_NAME);
+	Proto_RegisterModule(PROTOTYPE_TRANSLATION, MODULENAME);
 
-	CreateProtoServiceFunction(MODULE_NAME, PSS_MESSAGE, sendMessage);
+	CreateProtoServiceFunction(MODULENAME, PSS_MESSAGE, sendMessage);
 }
 
 //------------------------------------------------------------------------------
diff --git a/plugins/CyrTranslit/src/TransliterationProtocol.h b/plugins/CyrTranslit/src/TransliterationProtocol.h
index cf86d183bc..164debbfd4 100644
--- a/plugins/CyrTranslit/src/TransliterationProtocol.h
+++ b/plugins/CyrTranslit/src/TransliterationProtocol.h
@@ -49,7 +49,7 @@ public:
 	static void TranslateMessageUTF(WPARAM wParam, LPARAM lParam);
 
 private:
-	static char *MODULE_NAME;
+	static char *MODULENAME;
 
 	TransliterationProtocol();
 	~TransliterationProtocol();
diff --git a/plugins/CyrTranslit/src/main.cpp b/plugins/CyrTranslit/src/main.cpp
index 6822b00b0b..ec89d82d52 100644
--- a/plugins/CyrTranslit/src/main.cpp
+++ b/plugins/CyrTranslit/src/main.cpp
@@ -22,6 +22,8 @@
 CMPlugin g_plugin;
 int &hLangpack(g_plugin.m_hLang);
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
 PLUGININFOEX pluginInfoEx={
 	sizeof(PLUGININFOEX),
 	__PLUGIN_NAME,
@@ -34,15 +36,16 @@ PLUGININFOEX pluginInfoEx={
 	{0xbcec0bd7, 0xca59, 0x44b2, {0x9a, 0x14, 0x3a, 0x14, 0x98, 0x0f, 0x52, 0x4a}}
 };
 
-//------------------------------------------------------------------------------
+CMPlugin::CMPlugin() :
+	PLUGIN<CMPlugin>("CyrTranslit", pluginInfoEx)
+{}
 
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
 	return &pluginInfoEx;
 }
 
-
-//------------------------------------------------------------------------------
+/////////////////////////////////////////////////////////////////////////////////////////
 
 extern "C" __declspec(dllexport) int Load(void)
 {
@@ -54,7 +57,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	return 0;
 }
 
-//------------------------------------------------------------------------------
+/////////////////////////////////////////////////////////////////////////////////////////
 
 extern "C" __declspec(dllexport) int Unload(void)
 {
diff --git a/plugins/CyrTranslit/src/stdafx.h b/plugins/CyrTranslit/src/stdafx.h
index 027a5f0907..a2c3cd6387 100644
--- a/plugins/CyrTranslit/src/stdafx.h
+++ b/plugins/CyrTranslit/src/stdafx.h
@@ -35,7 +35,5 @@
 
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
-	CMPlugin() :
-		PLUGIN<CMPlugin>("CyrTranslit")
-	{}
+	CMPlugin();
 };
-- 
cgit v1.2.3