summaryrefslogtreecommitdiffstats
path: root/src/network/access/qhttpnetworkrequest_p.h
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-05-13 14:38:44 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-05-13 14:38:44 (GMT)
commit5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1 (patch)
tree712cb1697a1f09439f77219c44ed90fb0223ff49 /src/network/access/qhttpnetworkrequest_p.h
parentfdd2ad0813a856a00cac83ccff9bdd210b398c9c (diff)
parent9820412d2551b655fec24ffde7b2a56e3ad168ea (diff)
downloadQt-5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1.zip
Qt-5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1.tar.gz
Qt-5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/network/access/qhttpnetworkrequest_p.h')
-rw-r--r--src/network/access/qhttpnetworkrequest_p.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h
index d18e116..ed4325a 100644
--- a/src/network/access/qhttpnetworkrequest_p.h
+++ b/src/network/access/qhttpnetworkrequest_p.h
@@ -58,6 +58,8 @@
QT_BEGIN_NAMESPACE
+class QNonContiguousByteDevice;
+
class QHttpNetworkRequestPrivate;
class Q_AUTOTEST_EXPORT QHttpNetworkRequest: public QHttpNetworkHeader
{
@@ -104,8 +106,8 @@ public:
Priority priority() const;
void setPriority(Priority priority);
- QIODevice *data() const;
- void setData(QIODevice *data);
+ void setUploadByteDevice(QNonContiguousByteDevice *bd);
+ QNonContiguousByteDevice* uploadByteDevice() const;
private:
QSharedDataPointer<QHttpNetworkRequestPrivate> d;
@@ -113,7 +115,6 @@ private:
friend class QHttpNetworkConnectionPrivate;
};
-
class QHttpNetworkRequestPrivate : public QHttpNetworkHeaderPrivate
{
public:
@@ -129,7 +130,7 @@ public:
QHttpNetworkRequest::Operation operation;
QHttpNetworkRequest::Priority priority;
- mutable QIODevice *data;
+ mutable QNonContiguousByteDevice* uploadByteDevice;
bool autoDecompress;
};