code cleaning

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

2 files changed, 93 insertions, 103 deletions

diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp
index 300ce8fe74..f240d2e89a 100644
--- a/src/core/stdclist/src/clcpaint.cpp
+++ b/src/core/stdclist/src/clcpaint.cpp
@@ -82,12 +82,11 @@ static void __inline SetHotTrackColour(HDC hdc, struct ClcData *dat)
 			}

 			newCol = RGB(r, g, b);

 		}

-		else

-			newCol = dat->hotTextColour;

+		else newCol = dat->hotTextColour;

+		

 		SetTextColor(hdc, newCol);

 	}

-	else

-		SetTextColor(hdc, dat->hotTextColour);

+	else SetTextColor(hdc, dat->hotTextColour);

 }

 

 static int GetStatusOnlineness(int status)

@@ -190,27 +189,24 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 	ChangeToFont(hdcMem, dat, FONTID_CONTACTS, &fontHeight);

 	SetBkMode(hdcMem, TRANSPARENT);

 	{

-		HBRUSH hBrush;

-

-		hBrush = CreateSolidBrush(tmpbkcolour);

+		HBRUSH hBrush = CreateSolidBrush(tmpbkcolour);

 		FillRect(hdcMem, rcPaint, hBrush);

 		DeleteObject(hBrush);

 		if (dat->hBmpBackground) {

-			BITMAP bmp;

-			HDC hdcBmp;

-			int x, y;

-			int maxx, maxy;

-			int destw, desth;

-

 			// XXX: Halftone isnt supported on 9x, however the scretch problems dont happen on 98.

 			SetStretchBltMode(hdcMem, HALFTONE);

 

+			BITMAP bmp;

 			GetObject(dat->hBmpBackground, sizeof(bmp), &bmp);

-			hdcBmp = CreateCompatibleDC(hdcMem);

+

+			HDC hdcBmp = CreateCompatibleDC(hdcMem);

 			SelectObject(hdcBmp, dat->hBmpBackground);

-			y = dat->backgroundBmpUse & CLBF_SCROLL ? -dat->yScroll : 0;

-			maxx = dat->backgroundBmpUse & CLBF_TILEH ? clRect.right : 1;

-			maxy = dat->backgroundBmpUse & CLBF_TILEV ? maxy = rcPaint->bottom : y + 1;

+

+			int y = dat->backgroundBmpUse & CLBF_SCROLL ? -dat->yScroll : 0;

+			int maxx = dat->backgroundBmpUse & CLBF_TILEH ? clRect.right : 1;

+			int maxy = dat->backgroundBmpUse & CLBF_TILEV ? rcPaint->bottom : y + 1;

+

+			int destw, desth;

 			switch (dat->backgroundBmpUse & CLBM_TYPE) {

 			case CLB_STRETCH:

 				if (dat->backgroundBmpUse & CLBF_PROPORTIONAL) {

@@ -248,7 +244,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 					desth = clRect.bottom;

 				}

 				break;

-			default: //clb_topleft

+			default: // clb_topleft

 				destw = bmp.bmWidth;

 				desth = bmp.bmHeight;

 				break;

@@ -256,7 +252,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 			for (; y < maxy; y += desth) {

 				if (y < rcPaint->top - desth)

 					continue;

-				for (x = 0; x < maxx; x += destw)

+				for (int x = 0; x < maxx; x += destw)

 					StretchBlt(hdcMem, x, y, destw, desth, hdcBmp, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);

 			}

 			DeleteDC(hdcBmp);

@@ -283,7 +279,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 			int width, checkboxWidth;

 			char *szCounts;

 

-			//alternating grey

+			// alternating grey

 			if (style & CLS_GREYALTERNATE && index & 1) {

 				RECT rc;

 				rc.top = y;

@@ -293,7 +289,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 				FillRect(hdcMem, &rc, hBrushAlternateGrey);

 			}

 

-			//setup

+			// setup

 			if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP)

 				ChangeToFont(hdcMem, dat, FONTID_GROUPS, &fontHeight);

 			else if (group->cl.items[group->scanIndex]->type == CLCIT_INFO) {

@@ -310,8 +306,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 				((group->cl.items[group->scanIndex]->flags & CONTACTF_INVISTO

 				&& GetRealStatus(group->cl.items[group->scanIndex], status) != ID_STATUS_INVISIBLE)

 				|| (group->cl.items[group->scanIndex]->flags & CONTACTF_VISTO

-				&& GetRealStatus(group->cl.items[group->scanIndex], status) == ID_STATUS_INVISIBLE)))

-			{

+				&& GetRealStatus(group->cl.items[group->scanIndex], status) == ID_STATUS_INVISIBLE))) {

 				// the contact is in the always visible list and the proto is invisible

 				// the contact is in the always invisible and the proto is in any other mode

 				ChangeToFont(hdcMem, dat, group->cl.items[group->scanIndex]->flags & CONTACTF_ONLINE ? FONTID_INVIS : FONTID_OFFINVIS, &fontHeight);

@@ -339,7 +334,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 			else

 				checkboxWidth = 0;

 

-			//background

+			// background

 			if (selected) {

 				int x = dat->leftMargin + indent * dat->groupIndent + checkboxWidth + dat->iconXSpace - 2;

 				ImageList_DrawEx(dat->himlHighlight, 0, hdcMem, x, y, min(width + 5, clRect.right - x), dat->rowHeight, CLR_NONE, CLR_NONE,

@@ -349,7 +344,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 			else if (hottrack)

 				SetHotTrackColour(hdcMem, dat);

 

-			//checkboxes

+			// checkboxes

 			if (checkboxWidth) {

 				RECT rc;

 				HANDLE hTheme = OpenThemeData(hwnd, L"BUTTON");

@@ -368,7 +363,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 				}

 			}

 

-			//icon

+			// icon

 			if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP)

 				iImage = group->cl.items[group->scanIndex]->group->expanded ? IMAGE_GROUPOPEN : IMAGE_GROUPSHUT;

 			else if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT)

@@ -392,9 +387,9 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 					y + ((dat->rowHeight - 16) >> 1), 0, 0, CLR_NONE, colourFg, mode);

 			}

 

-			//extra icons

+			// extra icons

 			int rightOffset = 0;

-			for (int i = dat->extraColumnsCount-1; i >= 0; i--) {

+			for (int i = dat->extraColumnsCount - 1; i >= 0; i--) {

 				COLORREF colourFg = dat->selBkColour;

 				if (group->cl.items[group->scanIndex]->iExtraImage[i] == EMPTY_EXTRA_ICON)

 					continue;

@@ -452,8 +447,8 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 				}

 				else

 					TextOut(hdcMem, dat->leftMargin + indent * dat->groupIndent + checkboxWidth + dat->iconXSpace,

-						y + ((dat->rowHeight - fontHeight) >> 1), group->cl.items[group->scanIndex]->szText,

-						(int)mir_tstrlen(group->cl.items[group->scanIndex]->szText));

+					y + ((dat->rowHeight - fontHeight) >> 1), group->cl.items[group->scanIndex]->szText,

+					(int)mir_tstrlen(group->cl.items[group->scanIndex]->szText));

 				if (dat->exStyle & CLS_EX_LINEWITHGROUPS) {

 					rc.top = y + (dat->rowHeight >> 1);

 					rc.bottom = rc.top + 2;

@@ -499,11 +494,9 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 		}

 		group->scanIndex++;

 	}

+

 	if (dat->iInsertionMark != -1) { //insertion mark

-		HBRUSH hBrush;

 		POINT pts[8];

-		HRGN hRgn;

-

 		pts[0].x = dat->leftMargin;

 		pts[0].y = dat->iInsertionMark * dat->rowHeight - dat->yScroll - 4;

 		pts[1].x = pts[0].x + 2;

@@ -520,48 +513,45 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 		pts[6].y = pts[5].y;

 		pts[7].x = pts[0].x;

 		pts[7].y = pts[4].y;

-		hRgn = CreatePolygonRgn(pts, SIZEOF(pts), ALTERNATE);

-		hBrush = CreateSolidBrush(dat->fontInfo[FONTID_CONTACTS].colour);

+		HRGN hRgn = CreatePolygonRgn(pts, SIZEOF(pts), ALTERNATE);

+		HBRUSH hBrush = CreateSolidBrush(dat->fontInfo[FONTID_CONTACTS].colour);

 		FillRgn(hdcMem, hRgn, hBrush);

 		DeleteObject(hBrush);

 		DeleteObject(hRgn);

 	}

 	if (!grey)

-		BitBlt(hdc, rcPaint->left, rcPaint->top, rcPaint->right - rcPaint->left, rcPaint->bottom - rcPaint->top, hdcMem, rcPaint->left, rcPaint->top,

-		SRCCOPY);

-	SelectObject(hdcMem,hOldBitmap);

-	SelectObject(hdcMem,hOldFont);

+		BitBlt(hdc, rcPaint->left, rcPaint->top, rcPaint->right - rcPaint->left, rcPaint->bottom - rcPaint->top, hdcMem, rcPaint->left, rcPaint->top, SRCCOPY);

+	SelectObject(hdcMem, hOldBitmap);

+	SelectObject(hdcMem, hOldFont);

 	DeleteDC(hdcMem);

 	if (hBrushAlternateGrey)

 		DeleteObject(hBrushAlternateGrey);

+	

 	if (grey) {

-		PBYTE bits;

 		BITMAPINFOHEADER bmih = { 0 };

-		int i;

-		int greyRed, greyGreen, greyBlue;

-		COLORREF greyColour;

 		bmih.biBitCount = 32;

 		bmih.biSize = sizeof(bmih);

 		bmih.biCompression = BI_RGB;

 		bmih.biHeight = -clRect.bottom;

 		bmih.biPlanes = 1;

 		bmih.biWidth = clRect.right;

-		bits = (PBYTE) malloc(4 * bmih.biWidth * -bmih.biHeight);

-		GetDIBits(hdc, hBmpOsb, 0, clRect.bottom, bits, (BITMAPINFO *) & bmih, DIB_RGB_COLORS);

-		greyColour = GetSysColor(COLOR_3DFACE);

-		greyRed = GetRValue(greyColour) * 2;

-		greyGreen = GetGValue(greyColour) * 2;

-		greyBlue = GetBValue(greyColour) * 2;

+		PBYTE bits = (PBYTE)malloc(4 * bmih.biWidth * -bmih.biHeight);

+		GetDIBits(hdc, hBmpOsb, 0, clRect.bottom, bits, (BITMAPINFO *)& bmih, DIB_RGB_COLORS);

+		

+		COLORREF greyColour = GetSysColor(COLOR_3DFACE);

+		int greyRed = GetRValue(greyColour) * 2;

+		int greyGreen = GetGValue(greyColour) * 2;

+		int greyBlue = GetBValue(greyColour) * 2;

 		if (divide3[0] == 255) {

 			for (i = 0; i < SIZEOF(divide3); i++)

 				divide3[i] = (i + 1) / 3;

 		}

-		for (i = 4 * clRect.right * clRect.bottom - 4; i >= 0; i -= 4) {

+		for (int i = 4 * clRect.right * clRect.bottom - 4; i >= 0; i -= 4) {

 			bits[i] = divide3[bits[i] + greyBlue];

 			bits[i + 1] = divide3[bits[i + 1] + greyGreen];

 			bits[i + 2] = divide3[bits[i + 2] + greyRed];

 		}

-		SetDIBitsToDevice(hdc, 0, 0, clRect.right, clRect.bottom, 0, 0, 0, clRect.bottom, bits, (BITMAPINFO *) & bmih, DIB_RGB_COLORS);

+		SetDIBitsToDevice(hdc, 0, 0, clRect.right, clRect.bottom, 0, 0, 0, clRect.bottom, bits, (BITMAPINFO *)& bmih, DIB_RGB_COLORS);

 		free(bits);

 	}

 	DeleteObject(hBmpOsb);

diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index 8d43a58687..b3c78131f7 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -21,6 +21,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

+

 #include "commonheaders.h"

 

 static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

@@ -29,22 +30,21 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 	case WM_USER + 1:

 		{

 			MCONTACT hContact = wParam;

-			DBCONTACTWRITESETTING *ws = (DBCONTACTWRITESETTING *) lParam;

-			if (hContact == NULL && ws != NULL && ws->szModule != NULL && ws->szSetting != NULL && 

-				 mir_strcmpi(ws->szModule, "CList") == 0 && mir_strcmpi(ws->szSetting, "UseGroups") == 0 && IsWindowVisible(hwndDlg))

-			{

+			DBCONTACTWRITESETTING *ws = (DBCONTACTWRITESETTING *)lParam;

+			if (hContact == NULL && ws != NULL && ws->szModule != NULL && ws->szSetting != NULL &&

+				mir_strcmpi(ws->szModule, "CList") == 0 && mir_strcmpi(ws->szSetting, "UseGroups") == 0 && IsWindowVisible(hwndDlg)) {

 				CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, ws->value.bVal == 0 ? BST_CHECKED : BST_UNCHECKED);

 			}

 		}

 		break;

 

 	case WM_DESTROY:

-		UnhookEvent((HANDLE) GetWindowLongPtr(hwndDlg, GWLP_USERDATA));

+		UnhookEvent((HANDLE)GetWindowLongPtr(hwndDlg, GWLP_USERDATA));

 		break;

 

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

-		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR) HookEventMessage(ME_DB_CONTACT_SETTINGCHANGED, hwndDlg, WM_USER + 1));

+		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)HookEventMessage(ME_DB_CONTACT_SETTINGCHANGED, hwndDlg, WM_USER + 1));

 		CheckDlgButton(hwndDlg, IDC_ONTOP, db_get_b(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE,

 			db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

@@ -118,32 +118,33 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			EnableWindow(GetDlgItem(hwndDlg, IDC_PRIMARYSTATUS), FALSE);

 		}

 		SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETRANGE, 0, MAKELONG(120, 1));

-		SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETPOS, 0,

-			MAKELONG(db_get_w(NULL, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT), 0));

+		SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT), 0));

 		{

-			int i, count, item;

+			ptrA szPrimaryStatus(db_get_sa(NULL, "CList", "PrimaryStatus"));

+

+			int item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM)TranslateT("Global"));

+			SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM)0);

+			

+			int count;

 			PROTOACCOUNT **accs;

-			DBVARIANT dbv = { DBVT_DELETED };

-			db_get(NULL, "CList", "PrimaryStatus", &dbv);

-			CallService(MS_PROTO_ENUMACCOUNTS, (WPARAM)&count, (LPARAM)&accs);

-			item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM) TranslateT("Global"));

-			SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM) 0);

-			for (i = 0; i < count; i++) {

-				if (!IsAccountEnabled(accs[i]) || CallProtoService( accs[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) == 0)

+			ProtoEnumAccounts(&count, &accs);

+			for (int i = 0; i < count; i++) {

+				if (!IsAccountEnabled(accs[i]) || CallProtoService(accs[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) == 0)

 					continue;

-				item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM) accs[i]->tszAccountName);

-				SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM) accs[i]);

-				if (dbv.type == DBVT_ASCIIZ && !mir_strcmp(dbv.pszVal, accs[i]->szModuleName))

+

+				item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM)accs[i]->tszAccountName);

+				SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM)accs[i]);

+				if (!mir_strcmp(szPrimaryStatus, accs[i]->szModuleName))

 					SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETCURSEL, item, 0);

 			}

-			db_free(&dbv);

 		}

-		if (-1 == (int) SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0))

+		if (CB_ERR == SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0))

 			SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETCURSEL, 0, 0);

-		SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM) GetDlgItem(hwndDlg, IDC_BLINKTIME), 0);   // set buddy

+		SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_BLINKTIME), 0);   // set buddy

 		SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETRANGE, 0, MAKELONG(0x3FFF, 250));

 		SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "IconFlashTime", 550), 0));

 		return TRUE;

+

 	case WM_COMMAND:

 		if (LOWORD(wParam) == IDC_AUTOHIDE) {

 			EnableWindow(GetDlgItem(hwndDlg, IDC_HIDETIME), IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

@@ -164,60 +165,60 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			break;

 		if (LOWORD(wParam) == IDC_PRIMARYSTATUS && HIWORD(wParam) != CBN_SELCHANGE)

 			break;

-		if ((LOWORD(wParam) == IDC_HIDETIME || LOWORD(wParam) == IDC_CYCLETIME) && (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus()))

+		if ((LOWORD(wParam) == IDC_HIDETIME || LOWORD(wParam) == IDC_CYCLETIME) && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))

 			return 0;

-		if (LOWORD(wParam) == IDC_BLINKTIME && HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus())

+		if (LOWORD(wParam) == IDC_BLINKTIME && HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())

 			return 0;       // dont make apply enabled during buddy set crap

 		SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 		break;

+

 	case WM_NOTIFY:

-		switch (((LPNMHDR) lParam)->idFrom) {

+		switch (((LPNMHDR)lParam)->idFrom) {

 		case 0:

-			switch (((LPNMHDR) lParam)->code) {

+			switch (((LPNMHDR)lParam)->code) {

 			case PSN_APPLY:

-				db_set_b(NULL, "CList", "HideOffline", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE));

+				db_set_b(NULL, "CList", "HideOffline", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE));

 				{

 					DWORD caps = CallService(MS_CLUI_GETCAPS, CLUICAPS_FLAGS1, 0);

 					if (caps & CLUIF_HIDEEMPTYGROUPS)

 						db_set_b(NULL, "CList", "HideEmptyGroups",

-						(BYTE) IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS));

+						(BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS));

 					if (caps & CLUIF_DISABLEGROUPS)

-						db_set_b(NULL, "CList", "UseGroups", (BYTE) ! IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS));

+						db_set_b(NULL, "CList", "UseGroups", (BYTE)!IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS));

 					if (!(caps & CLUIF_HASONTOPOPTION)) {

-						db_set_b(NULL, "CList", "OnTop", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ONTOP));

-						SetWindowPos( pcli->hwndContactList,

+						db_set_b(NULL, "CList", "OnTop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONTOP));

+						SetWindowPos(pcli->hwndContactList,

 							IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0,

 							SWP_NOMOVE | SWP_NOSIZE);

 					}

 					if (!(caps & CLUIF_HASAUTOHIDEOPTION)) {

-						db_set_b(NULL, "CList", "AutoHide", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

+						db_set_b(NULL, "CList", "AutoHide", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

 						db_set_w(NULL, "CList", "HideTime",

-							(WORD) SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));

+							(WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));

 					}

 				}

-				db_set_b(NULL, "CList", "SortByStatus", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SORTBYSTATUS));

-				db_set_b(NULL, "CList", "SortByProto", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SORTBYPROTO));

-				db_set_b(NULL, "CList", "ConfirmDelete", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_CONFIRMDELETE));

-				db_set_b(NULL, "CList", "Tray1Click", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ONECLK));

-				db_set_b(NULL, "CList", "AlwaysStatus", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSTATUS));

-				db_set_b(NULL, "CList", "AlwaysMulti", (BYTE) ! IsDlgButtonChecked(hwndDlg, IDC_ALWAYSMULTI));

+				db_set_b(NULL, "CList", "SortByStatus", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SORTBYSTATUS));

+				db_set_b(NULL, "CList", "SortByProto", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SORTBYPROTO));

+				db_set_b(NULL, "CList", "ConfirmDelete", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CONFIRMDELETE));

+				db_set_b(NULL, "CList", "Tray1Click", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONECLK));

+				db_set_b(NULL, "CList", "AlwaysStatus", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSTATUS));

+				db_set_b(NULL, "CList", "AlwaysMulti", (BYTE)!IsDlgButtonChecked(hwndDlg, IDC_ALWAYSMULTI));

 				db_set_b(NULL, "CList", "TrayIcon",

-					(BYTE) (IsDlgButtonChecked(hwndDlg, IDC_DONTCYCLE) ? SETTING_TRAYICON_SINGLE

-					: (IsDlgButtonChecked(hwndDlg, IDC_CYCLE) ? SETTING_TRAYICON_CYCLE :

-				SETTING_TRAYICON_MULTI)));

+					(BYTE)(IsDlgButtonChecked(hwndDlg, IDC_DONTCYCLE) ? SETTING_TRAYICON_SINGLE

+					: (IsDlgButtonChecked(hwndDlg, IDC_CYCLE) ? SETTING_TRAYICON_CYCLE : SETTING_TRAYICON_MULTI)));

 				db_set_w(NULL, "CList", "CycleTime",

-					(WORD) SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));

+					(WORD)SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));

 				db_set_w(NULL, "CList", "IconFlashTime",

-					(WORD) SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));

-				db_set_b(NULL, "CList", "DisableTrayFlash", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK));

-				db_set_b(NULL, "CList", "NoIconBlink", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ICONBLINK));

+					(WORD)SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));

+				db_set_b(NULL, "CList", "DisableTrayFlash", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK));

+				db_set_b(NULL, "CList", "NoIconBlink", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ICONBLINK));

 				{

 					int cur = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0);

-					PROTOACCOUNT *pa = ( PROTOACCOUNT* )SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cur, 0 );

-					if ( pa == NULL )

+					PROTOACCOUNT *pa = (PROTOACCOUNT*)SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cur, 0);

+					if (pa == NULL)

 						db_unset(NULL, "CList", "PrimaryStatus");

 					else

-						db_set_s(NULL, "CList", "PrimaryStatus", pa->szModuleName );

+						db_set_s(NULL, "CList", "PrimaryStatus", pa->szModuleName);

 				}

 

 				pcli->pfnTrayIconIconsChanged();

@@ -255,10 +256,9 @@ int CListModernOptInit(WPARAM wParam, LPARAM lParam)
 		MODERNOPT_CTRL_LAST

 	};

 

-	MODERNOPTOBJECT obj = {0};

-

+	MODERNOPTOBJECT obj = { 0 };

 	obj.cbSize = sizeof(obj);

-	obj.dwFlags = MODEROPT_FLG_TCHAR|MODEROPT_FLG_NORESIZE;

+	obj.dwFlags = MODEROPT_FLG_TCHAR | MODEROPT_FLG_NORESIZE;

 	obj.hIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

 	obj.hInstance = g_hInst;

 	obj.iSection = MODERNOPT_PAGE_CLIST;