foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-10 10:52:31 -05:00
Code Issues Activity

gui: simplify OptionsDialog::updateDefaultProxyNets()

Browse source 
Do not create strings and compare them to check if one `addr:port`
equals another. Use `CService::operator==()` instead.

`strDefaultProxyGUI` was assigned the same value 3 times. Instead save
it in `const CService ui_proxy` at the beginning of the function.
This commit is contained in:
Vasil Dimov 2022-07-15 17:50:08 +02:00
parent 96c791dd20
commit fd4f0f41e9
No known key found for this signature in database
GPG key ID: 54DF06F64B55CBBF
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/qt/optionsdialog.cpp
View file

@ -408,24 +408,21 @@ void OptionsDialog::updateProxyValidationState()
void OptionsDialog::updateDefaultProxyNets() void OptionsDialog::updateDefaultProxyNets()
{ {
CNetAddr ui_proxy_netaddr;
LookupHost(ui->proxyIp->text().toStdString(), ui_proxy_netaddr, /*fAllowLookup=*/false);
const CService ui_proxy{ui_proxy_netaddr, ui->proxyPort->text().toUShort()};
Proxy proxy; Proxy proxy;
std::string strProxy; bool has_proxy;
QString strDefaultProxyGUI;
model->node().getProxy(NET_IPV4, proxy); has_proxy = model->node().getProxy(NET_IPV4, proxy);
strProxy = proxy.proxy.ToStringAddr() + ":" + proxy.proxy.ToStringPort(); ui->proxyReachIPv4->setChecked(has_proxy && proxy.proxy == ui_proxy);
strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text();
(strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachIPv4->setChecked(true) : ui->proxyReachIPv4->setChecked(false);
model->node().getProxy(NET_IPV6, proxy); has_proxy = model->node().getProxy(NET_IPV6, proxy);
strProxy = proxy.proxy.ToStringAddr() + ":" + proxy.proxy.ToStringPort(); ui->proxyReachIPv6->setChecked(has_proxy && proxy.proxy == ui_proxy);
strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text();
(strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachIPv6->setChecked(true) : ui->proxyReachIPv6->setChecked(false);
model->node().getProxy(NET_ONION, proxy); has_proxy = model->node().getProxy(NET_ONION, proxy);
strProxy = proxy.proxy.ToStringAddr() + ":" + proxy.proxy.ToStringPort(); ui->proxyReachTor->setChecked(has_proxy && proxy.proxy == ui_proxy);
strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text();
(strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachTor->setChecked(true) : ui->proxyReachTor->setChecked(false);
} }
ProxyAddressValidator::ProxyAddressValidator(QObject *parent) : ProxyAddressValidator::ProxyAddressValidator(QObject *parent) :