From 7878b0bf9ad180cdd52bc9c7cdf2461621b76107 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 14 Jul 2023 11:47:40 +0200 Subject: [PATCH] McuSupport: Use aspect more directly in RunConfiguration Change-Id: I75bd439a1747cf8c3dcb40327a7b614fc7438590 Reviewed-by: Christian Kandeler --- .../mcusupport/mcusupportrunconfiguration.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp index 8b80f09fccc..d428074dc8b 100644 --- a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp +++ b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp @@ -42,22 +42,23 @@ static QStringList flashAndRunArgs(const RunConfiguration *rc, const Target *tar class FlashAndRunConfiguration final : public RunConfiguration { public: - FlashAndRunConfiguration(Target *target, Utils::Id id) + FlashAndRunConfiguration(Target *target, Id id) : RunConfiguration(target, id) { - auto flashAndRunParameters = addAspect(); - flashAndRunParameters->setLabelText(Tr::tr("Flash and run CMake parameters:")); - flashAndRunParameters->setDisplayStyle(StringAspect::TextEditDisplay); - flashAndRunParameters->setSettingsKey("FlashAndRunConfiguration.Parameters"); + flashAndRunParameters.setLabelText(Tr::tr("Flash and run CMake parameters:")); + flashAndRunParameters.setDisplayStyle(StringAspect::TextEditDisplay); + flashAndRunParameters.setSettingsKey("FlashAndRunConfiguration.Parameters"); - setUpdater([target, flashAndRunParameters, this] { - flashAndRunParameters->setValue(flashAndRunArgs(this, target).join(' ')); + setUpdater([target, this] { + flashAndRunParameters.setValue(flashAndRunArgs(this, target).join(' ')); }); update(); connect(target->project(), &Project::displayNameChanged, this, &RunConfiguration::update); } + + StringAspect flashAndRunParameters{this}; }; class FlashAndRunWorker : public SimpleTargetRunner