diff options
20 files changed, 41 insertions, 53 deletions
diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp index 323e5d45b46..33ce4caa9ed 100644 --- a/src/plugins/android/androidrunconfiguration.cpp +++ b/src/plugins/android/androidrunconfiguration.cpp @@ -54,8 +54,7 @@ public: environment.addSupportedBaseEnvironment(Tr::tr("Clean Environment"), {}); extraAppArgs.setMacroExpander(macroExpander()); - - connect(&extraAppArgs, &BaseAspect::changed, this, [this, target] { + extraAppArgs.addOnChanged(this, [this, target] { if (target->buildConfigurations().first()->buildType() == BuildConfiguration::BuildType::Release) { const QString buildKey = target->activeBuildKey(); target->buildSystem()->setExtraData(buildKey, diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp index f1dde9c9211..854c178596e 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp +++ b/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"); - - connect(&m_arguments, &BaseAspect::changed, this, [this] { m_runAutogen = true; }); + m_arguments.addOnChanged(this, [this] { m_runAutogen = true; }); setWorkingDirectoryProvider([this] { return project()->projectDirectory(); }); diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp index 8ad689f1305..da43cf47ae0 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp @@ -42,8 +42,7 @@ public: arguments.setValue("--force --install"); arguments.setDisplayStyle(StringAspect::LineEditDisplay); arguments.setHistoryCompleter("AutotoolsPM.History.AutoreconfStepArgs"); - - connect(&arguments, &BaseAspect::changed, this, [this] { m_runAutoreconf = true; }); + arguments.addOnChanged(this, [this] { m_runAutoreconf = true; }); setCommandLineProvider([this] { return CommandLine("autoreconf", arguments(), CommandLine::Raw); diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp index 4303b298f72..bf5b047fcee 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.cpp +++ b/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"); - - connect(&arguments, &BaseAspect::changed, this, [this] { - m_runConfigure = true; - }); + arguments.addOnChanged(this, [this] { m_runConfigure = true; }); setCommandLineProvider([this] { return getCommandLine(arguments()); diff --git a/src/plugins/axivion/axivionsettings.cpp b/src/plugins/axivion/axivionsettings.cpp index 9100b7c4e99..7d54525e06a 100644 --- a/src/plugins/axivion/axivionsettings.cpp +++ b/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); - connect(&m_username, &BaseAspect::changed, this, checkValidity); + m_dashboardUrl.addOnChanged(this, checkValidity); + m_username.addOnChanged(this, checkValidity); } AxivionServer DashboardSettingsWidget::dashboardServer() const diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp index a3aa30d78e9..ca8d089410b 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp @@ -251,8 +251,9 @@ public: .addToContainer(menuId) .addOnTriggered(this, &ArtisticStyle::formatFile); - connect(&settings().supportedMimeTypes, &Utils::BaseAspect::changed, - this, [this] { updateActions(Core::EditorManager::currentEditor()); }); + settings().supportedMimeTypes.addOnChanged(this, [this] { + updateActions(Core::EditorManager::currentEditor()); + }); } QString id() const final diff --git a/src/plugins/beautifier/beautifiertool.cpp b/src/plugins/beautifier/beautifiertool.cpp index cfcc117667f..029448c65df 100644 --- a/src/plugins/beautifier/beautifiertool.cpp +++ b/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; diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp index d964fe30b1b..14c7313503f 100644 --- a/src/plugins/beautifier/clangformat/clangformat.cpp +++ b/src/plugins/beautifier/clangformat/clangformat.cpp @@ -346,8 +346,9 @@ public: .addToContainer(menuId) .addOnTriggered(this, &ClangFormat::disableFormattingSelectedText); - connect(&settings().supportedMimeTypes, &BaseAspect::changed, - this, [this] { updateActions(Core::EditorManager::currentEditor()); }); + settings().supportedMimeTypes.addOnChanged(this, [this] { + updateActions(Core::EditorManager::currentEditor()); + }); } QString id() const final diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp index a18371ff53b..9ea435b0843 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp @@ -254,8 +254,9 @@ public: .addToContainer(menuId) .addOnTriggered(this, &Uncrustify::formatSelectedText); - connect(&settings().supportedMimeTypes, &Utils::BaseAspect::changed, - this, [this] { updateActions(Core::EditorManager::currentEditor()); }); + settings().supportedMimeTypes.addOnChanged(this, [this] { + updateActions(Core::EditorManager::currentEditor()); + }); } QString id() const final diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp index 66ca757bf9c..b2628093a59 100644 --- a/src/plugins/boot2qt/qdbrunconfiguration.cpp +++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp @@ -76,8 +76,8 @@ public: fullCommand.setValue(cmd.toUserOutput()); }; - connect(&arguments, &BaseAspect::changed, this, updateFullCommand); - connect(&executable, &BaseAspect::changed, this, updateFullCommand); + arguments.addOnChanged(this, updateFullCommand); + executable.addOnChanged(this, updateFullCommand); updateFullCommand(); } diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 2ca2755f58f..5fc11644137 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/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] { - m_configModel->flush(); // clear out config cache...; - }); + buildDirAspect->addOnChanged(this, [this] { m_configModel->flush(); }); // clear 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] { - updateButtonState(); - }); + qmlDebugAspect->addOnChanged(this, [this] { updateButtonState(); }); m_warningMessageLabel = new InfoLabel({}, InfoLabel::Warning); m_warningMessageLabel->setVisible(false); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index aacd273f63e..078b4225e20 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -610,11 +610,11 @@ QWidget *CMakeBuildStep::createConfigWidget() updateDetails(); - connect(&cmakeArguments, &BaseAspect::changed, this, updateDetails); - connect(&toolArguments, &BaseAspect::changed, this, updateDetails); - connect(&useStaging, &BaseAspect::changed, this, updateDetails); - connect(&stagingDir, &BaseAspect::changed, this, updateDetails); - connect(&useiOSAutomaticProvisioningUpdates, &BaseAspect::changed, this, updateDetails); + cmakeArguments.addOnChanged(this, updateDetails); + toolArguments.addOnChanged(this, updateDetails); + useStaging.addOnChanged(this, updateDetails); + stagingDir.addOnChanged(this, updateDetails); + useiOSAutomaticProvisioningUpdates.addOnChanged(this, updateDetails); connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::settingsChanged, this, updateDetails); diff --git a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp index c21b12a93aa..4db53a64d3d 100644 --- a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp @@ -116,8 +116,7 @@ public: && isApplicable(editor->document())); }; - connect(&autoFormatMime, &Utils::StringAspect::changed, - this, updateActions); + autoFormatMime.addOnChanged(this, updateActions); connect(EditorManager::instance(), &EditorManager::currentEditorChanged, this, updateActions); connect(EditorManager::instance(), &EditorManager::aboutToSave, diff --git a/src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp b/src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp index 1040efd75ca..e7ff3879e9b 100644 --- a/src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp +++ b/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, diff --git a/src/plugins/compilerexplorer/compilerexplorereditor.cpp b/src/plugins/compilerexplorer/compilerexplorereditor.cpp index 1d00f8cb95c..f1a103a88e9 100644 --- a/src/plugins/compilerexplorer/compilerexplorereditor.cpp +++ b/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()); }); diff --git a/src/plugins/compilerexplorer/compilerexplorersettings.cpp b/src/plugins/compilerexplorer/compilerexplorersettings.cpp index 291624aac40..13c84159d8e 100644 --- a/src/plugins/compilerexplorer/compilerexplorersettings.cpp +++ b/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, - &Utils::StringSelectionAspect::changed, - result.get(), - [this, result = result.get()] { result->setLanguageId(languageId()); }); + languageId.addOnChanged( result.get(), [this, result = result.get()] { + result->setLanguageId(languageId()); + }); connect(result.get(), &Utils::AspectContainer::changed, this, &SourceSettings::changed); diff --git a/src/plugins/copilot/copilotplugin.cpp b/src/plugins/copilot/copilotplugin.cpp index b5729fe955d..9e7baeab165 100644 --- a/src/plugins/copilot/copilotplugin.cpp +++ b/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(); diff --git a/src/plugins/copilot/copilotsettings.cpp b/src/plugins/copilot/copilotsettings.cpp index 81fd4c3b126..fc1c48ea419 100644 --- a/src/plugins/copilot/copilotsettings.cpp +++ b/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); }); - connect(&useGlobalSettings, &BaseAspect::changed, this, [this, project] { save(project); }); + enableCopilot.addOnChanged(this, [this, project] { save(project); }); + useGlobalSettings.addOnChanged(this, [this, project] { save(project); }); } void CopilotProjectSettings::setUseGlobalSettings(bool useGlobal) diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 1ff36dc8051..934cd167cbc 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/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(); } diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp index 37a2075e1b4..d928eeeec6f 100644 --- a/src/plugins/coreplugin/systemsettings.cpp +++ b/src/plugins/coreplugin/systemsettings.cpp @@ -152,9 +152,8 @@ SystemSettings::SystemSettings() autoSuspendMinDocumentCount.setEnabler(&autoSuspendEnabled); bigFileSizeLimitInMB.setEnabler(&warnBeforeOpeningBigFiles); - connect(&autoSaveModifiedFiles, &BaseAspect::changed, - this, &EditorManagerPrivate::updateAutoSave); - connect(&autoSaveInterval, &BaseAspect::changed, this, &EditorManagerPrivate::updateAutoSave); + autoSaveModifiedFiles.addOnChanged(this, &EditorManagerPrivate::updateAutoSave); + autoSaveInterval.addOnChanged(this, &EditorManagerPrivate::updateAutoSave); } class SystemSettingsWidget : public IOptionsPageWidget |