removed not needed interfaces

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

4 files changed, 5 insertions, 24 deletions

diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp
index 9b94400299..b9aacd198b 100644
--- a/plugins/YAPP/src/yapp.cpp
+++ b/plugins/YAPP/src/yapp.cpp
@@ -2,7 +2,6 @@
 //

 

 #include "common.h"

-#include "yapp.h"

 #include "version.h"

 #include "message_pump.h"

 #include "options.h"

@@ -37,23 +36,21 @@ PLUGININFOEX pluginInfo={
 	__COPYRIGHT,

 	__AUTHORWEB,

 	UNICODE_AWARE,

-	{ 0xefd15f16, 0x7ae4, 0x40d7, { 0xa8, 0xe3, 0xa4, 0x11, 0xed, 0x74, 0x7b, 0xd5 } } // {EFD15F16-7AE4-40d7-A8E3-A411ED747BD5}

+	// {EFD15F16-7AE4-40d7-A8E3-A411ED747BD5}

+	{0xefd15f16, 0x7ae4, 0x40d7, {0xa8, 0xe3, 0xa4, 0x11, 0xed, 0x74, 0x7b, 0xd5 }}

 };

 

 extern "C" BOOL APIENTRY DllMain( HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)

 {

 	hInst = hModule;

-	DisableThreadLibraryCalls(hInst);

 	return TRUE;

 }

 

-extern "C" YAPP_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

 {

 	return &pluginInfo;

 }

 

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

-

 int ReloadFont(WPARAM wParam, LPARAM lParam) 

 {

 	LOGFONT log_font;

@@ -172,7 +169,7 @@ int PreShutdown(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-extern "C" int YAPP_API Load(void) {

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

 

 	mir_getLP(&pluginInfo);

 

@@ -186,7 +183,7 @@ extern "C" int YAPP_API Load(void) {
 	return 0;

 }

 

-extern "C" int YAPP_API Unload()

+extern "C" int __declspec(dllexport) Unload()

 {

 	DeinitNotify();

 	DeleteObject(hFontFirstLine);

diff --git a/plugins/YAPP/src/yapp.h b/plugins/YAPP/src/yapp.h
deleted file mode 100644
index de86e26295..0000000000
--- a/plugins/YAPP/src/yapp.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// The following ifdef block is the standard way of creating macros which make exporting 

-// from a DLL simpler. All files within this DLL are compiled with the POPUPS2_EXPORTS

-// symbol defined on the command line. this symbol should not be defined on any project

-// that uses this DLL. This way any other project whose source files include this file see 

-// POPUPS2_API functions as being imported from a DLL, whereas this DLL sees symbols

-// defined with this macro as being exported.

-#ifdef YAPP_EXPORTS

-#define YAPP_API __declspec(dllexport)

-#else

-#define YAPP_API __declspec(dllimport)

-#endif

-

diff --git a/plugins/YAPP/yapp_11.vcxproj b/plugins/YAPP/yapp_11.vcxproj
index 77151538a1..c083bada83 100644
--- a/plugins/YAPP/yapp_11.vcxproj
+++ b/plugins/YAPP/yapp_11.vcxproj
@@ -202,7 +202,6 @@
     <ClInclude Include="src\notify.h" />

     <ClInclude Include="src\options.h" />

     <ClInclude Include="src\yapp_history.h" />

-    <ClInclude Include="src\yapp.h" />

     <ClInclude Include="src\popwin.h" />

     <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\services.h" />

diff --git a/plugins/YAPP/yapp_11.vcxproj.filters b/plugins/YAPP/yapp_11.vcxproj.filters
index e1420633dc..872e1a2ec4 100644
--- a/plugins/YAPP/yapp_11.vcxproj.filters
+++ b/plugins/YAPP/yapp_11.vcxproj.filters
@@ -59,9 +59,6 @@
     <ClInclude Include="src\yapp_history.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\yapp.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\popwin.h">

       <Filter>Header Files</Filter>

     </ClInclude>