From 8f44ec2e486e8fd5a5cd2b8165cc738e059d1502 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 7 Dec 2023 11:44:26 +0100 Subject: 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 Reviewed-by: Fabian Kosmale --- src/corelib/io/qurlquery.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/corelib/io/qurlquery.h') 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> list) + QUrlQuery(std::initializer_list> list) : QUrlQuery() { - for (const QPair &item : list) + for (const std::pair &item : list) addQueryItem(item.first, item.second); } @@ -54,8 +54,8 @@ public: QChar queryValueDelimiter() const; QChar queryPairDelimiter() const; - void setQueryItems(const QList > &query); - QList > queryItems(QUrl::ComponentFormattingOptions encoding = QUrl::PrettyDecoded) const; + void setQueryItems(const QList > &query); + QList > queryItems(QUrl::ComponentFormattingOptions encoding = QUrl::PrettyDecoded) const; bool hasQueryItem(const QString &key) const; void addQueryItem(const QString &key, const QString &value); -- cgit v1.2.3