From 983ca3106d0b2eb429bad2b7eea71c0cb6a8429a Mon Sep 17 00:00:00 2001
From: Christiaan Janssen <christiaan.janssen@qt.io>
Date: Mon, 15 Nov 2021 09:48:47 +0100
Subject: [PATCH] McuSupport: avoid double-space strings in warnings

Change-Id: Ia40412154662ce9a22ae569c9f8abf31b419cbce
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/mcusupport/mcusupportoptions.cpp | 17 +++++++++--------
 src/plugins/mcusupport/mcusupportoptions.h   |  4 ++--
 src/plugins/mcusupport/mcusupportsdk.cpp     | 12 ++++++------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp
index 75f829b5308..858b0126eb7 100644
--- a/src/plugins/mcusupport/mcusupportoptions.cpp
+++ b/src/plugins/mcusupport/mcusupportoptions.cpp
@@ -258,7 +258,7 @@ void McuPackage::setRelativePathModifier(const QString &path)
     m_relativePathModifier = path;
 }
 
-void McuPackage::setVersions(const QVector<QString> &versions)
+void McuPackage::setVersions(const QStringList &versions)
 {
     m_versions = versions;
 }
@@ -312,13 +312,14 @@ void McuPackage::updateStatusUi()
 QString McuPackage::statusText() const
 {
     const QString displayPackagePath = m_path.toUserOutput();
-    const QString displayVersions = QStringList(m_versions.toList()).join(" or ");
-    const QString displayRequiredPath = QString("%1 %2").arg(
-        FilePath::fromString(m_detectionPath).toUserOutput(),
-        displayVersions);
-    const QString displayDetectedPath = QString("%1 %2").arg(
-        FilePath::fromString(m_detectionPath).toUserOutput(),
-        m_detectedVersion);
+    const QString displayVersions = m_versions.join(" or ");
+    const QString outDetectionPath = FilePath::fromString(m_detectionPath).toUserOutput();
+    const QString displayRequiredPath = m_versions.empty() ?
+                outDetectionPath :
+                QString("%1 %2").arg(outDetectionPath, displayVersions);
+    const QString displayDetectedPath = m_versions.empty() ?
+                outDetectionPath :
+                QString("%1 %2").arg(outDetectionPath, m_detectedVersion);
 
     QString response;
     switch (m_status) {
diff --git a/src/plugins/mcusupport/mcusupportoptions.h b/src/plugins/mcusupport/mcusupportoptions.h
index 95130fb0aba..807683167f2 100644
--- a/src/plugins/mcusupport/mcusupportoptions.h
+++ b/src/plugins/mcusupport/mcusupportoptions.h
@@ -88,7 +88,7 @@ public:
     void writeGeneralSettings() const;
     bool writeToSettings() const;
     void setRelativePathModifier(const QString &path);
-    void setVersions(const QVector<QString> &versions);
+    void setVersions(const QStringList &versions);
 
     bool automaticKitCreationEnabled() const;
     void setAutomaticKitCreationEnabled(const bool enabled);
@@ -118,7 +118,7 @@ private:
     Utils::FilePath m_path;
     QString m_relativePathModifier; // relative path to m_path to be returned by path()
     QString m_detectedVersion;
-    QVector<QString> m_versions;
+    QStringList m_versions;
     QString m_downloadUrl;
     QString m_environmentVariableName;
     bool m_addToPath = false;
diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp
index a9cdf7a976f..1823d634513 100644
--- a/src/plugins/mcusupport/mcusupportsdk.cpp
+++ b/src/plugins/mcusupport/mcusupportsdk.cpp
@@ -341,13 +341,13 @@ struct McuTargetDescription
     } platform;
     struct {
         QString id;
-        QVector<QString> versions;
+        QStringList versions;
     } toolchain;
     struct {
         QString name;
         QString defaultPath;
         QString envVar;
-        QVector<QString> versions;
+        QStringList versions;
     } boardSdk;
     struct {
         QString envVar;
@@ -658,10 +658,10 @@ static McuTargetDescription parseDescriptionJsonCommon(const QString &qulVersion
     const QJsonObject freeRTOS = target.value("freeRTOS").toObject();
 
     const QVariantList toolchainVersions = toolchain.value("versions").toArray().toVariantList();
-    const auto toolchainVersionsVector = Utils::transform<QVector<QString> >(
+    const auto toolchainVersionsList = Utils::transform<QStringList>(
                 toolchainVersions, [&](const QVariant &version) { return version.toString(); });
     const QVariantList boardSdkVersions = boardSdk.value("versions").toArray().toVariantList();
-    const auto boardSdkVersionsVector = Utils::transform<QVector<QString> >(
+    const auto boardSdkVersionsList = Utils::transform<QStringList>(
                 boardSdkVersions, [&](const QVariant &version) { return version.toString(); });
 
     return {
@@ -670,13 +670,13 @@ static McuTargetDescription parseDescriptionJsonCommon(const QString &qulVersion
         {},
         {
             toolchain.value("id").toString(),
-            toolchainVersionsVector,
+            toolchainVersionsList,
         },
         {
             boardSdk.value("name").toString(),
             boardSdk.value("defaultPath").toString(),
             boardSdk.value("envVar").toString(),
-            boardSdkVersionsVector,
+            boardSdkVersionsList,
         },
         {
             freeRTOS.value("envVar").toString(),