Skip to content

Commit

Permalink
Remove trivial overrides from QProcess
Browse files Browse the repository at this point in the history
Change-Id: I630fc44213fdc380c8b00e159989d5067bb2a185
Reviewed-by: Volker Hilsheimer <[email protected]>
Reviewed-by: Oswald Buddenhagen <[email protected]>
  • Loading branch information
jobor committed Mar 6, 2020
1 parent 3dbfded commit 6cca46e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 31 deletions.
28 changes: 0 additions & 28 deletions src/corelib/io/qprocess.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1660,17 +1660,6 @@ qint64 QProcess::processId() const
#endif
}

/*! \reimp
This function operates on the current read channel.
\sa readChannel(), setReadChannel()
*/
bool QProcess::canReadLine() const
{
return QIODevice::canReadLine();
}

/*!
Closes all communication with the process and kills it. After calling this
function, QProcess will no longer emit readyRead(), and data can no
Expand All @@ -1688,30 +1677,13 @@ void QProcess::close()
QIODevice::close();
}

/*! \reimp
Returns \c true if the process is not running, and no more data is available
for reading; otherwise returns \c false.
*/
bool QProcess::atEnd() const
{
return QIODevice::atEnd();
}

/*! \reimp
*/
bool QProcess::isSequential() const
{
return true;
}

/*! \reimp
*/
qint64 QProcess::bytesAvailable() const
{
return QIODevice::bytesAvailable();
}

/*! \reimp
*/
qint64 QProcess::bytesToWrite() const
Expand Down
3 changes: 0 additions & 3 deletions src/corelib/io/qprocess.h
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,9 @@ class Q_CORE_EXPORT QProcess : public QIODevice
QProcess::ExitStatus exitStatus() const;

// QIODevice
qint64 bytesAvailable() const override; // ### Qt6: remove trivial override
qint64 bytesToWrite() const override;
bool isSequential() const override;
bool canReadLine() const override; // ### Qt6: remove trivial override
void close() override;
bool atEnd() const override; // ### Qt6: remove trivial override

static int execute(const QString &program, const QStringList &arguments);
#if QT_DEPRECATED_SINCE(5, 15)
Expand Down

0 comments on commit 6cca46e

Please sign in to comment.