summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Krems <m.krems@software-vision.eu>2012-07-05 08:00:52 +0200
committerShane Kearns <shane.kearns@accenture.com>2012-07-05 13:42:48 +0200
commit15b9e24bd6581786afbfa9431362d5279f78deb5 (patch)
treefc3bd856281907b494c3153fb0db0eee49b35ee9
parent9b9e878b9f1885abe1ef30c832cf32be02e786fd (diff)
remove Qt3Support code
Change-Id: I07eee5ab540f4a19f40cf84c82c4bd04b8c0f3c6 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
-rw-r--r--src/qftp/qftp.cpp29
-rw-r--r--src/qftp/qftp.h9
2 files changed, 0 insertions, 38 deletions
diff --git a/src/qftp/qftp.cpp b/src/qftp/qftp.cpp
index c00e6e8..c7c9aa9 100644
--- a/src/qftp/qftp.cpp
+++ b/src/qftp/qftp.cpp
@@ -1430,35 +1430,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)
-{
- 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/qftp/qftp.h b/src/qftp/qftp.h
index c707a72..9c5c2a5 100644
--- a/src/qftp/qftp.h
+++ b/src/qftp/qftp.h
@@ -118,10 +118,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;
@@ -149,11 +145,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)
QScopedPointer<QFtpPrivate> d;