Use the new BaseAspect::addOnChanged in a few places

... and in some cases move it closer to the aspect setup. I kept
the original location in cases where the order possibly matters.

Change-Id: I4774ea355d0d1e3cf890676a84121195fca6d406
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/android/androidrunconfiguration.cpp

@@ -54,8 +54,7 @@ public:
         environment.addSupportedBaseEnvironment(Tr::tr("Clean Environment"), {});
 
         extraAppArgs.setMacroExpander(macroExpander());
-
+        extraAppArgs.addOnChanged(this, [this, target] {
-        connect(&extraAppArgs, &BaseAspect::changed, this, [this, target] {
             if (target->buildConfigurations().first()->buildType() == BuildConfiguration::BuildType::Release) {
                 const QString buildKey = target->activeBuildKey();
                 target->buildSystem()->setExtraData(buildKey,

src/plugins/autotoolsprojectmanager/autogenstep.cpp

@@ -52,8 +52,7 @@ AutogenStep::AutogenStep(BuildStepList *bsl, Id id) : AbstractProcessStep(bsl, i
     m_arguments.setLabelText(Tr::tr("Arguments:"));
     m_arguments.setDisplayStyle(StringAspect::LineEditDisplay);
     m_arguments.setHistoryCompleter("AutotoolsPM.History.AutogenStepArgs");
-
+    m_arguments.addOnChanged(this, [this] { m_runAutogen = true; });
-    connect(&m_arguments, &BaseAspect::changed, this, [this] { m_runAutogen = true; });
 
     setWorkingDirectoryProvider([this] { return project()->projectDirectory(); });
 

src/plugins/autotoolsprojectmanager/autoreconfstep.cpp

@@ -42,8 +42,7 @@ public:
         arguments.setValue("--force --install");
         arguments.setDisplayStyle(StringAspect::LineEditDisplay);
         arguments.setHistoryCompleter("AutotoolsPM.History.AutoreconfStepArgs");
-
+        arguments.addOnChanged(this, [this] { m_runAutoreconf = true; });
-        connect(&arguments, &BaseAspect::changed, this, [this] { m_runAutoreconf = true; });
 
         setCommandLineProvider([this] {
             return CommandLine("autoreconf", arguments(), CommandLine::Raw);

src/plugins/autotoolsprojectmanager/configurestep.cpp

@@ -45,10 +45,7 @@ public:
         arguments.setSettingsKey("AutotoolsProjectManager.ConfigureStep.AdditionalArguments");
         arguments.setLabelText(Tr::tr("Arguments:"));
         arguments.setHistoryCompleter("AutotoolsPM.History.ConfigureArgs");
-
+        arguments.addOnChanged(this, [this] { m_runConfigure = true; });
-        connect(&arguments, &BaseAspect::changed, this, [this] {
-            m_runConfigure = true;
-        });
 
         setCommandLineProvider([this] {
             return getCommandLine(arguments());

src/plugins/axivion/axivionsettings.cpp

@@ -251,8 +251,8 @@ DashboardSettingsWidget::DashboardSettingsWidget(QWidget *parent, QPushButton *o
         m_valid.setValue(isValid());
         ok->setEnabled(m_valid());
     };
-    connect(&m_dashboardUrl, &BaseAspect::changed, this, checkValidity);
+    m_dashboardUrl.addOnChanged(this, checkValidity);
-    connect(&m_username, &BaseAspect::changed, this, checkValidity);
+    m_username.addOnChanged(this, checkValidity);
 }
 
 AxivionServer DashboardSettingsWidget::dashboardServer() const

src/plugins/beautifier/artisticstyle/artisticstyle.cpp

@@ -251,8 +251,9 @@ public:
             .addToContainer(menuId)
             .addOnTriggered(this, &ArtisticStyle::formatFile);
 
-        connect(&settings().supportedMimeTypes, &Utils::BaseAspect::changed,
+        settings().supportedMimeTypes.addOnChanged(this, [this] {
-                this, [this] { updateActions(Core::EditorManager::currentEditor()); });
+            updateActions(Core::EditorManager::currentEditor());
+        });
     }
 
     QString id() const final

src/plugins/beautifier/beautifiertool.cpp

@@ -152,6 +152,7 @@ AbstractSettings::AbstractSettings(const QString &name, const QString &ending)
     command.setCommandVersionArguments({"--version"});
     command.setPromptDialogTitle(BeautifierTool::msgCommandPromptDialogTitle("Clang Format"));
     command.setValidatePlaceHolder(true);
+    command.addOnChanged(this, [this] { m_version = {}; version(); });
 
     supportedMimeTypes.setDisplayStyle(StringAspect::LineEditDisplay);
     supportedMimeTypes.setSettingsKey("supportedMime");
@@ -172,8 +173,6 @@ AbstractSettings::AbstractSettings(const QString &name, const QString &ending)
         }
         return types.join("; ");
     });
-
-    connect(&command, &BaseAspect::changed, this, [this] { m_version = {}; version(); });
 }
 
 AbstractSettings::~AbstractSettings() = default;

src/plugins/beautifier/clangformat/clangformat.cpp

@@ -346,8 +346,9 @@ public:
             .addToContainer(menuId)
             .addOnTriggered(this, &ClangFormat::disableFormattingSelectedText);
 
-        connect(&settings().supportedMimeTypes, &BaseAspect::changed,
+        settings().supportedMimeTypes.addOnChanged(this, [this] {
-                this, [this] { updateActions(Core::EditorManager::currentEditor()); });
+            updateActions(Core::EditorManager::currentEditor());
+        });
     }
 
     QString id() const final

src/plugins/beautifier/uncrustify/uncrustify.cpp

@@ -254,8 +254,9 @@ public:
             .addToContainer(menuId)
             .addOnTriggered(this, &Uncrustify::formatSelectedText);
 
-        connect(&settings().supportedMimeTypes, &Utils::BaseAspect::changed,
+        settings().supportedMimeTypes.addOnChanged(this, [this] {
-                this, [this] { updateActions(Core::EditorManager::currentEditor()); });
+            updateActions(Core::EditorManager::currentEditor());
+        });
     }
 
     QString id() const final

src/plugins/boot2qt/qdbrunconfiguration.cpp

@@ -76,8 +76,8 @@ public:
             fullCommand.setValue(cmd.toUserOutput());
         };
 
-        connect(&arguments, &BaseAspect::changed, this, updateFullCommand);
+        arguments.addOnChanged(this, updateFullCommand);
-        connect(&executable, &BaseAspect::changed, this, updateFullCommand);
+        executable.addOnChanged(this, updateFullCommand);
         updateFullCommand();
     }
 

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

@@ -201,11 +201,9 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
 
     auto buildDirAspect = bc->buildDirectoryAspect();
     buildDirAspect->setAutoApplyOnEditingFinished(true);
-    connect(buildDirAspect, &BaseAspect::changed, this, [this] {
+    buildDirAspect->addOnChanged(this, [this] { m_configModel->flush(); }); // clear config cache
-        m_configModel->flush(); // clear out config cache...;
-    });
 
-    connect(&m_buildConfig->buildTypeAspect, &BaseAspect::changed, this, [this] {
+    m_buildConfig->buildTypeAspect.addOnChanged(this, [this] {
         if (!m_buildConfig->cmakeBuildSystem()->isMultiConfig()) {
             CMakeConfig config;
             config << CMakeConfigItem("CMAKE_BUILD_TYPE",
@@ -216,9 +214,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
     });
 
     auto qmlDebugAspect = bc->aspect<QtSupport::QmlDebuggingAspect>();
-    connect(qmlDebugAspect, &QtSupport::QmlDebuggingAspect::changed, this, [this] {
+    qmlDebugAspect->addOnChanged(this, [this] { updateButtonState(); });
-        updateButtonState();
-    });
 
     m_warningMessageLabel = new InfoLabel({}, InfoLabel::Warning);
     m_warningMessageLabel->setVisible(false);

src/plugins/cmakeprojectmanager/cmakebuildstep.cpp

@@ -610,11 +610,11 @@ QWidget *CMakeBuildStep::createConfigWidget()
 
     updateDetails();
 
-    connect(&cmakeArguments, &BaseAspect::changed, this, updateDetails);
+    cmakeArguments.addOnChanged(this, updateDetails);
-    connect(&toolArguments, &BaseAspect::changed, this, updateDetails);
+    toolArguments.addOnChanged(this, updateDetails);
-    connect(&useStaging, &BaseAspect::changed, this, updateDetails);
+    useStaging.addOnChanged(this, updateDetails);
-    connect(&stagingDir, &BaseAspect::changed, this, updateDetails);
+    stagingDir.addOnChanged(this, updateDetails);
-    connect(&useiOSAutomaticProvisioningUpdates, &BaseAspect::changed, this, updateDetails);
+    useiOSAutomaticProvisioningUpdates.addOnChanged(this, updateDetails);
 
     connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::settingsChanged,
             this, updateDetails);

src/plugins/cmakeprojectmanager/cmakeformatter.cpp

@@ -116,8 +116,7 @@ public:
                                   && isApplicable(editor->document()));
         };
 
-        connect(&autoFormatMime, &Utils::StringAspect::changed,
+        autoFormatMime.addOnChanged(this, updateActions);
-                this, updateActions);
         connect(EditorManager::instance(), &EditorManager::currentEditorChanged,
                 this, updateActions);
         connect(EditorManager::instance(), &EditorManager::aboutToSave,

src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp

@@ -99,7 +99,7 @@ QWidget *CMakeInstallStep::createConfigWidget()
 
     updateDetails();
 
-    connect(&cmakeArguments, &StringAspect::changed, this, updateDetails);
+    cmakeArguments.addOnChanged(this, updateDetails);
 
     connect(ProjectExplorerPlugin::instance(),
             &ProjectExplorerPlugin::settingsChanged,

src/plugins/compilerexplorer/compilerexplorereditor.cpp

@@ -104,7 +104,7 @@ public:
             settings->source.setVolatileValue(plainText());
         });
 
-        connect(&settings->source, &Utils::StringAspect::changed, this, [settings, this] {
+        settings->source.addOnChanged(this, [settings, this] {
             if (settings->source.volatileValue() != plainText())
                 setPlainText(settings->source.volatileValue());
         });

src/plugins/compilerexplorer/compilerexplorersettings.cpp

@@ -77,10 +77,9 @@ SourceSettings::SourceSettings(const ApiConfigFunction &apiConfigFunction)
     compilers.setCreateItemFunction([this, apiConfigFunction] {
         auto result = std::make_shared<CompilerSettings>(apiConfigFunction);
         connect(this, &SourceSettings::languagesChanged, result.get(), &CompilerSettings::refresh);
-        connect(&languageId,
+        languageId.addOnChanged( result.get(), [this, result = result.get()] {
-                &Utils::StringSelectionAspect::changed,
+            result->setLanguageId(languageId());
-                result.get(),
+        });
-                [this, result = result.get()] { result->setLanguageId(languageId()); });
 
         connect(result.get(), &Utils::AspectContainer::changed, this, &SourceSettings::changed);
 

src/plugins/copilot/copilotplugin.cpp

@@ -125,7 +125,7 @@ public:
             requestAct->setEnabled(enabled);
         };
 
-        connect(&settings().enableCopilot, &BaseAspect::changed, this, updateActions);
+        settings().enableCopilot.addOnChanged(this, updateActions);
 
         updateActions();
 

src/plugins/copilot/copilotsettings.cpp

@@ -252,8 +252,8 @@ CopilotProjectSettings::CopilotProjectSettings(ProjectExplorer::Project *project
     Store map = storeFromVariant(project->namedSettings(Constants::COPILOT_PROJECT_SETTINGS_ID));
     fromMap(map);
 
-    connect(&enableCopilot, &BaseAspect::changed, this, [this, project] { save(project); });
+    enableCopilot.addOnChanged(this, [this, project] { save(project); });
-    connect(&useGlobalSettings, &BaseAspect::changed, this, [this, project] { save(project); });
+    useGlobalSettings.addOnChanged(this, [this, project] { save(project); });
 }
 
 void CopilotProjectSettings::setUseGlobalSettings(bool useGlobal)

src/plugins/coreplugin/generalsettings.cpp

@@ -60,6 +60,10 @@ GeneralSettings::GeneralSettings()
     showShortcutsInContextMenus.setLabelText(
         Tr::tr("Show keyboard shortcuts in context menus (default: %1)")
             .arg(defaultShowShortcutsInContextMenu() ? Tr::tr("on") : Tr::tr("off")));
+    showShortcutsInContextMenus.addOnChanged(this, [this] {
+        QCoreApplication::setAttribute(Qt::AA_DontShowShortcutsInContextMenus,
+                                       !showShortcutsInContextMenus());
+    });
 
     provideSplitterCursors.setSettingsKey("General/OverrideSplitterCursors");
     provideSplitterCursors.setDefaultValue(false);
@@ -69,11 +73,6 @@ GeneralSettings::GeneralSettings()
                "not displayed properly, you can use the cursors provided by %1.")
             .arg(QGuiApplication::applicationDisplayName()));
 
-    connect(&showShortcutsInContextMenus, &BaseAspect::changed, this, [this] {
-        QCoreApplication::setAttribute(Qt::AA_DontShowShortcutsInContextMenus,
-                                       !showShortcutsInContextMenus());
-    });
-
     readSettings();
 }
 

src/plugins/coreplugin/systemsettings.cpp

@@ -152,9 +152,8 @@ SystemSettings::SystemSettings()
     autoSuspendMinDocumentCount.setEnabler(&autoSuspendEnabled);
     bigFileSizeLimitInMB.setEnabler(&warnBeforeOpeningBigFiles);
 
-    connect(&autoSaveModifiedFiles, &BaseAspect::changed,
+    autoSaveModifiedFiles.addOnChanged(this, &EditorManagerPrivate::updateAutoSave);
-            this, &EditorManagerPrivate::updateAutoSave);
+    autoSaveInterval.addOnChanged(this, &EditorManagerPrivate::updateAutoSave);
-    connect(&autoSaveInterval, &BaseAspect::changed, this, &EditorManagerPrivate::updateAutoSave);
 }
 
 class SystemSettingsWidget : public IOptionsPageWidget