scripted-diff: rename ToStringIP[Port]() to ToStringAddr[Port]()
"IP" stands for "Internet Protocol". "IP address" is sometimes shortened to just "IP" or "address". However, Tor or I2P addresses are not "IP addresses", nor "IPs". Thus, use "Addr" instead of "IP" for addresses that could be IP, Tor or I2P addresses: `CService::ToStringIPPort()` -> `CService::ToStringAddrPort()` `CNetAddr::ToStringIP()` -> `CNetAddr::ToStringAddr()` -BEGIN VERIFY SCRIPT- sed -i 's/ToStringIPPort/ToStringAddrPort/g' -- $(git grep -l ToStringIPPort src) sed -i 's/ToStringIP/ToStringAddr/g' -- $(git grep -l ToStringIP src) -END VERIFY SCRIPT-
This commit is contained in:
10 files changed
+23
-23
No files matched your search
@@ -287,7 +287,7 @@ bool ClientModel::getProxyInfo(std::string& ip_port) const
|
||||
{
|
||||
Proxy ipv4, ipv6;
|
||||
if (m_node.getProxy((Network) 1, ipv4) && m_node.getProxy((Network) 2, ipv6)) {
|
||||
ip_port = ipv4.proxy.ToStringIPPort();
|
||||
ip_port = ipv4.proxy.ToStringAddrPort();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -413,17 +413,17 @@ void OptionsDialog::updateDefaultProxyNets()
|
||||
QString strDefaultProxyGUI;
|
||||
|
||||
model->node().getProxy(NET_IPV4, proxy);
|
||||
strProxy = proxy.proxy.ToStringIP() + ":" + proxy.proxy.ToStringPort();
|
||||
strProxy = proxy.proxy.ToStringAddr() + ":" + proxy.proxy.ToStringPort();
|
||||
strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text();
|
||||
(strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachIPv4->setChecked(true) : ui->proxyReachIPv4->setChecked(false);
|
||||
|
||||
model->node().getProxy(NET_IPV6, proxy);
|
||||
strProxy = proxy.proxy.ToStringIP() + ":" + proxy.proxy.ToStringPort();
|
||||
strProxy = proxy.proxy.ToStringAddr() + ":" + proxy.proxy.ToStringPort();
|
||||
strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text();
|
||||
(strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachIPv6->setChecked(true) : ui->proxyReachIPv6->setChecked(false);
|
||||
|
||||
model->node().getProxy(NET_ONION, proxy);
|
||||
strProxy = proxy.proxy.ToStringIP() + ":" + proxy.proxy.ToStringPort();
|
||||
strProxy = proxy.proxy.ToStringAddr() + ":" + proxy.proxy.ToStringPort();
|
||||
strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text();
|
||||
(strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachTor->setChecked(true) : ui->proxyReachTor->setChecked(false);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user