feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove unused readChannel()

Browse Source 
By default QProcess::readChannel() returns StandardOutput,
and since no one modifies it, it will always be the same.
No need for an assert.

Change-Id: Id55f75e5cce4f1b8eaef2ec3094d7b103c2f0238
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2021-07-09 16:30:09 +02:00
parent 1a98fe33db
commit 327645c0f0
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/qtcprocess.cpp
View File

@@ -118,7 +118,6 @@ public:
virtual void setStandardInputFile(const QString &fileName) = 0; virtual void setStandardInputFile(const QString &fileName) = 0;
virtual void setProcessChannelMode(QProcess::ProcessChannelMode mode) = 0; virtual void setProcessChannelMode(QProcess::ProcessChannelMode mode) = 0;
virtual QProcess::ProcessChannel readChannel() const = 0; // only in assert?
virtual qint64 bytesAvailable() const = 0; virtual qint64 bytesAvailable() const = 0;
virtual QString program() const = 0; virtual QString program() const = 0;
virtual QProcess::ProcessError error() const = 0; virtual QProcess::ProcessError error() const = 0;
@@ -230,8 +229,6 @@ public:
void setProcessChannelMode(QProcess::ProcessChannelMode mode) override void setProcessChannelMode(QProcess::ProcessChannelMode mode) override
{ m_process.setProcessChannelMode(mode); } { m_process.setProcessChannelMode(mode); }
QProcess::ProcessChannel readChannel() const override
{ return m_process.readChannel(); }
qint64 bytesAvailable() const override qint64 bytesAvailable() const override
{ return m_process.bytesAvailable(); } { return m_process.bytesAvailable(); }
QString program() const override QString program() const override
@@ -307,7 +304,6 @@ public:
void setStandardInputFile(const QString &fileName) override { QTC_CHECK(false); } void setStandardInputFile(const QString &fileName) override { QTC_CHECK(false); }
void setProcessChannelMode(QProcess::ProcessChannelMode mode) override { QTC_CHECK(false); } void setProcessChannelMode(QProcess::ProcessChannelMode mode) override { QTC_CHECK(false); }
QProcess::ProcessChannel readChannel() const override { QTC_CHECK(false); return QProcess::StandardOutput; }
qint64 bytesAvailable() const override { QTC_CHECK(false); return 0; } qint64 bytesAvailable() const override { QTC_CHECK(false); return 0; }
QString program() const override { return m_command; } QString program() const override { return m_command; }
QProcess::ProcessError error() const override { return m_error; } QProcess::ProcessError error() const override { return m_error; }
@@ -873,8 +869,6 @@ bool QtcProcess::readDataFromProcess(int timeoutS,
return false; return false;
} }
QTC_ASSERT(d->m_process->readChannel() == QProcess::StandardOutput, return false);
// Keep the process running until it has no longer has data // Keep the process running until it has no longer has data
bool finished = false; bool finished = false;
bool hasData = false; bool hasData = false;