diff options
author | Artem Sokolovskii <artem.sokolovskii@qt.io> | 2022-12-08 14:15:23 +0100 |
---|---|---|
committer | Artem Sokolovskii <artem.sokolovskii@qt.io> | 2022-12-09 11:17:00 +0000 |
commit | 69abc39aead7414fc20f55680de0a88ae4b846ea (patch) | |
tree | d12b17ae1c60e07ed16cd9a796495a1920e92e8f | |
parent | 823eafcda9e469b325d095c0a55efc76c3dfe949 (diff) |
CodeStyle: Fix save settings without applying
Change-Id: Iebe4c4fb6f3279592e7933981aba69087db558f9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/plugins/cppeditor/cppcodestylesettingspage.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/plugins/cppeditor/cppcodestylesettingspage.cpp b/src/plugins/cppeditor/cppcodestylesettingspage.cpp index 6493c13589..67a785809d 100644 --- a/src/plugins/cppeditor/cppcodestylesettingspage.cpp +++ b/src/plugins/cppeditor/cppcodestylesettingspage.cpp @@ -253,11 +253,6 @@ void CppCodeStylePreferencesWidget::slotCodeStyleSettingsChanged() if (m_blockUpdates) return; - if (m_preferences) { - auto current = qobject_cast<CppCodeStylePreferences *>(m_preferences->currentPreferences()); - if (current) - current->setCodeStyleSettings(cppCodeStyleSettings()); - } emit codeStyleSettingsChanged(cppCodeStyleSettings()); updatePreview(); } @@ -267,12 +262,6 @@ void CppCodeStylePreferencesWidget::slotTabSettingsChanged(const TabSettings &se if (m_blockUpdates) return; - if (m_preferences) { - auto current = qobject_cast<CppCodeStylePreferences *>(m_preferences->currentPreferences()); - if (current) - current->setTabSettings(settings); - } - emit tabSettingsChanged(settings); updatePreview(); } @@ -355,6 +344,14 @@ void CppCodeStylePreferencesWidget::addTab(CppCodeStyleWidget *page, QString tab void CppCodeStylePreferencesWidget::apply() { + if (m_preferences) { + auto current = qobject_cast<CppCodeStylePreferences *>(m_preferences->currentPreferences()); + if (current) { + current->setTabSettings(tabSettings()); + current->setCodeStyleSettings(cppCodeStyleSettings()); + } + } + emit applyEmitted(); } |