From 02d8e2af1bf2f95211587922df1002bff57cbe72 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Mon, 5 Dec 2016 16:30:29 +0100
Subject: CppTools: Clean up ProjectInfo

Change-Id: I5d0db45d9fdb624bb6cc55d7f04061d553f13bce
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/cpptools/cppmodelmanager.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'src/plugins/cpptools/cppmodelmanager.cpp')

diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 4334af3b2e..890fe2b1a7 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -49,7 +49,6 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <extensionsystem/pluginmanager.h>
-#include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
@@ -683,13 +682,6 @@ void CppModelManager::removeFilesFromSnapshot(const QSet<QString> &filesToRemove
         d->m_snapshot.remove(i.next());
 }
 
-static QSet<QString> projectPartIds(const QSet<ProjectPart::Ptr> &projectParts)
-{
-    return Utils::transform(projectParts, [](const ProjectPart::Ptr &projectPart) {
-        return projectPart->id();
-    });
-}
-
 class ProjectInfoComparer
 {
 public:
@@ -721,8 +713,8 @@ public:
 
     QStringList removedProjectParts()
     {
-        QSet<QString> removed = projectPartIds(m_old.projectParts().toSet());
-        removed.subtract(projectPartIds(m_new.projectParts().toSet()));
+        QSet<QString> removed = projectPartIds(m_old.projectParts());
+        removed.subtract(projectPartIds(m_new.projectParts()));
         return removed.toList();
     }
 
@@ -743,6 +735,17 @@ public:
         return CppModelManager::timeStampModifiedFiles(documentsToCheck);
     }
 
+private:
+    static QSet<QString> projectPartIds(const QVector<ProjectPart::Ptr> &projectParts)
+    {
+        QSet<QString> ids;
+
+        foreach (const ProjectPart::Ptr &projectPart, projectParts)
+            ids.insert(projectPart->id());
+
+        return ids;
+    }
+
 private:
     const ProjectInfo &m_old;
     const QSet<QString> m_oldSourceFiles;
-- 
cgit v1.2.1