Simplify functions

This commit is contained in:
Chocobo1
2022-09-07 12:51:01 +08:00
parent 987e1b544a
commit 4094a4c448
4 changed files with 17 additions and 26 deletions

View File

@@ -47,22 +47,15 @@ namespace Utils
return !QHostAddress(ip).isNull();
}
Subnet parseSubnet(const QString &subnetStr, bool *ok)
std::optional<Subnet> parseSubnet(const QString &subnetStr)
{
const Subnet invalid = qMakePair(QHostAddress(), -1);
const Subnet subnet = QHostAddress::parseSubnet(subnetStr);
if (ok)
*ok = (subnet != invalid);
const Subnet invalid = {QHostAddress(), -1};
if (subnet == invalid)
return std::nullopt;
return subnet;
}
bool canParseSubnet(const QString &subnetStr)
{
bool ok = false;
parseSubnet(subnetStr, &ok);
return ok;
}
bool isLoopbackAddress(const QHostAddress &addr)
{
return (addr == QHostAddress::LocalHost)