Skip to content

Commit fd4f0f4

Browse files
committed
gui: simplify OptionsDialog::updateDefaultProxyNets()
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.
1 parent 96c791d commit fd4f0f4

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

src/qt/optionsdialog.cpp

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -408,24 +408,21 @@ void OptionsDialog::updateProxyValidationState()
408408

409409
void OptionsDialog::updateDefaultProxyNets()
410410
{
411+
CNetAddr ui_proxy_netaddr;
412+
LookupHost(ui->proxyIp->text().toStdString(), ui_proxy_netaddr, /*fAllowLookup=*/false);
413+
const CService ui_proxy{ui_proxy_netaddr, ui->proxyPort->text().toUShort()};
414+
411415
Proxy proxy;
412-
std::string strProxy;
413-
QString strDefaultProxyGUI;
414-
415-
model->node().getProxy(NET_IPV4, proxy);
416-
strProxy = proxy.proxy.ToStringAddr() + ":" + proxy.proxy.ToStringPort();
417-
strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text();
418-
(strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachIPv4->setChecked(true) : ui->proxyReachIPv4->setChecked(false);
419-
420-
model->node().getProxy(NET_IPV6, proxy);
421-
strProxy = proxy.proxy.ToStringAddr() + ":" + proxy.proxy.ToStringPort();
422-
strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text();
423-
(strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachIPv6->setChecked(true) : ui->proxyReachIPv6->setChecked(false);
424-
425-
model->node().getProxy(NET_ONION, proxy);
426-
strProxy = proxy.proxy.ToStringAddr() + ":" + proxy.proxy.ToStringPort();
427-
strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text();
428-
(strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachTor->setChecked(true) : ui->proxyReachTor->setChecked(false);
416+
bool has_proxy;
417+
418+
has_proxy = model->node().getProxy(NET_IPV4, proxy);
419+
ui->proxyReachIPv4->setChecked(has_proxy && proxy.proxy == ui_proxy);
420+
421+
has_proxy = model->node().getProxy(NET_IPV6, proxy);
422+
ui->proxyReachIPv6->setChecked(has_proxy && proxy.proxy == ui_proxy);
423+
424+
has_proxy = model->node().getProxy(NET_ONION, proxy);
425+
ui->proxyReachTor->setChecked(has_proxy && proxy.proxy == ui_proxy);
429426
}
430427

431428
ProxyAddressValidator::ProxyAddressValidator(QObject *parent) :

0 commit comments

Comments
 (0)