From 5bb8e678467ae6b1ee9d15ead673b06543740969 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Tue, 5 Mar 2019 17:13:45 +0100 Subject: [PATCH] ClangFormat: Do not save settings if they are not overridden Apply only settings from checkboxes in that case. Change-Id: Ic6740ab9d769730bba4d04dcdde7ad1e2a464614 Reviewed-by: Marco Bubke --- src/plugins/clangformat/clangformatconfigwidget.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp index 27192a67f64..feb61f3276a 100644 --- a/src/plugins/clangformat/clangformatconfigwidget.cpp +++ b/src/plugins/clangformat/clangformatconfigwidget.cpp @@ -188,6 +188,9 @@ void ClangFormatConfigWidget::apply() } settings.write(); + if (!m_ui->overrideDefault->isChecked()) + return; + const QString text = m_ui->clangFormatOptionsTable->toPlainText(); clang::format::FormatStyle style; style.Language = clang::format::FormatStyle::LK_Cpp;