From d69302ad61c5ef16ad3bdc439bc41858b7b1c607 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 12 Jul 2023 17:10:29 +0200 Subject: [PATCH] Nim: Use aspect more directly in NimCompilerCleanStep Change-Id: I8433dfa96c65ea3e1f7e9b0daef2e64e6cc65684 Reviewed-by: Jarek Kobus --- .../nim/project/nimcompilercleanstep.cpp | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/plugins/nim/project/nimcompilercleanstep.cpp b/src/plugins/nim/project/nimcompilercleanstep.cpp index 798ba4f8a0c..4e2c51446a8 100644 --- a/src/plugins/nim/project/nimcompilercleanstep.cpp +++ b/src/plugins/nim/project/nimcompilercleanstep.cpp @@ -23,7 +23,17 @@ namespace Nim { class NimCompilerCleanStep final : public BuildStep { public: - NimCompilerCleanStep(BuildStepList *parentList, Id id); + NimCompilerCleanStep(BuildStepList *parentList, Id id) + : BuildStep(parentList, id) + { + workingDir.setLabelText(Tr::tr("Working directory:")); + workingDir.setDisplayStyle(StringAspect::LineEditDisplay); + + setSummaryUpdater([this] { + workingDir.setValue(buildDirectory()); + return displayName(); + }); + } private: bool init() final; @@ -34,21 +44,9 @@ private: bool removeOutFilePath(); FilePath m_buildDir; + FilePathAspect workingDir{this}; }; -NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList, Id id) - : BuildStep(parentList, id) -{ - auto workingDirectory = addAspect(); - workingDirectory->setLabelText(Tr::tr("Working directory:")); - workingDirectory->setDisplayStyle(StringAspect::LineEditDisplay); - - setSummaryUpdater([this, workingDirectory] { - workingDirectory->setValue(buildDirectory()); - return displayName(); - }); -} - bool NimCompilerCleanStep::init() { FilePath buildDir = buildDirectory();