From fe2af0f8a3e1e686d78164d97c72b3eda5511459 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 12 May 2023 16:38:43 +0200 Subject: [PATCH] RSSListing: remove metaDataChanged slot to handle redirects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QNetworkAccessManager takes care of doing that by default anyway, these days. Task-number: QTBUG-111228 Pick-to: 6.5 Change-Id: I890d258599e22efb6fc6ce0140304a97edcbb3f8 Reviewed-by: Mårten Nordheim Reviewed-by: Øystein Heskestad --- examples/corelib/serialization/rsslisting/rsslisting.cpp | 9 --------- examples/corelib/serialization/rsslisting/rsslisting.h | 1 - 2 files changed, 10 deletions(-) diff --git a/examples/corelib/serialization/rsslisting/rsslisting.cpp b/examples/corelib/serialization/rsslisting/rsslisting.cpp index 68dcb690475..8d59341d699 100644 --- a/examples/corelib/serialization/rsslisting/rsslisting.cpp +++ b/examples/corelib/serialization/rsslisting/rsslisting.cpp @@ -77,7 +77,6 @@ void RSSListing::get(const QUrl &url) currentReply = url.isValid() ? manager.get(QNetworkRequest(url)) : nullptr; if (currentReply) { connect(currentReply, &QNetworkReply::readyRead, this, &RSSListing::readyRead); - connect(currentReply, &QNetworkReply::metaDataChanged, this, &RSSListing::metaDataChanged); connect(currentReply, &QNetworkReply::errorOccurred, this, &RSSListing::error); } xml.setDevice(currentReply); // Equivalent to clear() if currentReply is null. @@ -106,14 +105,6 @@ void RSSListing::fetch() get(QUrl(lineEdit->text())); } -void RSSListing::metaDataChanged() -{ - const QUrl redirectionTarget = - currentReply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); - if (redirectionTarget.isValid()) - get(redirectionTarget); -} - /* Reads data received from the RDF source. diff --git a/examples/corelib/serialization/rsslisting/rsslisting.h b/examples/corelib/serialization/rsslisting/rsslisting.h index e0ad80870d4..211b2cec332 100644 --- a/examples/corelib/serialization/rsslisting/rsslisting.h +++ b/examples/corelib/serialization/rsslisting/rsslisting.h @@ -27,7 +27,6 @@ public slots: void fetch(); void finished(QNetworkReply *reply); void readyRead(); - void metaDataChanged(); void error(QNetworkReply::NetworkError); private: