From 02dbd5da52ec7159cbfa28889bb939f40c34dadf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Mon, 27 Feb 2023 17:36:01 +0100 Subject: [PATCH] DNS Lookup: Use std::optional instead of casting enum to int Task-number: QTBUG-108873 Change-Id: I0bd5dc004154c1c4026be2feb6187c53e5e77801 Reviewed-by: Marc Mutz (cherry picked from commit b300c6b777cda86782b35976fa8babdc238984ce) Reviewed-by: Qt Cherry-pick Bot --- examples/network/dnslookup/dnslookup.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/network/dnslookup/dnslookup.cpp b/examples/network/dnslookup/dnslookup.cpp index 282d6127c22..d1b7ce1e783 100644 --- a/examples/network/dnslookup/dnslookup.cpp +++ b/examples/network/dnslookup/dnslookup.cpp @@ -13,7 +13,7 @@ #include -static int typeFromParameter(QStringView type) +static std::optional typeFromParameter(QStringView type) { if (type.compare(u"a", Qt::CaseInsensitive) == 0) return QDnsLookup::A; @@ -33,7 +33,7 @@ static int typeFromParameter(QStringView type) return QDnsLookup::SRV; if (type.compare(u"txt", Qt::CaseInsensitive) == 0) return QDnsLookup::TXT; - return -1; + return std::nullopt; } //! [0] @@ -79,12 +79,12 @@ CommandLineParseResult parseCommandLine(QCommandLineParser &parser, DnsQuery *qu if (parser.isSet(typeOption)) { const QString typeParameter = parser.value(typeOption); - const int type = typeFromParameter(typeParameter); - if (type < 0) { + if (std::optional type = typeFromParameter(typeParameter)) { + query->type = *type; + } else { *errorMessage = "Bad record type: " + typeParameter; return CommandLineError; } - query->type = static_cast(type); } const QStringList positionalArguments = parser.positionalArguments();