From 7586e1980f6b539047d3a4c70e57560c04d2a7ae Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 24 Sep 2021 17:41:37 +0200 Subject: Use QLatin1String::arg() directly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No need to wrap the QLatin1String in a QString() to get at arg now. Change-Id: Iac90e052b88077b9c2bd3e7eca6bc31935baa4b8 Reviewed-by: Tor Arne Vestbø Reviewed-by: Thiago Macieira --- src/testlib/qteamcitylogger.cpp | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/testlib/qteamcitylogger.cpp b/src/testlib/qteamcitylogger.cpp index 3647062170..c124d3ef0e 100644 --- a/src/testlib/qteamcitylogger.cpp +++ b/src/testlib/qteamcitylogger.cpp @@ -112,13 +112,13 @@ void QTeamCityLogger::startLogging() flowID = tcEscapedString(QString::fromUtf8(QTestResult::currentTestObjectName())); - QString str = QString(QLatin1String("##teamcity[testSuiteStarted name='%1' flowId='%1']\n")).arg(flowID); + QString str = QLatin1String("##teamcity[testSuiteStarted name='%1' flowId='%1']\n").arg(flowID); outputString(qPrintable(str)); } void QTeamCityLogger::stopLogging() { - QString str = QString(QLatin1String("##teamcity[testSuiteFinished name='%1' flowId='%1']\n")).arg(flowID); + QString str = QLatin1String("##teamcity[testSuiteFinished name='%1' flowId='%1']\n").arg(flowID); outputString(qPrintable(str)); QAbstractTestLogger::stopLogging(); @@ -146,7 +146,7 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description, QString tmpFuncName = escapedTestFuncName(); if (tmpFuncName != currTestFuncName) { - buf = QString(QLatin1String("##teamcity[testStarted name='%1' flowId='%2']\n")).arg(tmpFuncName, flowID); + buf = QLatin1String("##teamcity[testStarted name='%1' flowId='%2']\n").arg(tmpFuncName, flowID); outputString(qPrintable(buf)); } @@ -157,21 +157,17 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description, return; } - QString detailedText = QString::fromUtf8(description); - detailedText = tcEscapedString(detailedText); + QString detailedText = tcEscapedString(QString::fromUtf8(description)); // Test failed if (type == Fail || type == XPass) { QString messageText(QLatin1String("Failure!")); if (file) - messageText += QString(QLatin1String(" |[Loc: %1(%2)|]")).arg(QString::fromUtf8(file)).arg(line); + messageText += QLatin1String(" |[Loc: %1(%2)|]").arg(QString::fromUtf8(file)).arg(line); - buf = QString(QLatin1String("##teamcity[testFailed name='%1' message='%2' details='%3' flowId='%4']\n")) - .arg(tmpFuncName, - messageText, - detailedText, - flowID); + buf = QLatin1String("##teamcity[testFailed name='%1' message='%2' details='%3' flowId='%4']\n") + .arg(tmpFuncName, messageText, detailedText, flowID); outputString(qPrintable(buf)); } else if (type == Skip) { @@ -185,7 +181,7 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description, } if (!pendingMessages.isEmpty()) { - buf = QString(QLatin1String("##teamcity[testStdOut name='%1' out='%2' flowId='%3']\n")) + buf = QLatin1String("##teamcity[testStdOut name='%1' out='%2' flowId='%3']\n") .arg(tmpFuncName, pendingMessages, flowID); outputString(qPrintable(buf)); @@ -193,7 +189,7 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description, pendingMessages.clear(); } - buf = QString(QLatin1String("##teamcity[testFinished name='%1' flowId='%2']\n")).arg(tmpFuncName, flowID); + buf = QLatin1String("##teamcity[testFinished name='%1' flowId='%2']\n").arg(tmpFuncName, flowID); outputString(qPrintable(buf)); } @@ -262,15 +258,13 @@ void QTeamCityLogger::addPendingMessage(const char *type, const QString &msg, co pendMessage += QLatin1String("|n"); if (file) { - pendMessage += QString(QLatin1String("%1 |[Loc: %2(%3)|]: %4")) + pendMessage += QLatin1String("%1 |[Loc: %2(%3)|]: %4") .arg(QString::fromUtf8(type), QString::fromUtf8(file)) .arg(line) .arg(msg); - } - else { - pendMessage += QString(QLatin1String("%1: %2")) - .arg(QString::fromUtf8(type), msg); + } else { + pendMessage += QLatin1String("%1: %2").arg(QString::fromUtf8(type), msg); } pendingMessages.append(pendMessage); -- cgit v1.2.3