QUrlQuery: s/QPair/std::pair/

They're literally the same, QPair is an alias for std::pair, so this
is both SC and BC.

Also port from qMakePair to std::make_pair, so we can later drop the
qpair.h include (not done here to avoid breaking 6.6/6.5 users
relying on this transitive include for qMakePair().

Pick-to: 6.6 6.5
Change-Id: I593ca3fee5f330992b46170bb660b1b33a663427
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/corelib/io/qurlquery.h b/src/corelib/io/qurlquery.h
index 411f19a4c8..bca62c42e9 100644
--- a/src/corelib/io/qurlquery.h
+++ b/src/corelib/io/qurlquery.h
@@ -22,10 +22,10 @@ public:
     QUrlQuery();
     explicit QUrlQuery(const QUrl &url);
     explicit QUrlQuery(const QString &queryString);
-    QUrlQuery(std::initializer_list<QPair<QString, QString>> list)
+    QUrlQuery(std::initializer_list<std::pair<QString, QString>> list)
         : QUrlQuery()
     {
-        for (const QPair<QString, QString> &item : list)
+        for (const std::pair<QString, QString> &item : list)
             addQueryItem(item.first, item.second);
     }
 
@@ -54,8 +54,8 @@ public:
     QChar queryValueDelimiter() const;
     QChar queryPairDelimiter() const;
 
-    void setQueryItems(const QList<QPair<QString, QString> > &query);
-    QList<QPair<QString, QString> > queryItems(QUrl::ComponentFormattingOptions encoding = QUrl::PrettyDecoded) const;
+    void setQueryItems(const QList<std::pair<QString, QString> > &query);
+    QList<std::pair<QString, QString> > queryItems(QUrl::ComponentFormattingOptions encoding = QUrl::PrettyDecoded) const;
 
     bool hasQueryItem(const QString &key) const;
     void addQueryItem(const QString &key, const QString &value);