RSSListing: remove metaDataChanged slot to handle redirects
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 <marten.nordheim@qt.io> Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io>
This commit is contained in:
parent
e7b1bc6590
commit
fe2af0f8a3
@ -77,7 +77,6 @@ void RSSListing::get(const QUrl &url)
|
|||||||
currentReply = url.isValid() ? manager.get(QNetworkRequest(url)) : nullptr;
|
currentReply = url.isValid() ? manager.get(QNetworkRequest(url)) : nullptr;
|
||||||
if (currentReply) {
|
if (currentReply) {
|
||||||
connect(currentReply, &QNetworkReply::readyRead, this, &RSSListing::readyRead);
|
connect(currentReply, &QNetworkReply::readyRead, this, &RSSListing::readyRead);
|
||||||
connect(currentReply, &QNetworkReply::metaDataChanged, this, &RSSListing::metaDataChanged);
|
|
||||||
connect(currentReply, &QNetworkReply::errorOccurred, this, &RSSListing::error);
|
connect(currentReply, &QNetworkReply::errorOccurred, this, &RSSListing::error);
|
||||||
}
|
}
|
||||||
xml.setDevice(currentReply); // Equivalent to clear() if currentReply is null.
|
xml.setDevice(currentReply); // Equivalent to clear() if currentReply is null.
|
||||||
@ -106,14 +105,6 @@ void RSSListing::fetch()
|
|||||||
get(QUrl(lineEdit->text()));
|
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.
|
Reads data received from the RDF source.
|
||||||
|
|
||||||
|
@ -27,7 +27,6 @@ public slots:
|
|||||||
void fetch();
|
void fetch();
|
||||||
void finished(QNetworkReply *reply);
|
void finished(QNetworkReply *reply);
|
||||||
void readyRead();
|
void readyRead();
|
||||||
void metaDataChanged();
|
|
||||||
void error(QNetworkReply::NetworkError);
|
void error(QNetworkReply::NetworkError);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user