From 6cca46ee60da9a70b515caabd68aa5cbbd7c3d87 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 5 Mar 2020 14:45:28 +0100 Subject: Remove trivial overrides from QProcess Change-Id: I630fc44213fdc380c8b00e159989d5067bb2a185 Reviewed-by: Volker Hilsheimer Reviewed-by: Oswald Buddenhagen --- src/corelib/io/qprocess.cpp | 28 ---------------------------- src/corelib/io/qprocess.h | 3 --- 2 files changed, 31 deletions(-) (limited to 'src') diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 40448b17ff..3b708d7727 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -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 @@ -1688,16 +1677,6 @@ 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 @@ -1705,13 +1684,6 @@ bool QProcess::isSequential() const return true; } -/*! \reimp -*/ -qint64 QProcess::bytesAvailable() const -{ - return QIODevice::bytesAvailable(); -} - /*! \reimp */ qint64 QProcess::bytesToWrite() const diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 59b70c9175..ee83c93cf8 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -248,12 +248,9 @@ public: 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) -- cgit v1.2.3