From b6c8ce20e6a4400fac6b922a73600a8b8fd01d9f Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 30 Sep 2022 12:17:16 +0200 Subject: [PATCH] WebAssembly: Limit the usage of qMakePair Change-Id: If4bdf567cf0dd1e01cbe41971f2d47ebc06a1d65 Reviewed-by: Alessandro Portale Reviewed-by: --- .../webassemblyrunconfigurationaspects.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp b/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp index f68d23ed221..ab5e644b27c 100644 --- a/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp +++ b/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp @@ -34,15 +34,14 @@ static WebBrowserEntries parseEmrunOutput(const QByteArray &output) while (ts.readLineInto(&line)) { const QRegularExpressionMatch match = regExp.match(line); if (match.hasMatch()) - result << qMakePair(match.captured(1), match.captured(2).trimmed()); + result.push_back({match.captured(1), match.captured(2).trimmed()}); } return result; } static WebBrowserEntries emrunBrowsers(ProjectExplorer::Target *target) { - WebBrowserEntries result; - result.append(qMakePair(QString(), WebBrowserSelectionAspect::tr("Default Browser"))); + WebBrowserEntries result{{{}, WebBrowserSelectionAspect::tr("Default Browser")}}; if (auto bc = target->activeBuildConfiguration()) { const Utils::Environment environment = bc->environment(); const Utils::FilePath emrunPath = environment.searchInPath("emrun"); @@ -134,8 +133,8 @@ Even if your browser was not detected, you can use --browser /path/to/browser/ex )") << WebBrowserEntries({ - qMakePair(QLatin1String("firefox"), QLatin1String("Mozilla Firefox")), - qMakePair(QLatin1String("chrome"), QLatin1String("Google Chrome"))}); + {QLatin1String("firefox"), QLatin1String("Mozilla Firefox")}, + {QLatin1String("chrome"), QLatin1String("Google Chrome")}}); QTest::newRow("emsdk 2.0.14") << QByteArray( @@ -149,8 +148,8 @@ Even if your browser was not detected, you can use --browser /path/to/browser/ex )") << WebBrowserEntries({ - qMakePair(QLatin1String("firefox"), QLatin1String("Mozilla Firefox 96.0.0.8041")), - qMakePair(QLatin1String("chrome"), QLatin1String("Google Chrome 97.0.4692.71"))}); + {QLatin1String("firefox"), QLatin1String("Mozilla Firefox 96.0.0.8041")}, + {QLatin1String("chrome"), QLatin1String("Google Chrome 97.0.4692.71")}}); } #endif // WITH_TESTS