From 8f44ec2e486e8fd5a5cd2b8165cc738e059d1502 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 7 Dec 2023 11:44:26 +0100 Subject: [PATCH] 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.cpp | 28 ++++++++++++++-------------- src/corelib/io/qurlquery.h | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp index c707e8a2e64..0ae8003ec77 100644 --- a/src/corelib/io/qurlquery.cpp +++ b/src/corelib/io/qurlquery.cpp @@ -123,14 +123,14 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QUrlQuery::QUrlQuery(std::initializer_list> list) + \fn QUrlQuery::QUrlQuery(std::initializer_list> list) \since 5.13 Constructs a QUrlQuery object from the \a list of key/value pair. */ -typedef QList > Map; +typedef QList > Map; class QUrlQueryPrivate : public QSharedData { @@ -146,7 +146,7 @@ public: void setQuery(const QString &query); void addQueryItem(const QString &key, const QString &value) - { itemList.append(qMakePair(recodeFromUser(key), recodeFromUser(value))); } + { itemList.append(std::make_pair(recodeFromUser(key), recodeFromUser(value))); } int findRecodedKey(const QString &key, int from = 0) const { for (int i = from; i < itemList.size(); ++i) @@ -290,17 +290,17 @@ void QUrlQueryPrivate::setQuery(const QString &query) if (delimiter == pos) { // the value delimiter wasn't found, store a null value - itemList.append(qMakePair(key, QString())); + itemList.append(std::make_pair(key, QString())); } else if (delimiter + 1 == pos) { // if the delimiter was found but the value is empty, store empty-but-not-null - itemList.append(qMakePair(key, QString(0, Qt::Uninitialized))); + itemList.append(std::make_pair(key, QString(0, Qt::Uninitialized))); } else { QString value; if (!qt_urlRecode(value, QStringView{delimiter + 1, pos}, QUrl::DecodeReserved, prettyDecodedActions)) value = QString(delimiter + 1, pos - delimiter - 1); - itemList.append(qMakePair(key, value)); + itemList.append(std::make_pair(key, value)); } if (pos != end) @@ -613,14 +613,14 @@ QChar QUrlQuery::queryPairDelimiter() const \sa queryItems(), isEmpty() */ -void QUrlQuery::setQueryItems(const QList > &query) +void QUrlQuery::setQueryItems(const QList > &query) { clear(); if (query.isEmpty()) return; QUrlQueryPrivate *dd = d; - QList >::const_iterator it = query.constBegin(), + QList >::const_iterator it = query.constBegin(), end = query.constEnd(); for ( ; it != end; ++it) dd->addQueryItem(it->first, it->second); @@ -634,20 +634,20 @@ void QUrlQuery::setQueryItems(const QList > &query) \sa setQueryItems(), {encoding}{Encoding} */ -QList > QUrlQuery::queryItems(QUrl::ComponentFormattingOptions encoding) const +QList > QUrlQuery::queryItems(QUrl::ComponentFormattingOptions encoding) const { if (!d) - return QList >(); + return QList >(); if (idempotentRecodeToUser(encoding)) return d->itemList; - QList > result; + QList > result; Map::const_iterator it = d->itemList.constBegin(); Map::const_iterator end = d->itemList.constEnd(); result.reserve(d->itemList.size()); for ( ; it != end; ++it) - result << qMakePair(d->recodeToUser(it->first, encoding), - d->recodeToUser(it->second, encoding)); + result << std::make_pair(d->recodeToUser(it->first, encoding), + d->recodeToUser(it->second, encoding)); return result; } @@ -766,7 +766,7 @@ void QUrlQuery::removeAllQueryItems(const QString &key) if (d.constData()) { auto *p = d.data(); const QString encodedKey = p->recodeFromUser(key); - auto firstEqualsEncodedKey = [&encodedKey](const QPair &item) { + auto firstEqualsEncodedKey = [&encodedKey](const std::pair &item) { return item.first == encodedKey; }; p->itemList.removeIf(firstEqualsEncodedKey); diff --git a/src/corelib/io/qurlquery.h b/src/corelib/io/qurlquery.h index 411f19a4c80..bca62c42e90 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);