From 54c2dff181b0900644e973fca1ebb21c862f124f Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 30 Jan 2019 12:10:24 +0100
Subject: [PATCH] {C,Q}MakeProjectManager: Simplify buildInfoListForKit
 implementations

In both cases the created lists contain at most one item, no need to check
for duplicates.

Change-Id: Ibd2cb100d4c4199e65ffc62678e255c8ab41b11c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../cmakeprojectmanager/cmakeprojectimporter.cpp | 16 ++--------------
 .../qmakeprojectmanager/qmakeprojectimporter.cpp | 15 ++-------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
index 7a83f082f87..170e52e9333 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
@@ -349,12 +349,11 @@ Kit *CMakeProjectImporter::createKit(void *directoryData) const
 
 const QList<BuildInfo> CMakeProjectImporter::buildInfoListForKit(const Kit *k, void *directoryData) const
 {
-    QList<BuildInfo> result;
     auto data = static_cast<const DirectoryData *>(directoryData);
     auto factory = qobject_cast<CMakeBuildConfigurationFactory *>(
                 BuildConfigurationFactory::find(k, projectFilePath().toString()));
     if (!factory)
-        return result;
+        return {};
 
     // create info:
     BuildInfo info = factory->createBuildInfo(k, projectDirectory().toString(),
@@ -362,19 +361,8 @@ const QList<BuildInfo> CMakeProjectImporter::buildInfoListForKit(const Kit *k, v
     info.buildDirectory = data->buildDirectory;
     info.displayName = info.typeName;
 
-    bool found = false;
-    foreach (BuildInfo bInfo, result) {
-        if (bInfo == info) {
-            found = true;
-            break;
-        }
-    }
-    if (!found)
-        result << info;
-
     qCDebug(cmInputLog()) << "BuildInfo configured.";
-
-    return result;
+    return {info};
 }
 
 CMakeProjectImporter::CMakeToolData
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
index f6d4aad459d..c97bab5a38c 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
@@ -233,12 +233,11 @@ Kit *QmakeProjectImporter::createKit(void *directoryData) const
 
 const QList<BuildInfo> QmakeProjectImporter::buildInfoListForKit(const Kit *k, void *directoryData) const
 {
-    QList<BuildInfo> result;
     auto *data = static_cast<DirectoryData *>(directoryData);
     auto factory = qobject_cast<QmakeBuildConfigurationFactory *>(
                 BuildConfigurationFactory::find(k, projectFilePath().toString()));
     if (!factory)
-        return result;
+        return {};
 
     // create info:
     BuildInfo info(factory);
@@ -258,17 +257,7 @@ const QList<BuildInfo> QmakeProjectImporter::buildInfoListForKit(const Kit *k, v
     extra.makefile = data->makefile;
     info.extraInfo = QVariant::fromValue(extra);
 
-    bool found = false;
-    foreach (const BuildInfo &bInfo, result) {
-        if (bInfo == info) {
-            found = true;
-            break;
-        }
-    }
-    if (!found)
-        result << info;
-
-    return result;
+    return {info};
 }
 
 void QmakeProjectImporter::deleteDirectoryData(void *directoryData) const