From a7d5cce8e2cea97d52a35a1769d0e87e84e5502a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 23 May 2018 16:11:59 +0300 Subject: we don't need MirandaPluginInfoEx() anymore. farewell, my lovely --- protocols/Discord/src/main.cpp | 13 ++++--------- protocols/Dummy/src/main.cpp | 5 ----- protocols/EmLanProto/src/amdproto.cpp | 5 ----- protocols/FacebookRM/src/main.cpp | 6 ------ protocols/Gadu-Gadu/src/gg.cpp | 5 ----- protocols/ICQCorp/src/corp.cpp | 5 ----- protocols/IRCG/src/main.cpp | 5 ----- protocols/IcqOscarJ/src/init.cpp | 5 ----- protocols/JabberG/src/jabber.cpp | 5 ----- protocols/MRA/src/Mra.cpp | 5 ----- protocols/MSN/src/msn.cpp | 5 ----- protocols/MinecraftDynmap/src/main.cpp | 5 ----- protocols/Omegle/src/main.cpp | 6 ------ protocols/Sametime/src/sametime.cpp | 5 ----- protocols/SkypeWeb/src/main.cpp | 5 ----- protocols/Steam/src/main.cpp | 5 ----- protocols/Tox/src/main.cpp | 5 ----- protocols/Twitter/src/main.cpp | 5 ----- protocols/VKontakte/src/main.cpp | 5 ----- 19 files changed, 4 insertions(+), 101 deletions(-) (limited to 'protocols') diff --git a/protocols/Discord/src/main.cpp b/protocols/Discord/src/main.cpp index 0b8404bf3d..e72f02b6a8 100644 --- a/protocols/Discord/src/main.cpp +++ b/protocols/Discord/src/main.cpp @@ -18,8 +18,12 @@ along with this program. If not, see . #include "stdafx.h" CHAT_MANAGER *pci; +CMPlugin g_plugin; + HWND g_hwndHeartbeat; +///////////////////////////////////////////////////////////////////////////////////////// + PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), __PLUGIN_NAME, @@ -39,15 +43,6 @@ CMPlugin::CMPlugin() : SetUniqueId(DB_KEY_ID); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - -///////////////////////////////////////////////////////////////////////////////////////// - -CMPlugin g_plugin; - ///////////////////////////////////////////////////////////////////////////////////////// // Interface information diff --git a/protocols/Dummy/src/main.cpp b/protocols/Dummy/src/main.cpp index 2c0203959b..79a8bedbdd 100644 --- a/protocols/Dummy/src/main.cpp +++ b/protocols/Dummy/src/main.cpp @@ -45,11 +45,6 @@ CMPlugin::CMPlugin() : SetUniqueId(templates[id].setting); } -extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp index 09893f2b12..6c02c60c61 100644 --- a/protocols/EmLanProto/src/amdproto.cpp +++ b/protocols/EmLanProto/src/amdproto.cpp @@ -37,11 +37,6 @@ CMPlugin::CMPlugin() : SetUniqueId("Nick"); } -extern "C" __declspec(dllexport) PLUGININFOEX* __cdecl MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// // Interface information diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp index 615b398450..97d57a5c4c 100644 --- a/protocols/FacebookRM/src/main.cpp +++ b/protocols/FacebookRM/src/main.cpp @@ -48,12 +48,6 @@ CMPlugin::CMPlugin() : SetUniqueId(FACEBOOK_KEY_ID); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) -{ - g_mirandaVersion = mirandaVersion; - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// // Interface information diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index 8c41562922..c6230db354 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -53,11 +53,6 @@ CMPlugin::CMPlugin() : SetUniqueId(GG_KEY_UIN); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ////////////////////////////////////////////////////////// extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; diff --git a/protocols/ICQCorp/src/corp.cpp b/protocols/ICQCorp/src/corp.cpp index be1339f51b..497037cf06 100644 --- a/protocols/ICQCorp/src/corp.cpp +++ b/protocols/ICQCorp/src/corp.cpp @@ -52,11 +52,6 @@ CMPlugin::CMPlugin() : Proto_SetUniqueId(protoName, "UIN"); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ////////////////////////////////////////////////////////////////////////// // Interface information diff --git a/protocols/IRCG/src/main.cpp b/protocols/IRCG/src/main.cpp index d8c7760439..e8b9724a67 100644 --- a/protocols/IRCG/src/main.cpp +++ b/protocols/IRCG/src/main.cpp @@ -60,11 +60,6 @@ CMPlugin::CMPlugin() : SetUniqueId("Nick"); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp index 03458a6e91..40edf08637 100644 --- a/protocols/IcqOscarJ/src/init.cpp +++ b/protocols/IcqOscarJ/src/init.cpp @@ -52,11 +52,6 @@ CMPlugin::CMPlugin() : SetUniqueId(UNIQUEIDSETTING); } -extern "C" PLUGININFOEX __declspec(dllexport) *MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp index be35a6b994..21900ab114 100755 --- a/protocols/JabberG/src/jabber.cpp +++ b/protocols/JabberG/src/jabber.cpp @@ -77,11 +77,6 @@ CMPlugin::CMPlugin() : SetUniqueId("jid"); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp index aafa5594be..cc50b71add 100644 --- a/protocols/MRA/src/Mra.cpp +++ b/protocols/MRA/src/Mra.cpp @@ -34,11 +34,6 @@ CMPlugin::CMPlugin() : SetUniqueId("e-mail"); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; diff --git a/protocols/MSN/src/msn.cpp b/protocols/MSN/src/msn.cpp index 2d0ebe2729..5b39364a1d 100644 --- a/protocols/MSN/src/msn.cpp +++ b/protocols/MSN/src/msn.cpp @@ -62,11 +62,6 @@ CMPlugin::CMPlugin() : SetUniqueId("wlid"); } -extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// // MirandaInterfaces - returns the protocol interface to the core diff --git a/protocols/MinecraftDynmap/src/main.cpp b/protocols/MinecraftDynmap/src/main.cpp index 46b8ec8e9d..d65a46fed8 100644 --- a/protocols/MinecraftDynmap/src/main.cpp +++ b/protocols/MinecraftDynmap/src/main.cpp @@ -46,11 +46,6 @@ CMPlugin::CMPlugin() : SetUniqueId("Nick"); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// // Interface information diff --git a/protocols/Omegle/src/main.cpp b/protocols/Omegle/src/main.cpp index 4e3a855042..8f1e9a35d5 100644 --- a/protocols/Omegle/src/main.cpp +++ b/protocols/Omegle/src/main.cpp @@ -51,12 +51,6 @@ CMPlugin::CMPlugin() : SetUniqueId("Nick"); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) -{ - g_mirandaVersion = mirandaVersion; - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// // Interface information diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp index 9f13661814..43ab40c2f8 100644 --- a/protocols/Sametime/src/sametime.cpp +++ b/protocols/Sametime/src/sametime.cpp @@ -25,11 +25,6 @@ CMPlugin::CMPlugin() : SetUniqueId("stid"); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// CMPlugin g_plugin; diff --git a/protocols/SkypeWeb/src/main.cpp b/protocols/SkypeWeb/src/main.cpp index 3ad43bdb3b..394126f175 100644 --- a/protocols/SkypeWeb/src/main.cpp +++ b/protocols/SkypeWeb/src/main.cpp @@ -46,11 +46,6 @@ CMPlugin::CMPlugin() : SetUniqueId(SKYPE_SETTINGS_ID); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; diff --git a/protocols/Steam/src/main.cpp b/protocols/Steam/src/main.cpp index d3800ab357..e42ef84bd4 100644 --- a/protocols/Steam/src/main.cpp +++ b/protocols/Steam/src/main.cpp @@ -26,11 +26,6 @@ CMPlugin::CMPlugin() : SetUniqueId("SteamID"); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; diff --git a/protocols/Tox/src/main.cpp b/protocols/Tox/src/main.cpp index b96745c315..0d128b5d65 100644 --- a/protocols/Tox/src/main.cpp +++ b/protocols/Tox/src/main.cpp @@ -28,11 +28,6 @@ CMPlugin::CMPlugin() : SetUniqueId(TOX_SETTINGS_ID); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; diff --git a/protocols/Twitter/src/main.cpp b/protocols/Twitter/src/main.cpp index dd2a9743d3..16a00f0ac9 100644 --- a/protocols/Twitter/src/main.cpp +++ b/protocols/Twitter/src/main.cpp @@ -46,11 +46,6 @@ CMPlugin::CMPlugin() : SetUniqueId(TWITTER_KEY_UN); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; diff --git a/protocols/VKontakte/src/main.cpp b/protocols/VKontakte/src/main.cpp index 89e02ff532..493c01411a 100644 --- a/protocols/VKontakte/src/main.cpp +++ b/protocols/VKontakte/src/main.cpp @@ -43,11 +43,6 @@ CMPlugin::CMPlugin() : SetUniqueId("ID"); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfoEx; -} - ///////////////////////////////////////////////////////////////////////////////////////// extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; -- cgit v1.2.3