diff --git a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp index a52217e6bf7..5ea78779eb3 100644 --- a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp +++ b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp @@ -62,22 +62,28 @@ static QStringList flashAndRunArgs(const Target *target) return {"--build", ".", "--target", targetName}; } -FlashAndRunConfiguration::FlashAndRunConfiguration(Target *target, Core::Id id) - : RunConfiguration(target, id) +class FlashAndRunConfiguration final : public RunConfiguration { - auto flashAndRunParameters = addAspect(); - flashAndRunParameters->setLabelText("Flash and run CMake parameters:"); - flashAndRunParameters->setDisplayStyle(BaseStringAspect::TextEditDisplay); - flashAndRunParameters->setSettingsKey("FlashAndRunConfiguration.Parameters"); + Q_DECLARE_TR_FUNCTIONS(McuSupport::Internal::FlashAndRunConfiguration) - setUpdater([target, flashAndRunParameters] { - flashAndRunParameters->setValue(flashAndRunArgs(target).join(' ')); - }); +public: + FlashAndRunConfiguration(Target *target, Core::Id id) + : RunConfiguration(target, id) + { + auto flashAndRunParameters = addAspect(); + flashAndRunParameters->setLabelText(tr("Flash and run CMake parameters:")); + flashAndRunParameters->setDisplayStyle(BaseStringAspect::TextEditDisplay); + flashAndRunParameters->setSettingsKey("FlashAndRunConfiguration.Parameters"); - update(); + setUpdater([target, flashAndRunParameters] { + flashAndRunParameters->setValue(flashAndRunArgs(target).join(' ')); + }); - connect(target->project(), &Project::displayNameChanged, this, &RunConfiguration::update); -} + update(); + + connect(target->project(), &Project::displayNameChanged, this, &RunConfiguration::update); + } +}; class FlashAndRunWorker : public SimpleTargetRunner { diff --git a/src/plugins/mcusupport/mcusupportrunconfiguration.h b/src/plugins/mcusupport/mcusupportrunconfiguration.h index 704c8c9c904..3b0a138e0a1 100644 --- a/src/plugins/mcusupport/mcusupportrunconfiguration.h +++ b/src/plugins/mcusupport/mcusupportrunconfiguration.h @@ -31,20 +31,12 @@ namespace McuSupport { namespace Internal { -class McuSupportRunConfigurationFactory : public ProjectExplorer::FixedRunConfigurationFactory +class McuSupportRunConfigurationFactory final : public ProjectExplorer::FixedRunConfigurationFactory { public: McuSupportRunConfigurationFactory(); }; -class FlashAndRunConfiguration : public ProjectExplorer::RunConfiguration -{ - Q_OBJECT - -public: - FlashAndRunConfiguration(ProjectExplorer::Target *target, Core::Id id); -}; - ProjectExplorer::RunWorkerFactory::WorkerCreator makeFlashAndRunWorker(); } // namespace Internal