forked from qt-creator/qt-creator
QtcProcess: Get rid of setErrorString() method
It's internal method, not meant to be used outside. It's only used in case of FailedToStart error. Remove it also from ProcessInterface. Leave it inside DefaultImpl and its subclasses only. Remove m_errorString field from ProcessSetupData. Change-Id: Ie605b95c2ff605ab1259045f1a5b16049207c1d3 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -221,6 +221,7 @@ protected:
|
||||
void defaultStart();
|
||||
|
||||
private:
|
||||
virtual void setErrorString(const QString &str) = 0;
|
||||
virtual void doDefaultStart(const QString &program, const QStringList &arguments) = 0;
|
||||
bool dissolveCommand(QString *program, QStringList *arguments);
|
||||
bool ensureProgramExists(const QString &program);
|
||||
@@ -394,7 +395,6 @@ private:
|
||||
m_process->setWorkingDirectory(m_setup->m_workingDirectory.path());
|
||||
m_process->setStandardInputFile(m_setup->m_standardInputFile);
|
||||
m_process->setProcessChannelMode(m_setup->m_processChannelMode);
|
||||
m_process->setErrorString(m_setup->m_errorString);
|
||||
if (m_setup->m_lowPriority)
|
||||
m_process->setLowPriority();
|
||||
if (m_setup->m_unixTerminalDisabled)
|
||||
@@ -525,7 +525,6 @@ public:
|
||||
void setProcessInterface(ProcessInterface *process)
|
||||
{
|
||||
m_process.reset(process);
|
||||
m_setup.m_errorString.clear();
|
||||
m_process->setParent(this);
|
||||
|
||||
connect(m_process.get(), &ProcessInterface::started,
|
||||
@@ -1182,15 +1181,7 @@ QString QtcProcess::errorString() const
|
||||
{
|
||||
if (d->m_process)
|
||||
return d->m_process->errorString();
|
||||
return d->m_setup.m_errorString;
|
||||
}
|
||||
|
||||
void QtcProcess::setErrorString(const QString &str)
|
||||
{
|
||||
if (d->m_process)
|
||||
d->m_process->setErrorString(str);
|
||||
else
|
||||
d->m_setup.m_errorString = str;
|
||||
return {};
|
||||
}
|
||||
|
||||
qint64 QtcProcess::processId() const
|
||||
|
||||
Reference in New Issue
Block a user