From 311fe1bf249a32c0cf18a61d6e34197c606cc330 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 10 Oct 2023 16:22:31 +0200
Subject: [PATCH] Beautifier: Fix saving of settings

Applying didn't actually apply the new values.

Fixes: QTCREATORBUG-29586
Change-Id: If9416cc18fffd269f6ca3d27523aa138e6f91d7a
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/beautifier/artisticstyle/artisticstyle.cpp | 1 +
 src/plugins/beautifier/clangformat/clangformat.cpp     | 4 +---
 src/plugins/beautifier/generalsettings.cpp             | 1 +
 src/plugins/beautifier/uncrustify/uncrustify.cpp       | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
index 14d8ea1c246..95c3d43ecbf 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
@@ -221,6 +221,7 @@ public:
 
         setOnApply([&s, configurations] {
             s.customStyle.setValue(configurations->currentConfiguration());
+            settings().apply();
             s.save();
         });
 
diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp
index 2a2cad2f41d..c8eab5ea0c2 100644
--- a/src/plugins/beautifier/clangformat/clangformat.cpp
+++ b/src/plugins/beautifier/clangformat/clangformat.cpp
@@ -82,9 +82,6 @@ public:
         fallbackStyle.addOption("WebKit");
         fallbackStyle.setDefaultValue("Default");
 
-        predefinedStyle.setSettingsKey("predefinedStyle");
-        predefinedStyle.setDefaultValue("LLVM");
-
         customStyle.setSettingsKey("customStyle");
 
         documentationFilePath = Core::ICore::userResourcePath(Constants::SETTINGS_DIRNAME)
@@ -299,6 +296,7 @@ public:
         setOnApply([configurations, customizedStyleButton] {
             settings().usePredefinedStyle.setValue(!customizedStyleButton->isChecked());
             settings().customStyle.setValue(configurations->currentConfiguration());
+            settings().apply();
             settings().save();
         });
 
diff --git a/src/plugins/beautifier/generalsettings.cpp b/src/plugins/beautifier/generalsettings.cpp
index 7b8d37416ac..be80de39385 100644
--- a/src/plugins/beautifier/generalsettings.cpp
+++ b/src/plugins/beautifier/generalsettings.cpp
@@ -24,6 +24,7 @@ GeneralSettings &generalSettings()
 
 GeneralSettings::GeneralSettings()
 {
+    setAutoApply(false);
     setSettingsGroups("Beautifier", "General");
 
     autoFormatOnSave.setSettingsKey(Utils::Constants::BEAUTIFIER_AUTO_FORMAT_ON_SAVE);
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp
index f04e5e61800..29722d4df19 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp
@@ -222,6 +222,7 @@ public:
 
         setOnApply([&s, configurations] {
             s.customStyle.setValue(configurations->currentConfiguration());
+            settings().apply();
             s.save();
         });
     }