From 88b04fed4966b0f1686690cb6101854afb52a5ee Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 17 May 2018 21:37:53 +0300
Subject: Db3x_mmap, Dbx_mdbx, Exchange, MyDetails, RecentContacts, TopToolBar,
 WebView => CMPlugin

---
 plugins/WebView/src/main.cpp  | 13 +++++++------
 plugins/WebView/src/stdafx.h  |  1 -
 plugins/WebView/src/webview.h |  1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'plugins/WebView/src')

diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp
index 303a58a03b..a5041f21c0 100644
--- a/plugins/WebView/src/main.cpp
+++ b/plugins/WebView/src/main.cpp
@@ -27,10 +27,15 @@ MWindowList hWindowList;
 HNETLIBUSER hNetlibUser;
 HANDLE hHookDisplayDataAlert, hHookAlertPopup, hHookAlertWPopup, hHookErrorPopup, hHookAlertOSD;
 
-int    hLangpack = 0;
+int hLangpack;
+CMPlugin g_plugin;
+
 static HMODULE hRichEd = nullptr;
 
-PLUGININFOEX pluginInfoEx = {
+/////////////////////////////////////////////////////////////////////////////////////////
+
+PLUGININFOEX pluginInfoEx =
+{
 	sizeof(PLUGININFOEX),
 	__PLUGIN_NAME,
 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
@@ -86,10 +91,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOC
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-CMPlugin g_plugin;
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
 extern "C" int __declspec(dllexport) Load()
 {
 	mir_getLP(&pluginInfoEx);
diff --git a/plugins/WebView/src/stdafx.h b/plugins/WebView/src/stdafx.h
index b214d3d6ea..3ce8c77b06 100644
--- a/plugins/WebView/src/stdafx.h
+++ b/plugins/WebView/src/stdafx.h
@@ -14,7 +14,6 @@
 #include <time.h>
 #include <wchar.h>
 
-#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_clist.h>
diff --git a/plugins/WebView/src/webview.h b/plugins/WebView/src/webview.h
index ced8d87a81..ee7d9ce62c 100644
--- a/plugins/WebView/src/webview.h
+++ b/plugins/WebView/src/webview.h
@@ -253,4 +253,3 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 		SetUniqueId("PreserveName");
 	}
 };
-
-- 
cgit v1.2.3