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

ProcessInterface: Simplify customStart() method

Browse Source 
Change-Id: I8940ca016076e42a73774a18a24b6b5ce2cb81ad
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-02-15 18:52:29 +01:00
parent 5c3a08bc4b
commit d520d457c1
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,12 +236,12 @@ public:
void setEnvironment(const Environment &) override { QTC_CHECK(false); } void setEnvironment(const Environment &) override { QTC_CHECK(false); }
void start(const QString &, const QStringList &) override void start(const QString &, const QStringList &) override
{ QTC_CHECK(false); } { QTC_CHECK(false); }
void customStart(const CommandLine &command, const Environment &environment) override void customStart() override
{ {
m_terminal.setAbortOnMetaChars(m_setup.m_abortOnMetaChars); m_terminal.setAbortOnMetaChars(m_setup.m_abortOnMetaChars);
m_terminal.setCommand(command); m_terminal.setCommand(m_setup.m_commandLine);
m_terminal.setWorkingDirectory(m_setup.m_workingDirectory); m_terminal.setWorkingDirectory(m_setup.m_workingDirectory);
m_terminal.setEnvironment(environment); m_terminal.setEnvironment(m_setup.m_environment);
m_terminal.start(); m_terminal.start();
} }
bool isCustomStart() const override { return true; } bool isCustomStart() const override { return true; }
@@ -785,10 +785,12 @@ void QtcProcess::start()
} }
d->ensureProcessInterfaceExists(); d->ensureProcessInterfaceExists();
d->clearForRun(); d->clearForRun();
d->m_process->m_setup.m_commandLine = d->fullCommandLine();
d->m_process->m_setup.m_environment = d->fullEnvironment();
const CommandLine cmd = d->fullCommandLine(); const CommandLine cmd = d->fullCommandLine();
const Environment env = d->fullEnvironment(); const Environment env = d->fullEnvironment();
if (d->m_process->isCustomStart()) if (d->m_process->isCustomStart())
d->m_process->customStart(cmd, env); d->m_process->customStart();
else else
d->defaultStart(cmd, env); d->defaultStart(cmd, env);
} }

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

@@ -284,7 +284,7 @@ public:
virtual void setEnvironment(const Environment &environment) = 0; virtual void setEnvironment(const Environment &environment) = 0;
virtual void start(const QString &program, const QStringList &arguments) = 0; virtual void start(const QString &program, const QStringList &arguments) = 0;
virtual void customStart(const CommandLine &, const Environment &) { QTC_CHECK(false); } virtual void customStart() { QTC_CHECK(false); }
virtual bool isCustomStart() const { return false; } virtual bool isCustomStart() const { return false; }
virtual void terminate() = 0; virtual void terminate() = 0;
virtual void kill() = 0; virtual void kill() = 0;