1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove trivial overrides from QProcess

Browse Source 
Change-Id: I630fc44213fdc380c8b00e159989d5067bb2a185
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
This commit is contained in:
Joerg Bornemann 2020-03-05 14:45:28 +01:00
parent 3dbfded87e
commit 6cca46ee60
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/corelib/io/qprocess.cpp
View File

@ -1660,17 +1660,6 @@ qint64 QProcess::processId() const
#endif #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 Closes all communication with the process and kills it. After calling this
function, QProcess will no longer emit readyRead(), and data can no function, QProcess will no longer emit readyRead(), and data can no
@ -1688,16 +1677,6 @@ void QProcess::close()
QIODevice::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 /*! \reimp
*/ */
bool QProcess::isSequential() const bool QProcess::isSequential() const
@ -1705,13 +1684,6 @@ bool QProcess::isSequential() const
return true; return true;
} }
/*! \reimp
*/
qint64 QProcess::bytesAvailable() const
{
return QIODevice::bytesAvailable();
}
/*! \reimp /*! \reimp
*/ */
qint64 QProcess::bytesToWrite() const qint64 QProcess::bytesToWrite() const

3
src/corelib/io/qprocess.h
View File

@ -248,12 +248,9 @@ public:
QProcess::ExitStatus exitStatus() const; QProcess::ExitStatus exitStatus() const;
// QIODevice // QIODevice
qint64 bytesAvailable() const override; // ### Qt6: remove trivial override
qint64 bytesToWrite() const override; qint64 bytesToWrite() const override;
bool isSequential() const override; bool isSequential() const override;
bool canReadLine() const override; // ### Qt6: remove trivial override
void close() override; void close() override;
bool atEnd() const override; // ### Qt6: remove trivial override
static int execute(const QString &program, const QStringList &arguments); static int execute(const QString &program, const QStringList &arguments);
#if QT_DEPRECATED_SINCE(5, 15) #if QT_DEPRECATED_SINCE(5, 15)