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

ProcessInterface: Remove program() method

Browse Source 
It looks it's really unneeded.

Change-Id: Ie9447abfbe57968e5f5302be6b23cb950c4d0ea7
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-02-14 16:49:42 +01:00
parent a3ff220f5b
commit ce40605934
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,7 +252,6 @@ public:
void close() override { m_terminal.stopProcess(); } void close() override { m_terminal.stopProcess(); }
qint64 write(const QByteArray &) override { QTC_CHECK(false); return -1; } qint64 write(const QByteArray &) override { QTC_CHECK(false); return -1; }
QString program() const override { QTC_CHECK(false); return {}; }
QProcess::ProcessError error() const override { return m_terminal.error(); } QProcess::ProcessError error() const override { return m_terminal.error(); }
QProcess::ProcessState state() const override { return m_terminal.state(); } QProcess::ProcessState state() const override { return m_terminal.state(); }
qint64 processId() const override { return m_terminal.processId(); } qint64 processId() const override { return m_terminal.processId(); }
@@ -334,8 +333,6 @@ public:
qint64 write(const QByteArray &data) override qint64 write(const QByteArray &data) override
{ return m_process->write(data); } { return m_process->write(data); }
QString program() const override
{ return m_process->program(); }
QProcess::ProcessError error() const override QProcess::ProcessError error() const override
{ return m_process->error(); } { return m_process->error(); }
QProcess::ProcessState state() const override QProcess::ProcessState state() const override
@@ -426,7 +423,6 @@ public:
void close() override { cancel(); } // TODO: see above void close() override { cancel(); } // TODO: see above
qint64 write(const QByteArray &data) override { return m_handle->write(data); } qint64 write(const QByteArray &data) override { return m_handle->write(data); }
QString program() const override { return m_handle->program(); }
QProcess::ProcessError error() const override { return m_handle->error(); } QProcess::ProcessError error() const override { return m_handle->error(); }
QProcess::ProcessState state() const override { return m_handle->state(); } QProcess::ProcessState state() const override { return m_handle->state(); }
qint64 processId() const override { return m_handle->processId(); } qint64 processId() const override { return m_handle->processId(); }
@@ -1013,7 +1009,7 @@ bool QtcProcess::readDataFromProcess(int timeoutS,
} }
// Prompt user, pretend we have data if says 'No'. // Prompt user, pretend we have data if says 'No'.
const bool hang = !hasData && !finished; const bool hang = !hasData && !finished;
hasData = hang && showTimeOutMessageBox && !askToKill(d->m_process->program()); hasData = hang && showTimeOutMessageBox && !askToKill(d->m_commandLine.executable().path());
} while (hasData && !finished); } while (hasData && !finished);
if (syncDebug) if (syncDebug)
qDebug() << "<readDataFromProcess" << finished; qDebug() << "<readDataFromProcess" << finished;

1
src/libs/utils/qtcprocess.h
View File

@@ -287,7 +287,6 @@ public:
virtual void close() = 0; virtual void close() = 0;
virtual qint64 write(const QByteArray &data) = 0; virtual qint64 write(const QByteArray &data) = 0;
virtual QString program() const = 0;
virtual QProcess::ProcessError error() const = 0; virtual QProcess::ProcessError error() const = 0;
virtual QProcess::ProcessState state() const = 0; virtual QProcess::ProcessState state() const = 0;
virtual qint64 processId() const = 0; virtual qint64 processId() const = 0;