small cleanup

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

3 files changed, 7 insertions, 10 deletions

diff --git a/plugins/wbOSD/src/events.cpp b/plugins/wbOSD/src/events.cpp
index 83d5d79c6b..f4c08d4208 100644
--- a/plugins/wbOSD/src/events.cpp
+++ b/plugins/wbOSD/src/events.cpp
@@ -8,10 +8,6 @@ Distributed under GNU's GPL 2 or later
 */

 

 #include "wbOSD.h"

-#include <m_message.h>

-

-extern HWND hwnd;

-extern HANDLE hHookContactStatusChanged;

 

 void logmsg2(char *str)

 {

diff --git a/plugins/wbOSD/src/main.cpp b/plugins/wbOSD/src/main.cpp
index e0510ed36a..5c6cef5884 100644
--- a/plugins/wbOSD/src/main.cpp
+++ b/plugins/wbOSD/src/main.cpp
@@ -34,7 +34,7 @@ static PLUGININFOEX pluginInfo = {
 	__AUTHORWEB,

 	UNICODE_AWARE,

 	// {FC718BC7-ABC8-43CD-AAD9-761614617738}

-	{ 0xfc718bc7, 0xabc8, 0x43cd, { 0xaa, 0xd9, 0x76, 0x16, 0x14, 0x61, 0x77, 0x38 } }

+	{0xfc718bc7, 0xabc8, 0x43cd, {0xaa, 0xd9, 0x76, 0x16, 0x14, 0x61, 0x77, 0x38}}

 };

 

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

@@ -92,7 +92,7 @@ extern "C" __declspec(dllexport) int Unload()
 

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

 

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

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

 {

 	hI = hinst;

 	return TRUE;

diff --git a/plugins/wbOSD/src/wbOSD.h b/plugins/wbOSD/src/wbOSD.h
index d690b2e85a..c8f80ffb99 100644
--- a/plugins/wbOSD/src/wbOSD.h
+++ b/plugins/wbOSD/src/wbOSD.h
@@ -14,8 +14,6 @@ Distributed under GNU's GPL 2 or later
 #include <shlwapi.h>

 #include <commctrl.h>

 

-#include "resource.h"

-#include "version.h"

 #include <newpluginapi.h>

 #include <m_langpack.h>

 #include <m_database.h>

@@ -24,6 +22,10 @@ Distributed under GNU's GPL 2 or later
 #include <m_protosvc.h>

 #include <m_ignore.h>

 #include <win2k.h>

+#include <m_message.h>

+

+#include "resource.h"

+#include "version.h"

 

 #define THIS_MODULE "mirandaosd"

 

@@ -118,5 +120,4 @@ extern HINSTANCE hI;
 extern HWND hwnd;

 extern HANDLE hservosda;

 extern HANDLE hHookedNewEvent, hHookedInit, hProtoAck, hContactSettingChanged, hHookContactStatusChanged, hContactStatusChanged, hpluginShutDown;

-extern HINSTANCE hUser32;

-

+extern HINSTANCE hUser32;
\ No newline at end of file