diff options
Diffstat (limited to 'src/network/access')
-rw-r--r-- | src/network/access/qftp.cpp | 30 | ||||
-rw-r--r-- | src/network/access/qftp.h | 9 | ||||
-rw-r--r-- | src/network/access/qhttp.h | 4 |
3 files changed, 0 insertions, 43 deletions
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index 50a3b1edaa..a7f96fa463 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -1434,36 +1434,6 @@ QFtp::QFtp(QObject *parent) SIGNAL(listInfo(QUrlInfo))); } -#ifdef QT3_SUPPORT -/*! - Use one of the constructors that doesn't take the \a name - argument and then use setObjectName() instead. -*/ -QFtp::QFtp(QObject *parent, const char *name) - : QObject(*new QFtpPrivate, parent) -{ - Q_D(QFtp); - setObjectName(QLatin1String(name)); - d->errorString = tr("Unknown error"); - - connect(&d->pi, SIGNAL(connectState(int)), - SLOT(_q_piConnectState(int))); - connect(&d->pi, SIGNAL(finished(QString)), - SLOT(_q_piFinished(QString))); - connect(&d->pi, SIGNAL(error(int,QString)), - SLOT(_q_piError(int,QString))); - connect(&d->pi, SIGNAL(rawFtpReply(int,QString)), - SLOT(_q_piFtpReply(int,QString))); - - connect(&d->pi.dtp, SIGNAL(readyRead()), - SIGNAL(readyRead())); - connect(&d->pi.dtp, SIGNAL(dataTransferProgress(qint64,qint64)), - SIGNAL(dataTransferProgress(qint64,qint64))); - connect(&d->pi.dtp, SIGNAL(listInfo(QUrlInfo)), - SIGNAL(listInfo(QUrlInfo))); -} -#endif - /*! \enum QFtp::State diff --git a/src/network/access/qftp.h b/src/network/access/qftp.h index 2a58344780..671b9ba7c7 100644 --- a/src/network/access/qftp.h +++ b/src/network/access/qftp.h @@ -124,10 +124,6 @@ public: qint64 bytesAvailable() const; qint64 read(char *data, qint64 maxlen); -#ifdef QT3_SUPPORT - inline QT3_SUPPORT qint64 readBlock(char *data, quint64 maxlen) - { return read(data, qint64(maxlen)); } -#endif QByteArray readAll(); int currentId() const; @@ -155,11 +151,6 @@ Q_SIGNALS: void commandFinished(int, bool); void done(bool); -#ifdef QT3_SUPPORT -public: - QT3_SUPPORT_CONSTRUCTOR QFtp(QObject *parent, const char *name); -#endif - private: Q_DISABLE_COPY(QFtp) Q_DECLARE_PRIVATE(QFtp) diff --git a/src/network/access/qhttp.h b/src/network/access/qhttp.h index 9018b767ff..83b23f85f9 100644 --- a/src/network/access/qhttp.h +++ b/src/network/access/qhttp.h @@ -232,10 +232,6 @@ public: qint64 bytesAvailable() const; qint64 read(char *data, qint64 maxlen); -#ifdef QT3_SUPPORT - inline QT3_SUPPORT qint64 readBlock(char *data, quint64 maxlen) - { return read(data, qint64(maxlen)); } -#endif QByteArray readAll(); int currentId() const; |