diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-15 04:15:40 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-15 04:15:40 (GMT) |
| commit | 3e056e3c1da450d3b879b68cdfa15bc5959ffbc8 (patch) | |
| tree | 53a77ae62bb9ccc8eca9e72c5419c1bd0d61c869 /src/network/access/qnetworkaccessftpbackend_p.h | |
| parent | 9861d14de8f77d90a40163298699c86a986b3f6a (diff) | |
| parent | 272c26b6daf3e48c3f338f4c78cc9e694ac7993f (diff) | |
| download | Qt-3e056e3c1da450d3b879b68cdfa15bc5959ffbc8.zip Qt-3e056e3c1da450d3b879b68cdfa15bc5959ffbc8.tar.gz Qt-3e056e3c1da450d3b879b68cdfa15bc5959ffbc8.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/network/access/qnetworkaccessftpbackend_p.h')
| -rw-r--r-- | src/network/access/qnetworkaccessftpbackend_p.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/network/access/qnetworkaccessftpbackend_p.h b/src/network/access/qnetworkaccessftpbackend_p.h index 9ec2dd8..1bb7ff2 100644 --- a/src/network/access/qnetworkaccessftpbackend_p.h +++ b/src/network/access/qnetworkaccessftpbackend_p.h @@ -87,11 +87,8 @@ public: virtual void open(); virtual void closeDownstreamChannel(); - virtual void closeUpstreamChannel(); virtual bool waitForDownstreamReadyRead(int msecs); - virtual bool waitForUpstreamBytesWritten(int msecs); - virtual void upstreamReadyRead(); virtual void downstreamReadyWrite(); void disconnectFromFtp(); @@ -105,7 +102,7 @@ public slots: private: friend class QNetworkAccessFtpIODevice; QPointer<QNetworkAccessFtpFtp> ftp; - QNetworkAccessFtpIODevice *uploadDevice; + QIODevice *uploadDevice; qint64 totalBytes; int helpId, sizeId, mdtmId; bool supportsSize, supportsMdtm; |