diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-13 10:33:34 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-13 10:24:47 +0000 |
| commit | 5ce218e14226e15ab928e2ddf8bbaaded78a46fa (patch) | |
| tree | 833b7a8d02de8d9623a91ffa3cc29e495907d594 /src/network/access/qhttpnetworkconnectionchannel.cpp | |
| parent | 8f27586b1e96ad377ac84bc6853fd522cdd09af2 (diff) | |
Fix warning and improve the signature of parseRedirectResponse
Fixes unnecessary indirect return value and deprecated construction
of QString from QByteArray.
Change-Id: I4b654348285923ac1df39fc03784175ad6acb674
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 82e573095b..647967839a 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -498,8 +498,8 @@ void QHttpNetworkConnectionChannel::handleStatus() case 305: case 307: { // Parse the response headers and get the "location" url - QUrl redirectUrl; - if (connection->d_func()->parseRedirectResponse(socket, reply, &redirectUrl)) + QUrl redirectUrl = connection->d_func()->parseRedirectResponse(socket, reply); + if (redirectUrl.isValid()) reply->setRedirectUrl(redirectUrl); if (qobject_cast<QHttpNetworkConnection *>(connection)) |