diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-16 12:16:15 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-16 12:16:15 +0000 |
| commit | aafecc66f4056279e5ddccf7804b147b54167612 (patch) | |
| tree | 2f7b12d1120a48c532ab5749bd717668a2ba7a19 | |
| parent | 5750b26d1a312d0298381de81430a77d96192fb2 (diff) | |
another portion of unneeded MirandaPluginInterfaces removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@444 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/ChangeKeyboardLayout/main.c | 7 | ||||
| -rw-r--r-- | plugins/CyrTranslit/main.cpp | 6 | ||||
| -rw-r--r-- | plugins/JSON/miminterface.cpp | 5 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/main.cpp | 10 | ||||
| -rw-r--r-- | plugins/TopToolBar/main.cpp | 9 |
5 files changed, 2 insertions, 35 deletions
diff --git a/plugins/ChangeKeyboardLayout/main.c b/plugins/ChangeKeyboardLayout/main.c index 1cd793f4f7..188813111c 100644 --- a/plugins/ChangeKeyboardLayout/main.c +++ b/plugins/ChangeKeyboardLayout/main.c @@ -40,13 +40,6 @@ __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) return &pluginInfoEx;
}
-static const MUUID interfaces[] = {{0xc5ef53a8, 0x80d4, 0x4ce9, { 0xb3, 0x41, 0xec, 0x90, 0xd3, 0xec, 0x91, 0x56 }}, MIID_LAST};
-
-__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
-{
- return interfaces;
-}
-
int __declspec(dllexport) Load(PLUGINLINK *link)
{
diff --git a/plugins/CyrTranslit/main.cpp b/plugins/CyrTranslit/main.cpp index 4d07deb714..88e0aa31a9 100644 --- a/plugins/CyrTranslit/main.cpp +++ b/plugins/CyrTranslit/main.cpp @@ -55,12 +55,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx;
}
-static const MUUID interfaces[] = {MIID_V_CYRTRANSLIT, MIID_LAST};
-
-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
-{
- return interfaces;
-}
//------------------------------------------------------------------------------
diff --git a/plugins/JSON/miminterface.cpp b/plugins/JSON/miminterface.cpp index 51260d3901..8b16cbdb81 100644 --- a/plugins/JSON/miminterface.cpp +++ b/plugins/JSON/miminterface.cpp @@ -11,8 +11,6 @@ MM_INTERFACE mmi;
PLUGINLINK* pluginLink; // Struct of functions pointers for service calls
-static const MUUID interfaces[] = {MIID_LIBJSON,MIID_LAST};
-
static HANDLE s_services[53];
PLUGININFOEX pluginInfo={
@@ -40,9 +38,6 @@ extern "C" { return &pluginInfo;
}
- __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) {
- return interfaces;
- }
__declspec(dllexport) int Unload(void) {
for (HANDLE* service=s_services; *service; service++) {
diff --git a/plugins/KeyboardNotify/main.cpp b/plugins/KeyboardNotify/main.cpp index 66ee22dcf9..2280d08c8f 100644 --- a/plugins/KeyboardNotify/main.cpp +++ b/plugins/KeyboardNotify/main.cpp @@ -305,6 +305,7 @@ BOOL bReminderDisabled = FALSE; char *szMetaProto = NULL;
BYTE bMetaProtoEnabled = 0;
+#define MIID_KBDNOTIFY {0x119d7288, 0x2050, 0x448d, { 0x99, 0x00, 0xd8, 0x6a, 0xc7, 0x04, 0x26, 0xbf }}
PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
@@ -317,7 +318,7 @@ PLUGININFOEX pluginInfo={ "http://addons.miranda-im.org/",
UNICODE_AWARE,
0, //doesn't replace anything built-in
- {0x119d7288, 0x2050, 0x448d, { 0x99, 0x00, 0xd8, 0x6a, 0xc7, 0x04, 0x26, 0xbf }} //{119D7288-2050-448d-9900-D86AC70426BF}
+ MIID_KBDNOTIFY //{119D7288-2050-448d-9900-D86AC70426BF}
};
@@ -1139,13 +1140,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfo;
}
-#define MIID_KBDNOTIFY {0x119d7288, 0x2050, 0x448d, { 0x99, 0x00, 0xd8, 0x6a, 0xc7, 0x04, 0x26, 0xbf }}
-static const MUUID interfaces[] = {MIID_KBDNOTIFY, 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/TopToolBar/main.cpp b/plugins/TopToolBar/main.cpp index 38f1805379..7fd001a4fb 100644 --- a/plugins/TopToolBar/main.cpp +++ b/plugins/TopToolBar/main.cpp @@ -22,15 +22,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /////////////////////////////////////////////////////////////////////////////////////////
-static const MUUID interfaces[] = {MIID_TTB, MIID_LAST};
-
-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
-{
- return interfaces;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
PLUGININFOEX pluginInfo =
{
sizeof(PLUGININFOEX),
|