Replace all uses of QPair/qMakePair with std::pair/std::make_pair

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

3 files changed, 6 insertions, 5 deletions

diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp
index 117eadc82..36574040e 100644
--- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp
+++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp
@@ -29,16 +29,17 @@
 ****************************************************************************/
 
 #include "visualstudiosolutionglobalsection.h"
-#include <QtCore/qpair.h>
 #include <QtCore/qvector.h>
 
+#include <utility>
+
 namespace qbs {
 
 class VisualStudioSolutionGlobalSectionPrivate
 {
 public:
     QString name;
-    QVector<QPair<QString, QString>> properties;
+    QVector<std::pair<QString, QString>> properties;
     bool post = false;
 };
 
@@ -74,7 +75,7 @@ void VisualStudioSolutionGlobalSection::setPost(bool post)
     d->post = post;
 }
 
-QVector<QPair<QString, QString> > VisualStudioSolutionGlobalSection::properties() const
+QVector<std::pair<QString, QString> > VisualStudioSolutionGlobalSection::properties() const
 {
     return d->properties;
 }
diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h
index 9c0bf950c..e4d3d7176 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<QPair<QString, QString> > properties() const;
+    QVector<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 3c1902c63..cb3698e92 100644
--- a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp
+++ b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp
@@ -80,7 +80,7 @@ public:
     QMap<QString, QSharedPointer<MSBuildProject>> msbuildProjects;
     QMap<QString, VisualStudioSolutionFileProject *> solutionProjects;
     QMap<QString, VisualStudioSolutionFolderProject *> solutionFolders;
-    QList<QPair<QString, bool>> propertySheetNames;
+    QList<std::pair<QString, bool>> propertySheetNames;
 
     void reset();
 };