From d154673f93ad95197bce8cadb995daa5bc39f5d8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 21 Jan 2014 20:04:48 +0000 Subject: minor code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@7820 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/netlib/netlibopts.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/modules/netlib/netlibopts.cpp') diff --git a/src/modules/netlib/netlibopts.cpp b/src/modules/netlib/netlibopts.cpp index 208921475d..5d54ef3cde 100644 --- a/src/modules/netlib/netlibopts.cpp +++ b/src/modules/netlib/netlibopts.cpp @@ -166,7 +166,7 @@ static void ChangeSettingIntByCheckbox(HWND hwndDlg, UINT ctrlId, int iUser, int CheckDlgButton(hwndDlg, ctrlId, newValue ? BST_CHECKED : BST_UNCHECKED); if (iUser == -1) { for (int i=0; iflags & NUF_NOOPTIONS)) + if (!(tempSettings[i]->flags & NUF_NOOPTIONS)) *(int*)(((PBYTE)&tempSettings[i]->settings) + memberOffset) = newValue; } else *(int*)(((PBYTE)&tempSettings[iUser]->settings) + memberOffset) = newValue; @@ -180,7 +180,7 @@ static void ChangeSettingStringByEdit(HWND hwndDlg, UINT ctrlId, int iUser, int GetDlgItemTextA(hwndDlg, ctrlId, szNewValue, newValueLen+1); if (iUser == -1) { for (int i=0; iflags & NUF_NOOPTIONS)) { + if (!(tempSettings[i]->flags & NUF_NOOPTIONS)) { char **ppszNew = (char**)(((PBYTE)&tempSettings[i]->settings)+memberOffset); mir_free(*ppszNew); *ppszNew = mir_strdup(szNewValue); @@ -306,7 +306,7 @@ static INT_PTR CALLBACK DlgProcNetlibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, AddProxyTypeItem(hwndDlg, PROXYTYPE_SOCKS4, settings.proxyType); AddProxyTypeItem(hwndDlg, PROXYTYPE_SOCKS5, settings.proxyType); if (flags & (NUF_HTTPCONNS | NUF_HTTPGATEWAY)) AddProxyTypeItem(hwndDlg, PROXYTYPE_HTTP, settings.proxyType); - if ( !(flags & NUF_NOHTTPSOPTION)) AddProxyTypeItem(hwndDlg, PROXYTYPE_HTTPS, settings.proxyType); + if (!(flags & NUF_NOHTTPSOPTION)) AddProxyTypeItem(hwndDlg, PROXYTYPE_HTTPS, settings.proxyType); if (flags & (NUF_HTTPCONNS | NUF_HTTPGATEWAY) || !(flags & NUF_NOHTTPSOPTION)) AddProxyTypeItem(hwndDlg, PROXYTYPE_IE, settings.proxyType); SetDlgItemTextA(hwndDlg, IDC_PROXYHOST, settings.szProxyServer?settings.szProxyServer:""); @@ -344,7 +344,7 @@ static INT_PTR CALLBACK DlgProcNetlibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, EnableMultipleControls(hwndDlg, useProxyControls, SIZEOF(useProxyControls), TRUE); if (selectedProxyType == 0) { for (int i=0; i < tempSettings.getCount(); i++) { - if ( !tempSettings[i]->settings.useProxy || + if (!tempSettings[i]->settings.useProxy || tempSettings[i]->flags & NUF_NOOPTIONS || !(tempSettings[i]->flags & NUF_OUTGOING)) continue; @@ -444,7 +444,7 @@ static INT_PTR CALLBACK DlgProcNetlibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, int newValue = GetDlgItemInt(hwndDlg, LOWORD(wParam), NULL, FALSE); if (iUser == -1) { for (int i=0; i < tempSettings.getCount(); i++) - if ( !(tempSettings[i]->flags & NUF_NOOPTIONS)) + if (!(tempSettings[i]->flags & NUF_NOOPTIONS)) tempSettings[i]->settings.wProxyPort = newValue; } else tempSettings[iUser]->settings.wProxyPort = newValue; @@ -503,7 +503,7 @@ int NetlibOptInitialise(WPARAM wParam, LPARAM) { mir_cslock lck(csNetlibUser); for (int i=0; i < netlibUser.getCount(); i++) - if ( !(netlibUser[i]->user.flags & NUF_NOOPTIONS)) + if (!(netlibUser[i]->user.flags & NUF_NOOPTIONS)) ++optionsCount; } -- cgit v1.2.3