Replace all uses of QVector with std::vector

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

6 files changed, 20 insertions, 26 deletions

diff --git a/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.cpp b/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.cpp
index 0621fe97c..99180e2e2 100644
--- a/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.cpp
+++ b/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.cpp
@@ -44,7 +44,8 @@
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qtextstream.h>
 #include <QtCore/quuid.h>
-#include <QtCore/qvector.h>
+
+#include <vector>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp
index c1a60e919..45a09236a 100644
--- a/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp
+++ b/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp
@@ -40,7 +40,8 @@
 #include <tools/set.h>
 
 #include <QtCore/qfileinfo.h>
-#include <QtCore/qvector.h>
+
+#include <vector>
 
 namespace qbs {
 
@@ -72,12 +73,10 @@ static QStringList headerFileExtensions()
             << QStringLiteral("h++");
 }
 
-static QVector<MSBuildFilter *> defaultItemGroupFilters(IMSBuildItemGroup *parent = 0)
+static std::vector<MSBuildFilter *> defaultItemGroupFilters(IMSBuildItemGroup *parent = 0)
 {
-    const auto filters = QVector<MSBuildFilter *> {
-        new MSBuildFilter(QStringLiteral("Source Files"), sourceFileExtensions(), parent),
-        new MSBuildFilter(QStringLiteral("Header Files"), headerFileExtensions(), parent)
-    };
+    const auto sourceFilter = new MSBuildFilter(QStringLiteral("Source Files"), sourceFileExtensions(), parent);
+    const auto headerFilter = new MSBuildFilter(QStringLiteral("Header Files"), headerFileExtensions(), parent);
 
     const auto formFilter = new MSBuildFilter(QStringLiteral("Form Files"),
                                               QStringList() << QStringLiteral("ui"), parent);
@@ -94,12 +93,9 @@ static QVector<MSBuildFilter *> defaultItemGroupFilters(IMSBuildItemGroup *paren
                                                      QStringList() << QStringLiteral("ts"), parent);
     translationFilter->setParseFiles(false);
 
-    return QVector<MSBuildFilter *>()
-            << filters
-            << formFilter
-            << resourceFilter
-            << generatedFilter
-            << translationFilter;
+    return std::vector<MSBuildFilter *> {
+        sourceFilter, headerFilter, formFilter, resourceFilter, generatedFilter, translationFilter
+    };
 }
 
 static bool matchesFilter(const MSBuildFilter *filter, const QString &filePath)
@@ -132,14 +128,11 @@ MSBuildFiltersProject::MSBuildFiltersProject(const GeneratableProductData &produ
                 allFiles.unite(Internal::Set<QString>::fromList(groupData.allFilePaths()));
     }
 
-    auto allFilesSorted = allFiles.toList();
-    std::sort(allFilesSorted.begin(), allFilesSorted.end());
-
     MSBuildItemGroup *headerFilesGroup = nullptr;
     MSBuildItemGroup *sourceFilesGroup = nullptr;
     MSBuildItemGroup *filesGroup = nullptr;
 
-    for (const auto &filePath : allFilesSorted) {
+    for (const auto &filePath : allFiles) {
         MSBuildFileItem *fileItem = nullptr;
 
         for (const MSBuildFilter *options : filterOptions) {
diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp
index 36574040e..1e4f5fd01 100644
--- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp
+++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp
@@ -29,9 +29,9 @@
 ****************************************************************************/
 
 #include "visualstudiosolutionglobalsection.h"
-#include <QtCore/qvector.h>
 
 #include <utility>
+#include <vector>
 
 namespace qbs {
 
@@ -39,7 +39,7 @@ class VisualStudioSolutionGlobalSectionPrivate
 {
 public:
     QString name;
-    QVector<std::pair<QString, QString>> properties;
+    std::vector<std::pair<QString, QString>> properties;
     bool post = false;
 };
 
@@ -75,14 +75,14 @@ void VisualStudioSolutionGlobalSection::setPost(bool post)
     d->post = post;
 }
 
-QVector<std::pair<QString, QString> > VisualStudioSolutionGlobalSection::properties() const
+std::vector<std::pair<QString, QString> > VisualStudioSolutionGlobalSection::properties() const
 {
     return d->properties;
 }
 
 void VisualStudioSolutionGlobalSection::appendProperty(const QString &key, const QString &value)
 {
-    d->properties.append({ key, value });
+    d->properties.push_back({ key, value });
 }
 
 } // namespace qbs
diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h
index e4d3d7176..dd821fce0 100644
--- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h
+++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h
@@ -52,7 +52,7 @@ public:
     bool isPost() const;
     void setPost(bool post);
 
-    QVector<std::pair<QString, QString> > properties() const;
+    std::vector<std::pair<QString, QString> > properties() const;
     void appendProperty(const QString &key, const QString &value);
 
 private:
diff --git a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp
index cb3698e92..ea621b271 100644
--- a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp
+++ b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp
@@ -292,12 +292,12 @@ void VisualStudioGenerator::generate()
     d->reset();
 }
 
-QVector<QSharedPointer<ProjectGenerator> > VisualStudioGenerator::createGeneratorList()
+std::vector<QSharedPointer<ProjectGenerator> > VisualStudioGenerator::createGeneratorList()
 {
-    QVector<QSharedPointer<ProjectGenerator> > result;
+    std::vector<QSharedPointer<ProjectGenerator> > result;
     for (const auto &info : VisualStudioVersionInfo::knownVersions()) {
         if (info.usesMsBuild())
-            result << QSharedPointer<ProjectGenerator>(new VisualStudioGenerator(info));
+            result.push_back(QSharedPointer<ProjectGenerator>(new VisualStudioGenerator(info)));
     }
     return result;
 }
diff --git a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.h b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.h
index 43c6709a7..b8e9ad2ae 100644
--- a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.h
+++ b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.h
@@ -61,7 +61,7 @@ public:
     QString generatorName() const override;
     void generate() override;
 
-    static QVector<QSharedPointer<ProjectGenerator> > createGeneratorList();
+    static std::vector<QSharedPointer<ProjectGenerator> > createGeneratorList();
 
 private:
     virtual void visitProject(const GeneratableProject &project) override;