diff options
author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-02-20 09:39:09 +0100 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-02-21 15:32:32 +0000 |
commit | 1d479510cae797f875b53e6a3d11af94de675ab8 (patch) | |
tree | a0b465dbe1641593cc2511aad2d37b6e9f0302d2 | |
parent | 4146f1067905c3718b0504b510367bb4349b4622 (diff) |
Replace non-const calls to temporaries with const
This fixes -Wclazy-detaching-temporary
Change-Id: I3c866c29c05f16e93eb86551efb21ccf9dc120b9
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/app/qbs/commandlinefrontend.cpp | 4 | ||||
-rw-r--r-- | src/libexec/qbs_processlauncher/processlauncher-main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/generator/makefilegenerator/makefilegenerator.cpp | 2 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 2 | ||||
-rw-r--r-- | tests/benchmarker/commandlineparser.cpp | 12 |
5 files changed, 13 insertions, 9 deletions
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp index c848b24d0..b2bb5df62 100644 --- a/src/app/qbs/commandlinefrontend.cpp +++ b/src/app/qbs/commandlinefrontend.cpp @@ -587,7 +587,7 @@ void CommandLineFrontend::dumpNodesTree() void CommandLineFrontend::listProducts() { - const QList<ProductData> products = productsToUse().begin().value(); + const QList<ProductData> products = productsToUse().constBegin().value(); QStringList output; for (const ProductData &p : products) { QString productInfo = p.fullDisplayName(); @@ -642,7 +642,7 @@ ProductData CommandLineFrontend::getTheOneRunnableProduct() if (m_parser.products().size() == 1) { const auto products = m_projects.front().projectData().allProducts(); for (const ProductData &p : products) { - if (p.name() == m_parser.products().front()) + if (p.name() == m_parser.products().constFirst()) return p; } QBS_CHECK(false); diff --git a/src/libexec/qbs_processlauncher/processlauncher-main.cpp b/src/libexec/qbs_processlauncher/processlauncher-main.cpp index 2c042603a..61bbfbc3c 100644 --- a/src/libexec/qbs_processlauncher/processlauncher-main.cpp +++ b/src/libexec/qbs_processlauncher/processlauncher-main.cpp @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) return 1; } - qbs::Internal::LauncherSocketHandler launcher(app.arguments().last()); + qbs::Internal::LauncherSocketHandler launcher(app.arguments().constLast()); QTimer::singleShot(0, &launcher, &qbs::Internal::LauncherSocketHandler::start); return app.exec(); } diff --git a/src/plugins/generator/makefilegenerator/makefilegenerator.cpp b/src/plugins/generator/makefilegenerator/makefilegenerator.cpp index 267bd90dc..11b9297d7 100644 --- a/src/plugins/generator/makefilegenerator/makefilegenerator.cpp +++ b/src/plugins/generator/makefilegenerator/makefilegenerator.cpp @@ -245,7 +245,7 @@ void qbs::MakefileGenerator::generate() stream << ' ' << transformedOutputFilePath(ta); stream << '\n'; for (const TransformerData &transformerData : productTransformerData) { - stream << transformedOutputFilePath(transformerData.outputs().first()) << ":"; + stream << transformedOutputFilePath(transformerData.outputs().constFirst()) << ":"; for (const ArtifactData &input : transformerData.inputs()) stream << ' ' << transformedArtifactFilePath(input); stream << '\n'; diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 94f0d4b52..e1f5026bd 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -135,7 +135,7 @@ QMap<QString, QString> TestBlackbox::findTypeScript(int *status) QString TestBlackbox::findArchiver(const QString &fileName, int *status) { if (fileName == "jar") - return findJdkTools(status)[fileName]; + return findJdkTools(status).value(fileName); QString binary = findExecutable(QStringList(fileName)); if (binary.isEmpty()) { diff --git a/tests/benchmarker/commandlineparser.cpp b/tests/benchmarker/commandlineparser.cpp index 97b127d94..7c7e1a9c7 100644 --- a/tests/benchmarker/commandlineparser.cpp +++ b/tests/benchmarker/commandlineparser.cpp @@ -78,9 +78,9 @@ void CommandLineParser::parse() << oldCommitOption << newCommitOption << testProjectOption << qbsRepoOption; for (const QCommandLineOption &o : mandatoryOptions) { if (!parser.isSet(o)) - throwException(o.names().front(), parser.helpText()); + throwException(o.names().constFirst(), parser.helpText()); if (parser.value(o).isEmpty()) - throwException(o.names().front(), QString(), parser.helpText()); + throwException(o.names().constFirst(), QString(), parser.helpText()); } m_oldCommit = parser.value(oldCommitOption); m_newCommit = parser.value(newCommitOption); @@ -99,7 +99,9 @@ void CommandLineParser::parse() } else if (activityString == nullBuildActivity()) { m_activities |= ActivityNullBuild; } else { - throwException(activitiesOption.names().front(), activityString, parser.helpText()); + throwException(activitiesOption.names().constFirst(), + activityString, + parser.helpText()); } } m_regressionThreshold = 5; @@ -108,7 +110,9 @@ void CommandLineParser::parse() const QString rawThresholdValue = parser.value(thresholdOption); m_regressionThreshold = rawThresholdValue.toInt(&ok); if (!ok) - throwException(thresholdOption.names().first(), rawThresholdValue, parser.helpText()); + throwException(thresholdOption.names().constFirst(), + rawThresholdValue, + parser.helpText()); } } |