From 9c0bc16e943e477a1d9ee24b6f3b1adb382a6fad Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 6 Dec 2021 12:41:09 +0100
Subject: [PATCH] TextEditor: Simplify BehaviorSettingsPage implementation a
 bit

ICore::settings() lives longer than anything in TextEditor.

Change-Id: I67df38f291f43763bdd236ea611db614ac515c97
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 .../texteditor/behaviorsettingspage.cpp       | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/plugins/texteditor/behaviorsettingspage.cpp b/src/plugins/texteditor/behaviorsettingspage.cpp
index 27d318d2779..f1c25b45470 100644
--- a/src/plugins/texteditor/behaviorsettingspage.cpp
+++ b/src/plugins/texteditor/behaviorsettingspage.cpp
@@ -39,7 +39,9 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
+
 #include <utils/hostosinfo.h>
+#include <utils/qtcassert.h>
 
 // for opening the respective coding style preferences
 #include <cppeditor/cppeditorconstants.h>
@@ -142,57 +144,50 @@ void BehaviorSettingsPage::apply()
                    &newBehaviorSettings, &newExtraEncodingSettings);
 
     QSettings *s = Core::ICore::settings();
+    QTC_ASSERT(s, return);
 
     if (d->m_codeStyle->tabSettings() != d->m_pageCodeStyle->tabSettings()) {
         d->m_codeStyle->setTabSettings(d->m_pageCodeStyle->tabSettings());
-        if (s)
-            d->m_codeStyle->toSettings(d->m_settingsPrefix, s);
+        d->m_codeStyle->toSettings(d->m_settingsPrefix, s);
     }
 
     if (d->m_codeStyle->currentDelegate() != d->m_pageCodeStyle->currentDelegate()) {
         d->m_codeStyle->setCurrentDelegate(d->m_pageCodeStyle->currentDelegate());
-        if (s)
-            d->m_codeStyle->toSettings(d->m_settingsPrefix, s);
+        d->m_codeStyle->toSettings(d->m_settingsPrefix, s);
     }
 
     if (newTypingSettings != d->m_typingSettings) {
         d->m_typingSettings = newTypingSettings;
-        if (s)
-            d->m_typingSettings.toSettings(d->m_settingsPrefix, s);
+        d->m_typingSettings.toSettings(d->m_settingsPrefix, s);
 
         emit TextEditorSettings::instance()->typingSettingsChanged(newTypingSettings);
     }
 
     if (newStorageSettings != d->m_storageSettings) {
         d->m_storageSettings = newStorageSettings;
-        if (s)
-            d->m_storageSettings.toSettings(d->m_settingsPrefix, s);
+        d->m_storageSettings.toSettings(d->m_settingsPrefix, s);
 
         emit TextEditorSettings::instance()->storageSettingsChanged(newStorageSettings);
     }
 
     if (newBehaviorSettings != d->m_behaviorSettings) {
         d->m_behaviorSettings = newBehaviorSettings;
-        if (s)
-            d->m_behaviorSettings.toSettings(d->m_settingsPrefix, s);
+        d->m_behaviorSettings.toSettings(d->m_settingsPrefix, s);
 
         emit TextEditorSettings::instance()->behaviorSettingsChanged(newBehaviorSettings);
     }
 
     if (newExtraEncodingSettings != d->m_extraEncodingSettings) {
         d->m_extraEncodingSettings = newExtraEncodingSettings;
-        if (s)
-            d->m_extraEncodingSettings.toSettings(d->m_settingsPrefix, s);
+        d->m_extraEncodingSettings.toSettings(d->m_settingsPrefix, s);
 
         emit TextEditorSettings::instance()->extraEncodingSettingsChanged(newExtraEncodingSettings);
     }
 
-    if (s) {
-        s->setValue(QLatin1String(Core::Constants::SETTINGS_DEFAULTTEXTENCODING),
-                    d->m_page->behaviorWidget->assignedCodecName());
-        s->setValue(QLatin1String(Core::Constants::SETTINGS_DEFAULT_LINE_TERMINATOR),
-                    d->m_page->behaviorWidget->assignedLineEnding());
-    }
+    s->setValue(QLatin1String(Core::Constants::SETTINGS_DEFAULTTEXTENCODING),
+                d->m_page->behaviorWidget->assignedCodecName());
+    s->setValue(QLatin1String(Core::Constants::SETTINGS_DEFAULT_LINE_TERMINATOR),
+                d->m_page->behaviorWidget->assignedLineEnding());
 }
 
 void BehaviorSettingsPage::settingsFromUI(TypingSettings *typingSettings,