diff options
author | Jonas M. Gastal <jgastal@profusion.mobi> | 2011-12-29 12:24:17 -0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-29 16:20:45 +0100 |
commit | 231369eb043e9c5221da1a4f2a724643a3f380f3 (patch) | |
tree | 0aeb845bbeea919dba5485c2351f3d7341525d0e /src/network/access/qnetworkreplydataimpl.cpp | |
parent | 4c1469f7da33dd65eb5e8e9a50b79d935eb4add0 (diff) |
Make qDecodeDataUrl return bool.
Change-Id: I23b9fed39af7bea6c171b35e10bd72c424bd903e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/access/qnetworkreplydataimpl.cpp')
-rw-r--r-- | src/network/access/qnetworkreplydataimpl.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/network/access/qnetworkreplydataimpl.cpp b/src/network/access/qnetworkreplydataimpl.cpp index 0cd10ce13b..285b41190d 100644 --- a/src/network/access/qnetworkreplydataimpl.cpp +++ b/src/network/access/qnetworkreplydataimpl.cpp @@ -70,19 +70,16 @@ QNetworkReplyDataImpl::QNetworkReplyDataImpl(QObject *parent, const QNetworkRequ QNetworkReply::open(QIODevice::ReadOnly); QUrl url = req.url(); - - // FIXME qDecodeDataUrl should instead be rewritten to have the QByteArray - // and the mime type as an output parameter and return a bool instead - d->decodeDataUrlResult = qDecodeDataUrl(url); - - if (! d->decodeDataUrlResult.first.isNull()) { - QString &mimeType = d->decodeDataUrlResult.first; - qint64 size = d->decodeDataUrlResult.second.size(); + QString mimeType; + QByteArray payload; + if (qDecodeDataUrl(url, mimeType, payload)) { + QString &mimeType = mimeType; + qint64 size = payload.size(); setHeader(QNetworkRequest::ContentTypeHeader, mimeType); setHeader(QNetworkRequest::ContentLengthHeader, size); QMetaObject::invokeMethod(this, "metaDataChanged", Qt::QueuedConnection); - d->decodedData.setBuffer(&d->decodeDataUrlResult.second); + d->decodedData.setBuffer(&payload); d->decodedData.open(QIODevice::ReadOnly); QMetaObject::invokeMethod(this, "downloadProgress", Qt::QueuedConnection, |