removed not needed interfaces

git-svn-id: http://svn.miranda-ng.org/main/trunk@3486 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

7 files changed, 21 insertions, 57 deletions

diff --git a/include/delphi/interfaces.inc b/include/delphi/interfaces.inc
index 3c92063080..3896da96a5 100644
--- a/include/delphi/interfaces.inc
+++ b/include/delphi/interfaces.inc
@@ -37,12 +37,6 @@ const MIID_TESTPLUGIN    :MUUID='{53B974F4-3C74-4DBA-8FC2-6F92FE013B8C}';
 

 const MIID_EXTRAICONSSERVICE:MUUID='{62D80749-F169-4592-B44D-3DD6DE9D50C5}';

 

-// Common plugin interfaces (non-core plugins)

-const MIID_LOGWINDOW     :MUUID='{C53AFB90-FA44-4304-BC9D-6A841C3905F5}';

-const MIID_EVENTNOTIFY   :MUUID='{F3D7EC5A-F7EF-45DD-8CA5-B0F6BA18647B}';

-const MIID_SRCONTACTS    :MUUID='{7CA6050E-BAF7-42D2-B936-0DB9DF572B95}';

-const MIID_HISTORYEXPORT :MUUID='{18FA2ADE-E31B-4B5D-953D-0AB25781C604}';

-

 const MIID_SMILEY        :MUUID='{E03C71B2-6DEE-467E-A4F0-DD516745876A}';

 const MIID_FLAGS         :MUUID='{88A3B66E-C438-4381-BC17-71D99D225F9C}';

 const MIID_SPELLCHECKER  :MUUID='{26EED12A-7016-4D0F-9B4A-0CAA7E2229F3}';

diff --git a/include/newpluginapi.h b/include/newpluginapi.h
index c240e2c8ff..698b41ecc9 100644
--- a/include/newpluginapi.h
+++ b/include/newpluginapi.h
@@ -71,12 +71,6 @@ typedef struct _MUUID {
 #define MIID_IMGSERVICES    {0xf3974915, 0xc9d5, 0x4c87, {0x85, 0x64, 0xa0, 0xeb, 0xf9, 0xd2, 0x5a, 0xa0}}

 #define MIID_TESTPLUGIN     {0x53b974f4, 0x3c74, 0x4dba, {0x8f, 0xc2, 0x6f, 0x92, 0xfe, 0x01, 0x3b, 0x8c}}

 

-/* Common plugin interfaces (non-core plugins) */

-#define MIID_LOGWINDOW      {0xc53afb90, 0xfa44, 0x4304, {0xbc, 0x9d, 0x6a, 0x84, 0x1c, 0x39, 0x05, 0xf5}}

-#define MIID_EVENTNOTIFY    {0xF3D7EC5A, 0xF7EF, 0x45DD, {0x8C, 0xA5, 0xB0, 0xF6, 0xBA, 0x18, 0x64, 0x7B}}

-#define MIID_SRCONTACTS     {0x7CA6050E, 0xBAF7, 0x42D2, {0xB9, 0x36, 0x0D, 0xB9, 0xDF, 0x57, 0x2B, 0x95}}

-#define MIID_HISTORYEXPORT  {0x18fa2ade, 0xe31b, 0x4b5d, {0x95, 0x3d, 0x0a, 0xb2, 0x57, 0x81, 0xc6, 0x04}}

-

 /* Special exception interface for protocols.

    This interface allows more than one plugin to implement it at the same time

 */

diff --git a/plugins/Console/src/init.cpp b/plugins/Console/src/init.cpp
index 179f1990d3..5dc110e778 100644
--- a/plugins/Console/src/init.cpp
+++ b/plugins/Console/src/init.cpp
@@ -37,11 +37,11 @@ PLUGININFOEX pluginInfoEx={
 	__PLUGIN_RIGHTS,

 	__PLUGIN_URL,

 	UNICODE_AWARE,

-	{ 0x23d4f302, 0xd513, 0x45b7, { 0x90, 0x27, 0x44, 0x5f, 0x29, 0x55, 0x73, 0x11 }} // {23D4F302-D513-45b7-9027-445F29557311}

-

+	// {23D4F302-D513-45b7-9027-445F29557311}

+	{0x23d4f302, 0xd513, 0x45b7, {0x90, 0x27, 0x44, 0x5f, 0x29, 0x55, 0x73, 0x11}}

 };

 

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

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

 {

 	hInst = hinstDLL;

 	return TRUE;

@@ -52,9 +52,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfoEx;

 }

 

-// we implement service mode interface

-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_LOGWINDOW, MIID_LAST};

-

 extern "C" __declspec(dllexport) int Load(void)

 {

 	mir_getLP(&pluginInfoEx);

diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp
index 0db72163fd..c90ca712f0 100644
--- a/plugins/ContactsPlus/src/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
@@ -48,19 +48,19 @@ HANDLE hContactMenuItem = NULL;
 int g_UnicodeCore;

 

 PLUGININFOEX pluginInfo = {

-  sizeof(PLUGININFOEX),

-  "Send/Receive Contacts+",

-   PLUGIN_MAKE_VERSION(1,5,2,0),

-  "Allows you to send and receive contacts.",

-  "Joe Kucera, Todor Totev",

-  "jokusoftware@miranda-im.org",

-  "(C) 2004-2008 Joe Kucera, Original Code (C) 2002 Dominus Procellarum",

-  "http://miranda-ng.org/",

-  UNICODE_AWARE,

-  {0x0324785E, 0x74CE, 0x4600,  {0xB7, 0x81, 0x85, 0x17, 0x73, 0xB3, 0xEF, 0xC5 } } // {0324785E-74CE-4600-B781-851773B3EFC5}

+	sizeof(PLUGININFOEX),

+	"Send/Receive Contacts+",

+	PLUGIN_MAKE_VERSION(1,5,2,0),

+	"Allows you to send and receive contacts.",

+	"Joe Kucera, Todor Totev",

+	"jokusoftware@miranda-im.org",

+	"(C) 2004-2008 Joe Kucera, Original Code (C) 2002 Dominus Procellarum",

+	"http://miranda-ng.org/",

+	UNICODE_AWARE,

+	// {0324785E-74CE-4600-B781-851773B3EFC5}

+	{0x0324785E, 0x74CE, 0x4600, {0xB7, 0x81, 0x85, 0x17, 0x73, 0xB3, 0xEF, 0xC5}}

 };

 

-

 static int HookDBEventAdded(WPARAM wParam, LPARAM lParam)

 {

   HANDLE hContact = (HANDLE)wParam;

@@ -101,7 +101,6 @@ static int HookDBEventAdded(WPARAM wParam, LPARAM lParam)
   return 0; //continue processing by other hooks

 }

 

-

 static void ProcessUnreadEvents(void)

 {

 	DBEVENTINFO dbei = {0};

@@ -127,7 +126,6 @@ static void ProcessUnreadEvents(void)
 	}

 }

 

-

 static bool CheckContactsServiceSupport(const char* szProto)

 {

 	// there is no way to determine if the service exists (only proto_interface call is supported by 0.8+)

@@ -137,7 +135,6 @@ static bool CheckContactsServiceSupport(const char* szProto)
 		return false;

 }

 

-

 static int HookPreBuildContactMenu(WPARAM wParam, LPARAM lParam)

 {

 	HANDLE hContact = (HANDLE)wParam;

@@ -162,7 +159,6 @@ static int HookPreBuildContactMenu(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-

 static int HookModulesLoaded(WPARAM wParam, LPARAM lParam)

 {

 	char* modules[2] = {0};

@@ -190,7 +186,6 @@ static int HookModulesLoaded(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-

 static int HookContactSettingChanged(WPARAM wParam, LPARAM lParam)

 {

   DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;

@@ -204,7 +199,6 @@ static int HookContactSettingChanged(WPARAM wParam, LPARAM lParam)
   return 0;

 }

 

-

 static int HookContactDeleted(WPARAM wParam, LPARAM lParam)

 {  // if our contact gets deleted close his window

   HWND h = WindowList_Find(ghSendWindowList,(HANDLE)wParam);

@@ -221,7 +215,6 @@ static int HookContactDeleted(WPARAM wParam, LPARAM lParam)
   return 0;

 }

 

-

 static INT_PTR ServiceSendCommand(WPARAM wParam, LPARAM lParam)

 {

   HWND hWnd;

@@ -252,8 +245,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfo;

 }

 

-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_SRCONTACTS, MIID_LAST};

-

 extern "C" __declspec(dllexport) int Load(void)

 {

 	mir_getLP(&pluginInfo);

diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr
index acde07e54d..876722eca7 100644
--- a/plugins/HistoryPlusPlus/historypp.dpr
+++ b/plugins/HistoryPlusPlus/historypp.dpr
@@ -149,14 +149,13 @@ begin
 end;

 

 var

-  PluginInterfaces: array[0..2] of TGUID;

+  PluginInterfaces: array[0..1] of TGUID;

 

 // tell Miranda about supported interfaces

 function MirandaPluginInterfaces:PMUUID; cdecl;

 begin

   PluginInterfaces[0]:=MIID_UIHISTORY;

-  PluginInterfaces[1]:=MIID_LOGWINDOW;

-  PluginInterfaces[2]:=MIID_LAST;

+  PluginInterfaces[1]:=MIID_LAST;

   Result := @PluginInterfaces;

 end;

 

diff --git a/plugins/IEView/src/ieview_main.cpp b/plugins/IEView/src/ieview_main.cpp
index 84277c6750..247a80c67a 100644
--- a/plugins/IEView/src/ieview_main.cpp
+++ b/plugins/IEView/src/ieview_main.cpp
@@ -43,7 +43,8 @@ PLUGININFOEX pluginInfoEx = {
 	__COPYRIGHT,

 	__AUTHORWEB,

 	UNICODE_AWARE,

-	{0x0495171b,   0x7137,   0x4ded, {0x97, 0xf8, 0xce, 0x6f, 0xed, 0x67, 0xd6, 0x91}}

+	// 0495171B-7137-4DED-97F8-CE6FED67D691

+	{0x0495171b, 0x7137, 0x4ded, {0x97, 0xf8, 0xce, 0x6f, 0xed, 0x67, 0xd6, 0x91}}

 };

 

 extern "C" BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpvReserved)

@@ -57,8 +58,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfoEx;

 }

 

-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_LOGWINDOW, MIID_LAST};

-

 extern "C" int __declspec(dllexport) Load(void)

 {

 	char text[_MAX_PATH];

diff --git a/plugins/NewEventNotify/src/main.cpp b/plugins/NewEventNotify/src/main.cpp
index 4719ef820d..6c2c286396 100644
--- a/plugins/NewEventNotify/src/main.cpp
+++ b/plugins/NewEventNotify/src/main.cpp
@@ -46,7 +46,8 @@ PLUGININFOEX pluginInfo = {
 	"GNU GPL",

 	"http://miranda-ng.org/",

 	UNICODE_AWARE,

-	{0x3503D584, 0x6234, 0x4BEF, {0xA5, 0x53, 0x6C, 0x1B, 0x9C, 0xD4, 0x71, 0xF2 } } // {3503D584-6234-4BEF-A553-6C1B9CD471F2}

+	// {3503D584-6234-4BEF-A553-6C1B9CD471F2}

+	{0x3503D584, 0x6234, 0x4BEF, {0xA5, 0x53, 0x6C, 0x1B, 0x9C, 0xD4, 0x71, 0xF2}}

 };

 

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

@@ -76,15 +77,6 @@ int HookedNewEvent(WPARAM wParam, LPARAM lParam)
 	dbe.cbSize = sizeof(dbe);

 	CallService(MS_DB_EVENT_GET, (WPARAM)lParam, (LPARAM)&dbe);

 

-	// Nightwish (no popups for RSS contacts at all...)

-	if (pluginOptions.bNoRSS) 

-	{						

-		if (dbe.szModule != NULL) {

-			if (!strncmp(dbe.szModule, "RSS", 3))

-				return 0;

-		}

-	}

-

 	//do not show popups for sub-contacts

 	if (hContact && ServiceExists(MS_MC_GETMETACONTACT) && CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0))

 		return 0;

@@ -172,8 +164,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfo;

 }

 

-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_EVENTNOTIFY, MIID_LAST};

-

 extern "C" __declspec(dllexport) int Load(void)

 {

 	hHookedInit = HookEvent(ME_SYSTEM_MODULESLOADED, HookedInit);

@@ -200,7 +190,7 @@ extern "C" __declspec(dllexport) int Unload(void)
 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

 {

-	hInst=hinstDLL;

+	hInst = hinstDLL;

 	return TRUE;

 }