From ecdf7d3b7d5bafe9437df0cc80ef0383c821a029 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 15 Jun 2012 21:57:27 +0000 Subject: unneeded MirandaPluginInterfaces removal git-svn-id: http://svn.miranda-ng.org/main/trunk@441 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AutoRun/autorun.vcxproj | 4 ++-- plugins/AutoRun/main.c | 5 ----- plugins/BASS_interface/Main.cpp | 6 ------ plugins/Db_autobackups/main.c | 6 ------ plugins/FirstRun/main.c | 5 ----- plugins/FloatingContacts/main.cpp | 7 ------- plugins/HistorySweeperLight/main.c | 6 ------ plugins/ModernOpt/main.cpp | 10 ---------- plugins/PackUpdater/Src/PackUpdater.cpp | 7 ------- plugins/QuickReplies/quickreplies.cpp | 7 ------- plugins/mTextControl/src/main.cpp | 6 ------ 11 files changed, 2 insertions(+), 67 deletions(-) diff --git a/plugins/AutoRun/autorun.vcxproj b/plugins/AutoRun/autorun.vcxproj index a83f7fb32d..5b6b16ed91 100644 --- a/plugins/AutoRun/autorun.vcxproj +++ b/plugins/AutoRun/autorun.vcxproj @@ -76,7 +76,7 @@ Level3 true ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;autorun_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;autorun_EXPORTS;%(PreprocessorDefinitions) OnlyExplicitInline false Size @@ -127,7 +127,7 @@ Full Level3 ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;autorun_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;autorun_EXPORTS;%(PreprocessorDefinitions) Default OnlyExplicitInline Size diff --git a/plugins/AutoRun/main.c b/plugins/AutoRun/main.c index c1c7263d68..84745d3b11 100644 --- a/plugins/AutoRun/main.c +++ b/plugins/AutoRun/main.c @@ -147,11 +147,6 @@ __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) return &pluginInfoEx; } -static const MUUID interfaces[] = {MIID_AUTORUN, MIID_LAST}; -__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} int __declspec(dllexport) Load(PLUGINLINK *link) { diff --git a/plugins/BASS_interface/Main.cpp b/plugins/BASS_interface/Main.cpp index 3744757ada..4a5cdfbf03 100644 --- a/plugins/BASS_interface/Main.cpp +++ b/plugins/BASS_interface/Main.cpp @@ -39,12 +39,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfo; } -static const MUUID interfaces[] = {MIID_BASSINT, MIID_LAST}; -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - #define MAXCHAN 5 static TCHAR CurrBassPath[MAX_PATH], tmp[MAX_PATH]; static int sndNSnd = 0, sndLimSnd; diff --git a/plugins/Db_autobackups/main.c b/plugins/Db_autobackups/main.c index e90f08b0c8..87de4cb9a0 100644 --- a/plugins/Db_autobackups/main.c +++ b/plugins/Db_autobackups/main.c @@ -170,12 +170,6 @@ __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) return &pluginInfo; } -static const MUUID interfaces[] = {MIID_DB_AUTOBACKUPS, MIID_LAST}; -__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - int __declspec(dllexport) Load(PLUGINLINK *link) { pluginLink=link; diff --git a/plugins/FirstRun/main.c b/plugins/FirstRun/main.c index d679f8c3f6..206d2cd518 100644 --- a/plugins/FirstRun/main.c +++ b/plugins/FirstRun/main.c @@ -51,11 +51,6 @@ __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) return &pluginInfo; } -static const MUUID interfaces[] = {MIID_FIRSTRUN, MIID_LAST}; -__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} int __declspec(dllexport) Load(PLUGINLINK *link) { diff --git a/plugins/FloatingContacts/main.cpp b/plugins/FloatingContacts/main.cpp index e8b47a684c..fc098001d3 100644 --- a/plugins/FloatingContacts/main.cpp +++ b/plugins/FloatingContacts/main.cpp @@ -148,13 +148,6 @@ static void InitOptions() { // {53C715A8-EB01-4136-A73C-441868610074} #define MIID_FLTCONT { 0x53c715a8, 0xeb01, 0x4136, { 0xa7, 0x3c, 0x44, 0x18, 0x68, 0x61, 0x0, 0x74 } } -static const MUUID interfaces[] = {MIID_FLTCONT, MIID_LAST}; - -extern "C" __declspec(dllexport) const MUUID * MirandaPluginInterfaces(void) -{ - return interfaces; -} - PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), __PLUGIN_NAME, diff --git a/plugins/HistorySweeperLight/main.c b/plugins/HistorySweeperLight/main.c index 868a0952f6..150f54a95f 100644 --- a/plugins/HistorySweeperLight/main.c +++ b/plugins/HistorySweeperLight/main.c @@ -154,12 +154,6 @@ __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) return &pluginInfoEx; } -static const MUUID interfaces[] = {MIID_HISTORYSWEEPERLIGHT, MIID_LAST}; -__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - int __declspec(dllexport) Load(PLUGINLINK *link) { pluginLink = link; diff --git a/plugins/ModernOpt/main.cpp b/plugins/ModernOpt/main.cpp index 89d59ab115..6cdb0d671b 100644 --- a/plugins/ModernOpt/main.cpp +++ b/plugins/ModernOpt/main.cpp @@ -35,16 +35,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx; } -///////////////////////////////////////////////////////////////////////////////////////// -// MirandaPluginInterfaces - returns the protocol interface to the core - -static const MUUID interfaces[] = {{ 0x621f886b, 0xa7f6, 0x457f, { 0x9d, 0x62, 0x8e, 0xe8, 0x4c, 0x27, 0x59, 0x93 }}, MIID_LAST }; - -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - ///////////////////////////////////////////////////////////////////////////////////////// // Performs a primary set of actions upon plugin loading diff --git a/plugins/PackUpdater/Src/PackUpdater.cpp b/plugins/PackUpdater/Src/PackUpdater.cpp index d50b045e37..308a3d04d4 100644 --- a/plugins/PackUpdater/Src/PackUpdater.cpp +++ b/plugins/PackUpdater/Src/PackUpdater.cpp @@ -52,13 +52,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx; } -static const MUUID interfaces[] = {{0x29517be5, 0x779a, 0x48e5, {0x89, 0x50, 0xcb, 0x4d, 0xe1, 0xd4, 0x31, 0x72}}, MIID_LAST}; - -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - extern "C" __declspec(dllexport) int Load(PLUGINLINK *link) { CLISTMENUITEM mi; diff --git a/plugins/QuickReplies/quickreplies.cpp b/plugins/QuickReplies/quickreplies.cpp index 441e4bf863..7f50f9be38 100644 --- a/plugins/QuickReplies/quickreplies.cpp +++ b/plugins/QuickReplies/quickreplies.cpp @@ -54,13 +54,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx; } -static const MUUID interfaces[] = {{0xa6a031b6, 0xd32f, 0x4842, {0x98, 0xc6, 0xec, 0x71, 0x6c, 0x57, 0x6b, 0x77}} , MIID_LAST}; - -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - extern "C" __declspec(dllexport) int Load(PLUGINLINK* link) { pluginLink = link; diff --git a/plugins/mTextControl/src/main.cpp b/plugins/mTextControl/src/main.cpp index 5418a7373b..2add659e34 100644 --- a/plugins/mTextControl/src/main.cpp +++ b/plugins/mTextControl/src/main.cpp @@ -66,12 +66,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx; } -extern "C" __declspec(dllexport) const MUUID *MirandaPluginInterfaces(void) -{ - static const MUUID interfaces[] = { MTEXT_UUID, MIID_LAST }; - return interfaces; -} - extern "C" __declspec(dllexport) int Load(PLUGINLINK *link) { pluginLink = link; -- cgit v1.2.3