Popup: changed warning level to w4

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

1 files changed, 32 insertions, 32 deletions

diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp
index c3f5a44151..b0f7004aec 100644
--- a/plugins/Popup/src/config.cpp
+++ b/plugins/Popup/src/config.cpp
@@ -2,9 +2,9 @@
 Popup Plus plugin for Miranda IM

 

 Copyright	© 2002 Luca Santarelli,

-			© 2004-2007 Victor Pavlychko

-			© 2010 MPK

-			© 2010 Merlin_de

+© 2004-2007 Victor Pavlychko

+© 2010 MPK

+© 2010 Merlin_de

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

@@ -30,9 +30,9 @@ HANDLE hMainThread;
 

 HANDLE hSemaphore;

 BOOL closing = FALSE;

-MTEXT_INTERFACE		MText = {0};

+MTEXT_INTERFACE		MText = { 0 };

 HANDLE folderId;

-BOOL gbPopupLoaded  = FALSE;

+BOOL gbPopupLoaded = FALSE;

 BOOL gbHppInstalled = FALSE;

 

 // ===== Brushes, Colours and Fonts =====

@@ -59,20 +59,20 @@ PLUGININFOEX pluginInfoEx =
 	__AUTHORWEB,

 	UNICODE_AWARE,

 	//  {26A9125D-7863-4E01-AF0E-D14EF95C5054}

-	{0x26a9125d, 0x7863, 0x4e01, {0xaf, 0xe, 0xd1, 0x4e, 0xf9, 0x5c, 0x50, 0x54}}

+	{ 0x26a9125d, 0x7863, 0x4e01, { 0xaf, 0xe, 0xd1, 0x4e, 0xf9, 0x5c, 0x50, 0x54 } }

 };

 

 

-HRESULT		(WINAPI *MyDwmEnableBlurBehindWindow)(HWND hWnd, DWM_BLURBEHIND *pBlurBehind);

+HRESULT(WINAPI *MyDwmEnableBlurBehindWindow)(HWND hWnd, DWM_BLURBEHIND *pBlurBehind);

 

 // ====== Common Vars ========================

 

 //  common funcs

 void LoadOptions() {

 	memset(&PopupOptions, 0, sizeof(PopupOptions));

-	#if defined(_DEBUG)

-		PopupOptions.debug = db_get_b(NULL, MODULNAME, "debug", FALSE);

-	#endif

+#if defined(_DEBUG)

+	PopupOptions.debug = db_get_b(NULL, MODULNAME, "debug", FALSE);

+#endif

 

 	// Load Popup Options

 	if (!OptionLoaded){

@@ -89,43 +89,43 @@ void LoadOptions() {
 void PopupPreview()

 {

 	TCHAR *lptzTitle1Eng = TranslateT("The Jabberwocky");

-	TCHAR *lptzText1Eng  = TranslateT("`Twas brillig, and the slithy toves\r\nDid gyre and gimble in the wabe:\r\nAll mimsy were the borogoves,\r\nAnd the mome raths outgrabe.\r\n\t[b][i]Lewis Carroll, 1855[/i][/b]");

+	TCHAR *lptzText1Eng = TranslateT("`Twas brillig, and the slithy toves\r\nDid gyre and gimble in the wabe:\r\nAll mimsy were the borogoves,\r\nAnd the mome raths outgrabe.\r\n\t[b][i]Lewis Carroll, 1855[/i][/b]");

 

 	TCHAR *lptzTitle2 = TranslateT("Test preview for the popup plugin settings. This is supposed to be long enough not to fit in one line...");

-	TCHAR *lptzText2  = TranslateTS(

+	TCHAR *lptzText2 = TranslateTS(

 		LPGENT("This is a special test preview for the popup plugin settings. The text and title are quite long so you can tweak your skin and plugin settings to best fit your needs :)")

 		);

 

-	POPUPDATA2 ppd = {0};

+	POPUPDATA2 ppd = { 0 };

 

 	memset(&ppd, 0, sizeof(ppd));

-	ppd.cbSize		= sizeof(ppd);

-	ppd.flags		= PU2_TCHAR;

+	ppd.cbSize = sizeof(ppd);

+	ppd.flags = PU2_TCHAR;

 

-	ppd.lptzTitle	= lptzTitle1Eng;

-	ppd.lptzText	= lptzText1Eng;

-	ppd.lchIcon		= LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);

+	ppd.lptzTitle = lptzTitle1Eng;

+	ppd.lptzText = lptzText1Eng;

+	ppd.lchIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);

 	CallService(MS_POPUP_ADDPOPUP2, (WPARAM)&ppd, APF_NO_HISTORY);

-	if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME*2)/3); // Pause

+	if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME * 2) / 3); // Pause

 

 	memset(&ppd, 0, sizeof(ppd));

-	ppd.cbSize		= sizeof(ppd);

-	ppd.flags		= PU2_TCHAR;

-	ppd.lptzTitle	= lptzTitle2;

-	ppd.lptzText	= lptzText2;

-	ppd.lchIcon		= LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

-	ppd.hbmAvatar	= hbmNoAvatar;

+	ppd.cbSize = sizeof(ppd);

+	ppd.flags = PU2_TCHAR;

+	ppd.lptzTitle = lptzTitle2;

+	ppd.lptzText = lptzText2;

+	ppd.lchIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

+	ppd.hbmAvatar = hbmNoAvatar;

 

 	CallService(MS_POPUP_ADDPOPUP2, (WPARAM)&ppd, APF_NO_HISTORY);

-	if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME*2)/3); // Pause

+	if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME * 2) / 3); // Pause

 

-	PUShowMessageT(TranslateT("This is a notification message"),	(DWORD)SM_NOTIFY|0x80000000);

-	if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME*2)/3); // Pause

+	PUShowMessageT(TranslateT("This is a notification message"), (DWORD)SM_NOTIFY | 0x80000000);

+	if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME * 2) / 3); // Pause

 

-	PUShowMessageT(TranslateT("This is a warning message"),			(DWORD)SM_WARNING|0x80000000);

-	if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME*2)/3); // Pause

+	PUShowMessageT(TranslateT("This is a warning message"), (DWORD)SM_WARNING | 0x80000000);

+	if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME * 2) / 3); // Pause

 

-	PUShowMessageT(TranslateT("This is an error message"),			(DWORD)SM_ERROR|0x80000000);

+	PUShowMessageT(TranslateT("This is an error message"), (DWORD)SM_ERROR | 0x80000000);

 }

 

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

@@ -140,7 +140,7 @@ static int EnumProc(const char *szSetting, LPARAM lParam)
 	EnumProcParam* param = (EnumProcParam*)lParam;

 

 	DBVARIANT dbv;

-	if ( !db_get(NULL, param->szModule, szSetting, &dbv)) {

+	if (!db_get(NULL, param->szModule, szSetting, &dbv)) {

 		db_set(NULL, param->szNewModule, szSetting, &dbv);

 		db_free(&dbv);

 	}