From 77fd9661ec4079036506ed091067ac42ff093f50 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 23 Apr 2021 04:25:27 +0200 Subject: [PATCH] ProjectExplorer: AbstractProcessStep code cosmetics Namespaces. Change-Id: I7781bcf7125ad854e05a3b3a6a97d0c39b76df69 Reviewed-by: Christian Stenger --- src/plugins/projectexplorer/abstractprocessstep.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index 7c143e4c1dc..e9da4dc056d 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -106,7 +106,7 @@ public: void cleanUp(QProcess *process); AbstractProcessStep *q; - std::unique_ptr m_process; + std::unique_ptr m_process; ProcessParameters m_param; std::function m_commandLineProvider; std::function m_workingDirectoryProvider; @@ -118,7 +118,7 @@ public: OutputFormatter *outputFormatter = nullptr; }; -AbstractProcessStep::AbstractProcessStep(BuildStepList *bsl, Utils::Id id) : +AbstractProcessStep::AbstractProcessStep(BuildStepList *bsl, Id id) : BuildStep(bsl, id), d(new Private(this)) { @@ -223,8 +223,8 @@ void AbstractProcessStep::doRun() ? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale()); d->stderrStream = std::make_unique(QTextCodec::codecForLocale()); - d->m_process.reset(new Utils::QtcProcess()); - d->m_process->setUseCtrlCStub(Utils::HostOsInfo::isWindowsHost()); + d->m_process.reset(new QtcProcess()); + d->m_process->setUseCtrlCStub(HostOsInfo::isWindowsHost()); d->m_process->setWorkingDirectory(wd.absolutePath()); // 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). @@ -272,7 +272,7 @@ void AbstractProcessStep::setupProcessParameters(ProcessParameters *params) cons { params->setMacroExpander(macroExpander()); - Utils::Environment env = buildEnvironment(); + Environment env = buildEnvironment(); if (d->m_environmentModifier) d->m_environmentModifier(env); params->setEnvironment(env);