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

ProjectExplorer: AbstractProcessStep code cosmetics

Browse Source 
Namespaces.

Change-Id: I7781bcf7125ad854e05a3b3a6a97d0c39b76df69
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-04-23 04:25:27 +02:00
parent 9dfdb9f0a2
commit 77fd9661ec
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -106,7 +106,7 @@ public:
void cleanUp(QProcess *process); void cleanUp(QProcess *process);
AbstractProcessStep *q; AbstractProcessStep *q;
std::unique_ptr<Utils::QtcProcess> m_process; std::unique_ptr<QtcProcess> m_process;
ProcessParameters m_param; ProcessParameters m_param;
std::function<CommandLine()> m_commandLineProvider; std::function<CommandLine()> m_commandLineProvider;
std::function<FilePath()> m_workingDirectoryProvider; std::function<FilePath()> m_workingDirectoryProvider;
@@ -118,7 +118,7 @@ public:
OutputFormatter *outputFormatter = nullptr; OutputFormatter *outputFormatter = nullptr;
}; };
AbstractProcessStep::AbstractProcessStep(BuildStepList *bsl, Utils::Id id) : AbstractProcessStep::AbstractProcessStep(BuildStepList *bsl, Id id) :
BuildStep(bsl, id), BuildStep(bsl, id),
d(new Private(this)) d(new Private(this))
{ {
@@ -223,8 +223,8 @@ void AbstractProcessStep::doRun()
? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale()); ? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale());
d->stderrStream = std::make_unique<QTextDecoder>(QTextCodec::codecForLocale()); d->stderrStream = std::make_unique<QTextDecoder>(QTextCodec::codecForLocale());
d->m_process.reset(new Utils::QtcProcess()); d->m_process.reset(new QtcProcess());
d->m_process->setUseCtrlCStub(Utils::HostOsInfo::isWindowsHost()); d->m_process->setUseCtrlCStub(HostOsInfo::isWindowsHost());
d->m_process->setWorkingDirectory(wd.absolutePath()); d->m_process->setWorkingDirectory(wd.absolutePath());
// Enforce PWD in the environment because some build tools use that. // Enforce PWD in the environment because some build tools use that.
// PWD can be different from getcwd in case of symbolic links (getcwd resolves symlinks). // PWD can be different from getcwd in case of symbolic links (getcwd resolves symlinks).
@@ -272,7 +272,7 @@ void AbstractProcessStep::setupProcessParameters(ProcessParameters *params) cons
{ {
params->setMacroExpander(macroExpander()); params->setMacroExpander(macroExpander());
Utils::Environment env = buildEnvironment(); Environment env = buildEnvironment();
if (d->m_environmentModifier) if (d->m_environmentModifier)
d->m_environmentModifier(env); d->m_environmentModifier(env);
params->setEnvironment(env); params->setEnvironment(env);