diff options
author | Markus Goetz <Markus.Goetz@nokia.com> | 2010-01-18 13:57:21 (GMT) |
---|---|---|
committer | Markus Goetz <Markus.Goetz@nokia.com> | 2010-01-18 15:48:03 (GMT) |
commit | b5d3b999fa9c52246c8d4e4c1389df105d96cced (patch) | |
tree | 35edc2742f9a170237c7f266fdc89648264c1853 /src/network/access/qfilenetworkreply_p.h | |
parent | c4a842563d40e8b4c3693a8acb77c9aff6f06e29 (diff) | |
download | Qt-b5d3b999fa9c52246c8d4e4c1389df105d96cced.zip Qt-b5d3b999fa9c52246c8d4e4c1389df105d96cced.tar.gz Qt-b5d3b999fa9c52246c8d4e4c1389df105d96cced.tar.bz2 |
Enhance QFileNetworkReply
It is now considered as finished immediatly after creation to avoid
an event loop spin.
Had to change the auto tests a bit to account for the new behaviour.
Reviewed-by: Peter Hartmann
Diffstat (limited to 'src/network/access/qfilenetworkreply_p.h')
-rw-r--r-- | src/network/access/qfilenetworkreply_p.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/network/access/qfilenetworkreply_p.h b/src/network/access/qfilenetworkreply_p.h index 6f10672..125fa2e 100644 --- a/src/network/access/qfilenetworkreply_p.h +++ b/src/network/access/qfilenetworkreply_p.h @@ -66,7 +66,7 @@ class QFileNetworkReply: public QNetworkReply { Q_OBJECT public: - QFileNetworkReply(QObject *parent, const QNetworkRequest &req); + QFileNetworkReply(QObject *parent, const QNetworkRequest &req, const QNetworkAccessManager::Operation op); ~QFileNetworkReply(); virtual void abort(); @@ -76,12 +76,9 @@ public: virtual bool isSequential () const; qint64 size() const; - virtual qint64 readData(char *data, qint64 maxlen); Q_DECLARE_PRIVATE(QFileNetworkReply) - Q_PRIVATE_SLOT(d_func(), void _q_startOperation()) - }; class QFileNetworkReplyPrivate: public QNetworkReplyPrivate @@ -92,12 +89,7 @@ public: QFile realFile; qint64 realFileSize; - void _q_startOperation(); - virtual bool isFinished() const; - void doFinished(); - bool finished; - Q_DECLARE_PUBLIC(QFileNetworkReply) }; |