Replace all uses of QSet with Internal::Set

Change-Id: I0ba0a39b4f7d8c7c76b869584317b53b85cffc81
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

3 files changed, 14 insertions, 16 deletions

diff --git a/src/lib/corelib/generators/generatordata.cpp b/src/lib/corelib/generators/generatordata.cpp
index 47178bca3..eb0cb2d09 100644
--- a/src/lib/corelib/generators/generatordata.cpp
+++ b/src/lib/corelib/generators/generatordata.cpp
@@ -39,6 +39,7 @@
 
 #include "generatordata.h"
 #include <tools/error.h>
+#include <tools/set.h>
 
 #include <QtCore/qdir.h>
 
@@ -93,7 +94,7 @@ QString GeneratableProjectData::name() const
 
 QDir GeneratableProject::baseBuildDirectory() const
 {
-    QSet<QString> baseBuildDirectory;
+    Internal::Set<QString> baseBuildDirectory;
     QMapIterator<QString, ProjectData> it(data);
     while (it.hasNext()) {
         it.next();
@@ -102,19 +103,19 @@ QDir GeneratableProject::baseBuildDirectory() const
         baseBuildDirectory.insert(dir.absolutePath());
     }
     Q_ASSERT(baseBuildDirectory.size() == 1);
-    return baseBuildDirectory.values().first();
+    return *baseBuildDirectory.begin();
 }
 
 QFileInfo GeneratableProject::filePath() const
 {
-    QSet<QString> filePath;
+    Internal::Set<QString> filePath;
     QMapIterator<QString, ProjectData> it(data);
     while (it.hasNext()) {
         it.next();
         filePath.insert(it.value().location().filePath());
     }
     Q_ASSERT(filePath.size() == 1);
-    return filePath.values().first();
+    return *filePath.begin();
 }
 
 bool GeneratableProject::hasMultipleConfigurations() const
diff --git a/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp
index 22bc72841..c1a60e919 100644
--- a/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp
+++ b/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp
@@ -37,6 +37,8 @@
 #include "msbuild/items/msbuildfilter.h"
 #include "msbuild/items/msbuildnone.h"
 
+#include <tools/set.h>
+
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qvector.h>
 
@@ -123,11 +125,11 @@ MSBuildFiltersProject::MSBuildFiltersProject(const GeneratableProductData &produ
         filter->appendProperty(QStringLiteral("SourceControlFiles"), options->sourceControlFiles());
     }
 
-    QSet<QString> allFiles;
+    Internal::Set<QString> allFiles;
     for (const auto &productData : product.data.values()) {
         for (const auto &groupData : productData.groups())
             if (groupData.isEnabled())
-                allFiles.unite(groupData.allFilePaths().toSet());
+                allFiles.unite(Internal::Set<QString>::fromList(groupData.allFilePaths()));
     }
 
     auto allFilesSorted = allFiles.toList();
diff --git a/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp
index 45aafbac7..6aa9857fb 100644
--- a/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp
+++ b/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp
@@ -336,20 +336,15 @@ void MSBuildQbsProductProject::addItemDefGroup(const Project &project,
                          debugBuild ? QStringLiteral("false") : QStringLiteral("true"));
 }
 
-// No QSet::intersects until Qt 5.6
-template <class T> bool setIntersects(const QSet<T> &this_, const QSet<T> &other)
-{
-    QSet<T> s = this_;
-    return !s.intersect(other).isEmpty();
-}
-
 static MSBuildFileItem *fileItemForFileTags(const QList<QString> &fileTags,
                                             IMSBuildItemGroup *parent = 0)
 {
-    const auto fileTagsSet = fileTags.toSet();
-    if (setIntersects(fileTagsSet, QSet<QString>() << QStringLiteral("hpp")))
+    const auto fileTagsSet = Internal::Set<QString>::fromList(fileTags);
+    if (fileTagsSet.intersects(
+                Internal::Set<QString> { QStringLiteral("hpp") }))
         return new MSBuildClInclude(parent);
-    if (setIntersects(fileTagsSet, QSet<QString>() << QStringLiteral("c") << QStringLiteral("cpp")))
+    if (fileTagsSet.intersects(
+                Internal::Set<QString> { QStringLiteral("c"), QStringLiteral("cpp") }))
         return new MSBuildClCompile(parent);
     return new MSBuildNone(parent);
 }