From f02fcaf02c4a023efc102fae230943a0c0f1458f Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 18 Jun 2019 14:30:58 +0200 Subject: [PATCH] CMake: Fix WS Change-Id: I24a265db05f4678a07f582f2e9a66ed1a17b0ac2 Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/cmaketool.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp index 1e186defe79..47da660ab2b 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp @@ -304,8 +304,8 @@ CMakeTool::PathMapper CMakeTool::pathMapper() const void CMakeTool::readInformation(CMakeTool::QueryType type) const { if ((type == QueryType::GENERATORS && !m_introspection->m_generators.isEmpty()) - || (type == QueryType::SERVER_MODE && m_introspection->m_queriedServerMode) - || (type == QueryType::VERSION && !m_introspection->m_version.fullVersion.isEmpty())) + || (type == QueryType::SERVER_MODE && m_introspection->m_queriedServerMode) + || (type == QueryType::VERSION && !m_introspection->m_version.fullVersion.isEmpty())) return; if (!m_introspection->m_triedCapabilities) { @@ -323,7 +323,7 @@ void CMakeTool::readInformation(CMakeTool::QueryType type) const } else if (type == QueryType::VERSION) { fetchVersionFromVersionOutput(); } else { - QTC_ASSERT(false, return); + QTC_ASSERT(false, return ); } } @@ -475,7 +475,7 @@ void CMakeTool::parseGeneratorsFromHelp(const QStringList &lines) const void CMakeTool::fetchVersionFromVersionOutput() const { - Utils::SynchronousProcessResponse response = run({"--version" }); + Utils::SynchronousProcessResponse response = run({"--version"}); if (response.result != Utils::SynchronousProcessResponse::Finished) return; @@ -500,7 +500,7 @@ void CMakeTool::parseVersionFormVersionOutput(const QStringList &lines) const void CMakeTool::fetchFromCapabilities() const { - Utils::SynchronousProcessResponse response = run({"-E", "capabilities" }, true); + Utils::SynchronousProcessResponse response = run({"-E", "capabilities"}, true); if (response.result != Utils::SynchronousProcessResponse::Finished) return; @@ -510,7 +510,7 @@ void CMakeTool::fetchFromCapabilities() const static int getVersion(const QVariantMap &obj, const QString value) { bool ok; - int result = obj.value(value).toInt(&ok); + int result = obj.value(value).toInt(&ok); if (!ok) return -1; return result; @@ -536,7 +536,7 @@ void CMakeTool::parseFromCapabilities(const QString &input) const { const QVariantMap fileApis = data.value("fileApi").toMap(); const QVariantList requests = fileApis.value("requests").toList(); - for (const QVariant &r: requests) { + for (const QVariant &r : requests) { const QVariantMap object = r.toMap(); const QString kind = object.value("kind").toString(); const QVariantMap versionObject = object.value("version").toMap();