code cleaning

18 files changed, 19 insertions, 34 deletions

diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp
index 4c9b2eaf55..cedc28e0ec 100644
--- a/plugins/Clist_nicer/src/init.cpp
+++ b/plugins/Clist_nicer/src/init.cpp
@@ -83,7 +83,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD, LPVOID)
 	return TRUE;

 }

 

-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)

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

 {

 	return &pluginInfo;

 }

diff --git a/plugins/ConnectionNotify/src/ConnectionNotify.cpp b/plugins/ConnectionNotify/src/ConnectionNotify.cpp
index 8221497252..cb1e82dbec 100644
--- a/plugins/ConnectionNotify/src/ConnectionNotify.cpp
+++ b/plugins/ConnectionNotify/src/ConnectionNotify.cpp
@@ -54,7 +54,7 @@ PLUGININFOEX pluginInfo = {
 	{ 0x4bb5b4aa, 0xc364, 0x4f23, { 0x97, 0x46, 0xd5, 0xb7, 0x8, 0xa2, 0x86, 0xa5 } }

 };

 

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

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

 

 // authentication callback futnction from extension manager

 // ======================================

diff --git a/plugins/ConnectionNotify/src/stdafx.h b/plugins/ConnectionNotify/src/stdafx.h
index e6ec948c9d..2837c72125 100644
--- a/plugins/ConnectionNotify/src/stdafx.h
+++ b/plugins/ConnectionNotify/src/stdafx.h
@@ -34,11 +34,6 @@
 

 #define PLUGINNAME_NEWSOUND PLUGINNAME "_new_sound"

 

-#if !defined(MIID_CONNECTIONNOTIFY)

-	#define MIID_CONNECTIONNOTIFY  {0x4bb5b4aa, 0xc364, 0x4f23, { 0x97, 0x46, 0xd5, 0xb7, 0x8, 0xa2, 0x86, 0xa5 } }

-#endif

-// 4BB5B4AA-C364-4F23-9746-D5B708A286A5

-

 // Note: could also use malloc() and free()

 #define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))

 #define FREE(x) HeapFree(GetProcessHeap(), 0, (x))

diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp
index 2fa66baa6d..9974bcc60c 100644
--- a/plugins/DbEditorPP/src/main.cpp
+++ b/plugins/DbEditorPP/src/main.cpp
@@ -35,7 +35,7 @@ PLUGININFOEX pluginInfoEx =
 	{ 0xa8a417ef, 0x7aa, 0x4f37, { 0x86, 0x9f, 0x7b, 0xfd, 0x74, 0x88, 0x65, 0x34 } }

 };

 

-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)

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

 {

 	return &pluginInfoEx;

 }

diff --git a/plugins/Folders/src/folders.cpp b/plugins/Folders/src/folders.cpp
index 512d619ece..e31e048b24 100644
--- a/plugins/Folders/src/folders.cpp
+++ b/plugins/Folders/src/folders.cpp
@@ -39,7 +39,7 @@ PLUGININFOEX pluginInfo = {
 	{ 0x2f129563, 0x2c7d, 0x4a9a, { 0xb9, 0x48, 0x97, 0xdf, 0xcc, 0x0a, 0xfd, 0xd7 } }

 };

 

-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)

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

 {

 	return &pluginInfo;

 }

diff --git a/plugins/IEView/src/ieview_main.cpp b/plugins/IEView/src/ieview_main.cpp
index 64710f6511..2653da6948 100644
--- a/plugins/IEView/src/ieview_main.cpp
+++ b/plugins/IEView/src/ieview_main.cpp
@@ -45,7 +45,7 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD, LPVOID)
 	return TRUE;

 }

 

-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)

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

 {

 	return &pluginInfoEx;

 }

diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp
index 46903559dd..d13ff2253c 100644
--- a/plugins/LotusNotify/src/LotusNotify.cpp
+++ b/plugins/LotusNotify/src/LotusNotify.cpp
@@ -1759,7 +1759,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)
 	return &pluginInfo;

 }

 

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

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

 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID )

 {

diff --git a/plugins/LotusNotify/src/LotusNotify.h b/plugins/LotusNotify/src/LotusNotify.h
index b9b3f60a1a..89b2ff6762 100644
--- a/plugins/LotusNotify/src/LotusNotify.h
+++ b/plugins/LotusNotify/src/LotusNotify.h
@@ -15,12 +15,8 @@ struct POPUPSQUEUE
 	struct POPUPSQUEUE *next;

 };

 

-#if !defined(MIID_LOTUSNOTIFY)

-	#define MIID_LOTUSNOTIFY  {0x127faa08, 0x54d0, 0x4f99, { 0x8a, 0x50, 0x6b, 0x5f, 0xd8, 0x92, 0x42, 0xec } }

-#endif

-// {127FAA08-54D0-4f99-8A50-6B5FD89242EC}

+// structure contines only LN msg id to send to popup 

 

-//structure contines only LN msg id to send to popup 

 typedef struct {

 	DWORD id;

 	char strNote[4*16]; 

diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp
index 629ff6961c..d3728d8e39 100644
--- a/plugins/PluginUpdater/src/PluginUpdater.cpp
+++ b/plugins/PluginUpdater/src/PluginUpdater.cpp
@@ -46,7 +46,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
 	return TRUE;

 }

 

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

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

 {

 	g_mirandaVersion = mirandaVersion;

 	return &pluginInfoEx;

diff --git a/plugins/Scriver/src/srmm.cpp b/plugins/Scriver/src/srmm.cpp
index 6b47a73fa7..493e698e23 100644
--- a/plugins/Scriver/src/srmm.cpp
+++ b/plugins/Scriver/src/srmm.cpp
@@ -51,7 +51,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
 	return TRUE;

 }

 

-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)

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

 {

 	return &pluginInfo;

 }

diff --git a/plugins/TopToolBar/src/main.cpp b/plugins/TopToolBar/src/main.cpp
index 4d39833380..58cc361049 100644
--- a/plugins/TopToolBar/src/main.cpp
+++ b/plugins/TopToolBar/src/main.cpp
@@ -19,7 +19,7 @@ PLUGININFOEX pluginInfo =
 	{0xf593c752, 0x51d8, 0x4d46, {0xba, 0x27, 0x37, 0x57, 0x79, 0x53, 0xf5, 0x5c}}

 };

 

-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)

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

 {

 	return &pluginInfo;

 }

diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp
index 74e09292cd..39cb71211a 100644
--- a/plugins/UserInfoEx/src/init.cpp
+++ b/plugins/UserInfoEx/src/init.cpp
@@ -121,7 +121,7 @@ static int OnShutdown(WPARAM, LPARAM)
  *

  * @return	pointer to pluginInfo struct

  **/

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

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

 {

 	myGlobals.mirandaVersion = mirandaVersion;

 	return &pluginInfo;

diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index bb7855c744..c46aee7c65 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -149,12 +149,12 @@ const wchar_t *http_error_string(int h)
 //////////////////////////////////////////////////////////

 // Gets plugin info

 //

-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)

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

 {

 	return &pluginInfo;

 }

 

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

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

 

 //////////////////////////////////////////////////////////

 // Cleanups from last plugin

diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index fe30a49b98..ffeb046594 100755
--- a/protocols/JabberG/src/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
@@ -86,12 +86,12 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD, LPVOID)
 	return TRUE;

 }

 

-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)

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

 {

 	return &pluginInfo;

 }

 

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

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

 

 ///////////////////////////////////////////////////////////////////////////////

 // OnModulesLoaded - execute some code when all plugins are initialized

diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp
index 2e10d02fae..0c863e3c3a 100644
--- a/protocols/MRA/src/Mra.cpp
+++ b/protocols/MRA/src/Mra.cpp
@@ -36,15 +36,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID)
 		g_hInstance = hInstance;

 		DisableThreadLibraryCalls(hInstance);

 		break;

-	case DLL_PROCESS_DETACH:

-		/* Nothink to do. */

-		break;

 	}

 

 	return TRUE;

 }

 

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

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

 

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

 {

diff --git a/protocols/MSN/src/msn.cpp b/protocols/MSN/src/msn.cpp
index bc2cbfe464..697c1f6569 100644
--- a/protocols/MSN/src/msn.cpp
+++ b/protocols/MSN/src/msn.cpp
@@ -54,9 +54,6 @@ static const PLUGININFOEX pluginInfo =
 	{0x97724af9, 0xf3fb, 0x47d3, {0xa3, 0xbf, 0xea, 0xa9, 0x35, 0xc7, 0x4e, 0x6d}}

 };

 

-int MSN_GCEventHook(WPARAM wParam, LPARAM lParam);

-int MSN_GCMenuHook(WPARAM wParam, LPARAM lParam);

-

 // Protocol instances

 static int sttCompareProtocols(const CMsnProto *p1, const CMsnProto *p2)

 {

diff --git a/protocols/VKontakte/src/main.cpp b/protocols/VKontakte/src/main.cpp
index 8f367d6c02..dd9687a554 100644
--- a/protocols/VKontakte/src/main.cpp
+++ b/protocols/VKontakte/src/main.cpp
@@ -44,12 +44,12 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD, LPVOID)
 	return TRUE;

 }

 

-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)

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

 {

 	return &pluginInfo;

 }

 

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

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

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // OnLoad - initialize the plugin instance

diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp
index 9370093941..013341958c 100644
--- a/src/core/stdclist/src/init.cpp
+++ b/src/core/stdclist/src/init.cpp
@@ -65,7 +65,7 @@ PLUGININFOEX pluginInfo = {
 	{ 0x240a91dc, 0x9464, 0x457a, { 0x97, 0x87, 0xff, 0x1e, 0xa8, 0x8e, 0x77, 0xe2 } }

 };

 

-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)

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

 {

 	return &pluginInfo;

 }