1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deprecation warnings agains u"..."_qs in dnslookup.cpp

Browse Source 
Change-Id: I29a177c7d46304c5b494218f5862195eb92c7684
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 3ab7b7e23023a223392ae67514ff7ec73126ac42)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2023-06-05 11:16:22 +02:00 committed by Qt Cherry-pick Bot
parent 8984ea7b4d
commit d1bef7ea9a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/network/dnslookup/dnslookup.cpp
View File

@ -80,7 +80,7 @@ CommandLineParseResult parseCommandLine(QCommandLineParser &parser, DnsQuery *qu
if (query->nameServer.isNull() if (query->nameServer.isNull()
|| query->nameServer.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol) { || query->nameServer.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol) {
return { Status::Error, return { Status::Error,
u"Bad nameserver address: %1"_qs.arg(nameserver) }; u"Bad nameserver address: %1"_s.arg(nameserver) };
} }
} }
@ -89,14 +89,14 @@ CommandLineParseResult parseCommandLine(QCommandLineParser &parser, DnsQuery *qu
if (std::optional<QDnsLookup::Type> type = typeFromParameter(typeParameter)) if (std::optional<QDnsLookup::Type> type = typeFromParameter(typeParameter))
query->type = *type; query->type = *type;
else else
return { Status::Error, u"Bad record type: %1"_qs.arg(typeParameter) }; return { Status::Error, u"Bad record type: %1"_s.arg(typeParameter) };
} }
const QStringList positionalArguments = parser.positionalArguments(); const QStringList positionalArguments = parser.positionalArguments();
if (positionalArguments.isEmpty()) if (positionalArguments.isEmpty())
return { Status::Error, u"Argument 'name' missing."_qs }; return { Status::Error, u"Argument 'name' missing."_s };
if (positionalArguments.size() > 1) if (positionalArguments.size() > 1)
return { Status::Error, u"Several 'name' arguments specified."_qs }; return { Status::Error, u"Several 'name' arguments specified."_s };
query->name = positionalArguments.first(); query->name = positionalArguments.first();
return { Status::Ok }; return { Status::Ok };
@ -203,7 +203,7 @@ int main(int argc, char *argv[])
case Status::Ok: case Status::Ok:
break; break;
case Status::Error: case Status::Error:
std::fputs(qPrintable(parseResult.errorString.value_or(u"Unknown error occurred"_qs)), std::fputs(qPrintable(parseResult.errorString.value_or(u"Unknown error occurred"_s)),
stderr); stderr);
std::fputs("\n\n", stderr); std::fputs("\n\n", stderr);
std::fputs(qPrintable(parser.helpText()), stderr); std::fputs(qPrintable(parser.helpText()), stderr);