feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Small cleanup.

Browse Source
This commit is contained in:
kh1
2011-01-11 16:10:09 +01:00
parent 9cf67d21bd
commit 80cd57a9b1
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/help/helpviewer_qwv.cpp
View File

@@ -66,7 +66,7 @@ public:
HelpNetworkReply(const QNetworkRequest &request, const QByteArray &fileData, HelpNetworkReply(const QNetworkRequest &request, const QByteArray &fileData,
const QString &mimeType); const QString &mimeType);
virtual void abort(); virtual void abort() {}
virtual qint64 bytesAvailable() const virtual qint64 bytesAvailable() const
{ return data.length() + QNetworkReply::bytesAvailable(); } { return data.length() + QNetworkReply::bytesAvailable(); }
@@ -76,26 +76,23 @@ protected:
private: private:
QByteArray data; QByteArray data;
qint64 origLen; qint64 dataLength;
}; };
HelpNetworkReply::HelpNetworkReply(const QNetworkRequest &request, HelpNetworkReply::HelpNetworkReply(const QNetworkRequest &request,
const QByteArray &fileData, const QString& mimeType) const QByteArray &fileData, const QString& mimeType)
: data(fileData), origLen(fileData.length()) : data(fileData)
, dataLength(fileData.length())
{ {
setRequest(request); setRequest(request);
setOpenMode(QIODevice::ReadOnly); setOpenMode(QIODevice::ReadOnly);
setHeader(QNetworkRequest::ContentTypeHeader, mimeType); setHeader(QNetworkRequest::ContentTypeHeader, mimeType);
setHeader(QNetworkRequest::ContentLengthHeader, QByteArray::number(origLen)); setHeader(QNetworkRequest::ContentLengthHeader, QByteArray::number(dataLength));
QTimer::singleShot(0, this, SIGNAL(metaDataChanged())); QTimer::singleShot(0, this, SIGNAL(metaDataChanged()));
QTimer::singleShot(0, this, SIGNAL(readyRead())); QTimer::singleShot(0, this, SIGNAL(readyRead()));
} }
void HelpNetworkReply::abort()
{
}
qint64 HelpNetworkReply::readData(char *buffer, qint64 maxlen) qint64 HelpNetworkReply::readData(char *buffer, qint64 maxlen)
{ {
qint64 len = qMin(qint64(data.length()), maxlen); qint64 len = qMin(qint64(data.length()), maxlen);