diff options
author | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2016-02-04 17:46:50 -0800 |
---|---|---|
committer | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2016-02-05 06:59:05 +0000 |
commit | 58bd015ddff84c6bd0b5dcff54b9512e188f346c (patch) | |
tree | 97734fcabaaaa82a1b31dd872fda7fb2bb542ca2 /src/corelib | |
parent | 3b73ee0fb54c45e51e329614d18e667f7e751d41 (diff) |
QProcess: Remove dead code
These functions appear to have been dead code always - even in the
earliest Qt4 releases!
Change-Id: Ie2a458092b45113782284cf8ed3aa11a018b60d4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/io/qprocess_p.h | 1 | ||||
-rw-r--r-- | src/corelib/io/qprocess_unix.cpp | 6 | ||||
-rw-r--r-- | src/corelib/io/qprocess_win.cpp | 9 | ||||
-rw-r--r-- | src/corelib/io/qprocess_wince.cpp | 6 |
4 files changed, 0 insertions, 22 deletions
diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h index 0c501aecd8..043a44df81 100644 --- a/src/corelib/io/qprocess_p.h +++ b/src/corelib/io/qprocess_p.h @@ -381,7 +381,6 @@ public: bool waitForReadyRead(int msecs = 30000); bool waitForBytesWritten(int msecs = 30000); bool waitForFinished(int msecs = 30000); - bool waitForWrite(int msecs = 30000); qint64 bytesAvailableInChannel(const Channel *channel) const; qint64 readFromChannel(const Channel *channel, char *data, qint64 maxlen); diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index a6900544be..f9d14c8e5a 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -1034,12 +1034,6 @@ bool QProcessPrivate::waitForFinished(int msecs) return false; } -bool QProcessPrivate::waitForWrite(int msecs) -{ - pollfd pfd = qt_make_pollfd(stdinChannel.pipe[1], POLLOUT); - return qt_poll_msecs(&pfd, 1, msecs < 0 ? 0 : msecs) == 1; -} - void QProcessPrivate::findExitCode() { } diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index cf0536c2de..611ce34550 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -819,15 +819,6 @@ qint64 QProcessPrivate::writeToStdin(const char *data, qint64 maxlen) return stdinChannel.writer->write(data, maxlen); } -bool QProcessPrivate::waitForWrite(int msecs) -{ - if (!stdinChannel.writer || stdinChannel.writer->waitForWrite(msecs)) - return true; - - setError(QProcess::Timedout); - return false; -} - bool QProcessPrivate::startDetached(const QString &program, const QStringList &arguments, const QString &workingDir, qint64 *pid) { QString args = qt_create_commandline(program, arguments); diff --git a/src/corelib/io/qprocess_wince.cpp b/src/corelib/io/qprocess_wince.cpp index c859a740d5..564b3f520d 100644 --- a/src/corelib/io/qprocess_wince.cpp +++ b/src/corelib/io/qprocess_wince.cpp @@ -278,12 +278,6 @@ qint64 QProcessPrivate::writeToStdin(const char *data, qint64 maxlen) return -1; } -bool QProcessPrivate::waitForWrite(int msecs) -{ - Q_UNUSED(msecs); - return false; -} - bool QProcessPrivate::startDetached(const QString &program, const QStringList &arguments, const QString &workingDir, qint64 *pid) { Q_UNUSED(workingDir); |