more cleaning for гштащуч

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

1 files changed, 349 insertions, 422 deletions

diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index 269af4ada0..ee03c1a221 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -26,8 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "commonheaders.h"

 

 /**

- * The CEvent structure describes the next anniversary to remind of.

- **/

+* The CEvent structure describes the next anniversary to remind of.

+**/

+

 struct CEvent

 {

 	enum EType { NONE, BIRTHDAY, ANNIVERSARY };

@@ -70,18 +71,18 @@ static REMINDEROPTIONS	gRemindOpts;
 

 static void UpdateTimer(BYTE bStartup);

 

-

 /***********************************************************************************************************

  * struct CEvent

  ***********************************************************************************************************/

 

 /**

- * This is the default constructor.

- *

- * @param	none

- *

- * @return nothing

- **/

+* This is the default constructor.

+*

+* @param	none

+*

+* @return nothing

+**/

+

 CEvent::CEvent()

 {

 	_wDaysLeft = 0xFFFF;

@@ -89,13 +90,14 @@ CEvent::CEvent()
 }

 

 /**

- * This is the default constructor.

- *

- * @param	eType			- initial type

- * @param	wDaysLeft		- initial days to event

- *

- * @return	nothing

- **/

+* This is the default constructor.

+*

+* @param	eType			- initial type

+* @param	wDaysLeft		- initial days to event

+*

+* @return	nothing

+**/

+

 CEvent::CEvent(EType eType, WORD wDaysLeft)

 {

 	_wDaysLeft = wDaysLeft;

@@ -103,18 +105,18 @@ CEvent::CEvent(EType eType, WORD wDaysLeft)
 }

 

 /**

- * This operator dups the attributes of the given CEvent object if

- * the event comes up earlier then the one of the object.

- *

- * @param	evt				- the reference to the event object whose attributes to assign.

- *

- * @retval	TRUE			- The values of @e evt have been assigned.

- * @retval	FALSE			- The values are not assigned.

- **/

+* This operator dups the attributes of the given CEvent object if

+* the event comes up earlier then the one of the object.

+*

+* @param	evt				- the reference to the event object whose attributes to assign.

+*

+* @retval	TRUE			- The values of @e evt have been assigned.

+* @retval	FALSE			- The values are not assigned.

+**/

+

 BYTE CEvent::operator << (const CEvent& evt)

 {

-	if (_wDaysLeft > evt._wDaysLeft)

-	{

+	if (_wDaysLeft > evt._wDaysLeft) {

 		_wDaysLeft = evt._wDaysLeft;

 		_eType = evt._eType;

 		return TRUE;

@@ -127,13 +129,13 @@ BYTE CEvent::operator << (const CEvent& evt)
  ***********************************************************************************************************/

 

 /**

- * This function returns the icon for the given anniversary,

- * which is the given number of days in advance.

- *

- * @param	evt				- structure specifying the next anniversary

- *

- * @return	The function returns icolib's icon if found or NULL otherwise.

- **/

+* This function returns the icon for the given anniversary,

+* which is the given number of days in advance.

+*

+* @param	evt				- structure specifying the next anniversary

+*

+* @return	The function returns icolib's icon if found or NULL otherwise.

+**/

 

 static HICON GetAnnivIcon(const CEvent &evt)

 {

@@ -163,13 +165,14 @@ static HICON GetAnnivIcon(const CEvent &evt)
 }

 

 /**

- * Displays an clist extra icon according to the kind of anniversary

- * and the days in advance.

- *

- * @param	evt				- structure specifying the next anniversary

- *

- * @return	nothing

- **/

+* Displays an clist extra icon according to the kind of anniversary

+* and the days in advance.

+*

+* @param	evt				- structure specifying the next anniversary

+*

+* @return	nothing

+**/

+

 static void NotifyWithExtraIcon(HANDLE hContact, const CEvent &evt)

 {

 	if (gRemindOpts.bCListExtraIcon) {

@@ -202,177 +205,161 @@ static void NotifyWithExtraIcon(HANDLE hContact, const CEvent &evt)
 }

 

 /**

- * Message procedure for popup messages

- *

- * @param	hWnd			- handle to the popupwindow

- * @param	uMsg			- message to handle

- * @param	wParam			- message specific parameter

- * @param	lParam			- message specific parameter

- *

- * @return	message specific

- **/

+* Message procedure for popup messages

+*

+* @param	hWnd			- handle to the popupwindow

+* @param	uMsg			- message to handle

+* @param	wParam			- message specific parameter

+* @param	lParam			- message specific parameter

+*

+* @return	message specific

+**/

+

 static LRESULT CALLBACK PopupWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)

 {

-	switch (uMsg)

-	{

+	switch (uMsg) {

 	case WM_COMMAND:

-		{

-			if (HIWORD(wParam) == STN_CLICKED)

-			{

-				PUDeletePopup(hWnd);

-				return TRUE;

-			}

-			break;

-		}

-

-	case WM_CONTEXTMENU:

-		{

+		if (HIWORD(wParam) == STN_CLICKED) {

 			PUDeletePopup(hWnd);

 			return TRUE;

 		}

+		break;

+

+	case WM_CONTEXTMENU:

+		PUDeletePopup(hWnd);

+		return TRUE;

 	}

 	return DefWindowProc(hWnd, uMsg, wParam, lParam);

 }

 

 /**

- * Displays a popup

- *

- * @param	hContact		- contact to display popup for

- * @param	eventType		- indicates which popup settings to apply

- * @param	DaysToAnniv		- days left until anniversary occures

- * @param	pszDesc			- this is the headline

- * @param	szMsg			- message to display

- *

- * @return	return value of the popup service

- **/

+* Displays a popup

+*

+* @param	hContact		- contact to display popup for

+* @param	eventType		- indicates which popup settings to apply

+* @param	DaysToAnniv		- days left until anniversary occures

+* @param	pszDesc			- this is the headline

+* @param	szMsg			- message to display

+*

+* @return	return value of the popup service

+**/

+

 static int NotifyWithPopup(HANDLE hContact, CEvent::EType eventType, int DaysToAnniv, LPCTSTR pszDesc, LPCTSTR pszMsg)

 {

-	if (gRemindOpts.bPopups)

-	{

-		POPUPDATAT ppd = { 0 };

-		ppd.PluginWindowProc = PopupWindowProc;

-		ppd.iSeconds = (int)db_get_b(NULL, MODNAME, SET_POPUP_DELAY, 0);

-

-		if (hContact) {

-			ppd.lchContact = hContact;

-			mir_sntprintf(ppd.lptzContactName, SIZEOF(ppd.lptzContactName),

-				_T("%s - %s"), TranslateTS(pszDesc), DB::Contact::DisplayName(hContact));

-		}

-		else mir_tcsncpy(ppd.lptzContactName, TranslateT("Reminder"), SIZEOF(ppd.lptzContactName));

+	if (!gRemindOpts.bPopups)

+		return 1;

 

-		mir_tcsncpy(ppd.lptzText, pszMsg, MAX_SECONDLINE);

+	POPUPDATAT ppd = { 0 };

+	ppd.PluginWindowProc = PopupWindowProc;

+	ppd.iSeconds = (int)db_get_b(NULL, MODNAME, SET_POPUP_DELAY, 0);

 

-		ppd.lchIcon = GetAnnivIcon(CEvent(eventType, DaysToAnniv));

+	if (hContact) {

+		ppd.lchContact = hContact;

+		mir_sntprintf(ppd.lptzContactName, SIZEOF(ppd.lptzContactName),

+			_T("%s - %s"), TranslateTS(pszDesc), DB::Contact::DisplayName(hContact));

+	}

+	else mir_tcsncpy(ppd.lptzContactName, TranslateT("Reminder"), SIZEOF(ppd.lptzContactName));

 

-		switch (eventType) {

-		case CEvent::BIRTHDAY:

-			switch (db_get_b(NULL, MODNAME, SET_POPUP_BIRTHDAY_COLORTYPE, POPUP_COLOR_CUSTOM)) {

-			case POPUP_COLOR_WINDOWS:

-				ppd.colorBack = GetSysColor(COLOR_BTNFACE);

-				ppd.colorText = GetSysColor(COLOR_WINDOWTEXT);

-				break;

-

-			case POPUP_COLOR_CUSTOM:

-				ppd.colorBack = db_get_dw(NULL, MODNAME, SET_POPUP_BIRTHDAY_COLOR_BACK, RGB(192,180,30));

-				ppd.colorText = db_get_dw(NULL, MODNAME, SET_POPUP_BIRTHDAY_COLOR_TEXT, 0);

-				break;

-			}

+	mir_tcsncpy(ppd.lptzText, pszMsg, MAX_SECONDLINE);

+

+	ppd.lchIcon = GetAnnivIcon(CEvent(eventType, DaysToAnniv));

+

+	switch (eventType) {

+	case CEvent::BIRTHDAY:

+		switch (db_get_b(NULL, MODNAME, SET_POPUP_BIRTHDAY_COLORTYPE, POPUP_COLOR_CUSTOM)) {

+		case POPUP_COLOR_WINDOWS:

+			ppd.colorBack = GetSysColor(COLOR_BTNFACE);

+			ppd.colorText = GetSysColor(COLOR_WINDOWTEXT);

 			break;

 

-		case CEvent::ANNIVERSARY:

-			switch (db_get_b(NULL, MODNAME, SET_POPUP_ANNIVERSARY_COLORTYPE, POPUP_COLOR_CUSTOM)) {

-			case POPUP_COLOR_WINDOWS:

-				ppd.colorBack = GetSysColor(COLOR_BTNFACE);

-				ppd.colorText = GetSysColor(COLOR_WINDOWTEXT);

-				break;

-

-			case POPUP_COLOR_CUSTOM:

-				ppd.colorBack = db_get_dw(NULL, MODNAME, SET_POPUP_ANNIVERSARY_COLOR_BACK, RGB(90, 190, 130));

-				ppd.colorText = db_get_dw(NULL, MODNAME, SET_POPUP_ANNIVERSARY_COLOR_TEXT, 0);

-				break;

-			}

+		case POPUP_COLOR_CUSTOM:

+			ppd.colorBack = db_get_dw(NULL, MODNAME, SET_POPUP_BIRTHDAY_COLOR_BACK, RGB(192, 180, 30));

+			ppd.colorText = db_get_dw(NULL, MODNAME, SET_POPUP_BIRTHDAY_COLOR_TEXT, 0);

+			break;

+		}

+		break;

+

+	case CEvent::ANNIVERSARY:

+		switch (db_get_b(NULL, MODNAME, SET_POPUP_ANNIVERSARY_COLORTYPE, POPUP_COLOR_CUSTOM)) {

+		case POPUP_COLOR_WINDOWS:

+			ppd.colorBack = GetSysColor(COLOR_BTNFACE);

+			ppd.colorText = GetSysColor(COLOR_WINDOWTEXT);

+			break;

+

+		case POPUP_COLOR_CUSTOM:

+			ppd.colorBack = db_get_dw(NULL, MODNAME, SET_POPUP_ANNIVERSARY_COLOR_BACK, RGB(90, 190, 130));

+			ppd.colorText = db_get_dw(NULL, MODNAME, SET_POPUP_ANNIVERSARY_COLOR_TEXT, 0);

+			break;

 		}

-		return PUAddPopupT(&ppd);

 	}

-	return 1;

+	return PUAddPopupT(&ppd);

 }

 

 /**

- * Flash contact list's contact icon.

- *

- * @param	hContact		- contact whose icon to flash

- * @param	evt				- structure specifying the next anniversary

- *

- * @return	nothing

- **/

+* Flash contact list's contact icon.

+*

+* @param	hContact		- contact whose icon to flash

+* @param	evt				- structure specifying the next anniversary

+*

+* @return	nothing

+**/

+

 static void NotifyFlashCListIcon(HANDLE hContact, const CEvent &evt)

 {

-	if (gRemindOpts.bFlashCList && evt._wDaysLeft == 0)

-	{

-		CLISTEVENT cle ={0};

-		TCHAR szMsg[MAX_PATH];

+	if (!gRemindOpts.bFlashCList || evt._wDaysLeft != 0)

+		return;

 

-		cle.cbSize = sizeof(CLISTEVENT);

-		cle.hContact = hContact;

-		cle.flags = CLEF_URGENT|CLEF_TCHAR;

-		cle.hDbEvent = NULL;

+	TCHAR szMsg[MAX_PATH];

 

-		switch (evt._eType) {

-			case CEvent::BIRTHDAY:

-				{

-					mir_sntprintf(szMsg, SIZEOF(szMsg),

-						TranslateT("%s has %s today."),

-						DB::Contact::DisplayName(hContact),

-						TranslateT("Birthday"));

-					cle.hIcon = IcoLib_GetIcon(ICO_COMMON_BIRTHDAY);

-				}

-				break;

-

-			case CEvent::ANNIVERSARY:

-				{

-					mir_sntprintf(szMsg, SIZEOF(szMsg),

-						TranslateT("%s has %s today."),

-						DB::Contact::DisplayName(hContact),

-						TranslateT("an anniversary"));

-					cle.hIcon = IcoLib_GetIcon(ICO_COMMON_ANNIVERSARY);

-				}

-				break;

+	CLISTEVENT cle = { sizeof(cle) };

+	cle.hContact = hContact;

+	cle.flags = CLEF_URGENT|CLEF_TCHAR;

+	cle.hDbEvent = NULL;

 

-			default:

-				szMsg[0] = NULL;

-		}

-		cle.ptszTooltip = szMsg;

+	switch (evt._eType) {

+	case CEvent::BIRTHDAY:

+		mir_sntprintf(szMsg, SIZEOF(szMsg), TranslateT("%s has %s today."), DB::Contact::DisplayName(hContact), TranslateT("Birthday"));

+		cle.hIcon = IcoLib_GetIcon(ICO_COMMON_BIRTHDAY);

+		break;

 

-		// pszService = NULL get error (crash),

-		// pszService = "dummy" get 'service not fount' and continue;

-		cle.pszService = "dummy";

-		cle.lParam = NULL;

+	case CEvent::ANNIVERSARY:

+		mir_sntprintf(szMsg, SIZEOF(szMsg), TranslateT("%s has %s today."), DB::Contact::DisplayName(hContact), TranslateT("an anniversary"));

+		cle.hIcon = IcoLib_GetIcon(ICO_COMMON_ANNIVERSARY);

+		break;

 

-		CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle);

+	default:

+		return;

 	}

+	cle.ptszTooltip = szMsg;

+

+	// pszService = NULL get error (crash),

+	// pszService = "dummy" get 'service not fount' and continue;

+	cle.pszService = "dummy";

+	cle.lParam = NULL;

+

+	CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle);

 }

 

 /**

- * Play a sound for the nearest upcoming anniversary

- *

- * @param	evt				- structure specifying the next anniversary

- *

- * @retval	0 if sound was played

- * @retval	1 otherwise

- **/

+* Play a sound for the nearest upcoming anniversary

+*

+* @param	evt				- structure specifying the next anniversary

+*

+* @retval	0 if sound was played

+* @retval	1 otherwise

+**/

+

 static BYTE NotifyWithSound(const CEvent &evt)

 {

-	if (evt._wDaysLeft <= min(db_get_b(NULL, MODNAME, SET_REMIND_SOUNDOFFSET, DEFVAL_REMIND_SOUNDOFFSET), gRemindOpts.wDaysEarlier))

-	{

-		switch (evt._eType)

-		{

-			case CEvent::BIRTHDAY:

-				SkinPlaySound(evt._wDaysLeft == 0 ? SOUND_BIRTHDAY_TODAY : SOUND_BIRTHDAY_SOON);

-				return 0;

-

-			case CEvent::ANNIVERSARY:

-				SkinPlaySound(SOUND_ANNIVERSARY);

-				return 0;

+	if (evt._wDaysLeft <= min(db_get_b(NULL, MODNAME, SET_REMIND_SOUNDOFFSET, DEFVAL_REMIND_SOUNDOFFSET), gRemindOpts.wDaysEarlier)) {

+		switch (evt._eType) {

+		case CEvent::BIRTHDAY:

+			SkinPlaySound(evt._wDaysLeft == 0 ? SOUND_BIRTHDAY_TODAY : SOUND_BIRTHDAY_SOON);

+			return 0;

+

+		case CEvent::ANNIVERSARY:

+			SkinPlaySound(SOUND_ANNIVERSARY);

+			return 0;

 		}

 	}

 	return 1;

@@ -384,8 +371,7 @@ static BYTE NotifyWithSound(const CEvent &evt)
 

 static LPCTSTR ContactGender(HANDLE hContact)

 {

-	switch (GenderOf(hContact))

-	{

+	switch (GenderOf(hContact)) {

 		case 'M': return TranslateT("He");

 		case 'F': return TranslateT("She");

 	}

@@ -397,82 +383,57 @@ static BYTE CheckAnniversaries(HANDLE hContact, MTime &Now, CEvent &evt, BYTE bN
 	int numAnniversaries = 0;

 	int Diff;

 	MAnnivDate mta;

-	int i;

 	TCHAR szAnniv[MAX_PATH];

 	TCHAR strMsg[MAX_SECONDLINE];

 	BYTE bOverflow = FALSE;

 	WORD wDaysEarlier;

 

-	if ((gRemindOpts.RemindState == REMIND_ANNIV) || (gRemindOpts.RemindState == REMIND_ALL))

-	{

-		for (i = 0; i < ANID_LAST && !mta.DBGetAnniversaryDate(hContact, i); i++)

-		{

+	if ((gRemindOpts.RemindState == REMIND_ANNIV) || (gRemindOpts.RemindState == REMIND_ALL)) {

+		for (int i = 0; i < ANID_LAST && !mta.DBGetAnniversaryDate(hContact, i); i++) {

 			mta.DBGetReminderOpts(hContact);

 

-			if (mta.RemindOption() != BST_UNCHECKED)

-			{

+			if (mta.RemindOption() != BST_UNCHECKED) {

 				wDaysEarlier = (mta.RemindOption() == BST_CHECKED) ? mta.RemindOffset() : -1;

 				if (wDaysEarlier == (WORD)-1)

-				{

 					wDaysEarlier = gRemindOpts.wDaysEarlier;

-				}

 

 				Diff = mta.CompareDays(Now);

-				if ((Diff >= 0) && (Diff <= wDaysEarlier))

-				{

-					if (evt._wDaysLeft > Diff)

-					{

+				if ((Diff >= 0) && (Diff <= wDaysEarlier)) {

+					if (evt._wDaysLeft > Diff) {

 						evt._wDaysLeft = Diff;

 						evt._eType = CEvent::ANNIVERSARY;

 					}

 					numAnniversaries++;

 

 					// create displayed text for popup

-					if (bNotify && !bOverflow)

-					{

+					if (bNotify && !bOverflow) {

 						// first anniversary found

-						if (numAnniversaries == 1)

-						{

+						if (numAnniversaries == 1) {

 							mir_sntprintf(szAnniv, MAX_PATH,

 								TranslateT("%s has the following anniversaries:\0"),

 								ContactGender(hContact));

 							mir_tcsncpy(strMsg, szAnniv, mir_tcslen(szAnniv));

 						}

-						switch (Diff)

-						{

-							case 0:

-								{

-									mir_sntprintf(szAnniv, MAX_PATH,

-										TranslateT("%d. %s today\0"),

-										mta.Age(), mta.Description());

-								}

-								break;

-

-							case 1:

-								{

-									mir_sntprintf(szAnniv, MAX_PATH,

-										TranslateT("%d. %s tomorrow\0"),

-										mta.Age() + 1, mta.Description());

-								}

-								break;

-

-							default:

-								{

-									mir_sntprintf(szAnniv, MAX_PATH,

-										TranslateT("%d. %s in %d days\0"),

-										mta.Age() + 1, mta.Description(), Diff);

-								}

+

+						switch (Diff) {

+						case 0:

+							mir_sntprintf(szAnniv, MAX_PATH, TranslateT("%d. %s today\0"), mta.Age(), mta.Description());

+							break;

+						case 1:

+							mir_sntprintf(szAnniv, MAX_PATH, TranslateT("%d. %s tomorrow\0"), mta.Age() + 1, mta.Description());

+							break;

+						default:

+							mir_sntprintf(szAnniv, MAX_PATH, TranslateT("%d. %s in %d days\0"), mta.Age() + 1, mta.Description(), Diff);

 						}

-						if (mir_tcslen(szAnniv) >= MAX_SECONDLINE - mir_tcslen(strMsg))

-						{

+

+						if (mir_tcslen(szAnniv) >= MAX_SECONDLINE - mir_tcslen(strMsg)) {

 							if (strMsg)

 								mir_tcsncat(strMsg, _T("\n...\0"), SIZEOF(strMsg));

 							else

 								mir_tcsncpy(strMsg, _T("\n...\0"), mir_tcslen(_T("\n...\0")));

 							bOverflow = TRUE;

 						}

-						else

-						{

+						else {

 							if (strMsg)

 								mir_tcsncat(strMsg, _T("\n- \0"), SIZEOF(strMsg));

 							else

@@ -484,36 +445,34 @@ static BYTE CheckAnniversaries(HANDLE hContact, MTime &Now, CEvent &evt, BYTE bN
 			}

 		}

 	}

+

 	// show one popup for all anniversaries

 	if (numAnniversaries != 0 && bNotify)

-	{

 		NotifyWithPopup(hContact, CEvent::ANNIVERSARY, Diff, LPGENT("Anniversaries"), strMsg);

-	}

+

 	return numAnniversaries != 0;

 }

 

 /**

- * This function checks, whether a contact has a birthday and it is within the period of time to remind of or not.

- *

- * @param	hContact		- the contact to check

- * @param	Now				- current time

- * @param	evt				- the reference to a structure, which retrieves the resulting DTB

- * @param	bNotify			- if TRUE, a popup will be displayed for a contact having birthday within the next few days.

- * @param	LastAnswer		- this parameter is used for the automatic backup function

- *

- * @retval	TRUE			- contact has a birthday to remind of

- * @retval	FALSE			- contact has no birthday or it is not within the desired period of time.

- **/

+* This function checks, whether a contact has a birthday and it is within the period of time to remind of or not.

+*

+* @param	hContact		- the contact to check

+* @param	Now				- current time

+* @param	evt				- the reference to a structure, which retrieves the resulting DTB

+* @param	bNotify			- if TRUE, a popup will be displayed for a contact having birthday within the next few days.

+* @param	LastAnswer		- this parameter is used for the automatic backup function

+*

+* @retval	TRUE			- contact has a birthday to remind of

+* @retval	FALSE			- contact has no birthday or it is not within the desired period of time.

+**/

+

 static BYTE CheckBirthday(HANDLE hContact, MTime &Now, CEvent &evt, BYTE bNotify, PWORD LastAnwer)

 {

 	BYTE result = FALSE;

 

-	if (gRemindOpts.RemindState == REMIND_BIRTH || gRemindOpts.RemindState == REMIND_ALL)

-	{

+	if (gRemindOpts.RemindState == REMIND_BIRTH || gRemindOpts.RemindState == REMIND_ALL) {

 		MAnnivDate mtb;

-

-		if (!mtb.DBGetBirthDate(hContact))

-		{

+		if (!mtb.DBGetBirthDate(hContact)) {

 			int Diff;

 			WORD wDaysEarlier;

 

@@ -521,56 +480,33 @@ static BYTE CheckBirthday(HANDLE hContact, MTime &Now, CEvent &evt, BYTE bNotify
 

 			// make backup of each protocol based birthday

 			if (db_get_b(NULL, MODNAME, SET_REMIND_SECUREBIRTHDAY, TRUE))

-			{

 				mtb.BackupBirthday(hContact, NULL, 0, LastAnwer);

-			}

 

-			if (mtb.RemindOption() != BST_UNCHECKED)

-			{

+			if (mtb.RemindOption() != BST_UNCHECKED) {

 				wDaysEarlier = (mtb.RemindOption() == BST_CHECKED) ? mtb.RemindOffset() : -1;

 				if (wDaysEarlier == (WORD)-1)

-				{

 					wDaysEarlier = gRemindOpts.wDaysEarlier;

-				}

 

 				Diff = mtb.CompareDays(Now);

-				if ((Diff >= 0) && (Diff <= wDaysEarlier))

-				{

-					if (evt._wDaysLeft > Diff)

-					{

+				if ((Diff >= 0) && (Diff <= wDaysEarlier)) {

+					if (evt._wDaysLeft > Diff) {

 						evt._wDaysLeft = Diff;

 						evt._eType = CEvent::BIRTHDAY;

 					}

 

-					if (bNotify)

-					{

+					if (bNotify) {

 						TCHAR szMsg[MAXDATASIZE];

 						WORD cchMsg = 0;

 

-						switch (Diff)

-						{

-							case 0:

-								{

-									cchMsg = mir_sntprintf(szMsg, SIZEOF(szMsg),

-										TranslateT("%s has birthday today."),

-										DB::Contact::DisplayName(hContact));

-								}

-								break;

-

-							case 1:

-								{

-									cchMsg = mir_sntprintf(szMsg, SIZEOF(szMsg),

-										TranslateT("%s has birthday tomorrow."),

-										DB::Contact::DisplayName(hContact));

-								}

-								break;

-

-							default:

-								{

-									cchMsg = mir_sntprintf(szMsg, SIZEOF(szMsg),

-										TranslateT("%s has birthday in %d days."),

-										DB::Contact::DisplayName(hContact), Diff);

-								}

+						switch (Diff) {

+						case 0:

+							cchMsg = mir_sntprintf(szMsg, SIZEOF(szMsg), TranslateT("%s has birthday today."), DB::Contact::DisplayName(hContact));

+							break;

+						case 1:

+							cchMsg = mir_sntprintf(szMsg, SIZEOF(szMsg), TranslateT("%s has birthday tomorrow."), DB::Contact::DisplayName(hContact));

+							break;

+						default:

+							cchMsg = mir_sntprintf(szMsg, SIZEOF(szMsg), TranslateT("%s has birthday in %d days."), DB::Contact::DisplayName(hContact), Diff);

 						}

 						mir_sntprintf(szMsg + cchMsg, SIZEOF(szMsg) - cchMsg,

 							TranslateT("\n%s becomes %d years old."),

@@ -587,16 +523,17 @@ static BYTE CheckBirthday(HANDLE hContact, MTime &Now, CEvent &evt, BYTE bNotify
 }

 

 /**

- * This function checks one contact. It is mainly used for clist extra icon rebuild notification handler.

- *

- * @param	hContact		- the contact to check

- * @param	Now				- current time

- * @param	evt				- the reference to a structure, which retrieves the resulting DTB

- * @param	bNotify			- if TRUE, a popup will be displayed for a contact having birthday within the next few days.

- * @param	LastAnswer		- this parameter is used for the automatic backup function

- *

- * @return	nothing

- **/

+* This function checks one contact. It is mainly used for clist extra icon rebuild notification handler.

+*

+* @param	hContact		- the contact to check

+* @param	Now				- current time

+* @param	evt				- the reference to a structure, which retrieves the resulting DTB

+* @param	bNotify			- if TRUE, a popup will be displayed for a contact having birthday within the next few days.

+* @param	LastAnswer		- this parameter is used for the automatic backup function

+*

+* @return	nothing

+**/

+

 static void CheckContact(HANDLE hContact, MTime &Now, CEvent &evt, BYTE bNotify, PWORD LastAnwer = 0)

 {

 	// ignore meta subcontacts here as their birthday information are collected explicitly

@@ -606,31 +543,26 @@ static void CheckContact(HANDLE hContact, MTime &Now, CEvent &evt, BYTE bNotify,
 	{

 		CEvent ca;

 

-		if (CheckBirthday(hContact, Now, ca, bNotify, LastAnwer) ||

-				CheckAnniversaries(hContact, Now, ca, bNotify))

-		{

+		if (CheckBirthday(hContact, Now, ca, bNotify, LastAnwer) || CheckAnniversaries(hContact, Now, ca, bNotify)) {

 			evt << ca;

-

 			if (bNotify)

-			{

 				NotifyFlashCListIcon(hContact, ca);

-			}

 		}

 		NotifyWithExtraIcon(hContact, ca);

 	}

 }

 

 /**

- * This function checks all contacts.

- *

- * @param	notify			- notification type

- *

- * @return	nothing

- **/

+* This function checks all contacts.

+*

+* @param	notify			- notification type

+*

+* @return	nothing

+**/

+

 void SvcReminderCheckAll(const ENotify notify)

 {

-	if (gRemindOpts.RemindState != REMIND_OFF)

-	{

+	if (gRemindOpts.RemindState != REMIND_OFF) {

 		CEvent evt;

 		MTime now;

 		WORD a1 = 0;

@@ -641,8 +573,7 @@ void SvcReminderCheckAll(const ENotify notify)
 		for (HANDLE hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact))

 			CheckContact(hContact, now, evt, notify != NOTIFY_CLIST, &a1);

 

-		if (notify != NOTIFY_CLIST)

-		{

+		if (notify != NOTIFY_CLIST) {

 			// play sound for the next anniversary

 			NotifyWithSound(evt);

 

@@ -662,45 +593,41 @@ void SvcReminderCheckAll(const ENotify notify)
  ***********************************************************************************************************/

 

 /**

- * This is the notification handler to tell reminder to reload required icons.

- * The reminder only loads icons to clist, which are really required at the moment.

- * This should help to save a bit memory.

- *

- * @param:	wParam			- not used

- * @param:	lParam			- not used

- *

- * @return	This function must return 0 in order to continue in the notification chain.

- **/

+* This is the notification handler to tell reminder to reload required icons.

+* The reminder only loads icons to clist, which are really required at the moment.

+* This should help to save a bit memory.

+*

+* @param:	wParam			- not used

+* @param:	lParam			- not used

+*

+* @return	This function must return 0 in order to continue in the notification chain.

+**/

+

 static int OnCListRebuildIcons(WPARAM, LPARAM)

 {

-	UINT i;

-

-	for (i = 0; i < SIZEOF(ghCListAnnivIcons); i++)

-	{

+	for (int i = 0; i < SIZEOF(ghCListAnnivIcons); i++)

 		ghCListAnnivIcons[i] = INVALID_HANDLE_VALUE;

-	}

-	for (i = 0; i < SIZEOF(ghCListBirthdayIcons); i++)

-	{

-		ghCListBirthdayIcons[i] = INVALID_HANDLE_VALUE;

-	}

+

+	for (int k = 0; k < SIZEOF(ghCListBirthdayIcons); k++)

+		ghCListBirthdayIcons[k] = INVALID_HANDLE_VALUE;

+

 	return 0;

 }

 

 /**

- * This function is the notification handler for clist extra icons to be applied for a contact.

- *

- * @param	hContact		- handle to the contact whose extra icon is to apply

- * @param	lParam			- not used

- *

- * @return	This function must return 0 in order to continue in the notification chain.

- **/

+* This function is the notification handler for clist extra icons to be applied for a contact.

+*

+* @param	hContact		- handle to the contact whose extra icon is to apply

+* @param	lParam			- not used

+*

+* @return	This function must return 0 in order to continue in the notification chain.

+**/

+

 int OnCListApplyIcon(HANDLE hContact, LPARAM)

 {

-	if (gRemindOpts.RemindState != REMIND_OFF)

-	{

+	if (gRemindOpts.RemindState != REMIND_OFF) {

 		CEvent evt;

 		MTime now;

-

 		now.GetLocalTime();

 		CheckContact(hContact, now, evt, FALSE);

 	}

@@ -708,15 +635,16 @@ int OnCListApplyIcon(HANDLE hContact, LPARAM)
 }

 

 /**

- * This is a notification handler for changed contact settings.

- * If any anniversary setting has changed for a meta sub contact,

- * the parental meta contact is rescanned.

- *

- * @param	hContact		- handle of the contect the notification was fired for

- * @param	pdbcws			- pointer to a DBCONTACTWRITESETTING structure

- *

- * @return	This function must return 0 in order to continue in the notification chain.

- **/

+* This is a notification handler for changed contact settings.

+* If any anniversary setting has changed for a meta sub contact,

+* the parental meta contact is rescanned.

+*

+* @param	hContact		- handle of the contect the notification was fired for

+* @param	pdbcws			- pointer to a DBCONTACTWRITESETTING structure

+*

+* @return	This function must return 0 in order to continue in the notification chain.

+**/

+

 static int OnContactSettingChanged(HANDLE hContact, DBCONTACTWRITESETTING* pdbcws)

 {

 	if (hContact &&										// valid contact not owner!

@@ -750,13 +678,13 @@ static int OnContactSettingChanged(HANDLE hContact, DBCONTACTWRITESETTING* pdbcw
 #define TBB_ICONAME	TOOLBARBUTTON_ICONIDPREFIX TBB_IDBTN TOOLBARBUTTON_ICONIDPRIMARYSUFFIX

 

 /**

- * This function is called by the ME_TTB_MODULELOADED event.

- * It adds a set of buttons to the TopToolbar plugin.

- *

- * @param	none

- *

- * @return	nothing

- **/

+* This function is called by the ME_TTB_MODULELOADED event.

+* It adds a set of buttons to the TopToolbar plugin.

+*

+* @param	none

+*

+* @return	nothing

+**/

 

 void SvcReminderOnTopToolBarLoaded()

 {

@@ -768,48 +696,45 @@ void SvcReminderOnTopToolBarLoaded()
 	TopToolbar_AddButton(&ttb);

 }

 

-

 /***********************************************************************************************************

  * services

  ***********************************************************************************************************/

 

 /**

- * This is the service function for MS_USERINFO_REMINDER_CHECK.

- *

- * @param:	wParam			- not used

- * @param:	lParam			- not used

- *

- * @return	0

- **/

+* This is the service function for MS_USERINFO_REMINDER_CHECK.

+*

+* @param:	wParam			- not used

+* @param:	lParam			- not used

+*

+* @return	0

+**/

+

 static INT_PTR CheckService(WPARAM, LPARAM)

 {

 	if (gRemindOpts.RemindState != REMIND_OFF)

-	{

 		SvcReminderCheckAll(NOTIFY_NOANNIV);

-	}

 	return 0;

 }

 

 /**

- * This is the service function for MS_USERINFO_REMINDER_AGGRASIVEBACKUP.

- *

- * @param	hContact		- handle to single contact or NULL to backup all

- * @param	lParam			- if 1, the messagebox will not be displayed

- *

- * return:	0

- **/

+* This is the service function for MS_USERINFO_REMINDER_AGGRASIVEBACKUP.

+*

+* @param	hContact		- handle to single contact or NULL to backup all

+* @param	lParam			- if 1, the messagebox will not be displayed

+*

+* return:	0

+**/

+

 static INT_PTR BackupBirthdayService(WPARAM wParam, LPARAM lParam)

 {

 	HANDLE hContact = (HANDLE)wParam;

 	MAnnivDate mdb;

 

-	if (hContact)

-	{

+	if (hContact) {

 		if (!mdb.DBGetBirthDate(hContact))

 			mdb.BackupBirthday(hContact, NULL, TRUE);

 	}

-	else

-	{

+	else {

 		WORD a1 = 0;

 

 		//walk through all the contacts stored in the DB

@@ -818,10 +743,8 @@ static INT_PTR BackupBirthdayService(WPARAM wParam, LPARAM lParam)
 				mdb.BackupBirthday(hContact, NULL, TRUE, &a1);

 	}

 

-	if (lParam != TRUE)

-	{

+	if (lParam != TRUE) {

 		MSGBOX mBox;

-

 		mBox.cbSize = sizeof(MSGBOX);

 		mBox.hParent = NULL;

 		mBox.hiLogo = IcoLib_GetIcon(ICO_COMMON_BIRTHDAY);

@@ -834,36 +757,36 @@ static INT_PTR BackupBirthdayService(WPARAM wParam, LPARAM lParam)
 }

 

 /**

- * This function returns a constant pointer to the module the date should be saved to

- *

- * @param	none

- *

- * @return	module to write birthday information to, MOD_MBIRTHDAY by default

- **/

+* This function returns a constant pointer to the module the date should be saved to

+*

+* @param	none

+*

+* @return	module to write birthday information to, MOD_MBIRTHDAY by default

+**/

+

 LPCSTR SvcReminderGetMyBirthdayModule()

 {

 	return ((db_get_b(NULL, MODNAME, SET_REMIND_BIRTHMODULE, DEFVAL_REMIND_BIRTHMODULE) == 1) ? USERINFO : MOD_MBIRTHDAY);

 }

 

-

 /***********************************************************************************************************

  * timer stuff

  ***********************************************************************************************************/

 

 /**

- * Timer procedure, called if date changed. This updates clist icons.

- *

- * @param	hwnd			- not used

- * @param	uMsg			- not used

- * @param	idEvent			- not used

- * @param	dwTime			- not used

- * @return	nothing

- **/

+* Timer procedure, called if date changed. This updates clist icons.

+*

+* @param	hwnd			- not used

+* @param	uMsg			- not used

+* @param	idEvent			- not used

+* @param	dwTime			- not used

+* @return	nothing

+**/

+

 static void CALLBACK TimerProc_DateChanged(HWND, UINT, UINT_PTR, DWORD)

 {

 	static MTime last;

 	MTime now;

-

 	now.GetLocalTime();

 	if (now.Day() > last.Day() || now.Month() > last.Month() || now.Year() > last.Year()) {

 		SvcReminderCheckAll(NOTIFY_CLIST);

@@ -872,27 +795,29 @@ static void CALLBACK TimerProc_DateChanged(HWND, UINT, UINT_PTR, DWORD)
 }

 

 /**

- * Timer procedure, called again and again if the notification interval ellapsed

- *

- * @param	hwnd			- not used

- * @param	uMsg			- not used

- * @param	idEvent			- not used

- * @param	dwTime			- not used

- *

- * @return	nothing

- **/

+* Timer procedure, called again and again if the notification interval ellapsed

+*

+* @param	hwnd			- not used

+* @param	uMsg			- not used

+* @param	idEvent			- not used

+* @param	dwTime			- not used

+*

+* @return	nothing

+**/

+

 static void CALLBACK TimerProc_Check(HWND, UINT, UINT_PTR, DWORD)

 {

 	SvcReminderCheckAll(NOTIFY_POPUP);

 }

 

 /**

- * Load timers or update them.

- *

- * @param	bStartup		- is only TRUE if module is loaded to indicate startup process

- *

- * @return	nothing

- **/

+* Load timers or update them.

+*

+* @param	bStartup		- is only TRUE if module is loaded to indicate startup process

+*

+* @return	nothing

+**/

+

 static void UpdateTimer(BYTE bStartup)

 {

 	LONG	wNotifyInterval =	60 * 60 * (LONG)db_get_w(NULL, MODNAME, SET_REMIND_NOTIFYINTERVAL, DEFVAL_REMIND_NOTIFYINTERVAL);

@@ -911,9 +836,8 @@ static void UpdateTimer(BYTE bStartup)
 

 		ghRemindDateChangeTimer = SetTimer(0, 0, 1000 * 60 * 5, (TIMERPROC)TimerProc_DateChanged);

 	}

-	else {

-		now.DBWriteStamp(NULL, MODNAME, SET_REMIND_LASTCHECK);

-	}

+	else now.DBWriteStamp(NULL, MODNAME, SET_REMIND_LASTCHECK);

+

 	// wait at least 5 seconds before checking at startup, to give miranda a better chance to load faster

 	KillTimer(0, ghRemindTimer);

 	ghRemindTimer = SetTimer(0, 0, 1000 * wNotifyInterval, TimerProc_Check);

@@ -957,12 +881,13 @@ void SvcReminderEnable(BYTE bEnable)
 }

 

 /**

- * This function is called by Miranda just after loading all system modules.

- *

- * @param	none

- *

- * @return	nothing

- **/

+* This function is called by Miranda just after loading all system modules.

+*

+* @param	none

+*

+* @return	nothing

+**/

+

 void SvcReminderOnModulesLoaded(void)

 {

 	// init clist extra icon structure

@@ -972,12 +897,13 @@ void SvcReminderOnModulesLoaded(void)
 }

 

 /**

- * This function initially loads all required stuff for reminder.

- *

- * @param	none

- *

- * @return	nothing

- **/

+* This function initially loads all required stuff for reminder.

+*

+* @param	none

+*

+* @return	nothing

+**/

+

 void SvcReminderLoadModule(void)

 {

 	// init sounds

@@ -1015,12 +941,13 @@ void SvcReminderLoadModule(void)
 }

 

 /**

- * This function unloads the reminder module.

- *

- * @param	none

- *

- * @return	nothing

- **/

+* This function unloads the reminder module.

+*

+* @param	none

+*

+* @return	nothing

+**/

+

 void SvcReminderUnloadModule(void)

 {

 	// kill timers