Flags, CrashDumper, CryptoPP, CSList, Db_autobackups, DbEditorPP: cmplugin adaptation

2 files changed, 8 insertions, 11 deletions

diff --git a/plugins/CyrTranslit/src/main.cpp b/plugins/CyrTranslit/src/main.cpp
index e78a6732d1..13cb87d0a3 100644
--- a/plugins/CyrTranslit/src/main.cpp
+++ b/plugins/CyrTranslit/src/main.cpp
@@ -19,7 +19,7 @@
 

 #include "stdafx.h"

 

-HINSTANCE hInst;

+CMPlugin g_plugin;

 int hLangpack = 0;

 

 PLUGININFOEX pluginInfoEx={

@@ -36,14 +36,6 @@ PLUGININFOEX pluginInfoEx={
 

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

 

-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)

-{

-	hInst = hinstDLL;

-	return TRUE;

-}

-

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

-

 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)

 {

 	return &pluginInfoEx;

diff --git a/plugins/CyrTranslit/src/stdafx.h b/plugins/CyrTranslit/src/stdafx.h
index 9b8a6c9a2a..027a5f0907 100644
--- a/plugins/CyrTranslit/src/stdafx.h
+++ b/plugins/CyrTranslit/src/stdafx.h
@@ -22,8 +22,6 @@
 #include <windows.h>

 #include <map>

 

-#define __NO_CMPLUGIN_NEEDED

-

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_protosvc.h>

@@ -34,3 +32,10 @@
 #include "MirandaContact.h"

 #include "TransliterationMap.h"

 #include "TransliterationProtocol.h"

+

+struct CMPlugin : public PLUGIN<CMPlugin>

+{

+	CMPlugin() :

+		PLUGIN<CMPlugin>("CyrTranslit")

+	{}

+};