more warning fixes

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

1 files changed, 21 insertions, 21 deletions

diff --git a/plugins/NewAwaySysMod/src/AwayOpt.cpp b/plugins/NewAwaySysMod/src/AwayOpt.cpp
index 134c494b3e..d34894cf92 100644
--- a/plugins/NewAwaySysMod/src/AwayOpt.cpp
+++ b/plugins/NewAwaySysMod/src/AwayOpt.cpp
@@ -333,13 +333,13 @@ COptPage g_MoreOptPage(MOD_NAME, NULL);
 

 void EnableMoreOptDlgControls()

 {

-	g_MoreOptPage.Enable(IDC_MOREOPTDLG_PERSTATUSPERSONAL, g_MoreOptPage.GetWndValue(IDC_MOREOPTDLG_SAVEPERSONALMSGS));

-	int Enabled = g_MoreOptPage.GetWndValue(IDC_MOREOPTDLG_RECENTMSGSCOUNT);

+	g_MoreOptPage.Enable(IDC_MOREOPTDLG_PERSTATUSPERSONAL, g_MoreOptPage.GetWndValue(IDC_MOREOPTDLG_SAVEPERSONALMSGS) != 0);

+	int Enabled = g_MoreOptPage.GetWndValue(IDC_MOREOPTDLG_RECENTMSGSCOUNT) != 0;

 	g_MoreOptPage.Enable(IDC_MOREOPTDLG_PERSTATUSMRM, Enabled);

 	g_MoreOptPage.Enable(IDC_MOREOPTDLG_USELASTMSG, Enabled);

 	g_MoreOptPage.Enable(IDC_MOREOPTDLG_USEDEFMSG, Enabled);

-	g_MoreOptPage.Enable(IDC_MOREOPTDLG_PERSTATUSPERSONAL, g_MoreOptPage.GetWndValue(IDC_MOREOPTDLG_SAVEPERSONALMSGS));

-	g_MoreOptPage.Enable(IDC_MOREOPTDLG_UPDATEMSGSPERIOD, g_MoreOptPage.GetWndValue(IDC_MOREOPTDLG_UPDATEMSGS));

+	g_MoreOptPage.Enable(IDC_MOREOPTDLG_PERSTATUSPERSONAL, g_MoreOptPage.GetWndValue(IDC_MOREOPTDLG_SAVEPERSONALMSGS) != 0);

+	g_MoreOptPage.Enable(IDC_MOREOPTDLG_UPDATEMSGSPERIOD, g_MoreOptPage.GetWndValue(IDC_MOREOPTDLG_UPDATEMSGS) != 0);

 	InvalidateRect(GetDlgItem(g_MoreOptPage.GetWnd(), IDC_MOREOPTDLG_UPDATEMSGSPERIOD_SPIN), NULL, false); // update spin control

 	g_MoreOptPage.MemToPage(true);

 }

@@ -454,7 +454,7 @@ COptPage g_AutoreplyOptPage(MOD_NAME, NULL);
 void EnableAutoreplyOptDlgControls()

 {

 	g_AutoreplyOptPage.PageToMem();

-	int Autoreply = g_AutoreplyOptPage.GetValue(IDC_REPLYDLG_ENABLEREPLY);

+	int Autoreply = g_AutoreplyOptPage.GetValue(IDC_REPLYDLG_ENABLEREPLY) != 0;

 

 	for (int i = 0; i < g_AutoreplyOptPage.Items.GetSize(); i++) {

 		switch (g_AutoreplyOptPage.Items[i]->GetParam()) {

@@ -944,7 +944,7 @@ __inline int ReplyIconToDBValue(int Value)
 

 static void SetListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem)

 {

-	int Icons[EXTRACOLUMNSCOUNT] = { 0xFF, 0xFF, 0xFF };

+	int GroupIcons[EXTRACOLUMNSCOUNT] = { 0xFF, 0xFF, 0xFF };

 	int FirstItemType = SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hFirstItem, 0);

 	HANDLE hItem = (FirstItemType == CLCIT_GROUP) ? hFirstItem : (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hFirstItem);

 	while (hItem) {

@@ -952,30 +952,31 @@ static void SetListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentIt
 		if (hChildItem)

 			SetListGroupIcons(hwndList, hChildItem, hItem);

 

-		for (int i = 0; i < _countof(Icons); i++) {

+		for (int i = 0; i < _countof(GroupIcons); i++) {

 			int Icon = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, 0));

-			if (Icons[i] == 0xFF)

-				Icons[i] = Icon;

-			else if (Icon != 0xFF && Icons[i] != Icon)

-				Icons[i] = EXTRAICON_INDEFINITE;

+			if (GroupIcons[i] == 0xFF)

+				GroupIcons[i] = Icon;

+			else if (Icon != 0xFF && GroupIcons[i] != Icon)

+				GroupIcons[i] = EXTRAICON_INDEFINITE;

 		}

 		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hItem);

 	}

+	

 	hItem = (FirstItemType == CLCIT_CONTACT) ? hFirstItem : (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hFirstItem);

 	while (hItem) {

-		for (int i = 0; i < _countof(Icons); i++) {

+		for (int i = 0; i < _countof(GroupIcons); i++) {

 			int Icon = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, 0));

-			if (Icons[i] == 0xFF)

-				Icons[i] = Icon;

-			else if (Icon != 0xFF && Icons[i] != Icon)

-				Icons[i] = EXTRAICON_INDEFINITE;

+			if (GroupIcons[i] == 0xFF)

+				GroupIcons[i] = Icon;

+			else if (Icon != 0xFF && GroupIcons[i] != Icon)

+				GroupIcons[i] = EXTRAICON_INDEFINITE;

 		}

 		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);

 	}

 	

 	// set icons

-	for (int i = 0; i < _countof(Icons); i++)

-		SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(i, Icons[i]));

+	for (int i = 0; i < _countof(GroupIcons); i++)

+		SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(i, GroupIcons[i]));

 }

 

 static void SetAllChildIcons(HWND hwndList, HANDLE hFirstItem, int iColumn, int iImage)

@@ -1065,7 +1066,6 @@ static void SetAllContactIcons(HWND hwndList, HANDLE hItemUnknown)
 	do {

 		HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0);

 		if (hItem) {

-			char *szProto = GetContactProto(hContact);

 			int Ignore = CContactSettings(ID_STATUS_ONLINE, hContact).Ignore;

 			int Reply = CContactSettings(ID_STATUS_ONLINE, hContact).Autoreply;

 			if (g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_PERSTATUSPERSONALSETTINGS)) {

@@ -1098,7 +1098,7 @@ static LRESULT CALLBACK ContactsSubclassProc(HWND hWnd, UINT Msg, WPARAM wParam,
 	return CallWindowProc(g_OrigContactsProc, hWnd, Msg, wParam, lParam);

 }

 

-INT_PTR CALLBACK ContactsOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK ContactsOptDlg(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam)

 {

 	HWND hwndList = GetDlgItem(hwndDlg, IDC_CONTACTSDLG_LIST);

 	static HANDLE hItemAll, hItemUnknown;

@@ -1360,7 +1360,7 @@ void InitOptions()
 }

 

 // NightFox

-int ModernOptInitialise(WPARAM wParam, LPARAM lParam)

+int ModernOptInitialise(WPARAM wParam, LPARAM)

 {

 	static int iBoldControls[] =

 	{