1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename QHttpHeaders::has() to contains()

Browse Source 
Resulted from API-review

Change-Id: I84e880dc6edb9c62fd1ddd50d477347443fd52a7
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit e2462b09b7dcbd52c4be0df5f01508dacf27cab5)
This commit is contained in:
Juha Vuolle 2024-01-10 14:44:20 +02:00
parent 149da3331b
commit 86e5979d51
4 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/access/qhttpheaders.cpp
View File

@ -907,7 +907,7 @@ bool QHttpHeaders::replace(qsizetype i, WellKnownHeader name, QAnyStringView new
\sa has(QHttpHeaders::WellKnownHeader) \sa has(QHttpHeaders::WellKnownHeader)
*/ */
bool QHttpHeaders::has(QAnyStringView name) const bool QHttpHeaders::contains(QAnyStringView name) const
{ {
return std::any_of(d->headers.cbegin(), d->headers.cend(), return std::any_of(d->headers.cbegin(), d->headers.cend(),
[&name](const Header &header) { return headerNameIs(header, name); }); [&name](const Header &header) { return headerNameIs(header, name); });
@ -916,9 +916,9 @@ bool QHttpHeaders::has(QAnyStringView name) const
/*! /*!
\overload has(QAnyStringView) \overload has(QAnyStringView)
*/ */
bool QHttpHeaders::has(WellKnownHeader name) const bool QHttpHeaders::contains(WellKnownHeader name) const
{ {
return has(headerNames[qToUnderlying(name)]); return contains(headerNames[qToUnderlying(name)]);
} }
/*! /*!
@ -943,7 +943,7 @@ QList<QByteArray> QHttpHeaders::names() const
*/ */
void QHttpHeaders::removeAll(QAnyStringView name) void QHttpHeaders::removeAll(QAnyStringView name)
{ {
if (has(name)) { if (contains(name)) {
d.detach(); d.detach();
d->headers.removeIf([&name](const Header &header){ d->headers.removeIf([&name](const Header &header){
return headerNameIs(header, name); return headerNameIs(header, name);

4
src/network/access/qhttpheaders.h
View File

@ -225,8 +225,8 @@ public:
Q_NETWORK_EXPORT bool replace(qsizetype i, QAnyStringView name, QAnyStringView newValue); Q_NETWORK_EXPORT bool replace(qsizetype i, QAnyStringView name, QAnyStringView newValue);
Q_NETWORK_EXPORT bool replace(qsizetype i, WellKnownHeader name, QAnyStringView newValue); Q_NETWORK_EXPORT bool replace(qsizetype i, WellKnownHeader name, QAnyStringView newValue);
Q_NETWORK_EXPORT bool has(QAnyStringView name) const; Q_NETWORK_EXPORT bool contains(QAnyStringView name) const;
Q_NETWORK_EXPORT bool has(WellKnownHeader name) const; Q_NETWORK_EXPORT bool contains(WellKnownHeader name) const;
Q_NETWORK_EXPORT QList<QByteArray> names() const; Q_NETWORK_EXPORT QList<QByteArray> names() const;

52
tests/auto/network/access/qhttpheaders/tst_qhttpheaders.cpp
View File

@ -137,8 +137,8 @@ void tst_QHttpHeaders::constructors()
QHttpHeaders hlist = QHttpHeaders::fromListOfPairs(list); QHttpHeaders hlist = QHttpHeaders::fromListOfPairs(list);
QHttpHeaders hmap = QHttpHeaders::fromMultiMap(map); QHttpHeaders hmap = QHttpHeaders::fromMultiMap(map);
QHttpHeaders hhash = QHttpHeaders::fromMultiHash(hash); QHttpHeaders hhash = QHttpHeaders::fromMultiHash(hash);
QVERIFY(hlist.has(nb1) && hmap.has(nb1) && hhash.has(nb1)); QVERIFY(hlist.contains(nb1) && hmap.contains(nb1) && hhash.contains(nb1));
QVERIFY(!hlist.has(n3) && !hmap.has(n3) && !hhash.has(n3)); QVERIFY(!hlist.contains(n3) && !hmap.contains(n3) && !hhash.contains(n3));
QVERIFY(hlist.equals(hmap)); QVERIFY(hlist.equals(hmap));
QVERIFY(hmap.equals(hhash)); QVERIFY(hmap.equals(hhash));
} }
@ -158,19 +158,19 @@ void tst_QHttpHeaders::accessors()
h1.clear(); h1.clear();
QVERIFY(h1.isEmpty()); QVERIFY(h1.isEmpty());
// has() // contains()
h1.append(n1, v1); h1.append(n1, v1);
QVERIFY(h1.has(n1)); QVERIFY(h1.contains(n1));
QVERIFY(h1.has(N1)); QVERIFY(h1.contains(N1));
QVERIFY(!h1.has(n2)); QVERIFY(!h1.contains(n2));
QVERIFY(!h1.has(QHttpHeaders::WellKnownHeader::Allow)); QVERIFY(!h1.contains(QHttpHeaders::WellKnownHeader::Allow));
h1.append(QHttpHeaders::WellKnownHeader::Accept, "nothing"); h1.append(QHttpHeaders::WellKnownHeader::Accept, "nothing");
QVERIFY(h1.has(QHttpHeaders::WellKnownHeader::Accept)); QVERIFY(h1.contains(QHttpHeaders::WellKnownHeader::Accept));
QVERIFY(h1.has("accept")); QVERIFY(h1.contains("accept"));
// values()/value() // values()/value()
#define EXISTS_NOT(H, N) do { \ #define EXISTS_NOT(H, N) do { \
QVERIFY(!H.has(N)); \ QVERIFY(!H.contains(N)); \
QCOMPARE(H.value(N, "ENOENT"), "ENOENT"); \ QCOMPARE(H.value(N, "ENOENT"), "ENOENT"); \
const auto values = H.values(N); \ const auto values = H.values(N); \
QVERIFY(values.isEmpty()); \ QVERIFY(values.isEmpty()); \
@ -180,7 +180,7 @@ void tst_QHttpHeaders::accessors()
#define EXISTS_N_TIMES(X, H, N, ...) do { \ #define EXISTS_N_TIMES(X, H, N, ...) do { \
const std::array expected = { __VA_ARGS__ }; \ const std::array expected = { __VA_ARGS__ }; \
static_assert(std::tuple_size_v<decltype(expected)> == X); \ static_assert(std::tuple_size_v<decltype(expected)> == X); \
QVERIFY(H.has(N)); \ QVERIFY(H.contains(N)); \
QCOMPARE(H.value(N, "ENOENT"), expected.front()); \ QCOMPARE(H.value(N, "ENOENT"), expected.front()); \
const auto values = H.values(N); \ const auto values = H.values(N); \
QCOMPARE(values.size(), X); \ QCOMPARE(values.size(), X); \
@ -251,11 +251,11 @@ void tst_QHttpHeaders::accessors()
QVERIFY(h1.append(n1, v1)); QVERIFY(h1.append(n1, v1));
QCOMPARE(h1.size(), 3); QCOMPARE(h1.size(), 3);
h1.removeAll(n1); h1.removeAll(n1);
QVERIFY(!h1.has(n1)); QVERIFY(!h1.contains(n1));
QCOMPARE(h1.size(), 1); QCOMPARE(h1.size(), 1);
QVERIFY(h1.has("accept")); QVERIFY(h1.contains("accept"));
h1.removeAll(QHttpHeaders::WellKnownHeader::Accept); h1.removeAll(QHttpHeaders::WellKnownHeader::Accept);
QVERIFY(!h1.has(QHttpHeaders::WellKnownHeader::Accept)); QVERIFY(!h1.contains(QHttpHeaders::WellKnownHeader::Accept));
// removeAt() // removeAt()
h1.clear(); h1.clear();
@ -264,15 +264,15 @@ void tst_QHttpHeaders::accessors()
h1.append(n3, v3); h1.append(n3, v3);
// Valid removals // Valid removals
QVERIFY(h1.has(n3)); QVERIFY(h1.contains(n3));
h1.removeAt(2); h1.removeAt(2);
QVERIFY(!h1.has(n3)); QVERIFY(!h1.contains(n3));
QVERIFY(h1.has(n1)); QVERIFY(h1.contains(n1));
h1.removeAt(0); h1.removeAt(0);
QVERIFY(!h1.has(n1)); QVERIFY(!h1.contains(n1));
QVERIFY(h1.has(n2)); QVERIFY(h1.contains(n2));
h1.removeAt(0); h1.removeAt(0);
QVERIFY(!h1.has(n2)); QVERIFY(!h1.contains(n2));
QVERIFY(h1.isEmpty()); QVERIFY(h1.isEmpty());
// toListOfPairs() // toListOfPairs()
@ -424,17 +424,17 @@ void tst_QHttpHeaders::headerNameField()
h1.append(nonNullLatin1, v1); h1.append(nonNullLatin1, v1);
QCOMPARE(h1.size(), 1); QCOMPARE(h1.size(), 1);
QVERIFY(h1.has(nonNullLatin1)); QVERIFY(h1.contains(nonNullLatin1));
QCOMPARE(h1.combinedValue(nonNullLatin1), v1); QCOMPARE(h1.combinedValue(nonNullLatin1), v1);
h1.append(nonNullUTF8, v2); h1.append(nonNullUTF8, v2);
QCOMPARE(h1.size(), 2); QCOMPARE(h1.size(), 2);
QVERIFY(h1.has(nonNullUTF8)); QVERIFY(h1.contains(nonNullUTF8));
QCOMPARE(h1.combinedValue(nonNullUTF8), v2); QCOMPARE(h1.combinedValue(nonNullUTF8), v2);
h1.append(nonNullUTF16, v3); h1.append(nonNullUTF16, v3);
QCOMPARE(h1.size(), 3); QCOMPARE(h1.size(), 3);
QVERIFY(h1.has(nonNullUTF16)); QVERIFY(h1.contains(nonNullUTF16));
QCOMPARE(h1.combinedValue(nonNullUTF16), v3); QCOMPARE(h1.combinedValue(nonNullUTF16), v3);
} }
@ -508,17 +508,17 @@ void tst_QHttpHeaders::headerValueField()
h1.append(n1, nonNullLatin1); h1.append(n1, nonNullLatin1);
QCOMPARE(h1.size(), 1); QCOMPARE(h1.size(), 1);
QVERIFY(h1.has(n1)); QVERIFY(h1.contains(n1));
QCOMPARE(h1.combinedValue(n1), "abc"); QCOMPARE(h1.combinedValue(n1), "abc");
h1.append(n2, nonNullUTF8); h1.append(n2, nonNullUTF8);
QCOMPARE(h1.size(), 2); QCOMPARE(h1.size(), 2);
QVERIFY(h1.has(n2)); QVERIFY(h1.contains(n2));
QCOMPARE(h1.combinedValue(n2), "def"); QCOMPARE(h1.combinedValue(n2), "def");
h1.append(n3, nonNullUTF16); h1.append(n3, nonNullUTF16);
QCOMPARE(h1.size(), 3); QCOMPARE(h1.size(), 3);
QVERIFY(h1.has(n3)); QVERIFY(h1.contains(n3));
QCOMPARE(h1.combinedValue(n3), "ghi"); QCOMPARE(h1.combinedValue(n3), "ghi");
} }

12
tests/auto/network/access/qnetworkrequestfactory/tst_qnetworkrequestfactory.cpp
View File

@ -194,13 +194,13 @@ void tst_QNetworkRequestFactory::headers()
// Initial state when no headers are set // Initial state when no headers are set
QVERIFY(factory.headers().isEmpty()); QVERIFY(factory.headers().isEmpty());
QVERIFY(factory.headers().values(name1).isEmpty()); QVERIFY(factory.headers().values(name1).isEmpty());
QVERIFY(!factory.headers().has(name1)); QVERIFY(!factory.headers().contains(name1));
// Set headers // Set headers
QHttpHeaders h1; QHttpHeaders h1;
h1.append(name1, value1); h1.append(name1, value1);
factory.setHeaders(h1); factory.setHeaders(h1);
QVERIFY(factory.headers().has(name1)); QVERIFY(factory.headers().contains(name1));
QCOMPARE(factory.headers().combinedValue(name1), value1); QCOMPARE(factory.headers().combinedValue(name1), value1);
QCOMPARE(factory.headers().size(), 1); QCOMPARE(factory.headers().size(), 1);
QVERIFY(factory.headers().values("nonexistent").isEmpty()); QVERIFY(factory.headers().values("nonexistent").isEmpty());
@ -209,7 +209,7 @@ void tst_QNetworkRequestFactory::headers()
QCOMPARE(request.rawHeader(name1), value1); QCOMPARE(request.rawHeader(name1), value1);
// Check that empty header does not match // Check that empty header does not match
QVERIFY(!factory.headers().has(""_ba)); QVERIFY(!factory.headers().contains(""_ba));
QVERIFY(factory.headers().values(""_ba).isEmpty()); QVERIFY(factory.headers().values(""_ba).isEmpty());
// Clear headers // Clear headers
@ -223,8 +223,8 @@ void tst_QNetworkRequestFactory::headers()
h1.append(name1, value1); h1.append(name1, value1);
h1.append(name2, value2); h1.append(name2, value2);
factory.setHeaders(h1); factory.setHeaders(h1);
QVERIFY(factory.headers().has(name1)); QVERIFY(factory.headers().contains(name1));
QVERIFY(factory.headers().has(name2)); QVERIFY(factory.headers().contains(name2));
QCOMPARE(factory.headers().combinedValue(name1), value1); QCOMPARE(factory.headers().combinedValue(name1), value1);
QCOMPARE(factory.headers().combinedValue(name2), value2); QCOMPARE(factory.headers().combinedValue(name2), value2);
QCOMPARE(factory.headers().size(), 2); QCOMPARE(factory.headers().size(), 2);
@ -239,7 +239,7 @@ void tst_QNetworkRequestFactory::headers()
h1.append(name1, value2); h1.append(name1, value2);
h1.append(name1, value3); h1.append(name1, value3);
factory.setHeaders(h1); factory.setHeaders(h1);
QVERIFY(factory.headers().has(name1)); QVERIFY(factory.headers().contains(name1));
QCOMPARE(factory.headers().combinedValue(name1), value1 + ',' + value2 + ',' + value3); QCOMPARE(factory.headers().combinedValue(name1), value1 + ',' + value2 + ',' + value3);
request = factory.createRequest(); request = factory.createRequest();
QVERIFY(request.hasRawHeader(name1)); QVERIFY(request.hasRawHeader(name1));